brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Remove "has_xinput" x11 API

Browse Source 
We always must have xinput, this is moot now.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/672
This commit is contained in:
Carlos Garnacho 2019-03-26 14:47:59 +01:00 committed by Jonas Ådahl
parent 8e13292d62
commit a32559e5ae
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
clutter/clutter/x11/clutter-backend-x11.c
View File

@ -250,7 +250,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest) if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
{ {
CLUTTER_NOTE (BACKEND, "Creating XI2 device manager"); CLUTTER_NOTE (BACKEND, "Creating XI2 device manager");
backend_x11->has_xinput = TRUE;
backend_x11->device_manager = backend_x11->device_manager =
g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_XI2, g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_XI2,
"backend", backend_x11, "backend", backend_x11,
@ -265,7 +264,6 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
if (backend_x11->device_manager == NULL) if (backend_x11->device_manager == NULL)
{ {
g_critical ("XI2 extension is missing."); g_critical ("XI2 extension is missing.");
backend_x11->has_xinput = FALSE;
backend_x11->xi_minor = -1; backend_x11->xi_minor = -1;
} }
@ -1164,36 +1162,6 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func,
} }
} }
/**
* clutter_x11_has_xinput:
*
* Gets whether Clutter has XInput support.
*
* Return value: %TRUE if Clutter was compiled with XInput support
* and XInput support is available at run time.
*
* Since: 0.8
*/
gboolean
clutter_x11_has_xinput (void)
{
ClutterBackend *backend = clutter_get_default_backend ();
if (backend == NULL)
{
g_critical ("The Clutter backend has not been initialised");
return FALSE;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend.");
return FALSE;
}
return CLUTTER_BACKEND_X11 (backend)->has_xinput;
}
/** /**
* clutter_x11_has_composite_extension: * clutter_x11_has_composite_extension:
* *

1
clutter/clutter/x11/clutter-backend-x11.h
View File

@ -100,7 +100,6 @@ struct _ClutterBackendX11
Time last_event_time; Time last_event_time;
ClutterDeviceManager *device_manager; ClutterDeviceManager *device_manager;
gboolean has_xinput;
int xi_minor; int xi_minor;
XSettingsClient *xsettings; XSettingsClient *xsettings;

3
clutter/clutter/x11/clutter-x11.h
View File

@ -128,9 +128,6 @@ gboolean clutter_x11_has_event_retrieval (void);
CLUTTER_EXPORT CLUTTER_EXPORT
ClutterStage *clutter_x11_get_stage_from_window (Window win); ClutterStage *clutter_x11_get_stage_from_window (Window win);
CLUTTER_EXPORT
gboolean clutter_x11_has_xinput (void);
CLUTTER_EXPORT CLUTTER_EXPORT
gboolean clutter_x11_has_composite_extension (void); gboolean clutter_x11_has_composite_extension (void);