isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-11 04:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "input-settings-x11: Use xcb to change input settings"

Browse Source 
This reverts commit 989f9630a4.

xcb is not smart enough to properly submit requests for
XIChangeProperty. Let's revert this until we can fix xcb.
This commit is contained in:
Jasper St. Pierre 2015-06-12 00:49:39 -04:00
parent 989f9630a4
commit 9747277b7e
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -93,7 +93,6 @@ MUTTER_PC_MODULES="
xrender xrender
x11-xcb x11-xcb
xcb-randr xcb-randr
xcb-xinput
" "
GLIB_GSETTINGS GLIB_GSETTINGS

8
src/backends/x11/meta-input-settings-x11.c
View File

@ -30,9 +30,7 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
#include <X11/Xlib-xcb.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <xcb/xinput.h>
#include <meta/errors.h> #include <meta/errors.h>
@ -80,7 +78,6 @@ change_property (ClutterInputDevice *device,
{ {
MetaBackend *backend = meta_get_backend (); MetaBackend *backend = meta_get_backend ();
Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend)); Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
xcb_connection_t *xcb_conn = XGetXCBConnection (xdisplay);
int device_id; int device_id;
Atom property_atom; Atom property_atom;
guchar *data_ret; guchar *data_ret;
@ -92,9 +89,8 @@ change_property (ClutterInputDevice *device,
if (!data_ret) if (!data_ret)
return; return;
xcb_input_xi_change_property (xcb_conn, device_id, XCB_PROP_MODE_REPLACE, XIChangeProperty (xdisplay, device_id, property_atom, type,
format, property_atom, type, format, XIPropModeReplace, data, nitems);
nitems, data);
meta_XFree (data_ret); meta_XFree (data_ret);
} }