diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2016-05-24 16:18:46 -0400 |
---|---|---|
committer | Chris Michael <cpmichael@osg.samsung.com> | 2016-05-27 11:57:53 -0400 |
commit | da8bcbc7c64da8e02543f201675d42b58760b21f (patch) | |
tree | 032dde9509c5cc6e3c59312f87b6cff3fe9aace0 /src/lib/ecore_drm2/ecore_drm2_device.c | |
parent | c1253164b2bc944b37b5d04b7b5814f6bbcde8bb (diff) |
ecore-drm2: update to latest elput
Diffstat (limited to 'src/lib/ecore_drm2/ecore_drm2_device.c')
-rw-r--r-- | src/lib/ecore_drm2/ecore_drm2_device.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c index ca43bcff95..df4f99173f 100644 --- a/src/lib/ecore_drm2/ecore_drm2_device.c +++ b/src/lib/ecore_drm2/ecore_drm2_device.c | |||
@@ -97,7 +97,7 @@ out: | |||
97 | } | 97 | } |
98 | 98 | ||
99 | EAPI Ecore_Drm2_Device * | 99 | EAPI Ecore_Drm2_Device * |
100 | ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync) | 100 | ecore_drm2_device_find(const char *seat, unsigned int tty) |
101 | { | 101 | { |
102 | Ecore_Drm2_Device *dev; | 102 | Ecore_Drm2_Device *dev; |
103 | 103 | ||
@@ -111,7 +111,7 @@ ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync) | |||
111 | goto path_err; | 111 | goto path_err; |
112 | } | 112 | } |
113 | 113 | ||
114 | dev->em = elput_manager_connect(seat, tty, sync); | 114 | dev->em = elput_manager_connect(seat, tty); |
115 | if (!dev->em) | 115 | if (!dev->em) |
116 | { | 116 | { |
117 | ERR("Could not connect to input manager"); | 117 | ERR("Could not connect to input manager"); |
@@ -135,7 +135,7 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device) | |||
135 | device->fd = elput_manager_open(device->em, device->path, -1); | 135 | device->fd = elput_manager_open(device->em, device->path, -1); |
136 | if (device->fd < 0) goto open_err; | 136 | if (device->fd < 0) goto open_err; |
137 | 137 | ||
138 | if (!elput_input_init(device->em, NULL)) | 138 | if (!elput_input_init(device->em)) |
139 | { | 139 | { |
140 | ERR("Could not initialize Elput Input"); | 140 | ERR("Could not initialize Elput Input"); |
141 | goto input_err; | 141 | goto input_err; |
@@ -251,25 +251,9 @@ ecore_drm2_device_pointer_left_handed_set(Ecore_Drm2_Device *device, Eina_Bool l | |||
251 | EAPI void | 251 | EAPI void |
252 | ecore_drm2_device_window_set(Ecore_Drm2_Device *device, unsigned int window) | 252 | ecore_drm2_device_window_set(Ecore_Drm2_Device *device, unsigned int window) |
253 | { | 253 | { |
254 | const Eina_List *seats, *l; | ||
255 | const Eina_List *devs, *ll; | ||
256 | Elput_Seat *seat; | ||
257 | Elput_Device *dev; | ||
258 | |||
259 | EINA_SAFETY_ON_NULL_RETURN(device); | 254 | EINA_SAFETY_ON_NULL_RETURN(device); |
260 | EINA_SAFETY_ON_NULL_RETURN(device->em); | 255 | EINA_SAFETY_ON_NULL_RETURN(device->em); |
261 | 256 | elput_manager_window_set(device->em, window); | |
262 | seats = elput_manager_seats_get(device->em); | ||
263 | if (!seats) return; | ||
264 | |||
265 | EINA_LIST_FOREACH(seats, l, seat) | ||
266 | { | ||
267 | devs = elput_input_devices_get(seat); | ||
268 | if (!devs) continue; | ||
269 | |||
270 | EINA_LIST_FOREACH(devs, ll, dev) | ||
271 | elput_device_window_set(dev, window); | ||
272 | } | ||
273 | } | 257 | } |
274 | 258 | ||
275 | EAPI void | 259 | EAPI void |