ecore-drm2: update to latest elput
This commit is contained in:
parent
c1253164b2
commit
da8bcbc7c6
|
@ -123,7 +123,7 @@ EAPI int ecore_drm2_shutdown(void);
|
||||||
* @ingroup Ecore_Drm2_Device_Group
|
* @ingroup Ecore_Drm2_Device_Group
|
||||||
* @since 1.18
|
* @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
|
* Try to open a given Ecore_Drm2_Device
|
||||||
|
|
|
@ -97,7 +97,7 @@ out:
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Drm2_Device *
|
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;
|
Ecore_Drm2_Device *dev;
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync)
|
||||||
goto path_err;
|
goto path_err;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->em = elput_manager_connect(seat, tty, sync);
|
dev->em = elput_manager_connect(seat, tty);
|
||||||
if (!dev->em)
|
if (!dev->em)
|
||||||
{
|
{
|
||||||
ERR("Could not connect to input manager");
|
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);
|
device->fd = elput_manager_open(device->em, device->path, -1);
|
||||||
if (device->fd < 0) goto open_err;
|
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");
|
ERR("Could not initialize Elput Input");
|
||||||
goto input_err;
|
goto input_err;
|
||||||
|
@ -251,25 +251,9 @@ ecore_drm2_device_pointer_left_handed_set(Ecore_Drm2_Device *device, Eina_Bool l
|
||||||
EAPI void
|
EAPI void
|
||||||
ecore_drm2_device_window_set(Ecore_Drm2_Device *device, unsigned int window)
|
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);
|
||||||
EINA_SAFETY_ON_NULL_RETURN(device->em);
|
EINA_SAFETY_ON_NULL_RETURN(device->em);
|
||||||
|
elput_manager_window_set(device->em, window);
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
|
|
|
@ -70,7 +70,7 @@ _ecore_evas_drm_init(Ecore_Evas_Engine_Drm_Data *edata, const char *device)
|
||||||
|
|
||||||
if (!device) device = "seat0";
|
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)
|
if (!edata->dev)
|
||||||
{
|
{
|
||||||
ERR("Failed to create device");
|
ERR("Failed to create device");
|
||||||
|
|
Loading…
Reference in New Issue