[PATCH] dix: purge dead device-based window access code.
Peter Hutterer
peter.hutterer at who-t.net
Mon Dec 8 00:16:51 PST 2008
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
dix/window.c | 17 -----------------
include/windowstr.h | 9 ---------
2 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/dix/window.c b/dix/window.c
index c038799..88ab5e9 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)
diff --git a/include/windowstr.h b/include/windowstr.h
index ccd42a7..b39b351 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -89,14 +89,6 @@ typedef struct _GenericClientMasks {
GenericMaskPtr geClients;
} GenericClientMasksRec, *GenericClientMasksPtr;
-typedef struct _WindowAccessRec {
- int defaultRule; /* WindowAccessDenyAll */
- DeviceIntPtr* perm;
- int nperm;
- DeviceIntPtr* deny;
- int ndeny;
-} WindowAccessRec, *WindowAccessPtr;
-
typedef struct _WindowOpt {
VisualID visual; /* default: same as parent */
CursorPtr cursor; /* default: window.cursorNone */
@@ -114,7 +106,6 @@ typedef struct _WindowOpt {
struct _OtherInputMasks *inputMasks; /* default: NULL */
DevCursorList deviceCursors; /* default: NULL */
struct _GenericClientMasks *geMasks; /* default: NULL */
- WindowAccessRec access;
} WindowOptRec, *WindowOptPtr;
#define BackgroundPixel 2L
--
1.6.0.4
More information about the xorg
mailing list