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

input-settings-x11: Factor out a get_property() helper

Browse Source 
We'll need to get the value of some properties. Fail if the number of
items returned is less than we expect and warn if it exceeds it so
that we can easily find out if items are added to a property later and
fix it.
This commit is contained in:
Rui Matos 2015-05-08 17:31:48 +02:00
parent 5b6380d394
commit 83bc703744
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,38 @@
G_DEFINE_TYPE (MetaInputSettingsX11, meta_input_settings_x11, META_TYPE_INPUT_SETTINGS) G_DEFINE_TYPE (MetaInputSettingsX11, meta_input_settings_x11, META_TYPE_INPUT_SETTINGS)
static void *
get_property (ClutterInputDevice *device,
const gchar *property,
Atom type,
int format,
gulong nitems)
{
MetaBackend *backend = meta_get_backend ();
Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
gulong nitems_ret, bytes_after_ret;
int rc, device_id, format_ret;
Atom property_atom, type_ret;
guchar *data_ret = NULL;
property_atom = XInternAtom (xdisplay, property, False);
device_id = clutter_input_device_get_device_id (device);
rc = XIGetProperty (xdisplay, device_id, property_atom,
0, 10, False, type, &type_ret, &format_ret,
&nitems_ret, &bytes_after_ret, &data_ret);
if (rc == Success && type_ret == type && format_ret == format && nitems_ret >= nitems)
{
if (nitems_ret > nitems)
g_warning ("Property '%s' for device '%s' returned %lu items, expected %lu",
property, clutter_input_device_get_device_name (device), nitems_ret, nitems);
return data_ret;
}
meta_XFree (data_ret);
return NULL;
}
static void static void
change_property (ClutterInputDevice *device, change_property (ClutterInputDevice *device,
const gchar *property, const gchar *property,
@ -45,23 +77,20 @@ 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));
gulong nitems_ret, bytes_after_ret; int device_id;
int rc, device_id, format_ret; Atom property_atom;
Atom property_atom, type_ret;
guchar *data_ret; guchar *data_ret;
property_atom = XInternAtom (xdisplay, property, False); property_atom = XInternAtom (xdisplay, property, False);
device_id = clutter_input_device_get_device_id (device); device_id = clutter_input_device_get_device_id (device);
rc = XIGetProperty (xdisplay, device_id, property_atom, data_ret = get_property (device, property, type, format, nitems);
0, 0, False, type, &type_ret, &format_ret, if (!data_ret)
&nitems_ret, &bytes_after_ret, &data_ret); return;
XIChangeProperty (xdisplay, device_id, property_atom, type,
format, XIPropModeReplace, data, nitems);
meta_XFree (data_ret); meta_XFree (data_ret);
if (rc == Success && type_ret == type && format_ret == format)
XIChangeProperty (xdisplay, device_id, property_atom, type,
format, XIPropModeReplace, data, nitems);
} }
static void static void