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

dga: Simplify mieq handler registration 

Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2018-08-27 16:39:10 -04:00 committed by Adam Jackson
parent 801977e825
commit 3d06d111b2
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/xfree86/common/xf86DGA.c
View File

@ -81,7 +81,6 @@
static DevPrivateKeyRec DGAScreenKeyRec; static DevPrivateKeyRec DGAScreenKeyRec;
#define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec) #define DGAScreenKeyRegistered dixPrivateKeyRegistered(&DGAScreenKeyRec)
static Bool mieq_installed;
static Bool DGACloseScreen(ScreenPtr pScreen); static Bool DGACloseScreen(ScreenPtr pScreen);
static void DGADestroyColormap(ColormapPtr pmap); static void DGADestroyColormap(ColormapPtr pmap);
@ -268,10 +267,7 @@ DGACloseScreen(ScreenPtr pScreen)
{ {
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen); DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
if (mieq_installed) { mieqSetHandler(ET_DGAEvent, NULL);
mieqSetHandler(ET_DGAEvent, NULL);
mieq_installed = FALSE;
}
FreeMarkedVisuals(pScreen); FreeMarkedVisuals(pScreen);
@ -461,10 +457,7 @@ xf86SetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet)
pScreenPriv->grabMouse = TRUE; pScreenPriv->grabMouse = TRUE;
pScreenPriv->grabKeyboard = TRUE; pScreenPriv->grabKeyboard = TRUE;
if (!mieq_installed) { mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
mieq_installed = TRUE;
}
return Success; return Success;
} }
@ -481,10 +474,7 @@ DGASetInputMode(int index, Bool keyboard, Bool mouse)
pScreenPriv->grabMouse = mouse; pScreenPriv->grabMouse = mouse;
pScreenPriv->grabKeyboard = keyboard; pScreenPriv->grabKeyboard = keyboard;
if (!mieq_installed) { mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
mieqSetHandler(ET_DGAEvent, DGAHandleEvent);
mieq_installed = TRUE;
}
} }
} }