SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xi: Add access control request handling.

Browse Source 
dix:	New file access.c to handle all access control for devices.
This commit is contained in:
Peter Hutterer
2007-02-22 20:00:59 +10:30
committed by Peter Hutterer
parent cd0af7a785
commit 4b8b0e377a
15 changed files with 921 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dix/window.c
View File

@@ -452,6 +452,13 @@ CreateRootWindow(ScreenPtr pScreen)
pWin->optional->inputMasks = NULL;
pWin->optional->deviceCursors = NULL;
#endif
pWin->optional->access.perm = NULL;
pWin->optional->access.deny = NULL;
pWin->optional->access.nperm = 0;
pWin->optional->access.ndeny = 0;
pWin->optional->access.defaultRule = 0;
pWin->optional->colormap = pScreen->defColormap;
pWin->optional->visual = pScreen->rootVisual;
@@ -505,7 +512,6 @@ CreateRootWindow(ScreenPtr pScreen)
if (disableSaveUnders)
pScreen->saveUnderSupport = NotUseful;
return TRUE;
}
@@ -523,6 +529,7 @@ InitRootWindow(WindowPtr pWin)
pWin->optional->cursor = rootCursor;
rootCursor->refcnt++;
if (!blackRoot && !whiteRoot) {
MakeRootTile(pWin);
backFlag |= CWBackPixmap;
@@ -3660,6 +3667,9 @@ CheckWindowOptionalNeed (register WindowPtr w)
pNode = pNode->next;
}
}
if (optional->access.nperm != 0 ||
optional->access.ndeny != 0)
return;
parentOptional = FindWindowWithOptional(w)->optional;
if (optional->visual != parentOptional->visual)
@@ -3705,8 +3715,12 @@ MakeWindowOptional (register WindowPtr pWin)
#endif
#ifdef XINPUT
optional->inputMasks = NULL;
optional->deviceCursors = NULL;
#endif
optional->deviceCursors = NULL;
optional->access.nperm = 0;
optional->access.ndeny = 0;
optional->access.perm = NULL;
optional->access.deny = NULL;
parentOptional = FindWindowWithOptional(pWin)->optional;
optional->visual = parentOptional->visual;
if (!pWin->cursorIsNone)
@@ -3771,6 +3785,9 @@ DisposeWindowOptional (register WindowPtr pWin)
pWin->optional->deviceCursors = NULL;
}
xfree(pWin->optional->access.perm);
xfree(pWin->optional->access.deny);
xfree (pWin->optional);
pWin->optional = NULL;
}