andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xi: add FreeInputMask function

Browse Source 
Does what it says on the box, complements MakeInputMask.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-11-04 15:49:23 +10:00
parent ee9346bb31
commit 61ef4daf64
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xi/exevents.c
View File

@ -1678,6 +1678,13 @@ MakeInputMasks(WindowPtr pWin)
return TRUE;
}
static void
FreeInputMask(OtherInputMasks **imask)
{
free(*imask);
*imask = NULL;
}
void
RecalculateDeviceDeliverableEvents(WindowPtr pWin)
{
@ -1737,8 +1744,9 @@ InputClientGone(WindowPtr pWin, XID id)
FreeInputClient(&other);
} else if (!(other->next)) {
if (ShouldFreeInputMasks(pWin, TRUE)) {
wOtherInputMasks(pWin)->inputClients = other->next;
free(wOtherInputMasks(pWin));
OtherInputMasks *mask = wOtherInputMasks(pWin);
mask->inputClients = other->next;
FreeInputMask(&mask);
pWin->optional->inputMasks = (OtherInputMasks *) NULL;
CheckWindowOptionalNeed(pWin);
FreeInputClient(&other);