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

APM: Use general handlers, not input handlers. 

Otherwise APM events get treated as input events, which messes up idle
time accounting and screensavers and such.  Not, we hope, that anyone
is using APM anymore.
This commit is contained in:
Adam Jackson 2009-03-30 14:56:15 -04:00
parent 283a081572
commit c74220b853
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/os-support/bsd/bsd_apm.c
View File

@ -122,7 +122,7 @@ xf86OSPMOpen(void)
} }
xf86PMGetEventFromOs = bsdPMGetEventFromOS; xf86PMGetEventFromOs = bsdPMGetEventFromOS;
xf86PMConfirmEventToOs = bsdPMConfirmEventToOs; xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
APMihPtr = xf86AddInputHandler(fd, xf86HandlePMEvents, NULL); APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
return bsdCloseAPM; return bsdCloseAPM;
} }
@ -132,7 +132,7 @@ bsdCloseAPM(void)
int fd; int fd;
if (APMihPtr) { if (APMihPtr) {
fd = xf86RemoveInputHandler(APMihPtr); fd = xf86RemoveGeneralHandler(APMihPtr);
close(fd); close(fd);
APMihPtr = NULL; APMihPtr = NULL;
} }

4
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
View File

@ -178,7 +178,7 @@ xf86OSPMOpen(void)
xf86PMGetEventFromOs = bsdPMGetEventFromOS; xf86PMGetEventFromOs = bsdPMGetEventFromOS;
xf86PMConfirmEventToOs = bsdPMConfirmEventToOs; xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
APMihPtr = xf86AddInputHandler(kq, xf86HandlePMEvents, NULL); APMihPtr = xf86AddGeneralHandler(kq, xf86HandlePMEvents, NULL);
return bsdCloseAPM; return bsdCloseAPM;
} }
@ -188,7 +188,7 @@ bsdCloseAPM(void)
int kq; int kq;
if (APMihPtr) { if (APMihPtr) {
kq = xf86RemoveInputHandler(APMihPtr); kq = xf86RemoveGeneralHandler(APMihPtr);
close(devFd); close(devFd);
devFd = -1; devFd = -1;
close(kq); close(kq);

4
hw/xfree86/os-support/linux/lnx_apm.c
View File

@ -180,7 +180,7 @@ lnxAPMOpen(void)
close(pfd); close(pfd);
xf86PMGetEventFromOs = lnxPMGetEventFromOs; xf86PMGetEventFromOs = lnxPMGetEventFromOs;
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs; xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
APMihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL); APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
xf86MsgVerb(X_INFO,3,"Open APM successful\n"); xf86MsgVerb(X_INFO,3,"Open APM successful\n");
return lnxCloseAPM; return lnxCloseAPM;
} }
@ -197,7 +197,7 @@ lnxCloseAPM(void)
ErrorF("APM: Closing device\n"); ErrorF("APM: Closing device\n");
#endif #endif
if (APMihPtr) { if (APMihPtr) {
fd = xf86RemoveInputHandler(APMihPtr); fd = xf86RemoveGeneralHandler(APMihPtr);
close(fd); close(fd);
APMihPtr = NULL; APMihPtr = NULL;
} }

4
hw/xfree86/os-support/solaris/sun_apm.c
View File

@ -215,7 +215,7 @@ xf86OSPMOpen(void)
} }
xf86PMGetEventFromOs = sunPMGetEventFromOS; xf86PMGetEventFromOs = sunPMGetEventFromOS;
xf86PMConfirmEventToOs = sunPMConfirmEventToOs; xf86PMConfirmEventToOs = sunPMConfirmEventToOs;
APMihPtr = xf86AddInputHandler(fd, xf86HandlePMEvents, NULL); APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
return sunCloseAPM; return sunCloseAPM;
} }
@ -225,7 +225,7 @@ sunCloseAPM(void)
int fd; int fd;
if (APMihPtr) { if (APMihPtr) {
fd = xf86RemoveInputHandler(APMihPtr); fd = xf86RemoveGeneralHandler(APMihPtr);
close(fd); close(fd);
APMihPtr = NULL; APMihPtr = NULL;
} }