ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Store XInput2 device info in the thread data.

This commit is contained in:
Alexandre Julliard 2012-08-15 21:21:20 +02:00
parent f881dcf712
commit f579091380
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dlls/winex11.drv/mouse.c
View File

@ -130,9 +130,6 @@ static Cursor create_cursor( HANDLE handle );
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
static BOOL xinput2_available; static BOOL xinput2_available;
static int xinput2_core_pointer;
static int xinput2_device_count;
static XIDeviceInfo *xinput2_devices;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f #define MAKE_FUNCPTR(f) static typeof(f) * p##f
MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIFreeDeviceInfo);
MAKE_FUNCPTR(XIQueryDevice); MAKE_FUNCPTR(XIQueryDevice);
@ -258,6 +255,7 @@ static void enable_xinput2(void)
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
struct x11drv_thread_data *data = x11drv_thread_data(); struct x11drv_thread_data *data = x11drv_thread_data();
XIEventMask mask; XIEventMask mask;
XIDeviceInfo *devices;
unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)];
int i, j; int i, j;
@ -276,19 +274,19 @@ static void enable_xinput2(void)
if (data->xi2_state == xi_unavailable) return; if (data->xi2_state == xi_unavailable) return;
wine_tsx11_lock(); wine_tsx11_lock();
if (xinput2_devices) pXIFreeDeviceInfo( xinput2_devices ); if (data->xi2_devices) pXIFreeDeviceInfo( data->xi2_devices );
xinput2_devices = pXIQueryDevice( data->display, XIAllDevices, &xinput2_device_count ); data->xi2_devices = devices = pXIQueryDevice( data->display, XIAllDevices, &data->xi2_device_count );
for (i = 0; i < xinput2_device_count; ++i) for (i = 0; i < data->xi2_device_count; ++i)
{ {
if (xinput2_devices[i].use != XIMasterPointer) continue; if (devices[i].use != XIMasterPointer) continue;
for (j = 0; j < xinput2_devices[i].num_classes; j++) for (j = 0; j < devices[i].num_classes; j++)
{ {
XIValuatorClassInfo *class = (XIValuatorClassInfo *)xinput2_devices[i].classes[j]; XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j];
if (xinput2_devices[i].classes[j]->type != XIValuatorClass) continue; if (devices[i].classes[j]->type != XIValuatorClass) continue;
if (class->number != 0 && class->number != 1) continue; if (class->number != 0 && class->number != 1) continue;
TRACE( "Device %u (%s) class %u num %u %f,%f res %u mode %u\n", TRACE( "Device %u (%s) class %u num %u %f,%f res %u mode %u\n",
xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name), devices[i].deviceid, debugstr_a(devices[i].name),
j, class->number, class->min, class->max, class->resolution, class->mode ); j, class->number, class->min, class->max, class->resolution, class->mode );
if (class->mode == XIModeAbsolute) if (class->mode == XIModeAbsolute)
{ {
@ -297,8 +295,8 @@ static void enable_xinput2(void)
} }
} }
TRACE( "Using %u (%s) as core pointer\n", TRACE( "Using %u (%s) as core pointer\n",
xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name) ); devices[i].deviceid, debugstr_a(devices[i].name) );
xinput2_core_pointer = xinput2_devices[i].deviceid; data->xi2_core_pointer = devices[i].deviceid;
break; break;
} }
@ -308,14 +306,13 @@ static void enable_xinput2(void)
XISetMask( mask_bits, XI_RawMotion ); XISetMask( mask_bits, XI_RawMotion );
XISetMask( mask_bits, XI_ButtonPress ); XISetMask( mask_bits, XI_ButtonPress );
for (i = 0; i < xinput2_device_count; ++i) for (i = 0; i < data->xi2_device_count; ++i)
{ {
if (xinput2_devices[i].use == XISlavePointer && if (devices[i].use == XISlavePointer && devices[i].attachment == data->xi2_core_pointer)
xinput2_devices[i].attachment == xinput2_core_pointer)
{ {
TRACE( "Device %u (%s) is attached to the core pointer\n", TRACE( "Device %u (%s) is attached to the core pointer\n",
xinput2_devices[i].deviceid, debugstr_a(xinput2_devices[i].name) ); devices[i].deviceid, debugstr_a(devices[i].name) );
mask.deviceid = xinput2_devices[i].deviceid; mask.deviceid = devices[i].deviceid;
pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 );
data->xi2_state = xi_enabled; data->xi2_state = xi_enabled;
} }
@ -333,6 +330,7 @@ static void disable_xinput2(void)
{ {
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
struct x11drv_thread_data *data = x11drv_thread_data(); struct x11drv_thread_data *data = x11drv_thread_data();
XIDeviceInfo *devices = data->xi2_devices;
XIEventMask mask; XIEventMask mask;
int i; int i;
@ -345,18 +343,17 @@ static void disable_xinput2(void)
mask.mask_len = 0; mask.mask_len = 0;
wine_tsx11_lock(); wine_tsx11_lock();
for (i = 0; i < xinput2_device_count; ++i) for (i = 0; i < data->xi2_device_count; ++i)
{ {
if (xinput2_devices[i].use == XISlavePointer && if (devices[i].use == XISlavePointer && devices[i].attachment == data->xi2_core_pointer)
xinput2_devices[i].attachment == xinput2_core_pointer)
{ {
mask.deviceid = xinput2_devices[i].deviceid; mask.deviceid = devices[i].deviceid;
pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 );
} }
} }
pXIFreeDeviceInfo( xinput2_devices ); pXIFreeDeviceInfo( devices );
xinput2_devices = NULL; data->xi2_devices = NULL;
xinput2_device_count = 0; data->xi2_device_count = 0;
wine_tsx11_unlock(); wine_tsx11_unlock();
#endif #endif
} }
@ -1517,6 +1514,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev )
int i, j; int i, j;
double dx = 0, dy = 0; double dx = 0, dy = 0;
struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_thread_data *thread_data = x11drv_thread_data();
XIDeviceInfo *devices = thread_data->xi2_devices;
if (!event->valuators.mask_len) return; if (!event->valuators.mask_len) return;
if (thread_data->xi2_state != xi_enabled) return; if (thread_data->xi2_state != xi_enabled) return;
@ -1532,14 +1530,14 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev )
input.u.mi.dy = dy; input.u.mi.dy = dy;
wine_tsx11_lock(); wine_tsx11_lock();
for (i = 0; i < xinput2_device_count; ++i) for (i = 0; i < thread_data->xi2_device_count; ++i)
{ {
if (xinput2_devices[i].deviceid != event->deviceid) continue; if (devices[i].deviceid != event->deviceid) continue;
for (j = 0; j < xinput2_devices[i].num_classes; j++) for (j = 0; j < devices[i].num_classes; j++)
{ {
XIValuatorClassInfo *class = (XIValuatorClassInfo *)xinput2_devices[i].classes[j]; XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j];
if (xinput2_devices[i].classes[j]->type != XIValuatorClass) continue; if (devices[i].classes[j]->type != XIValuatorClass) continue;
if (class->min >= class->max) continue; if (class->min >= class->max) continue;
if (class->number == 0) if (class->number == 0)
input.u.mi.dx = dx * (virtual_screen_rect.right - virtual_screen_rect.left) input.u.mi.dx = dx * (virtual_screen_rect.right - virtual_screen_rect.left)

3
dlls/winex11.drv/x11drv.h
View File

@ -327,6 +327,9 @@ struct x11drv_thread_data
DWORD clip_reset; /* time when clipping was last reset */ DWORD clip_reset; /* time when clipping was last reset */
HKL kbd_layout; /* active keyboard layout */ HKL kbd_layout; /* active keyboard layout */
enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */ enum { xi_unavailable = -1, xi_unknown, xi_disabled, xi_enabled } xi2_state; /* XInput2 state */
void *xi2_devices; /* list of XInput2 devices (valid when state is enabled) */
int xi2_device_count;
int xi2_core_pointer; /* XInput2 core pointer id */
}; };
extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN; extern struct x11drv_thread_data *x11drv_init_thread_data(void) DECLSPEC_HIDDEN;