drm2: update to latest elputdevs/discomfitor/drm2

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);
  * @ingroup Ecore_Drm2_Device_Group
  * @since 1.18
  */
-EAPI Ecore_Drm2_Device *ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync);
+EAPI Ecore_Drm2_Device *ecore_drm2_device_find(const char *seat, unsigned int tty);
 
 /**
  * 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:
 }
 
 EAPI Ecore_Drm2_Device *
-ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync)
+ecore_drm2_device_find(const char *seat, unsigned int tty)
 {
    Ecore_Drm2_Device *dev;
 
@@ -111,7 +111,7 @@ ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync)
         goto path_err;
      }
 
-   dev->em = elput_manager_connect(seat, tty, sync);
+   dev->em = elput_manager_connect(seat, tty);
    if (!dev->em)
      {
         ERR("Could not connect to input manager");
@@ -135,7 +135,7 @@ ecore_drm2_device_open(Ecore_Drm2_Device *device)
    device->fd = elput_manager_open(device->em, device->path, -1);
    if (device->fd < 0) goto open_err;
 
-   if (!elput_input_init(device->em, NULL))
+   if (!elput_input_init(device->em))
      {
         ERR("Could not initialize Elput Input");
         goto input_err;
@@ -251,25 +251,9 @@ ecore_drm2_device_pointer_left_handed_set(Ecore_Drm2_Device *device, Eina_Bool l
 EAPI void
 ecore_drm2_device_window_set(Ecore_Drm2_Device *device, unsigned int window)
 {
-   const Eina_List *seats, *l;
-   const Eina_List *devs, *ll;
-   Elput_Seat *seat;
-   Elput_Device *dev;
-
    EINA_SAFETY_ON_NULL_RETURN(device);
    EINA_SAFETY_ON_NULL_RETURN(device->em);
-
-   seats = elput_manager_seats_get(device->em);
-   if (!seats) return;
-
-   EINA_LIST_FOREACH(seats, l, seat)
-     {
-        devs = elput_input_devices_get(seat);
-        if (!devs) continue;
-
-        EINA_LIST_FOREACH(devs, ll, dev)
-          elput_device_window_set(dev, window);
-     }
+   elput_manager_window_set(device->em, window);
 }
 
 EAPI 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)
 
    if (!device) device = "seat0";
 
-   edata->dev = ecore_drm2_device_find(device, 0, EINA_TRUE);
+   edata->dev = ecore_drm2_device_find(device, 0);
    if (!edata->dev)
      {
         ERR("Failed to create device");