summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2008-12-08 16:41:20 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2008-12-10 12:42:45 +1000
commitb36c398b11321a908cfe217108b26a32ffc1d850 (patch)
tree7758fa93cd5878e01404ecdb46b8cb99b62fdddd /dix
parentaa71ac1dd4697738752c73fe4c106b665ea3ec25 (diff)
dix: purge dead device-based window access code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/window.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/dix/window.c b/dix/window.c
index c0387992d..88ab5e952 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -413,12 +413,6 @@ CreateRootWindow(ScreenPtr pScreen)
return FALSE;
}
- 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;
@@ -832,9 +826,6 @@ DisposeWindowOptional (WindowPtr pWin)
pWin->optional->deviceCursors = NULL;
}
- xfree(pWin->optional->access.perm);
- xfree(pWin->optional->access.deny);
-
/* Remove generic event mask allocations */
if (pWin->optional->geMasks)
gmask = pWin->optional->geMasks->geClients;
@@ -3467,9 +3458,6 @@ CheckWindowOptionalNeed (WindowPtr w)
pNode = pNode->next;
}
}
- if (optional->access.nperm != 0 ||
- optional->access.ndeny != 0)
- return;
if (optional->geMasks != NULL)
return;
@@ -3530,11 +3518,6 @@ MakeWindowOptional (WindowPtr pWin)
optional->geMasks->eventMasks[i] = 0;
}
- optional->access.nperm = 0;
- optional->access.ndeny = 0;
- optional->access.perm = NULL;
- optional->access.deny = NULL;
- optional->access.defaultRule = 0;
parentOptional = FindWindowWithOptional(pWin)->optional;
optional->visual = parentOptional->visual;
if (!pWin->cursorIsNone)