dga: Simplify mieq handler registration
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
801977e825
commit
3d06d111b2
@ -81,7 +81,6 @@
|
||||
static DevPrivateKeyRec DGAScreenKeyRec;
|
||||
|
||||
#define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec)
|
||||
static Bool mieq_installed;
|
||||
|
||||
static Bool DGACloseScreen(ScreenPtr pScreen);
|
||||
static void DGADestroyColormap(ColormapPtr pmap);
|
||||
@ -268,10 +267,7 @@ DGACloseScreen(ScreenPtr pScreen)
|
||||
{
|
||||
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
|
||||
|
||||
if (mieq_installed) {
|
||||
mieqSetHandler(ET_DGAEvent, NULL);
|
||||
mieq_installed = FALSE;
|
||||
}
|
||||
|
||||
FreeMarkedVisuals(pScreen);
|
||||
|
||||
@ -461,10 +457,7 @@ xf86SetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet)
|
||||
pScreenPriv->grabMouse = TRUE;
|
||||
pScreenPriv->grabKeyboard = TRUE;
|
||||
|
||||
if (!mieq_installed) {
|
||||
mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
|
||||
mieq_installed = TRUE;
|
||||
}
|
||||
|
||||
return Success;
|
||||
}
|
||||
@ -481,10 +474,7 @@ DGASetInputMode(int index, Bool keyboard, Bool mouse)
|
||||
pScreenPriv->grabMouse = mouse;
|
||||
pScreenPriv->grabKeyboard = keyboard;
|
||||
|
||||
if (!mieq_installed) {
|
||||
mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
|
||||
mieq_installed = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user