frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xquartz: Update for removal of AddEnabledDevice and RemoveEnabledDevice 

Regressed-in: be5a513fee
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2016-09-10 23:37:46 -07:00
parent 4f4ecd0f41
commit 7def2fea30
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/xquartz/darwin.c
View File

@ -303,6 +303,11 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
============================================================================= =============================================================================
*/ */
static void
DarwinInputHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
{
}
/* /*
* DarwinMouseProc: Handle the initialization, etc. of a mouse * DarwinMouseProc: Handle the initialization, etc. of a mouse
*/ */
@ -362,13 +367,13 @@ DarwinMouseProc(DeviceIntPtr pPointer, int what)
case DEVICE_ON: case DEVICE_ON:
pPointer->public.on = TRUE; pPointer->public.on = TRUE;
AddEnabledDevice(darwinEventReadFD); SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
return Success; return Success;
case DEVICE_CLOSE: case DEVICE_CLOSE:
case DEVICE_OFF: case DEVICE_OFF:
pPointer->public.on = FALSE; pPointer->public.on = FALSE;
RemoveEnabledDevice(darwinEventReadFD); RemoveNotifyFd(darwinEventReadFD);
return Success; return Success;
} }
@ -431,13 +436,13 @@ DarwinTabletProc(DeviceIntPtr pPointer, int what)
case DEVICE_ON: case DEVICE_ON:
pPointer->public.on = TRUE; pPointer->public.on = TRUE;
AddEnabledDevice(darwinEventReadFD); SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
return Success; return Success;
case DEVICE_CLOSE: case DEVICE_CLOSE:
case DEVICE_OFF: case DEVICE_OFF:
pPointer->public.on = FALSE; pPointer->public.on = FALSE;
RemoveEnabledDevice(darwinEventReadFD); RemoveNotifyFd(darwinEventReadFD);
return Success; return Success;
} }
return Success; return Success;
@ -459,12 +464,12 @@ DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
case DEVICE_ON: case DEVICE_ON:
pDev->public.on = TRUE; pDev->public.on = TRUE;
AddEnabledDevice(darwinEventReadFD); SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
break; break;
case DEVICE_OFF: case DEVICE_OFF:
pDev->public.on = FALSE; pDev->public.on = FALSE;
RemoveEnabledDevice(darwinEventReadFD); RemoveNotifyFd(darwinEventReadFD);
break; break;
case DEVICE_CLOSE: case DEVICE_CLOSE: