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:
parent
283a081572
commit
c74220b853
|
@ -122,7 +122,7 @@ xf86OSPMOpen(void)
|
|||
}
|
||||
xf86PMGetEventFromOs = bsdPMGetEventFromOS;
|
||||
xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
|
||||
APMihPtr = xf86AddInputHandler(fd, xf86HandlePMEvents, NULL);
|
||||
APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
|
||||
return bsdCloseAPM;
|
||||
}
|
||||
|
||||
|
@ -132,7 +132,7 @@ bsdCloseAPM(void)
|
|||
int fd;
|
||||
|
||||
if (APMihPtr) {
|
||||
fd = xf86RemoveInputHandler(APMihPtr);
|
||||
fd = xf86RemoveGeneralHandler(APMihPtr);
|
||||
close(fd);
|
||||
APMihPtr = NULL;
|
||||
}
|
||||
|
|
|
@ -178,7 +178,7 @@ xf86OSPMOpen(void)
|
|||
|
||||
xf86PMGetEventFromOs = bsdPMGetEventFromOS;
|
||||
xf86PMConfirmEventToOs = bsdPMConfirmEventToOs;
|
||||
APMihPtr = xf86AddInputHandler(kq, xf86HandlePMEvents, NULL);
|
||||
APMihPtr = xf86AddGeneralHandler(kq, xf86HandlePMEvents, NULL);
|
||||
return bsdCloseAPM;
|
||||
}
|
||||
|
||||
|
@ -188,7 +188,7 @@ bsdCloseAPM(void)
|
|||
int kq;
|
||||
|
||||
if (APMihPtr) {
|
||||
kq = xf86RemoveInputHandler(APMihPtr);
|
||||
kq = xf86RemoveGeneralHandler(APMihPtr);
|
||||
close(devFd);
|
||||
devFd = -1;
|
||||
close(kq);
|
||||
|
|
|
@ -180,7 +180,7 @@ lnxAPMOpen(void)
|
|||
close(pfd);
|
||||
xf86PMGetEventFromOs = lnxPMGetEventFromOs;
|
||||
xf86PMConfirmEventToOs = lnxPMConfirmEventToOs;
|
||||
APMihPtr = xf86AddInputHandler(fd,xf86HandlePMEvents,NULL);
|
||||
APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
|
||||
xf86MsgVerb(X_INFO,3,"Open APM successful\n");
|
||||
return lnxCloseAPM;
|
||||
}
|
||||
|
@ -197,7 +197,7 @@ lnxCloseAPM(void)
|
|||
ErrorF("APM: Closing device\n");
|
||||
#endif
|
||||
if (APMihPtr) {
|
||||
fd = xf86RemoveInputHandler(APMihPtr);
|
||||
fd = xf86RemoveGeneralHandler(APMihPtr);
|
||||
close(fd);
|
||||
APMihPtr = NULL;
|
||||
}
|
||||
|
|
|
@ -215,7 +215,7 @@ xf86OSPMOpen(void)
|
|||
}
|
||||
xf86PMGetEventFromOs = sunPMGetEventFromOS;
|
||||
xf86PMConfirmEventToOs = sunPMConfirmEventToOs;
|
||||
APMihPtr = xf86AddInputHandler(fd, xf86HandlePMEvents, NULL);
|
||||
APMihPtr = xf86AddGeneralHandler(fd, xf86HandlePMEvents, NULL);
|
||||
return sunCloseAPM;
|
||||
}
|
||||
|
||||
|
@ -225,7 +225,7 @@ sunCloseAPM(void)
|
|||
int fd;
|
||||
|
||||
if (APMihPtr) {
|
||||
fd = xf86RemoveInputHandler(APMihPtr);
|
||||
fd = xf86RemoveGeneralHandler(APMihPtr);
|
||||
close(fd);
|
||||
APMihPtr = NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user