XLibre/xf86-input-libinput
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-libinput.git synced 2026-04-14 10:54:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a helper function for the driver context initialization

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer
2015-11-13 09:39:29 +10:00
parent b1a9bea607
commit a72e96538a
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/xf86libinput.c
View File

@@ -1505,6 +1505,21 @@ xf86libinput_get_type_name(struct libinput_device *device,
return type_name;
}
static void
xf86libinput_init_driver_context(void)
{
if (!driver_context.libinput) {
driver_context.libinput = libinput_path_create_context(&interface, &driver_context);
libinput_log_set_handler(driver_context.libinput,
xf86libinput_log_handler);
/* we want all msgs, let the server filter */
libinput_log_set_priority(driver_context.libinput,
LIBINPUT_LOG_PRIORITY_DEBUG);
} else {
libinput_ref(driver_context.libinput);
}
}
static int
xf86libinput_pre_init(InputDriverPtr drv,
InputInfoPtr pInfo,
@@ -1540,17 +1555,7 @@ xf86libinput_pre_init(InputDriverPtr drv,
if (!path)
goto fail;
if (!driver_context.libinput) {
driver_context.libinput = libinput_path_create_context(&interface, &driver_context);
libinput_log_set_handler(driver_context.libinput,
xf86libinput_log_handler);
/* we want all msgs, let the server filter */
libinput_log_set_priority(driver_context.libinput,
LIBINPUT_LOG_PRIORITY_DEBUG);
} else {
libinput_ref(driver_context.libinput);
}
xf86libinput_init_driver_context();
libinput = driver_context.libinput;
if (libinput == NULL) {