wintab32: Capture the number of buttons earlier, allowing our button maps to be filled in.
This commit is contained in:
parent
3036e7f626
commit
f193197a66
|
@ -474,8 +474,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
|
||||||
int shft = 0;
|
int shft = 0;
|
||||||
|
|
||||||
X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL);
|
X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL);
|
||||||
pXGetDeviceButtonMapping(data->display, opendevice, map, 32);
|
cursor->BUTTONS = pXGetDeviceButtonMapping(data->display, opendevice, map, 32);
|
||||||
if (X11DRV_check_error())
|
if (X11DRV_check_error() || cursor->BUTTONS <= 0)
|
||||||
{
|
{
|
||||||
TRACE("No buttons, Non Tablet Device\n");
|
TRACE("No buttons, Non Tablet Device\n");
|
||||||
pXCloseDevice(data->display, opendevice);
|
pXCloseDevice(data->display, opendevice);
|
||||||
|
@ -606,7 +606,8 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
Button = (XButtonInfoPtr) any;
|
Button = (XButtonInfoPtr) any;
|
||||||
cursor->BUTTONS = Button->num_buttons;
|
TRACE(" ButtonInput %d: [class %d|length %d|num_buttons %d]\n",
|
||||||
|
class_loop, (int) Button->class, Button->length, Button->num_buttons);
|
||||||
cursor->BTNNAMES = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*cchBuf);
|
cursor->BTNNAMES = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*cchBuf);
|
||||||
for (i = 0; i < cursor->BUTTONS; i++)
|
for (i = 0; i < cursor->BUTTONS; i++)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue