summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/ecore_drm2/Ecore_Drm2.h2
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_device.c24
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c2
3 files changed, 6 insertions, 22 deletions
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index 0afe1054ac..c083d1a9f2 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -123,7 +123,7 @@ EAPI int ecore_drm2_shutdown(void);
123 * @ingroup Ecore_Drm2_Device_Group 123 * @ingroup Ecore_Drm2_Device_Group
124 * @since 1.18 124 * @since 1.18
125 */ 125 */
126EAPI Ecore_Drm2_Device *ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync); 126EAPI Ecore_Drm2_Device *ecore_drm2_device_find(const char *seat, unsigned int tty);
127 127
128/** 128/**
129 * Try to open a given Ecore_Drm2_Device 129 * Try to open a given Ecore_Drm2_Device
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
99EAPI Ecore_Drm2_Device * 99EAPI Ecore_Drm2_Device *
100ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync) 100ecore_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
251EAPI void 251EAPI void
252ecore_drm2_device_window_set(Ecore_Drm2_Device *device, unsigned int window) 252ecore_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
275EAPI void 259EAPI void
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index 3cdc7011f3..f6f4e0c0a9 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -70,7 +70,7 @@ _ecore_evas_drm_init(Ecore_Evas_Engine_Drm_Data *edata, const char *device)
70 70
71 if (!device) device = "seat0"; 71 if (!device) device = "seat0";
72 72
73 edata->dev = ecore_drm2_device_find(device, 0, EINA_TRUE); 73 edata->dev = ecore_drm2_device_find(device, 0);
74 if (!edata->dev) 74 if (!edata->dev)
75 { 75 {
76 ERR("Failed to create device"); 76 ERR("Failed to create device");