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

The NVIDIA graphics device comes up as an X extension event, but 

throws an error (BadMatch) when querying for the buttons. Catch this
error and and discard that device from being a tablet device.
This commit is contained in:
Aric Stewart 2004-01-30 22:56:06 +00:00 committed by Alexandre Julliard
parent c935908e2a
commit 04279d18cd
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/x11drv/wintab.c
View File

@ -277,6 +277,11 @@ sym_not_found:
return 0; return 0;
} }
static int Tablet_ErrorHandler(Display *dpy, XErrorEvent *event, void* arg)
{
return 1;
}
void X11DRV_LoadTabletInfo(HWND hwnddefault) void X11DRV_LoadTabletInfo(HWND hwnddefault)
{ {
struct x11drv_thread_data *data = x11drv_thread_data(); struct x11drv_thread_data *data = x11drv_thread_data();
@ -368,7 +373,15 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
int i; int i;
int shft = 0; int shft = 0;
X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL);
pXGetDeviceButtonMapping(data->display, opendevice, map, 32); pXGetDeviceButtonMapping(data->display, opendevice, map, 32);
if (X11DRV_check_error())
{
TRACE("No buttons, Non Tablet Device\n");
pXCloseDevice(data->display, opendevice);
cursor_target --;
continue;
}
for (i=0; i< cursor->BUTTONS; i++,shft++) for (i=0; i< cursor->BUTTONS; i++,shft++)
{ {