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

winex11: Cursor iteration is now done by checking ACTIVE cursors.

This commit is contained in:
John Klehm 2008-05-31 16:16:23 -05:00 committed by Alexandre Julliard
parent 97b2dcb62c
commit 8d70da9fa9
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/winex11.drv/wintab.c
View File

@ -307,7 +307,7 @@ static INT button_state[10];
static LOGCONTEXTW gSysContext; static LOGCONTEXTW gSysContext;
static WTI_DEVICES_INFO gSysDevice; static WTI_DEVICES_INFO gSysDevice;
static WTI_CURSORS_INFO gSysCursor[CURSORMAX]; static WTI_CURSORS_INFO gSysCursor[CURSORMAX];
static INT gNumCursors; static INT gNumCursors; /* do NOT use this to iterate through gSysCursor slots */
/* XInput stuff */ /* XInput stuff */
@ -493,6 +493,18 @@ static BOOL is_eraser(const char *name, const char *type)
return FALSE; return FALSE;
} }
static void disable_system_cursors(void)
{
UINT i;
for (i = 0; i < CURSORMAX; ++i)
{
gSysCursor[i].ACTIVE = 0;
}
gNumCursors = 0;
}
/*********************************************************************** /***********************************************************************
* X11DRV_LoadTabletInfo (X11DRV.@) * X11DRV_LoadTabletInfo (X11DRV.@)
@ -552,6 +564,9 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault)
gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensX= 65536;
gSysContext.lcSysSensY= 65536; gSysContext.lcSysSensY= 65536;
/* initialize cursors */
disable_system_cursors();
/* Device Defaults */ /* Device Defaults */
gSysDevice.HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS; gSysDevice.HARDWARE = HWC_HARDPROX|HWC_PHYSID_CURSORS;
gSysDevice.FIRSTCSR= 0; gSysDevice.FIRSTCSR= 0;
@ -856,8 +871,8 @@ static void set_button_state(int curnum, XID deviceid)
static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp)
{ {
int i; int i;
for (i = 0; i < gNumCursors; i++) for (i = 0; i < CURSORMAX; i++)
if (gSysCursor[i].PHYSID == deviceid) if (gSysCursor[i].ACTIVE && gSysCursor[i].PHYSID == deviceid)
{ {
*cursorp = &gSysCursor[i]; *cursorp = &gSysCursor[i];
return i; return i;
@ -997,11 +1012,13 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner)
devices = pXListInputDevices(data->display, &num_devices); devices = pXListInputDevices(data->display, &num_devices);
X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL);
for (cur_loop=0; cur_loop < gNumCursors; cur_loop++) for (cur_loop=0; cur_loop < CURSORMAX; cur_loop++)
{ {
char cursorNameA[WT_MAX_NAME_LEN]; char cursorNameA[WT_MAX_NAME_LEN];
int event_number=0; int event_number=0;
if (!gSysCursor[cur_loop].ACTIVE) continue;
/* the cursor name fits in the buffer because too long names are skipped */ /* the cursor name fits in the buffer because too long names are skipped */
WideCharToMultiByte(CP_UNIXCP, 0, gSysCursor[cur_loop].NAME, -1, cursorNameA, WT_MAX_NAME_LEN, NULL, NULL); WideCharToMultiByte(CP_UNIXCP, 0, gSysCursor[cur_loop].NAME, -1, cursorNameA, WT_MAX_NAME_LEN, NULL, NULL);
for (loop=0; loop < num_devices; loop ++) for (loop=0; loop < num_devices; loop ++)
@ -1295,12 +1312,10 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
case WTI_CURSORS+7: case WTI_CURSORS+7:
case WTI_CURSORS+8: case WTI_CURSORS+8:
case WTI_CURSORS+9: case WTI_CURSORS+9:
if (wCategory - WTI_CURSORS >= gNumCursors) /* Apps will poll different slots to detect what cursors are available
{ * if there isn't a cursor for this slot return 0 */
if (!gSysCursor[wCategory - WTI_CURSORS].ACTIVE)
rc = 0; rc = 0;
WARN("Requested cursor information for nonexistent cursor %d; only %d cursors\n",
wCategory - WTI_CURSORS, gNumCursors);
}
else else
{ {
tgtcursor = &gSysCursor[wCategory - WTI_CURSORS]; tgtcursor = &gSysCursor[wCategory - WTI_CURSORS];