applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wacom: Update from gnome-settings-daemon

Browse source
This commit is contained in:
Bastien Nocera 2012-02-20 18:47:44 +01:00
parent 8a8492ea26
commit 3824ad8a50
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
panels/wacom/gsd-input-helper.c
View file

@ -289,17 +289,35 @@ out:
return NULL;
}
#define TOOL_ID_FORMAT_SIZE 32
static int
get_id_for_index (guchar *data,
guint idx)
{
guchar *ptr;
int id;
ptr = data;
ptr += TOOL_ID_FORMAT_SIZE / 8 * idx;
id = *((int32_t*)ptr);
id = id & 0xfffff;
return id;
}
#define STYLUS_DEVICE_ID 0x02
#define ERASER_DEVICE_ID 0x0A
int
xdevice_get_last_tool_id (int deviceid)
xdevice_get_last_tool_id (int deviceid)
{
Atom prop;
Atom act_type;
int act_format;
unsigned long nitems, bytes_after;
unsigned char *data, *ptr;
unsigned char *data;
int id;
id = -1;
@ -329,18 +347,14 @@ xdevice_get_last_tool_id (int deviceid)
if (act_type != XA_INTEGER)
goto out;
if (act_format != 32)
if (act_format != TOOL_ID_FORMAT_SIZE)
goto out;
/* item 0 = tablet ID
* item 1 = old device serial number (== last tool in proximity)
* item 2 = old hardware serial number (including tool ID)
* item 3 = current serial number (0 if no tool in proximity) */
ptr = data;
ptr += act_format/8 * 2;
id = *((int32_t*)ptr);
id = id & 0xfffff;
id = get_id_for_index (data, 2);
/* That means that no tool was set down yet */
if (id == STYLUS_DEVICE_ID ||

10
panels/wacom/gsd-wacom-device.c
View file

@ -387,18 +387,18 @@ setup_property_notify (GsdWacomDevice *device)
{
Display *dpy;
XIEventMask evmask;
unsigned char bitmask[2] = { 0 };
int tool_id;
XISetMask (bitmask, XI_PropertyEvent);
evmask.deviceid = device->priv->device_id;
evmask.mask_len = sizeof (bitmask);
evmask.mask = bitmask;
evmask.mask_len = XIMaskLen (XI_PropertyEvent);
evmask.mask = g_malloc0(evmask.mask_len * sizeof(char));
XISetMask (evmask.mask, XI_PropertyEvent);
dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
XISelectEvents (dpy, DefaultRootWindow(dpy), &evmask, 1);
g_free (evmask.mask);
gdk_window_add_filter (NULL,
(GdkFilterFunc) filter_events,
device);