dix: purge dead device-based window access code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
aa71ac1dd4
commit
b36c398b11
17
dix/window.c
17
dix/window.c
|
@ -413,12 +413,6 @@ CreateRootWindow(ScreenPtr pScreen)
|
||||||
return FALSE;
|
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->colormap = pScreen->defColormap;
|
||||||
pWin->optional->visual = pScreen->rootVisual;
|
pWin->optional->visual = pScreen->rootVisual;
|
||||||
|
|
||||||
|
@ -832,9 +826,6 @@ DisposeWindowOptional (WindowPtr pWin)
|
||||||
pWin->optional->deviceCursors = NULL;
|
pWin->optional->deviceCursors = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
xfree(pWin->optional->access.perm);
|
|
||||||
xfree(pWin->optional->access.deny);
|
|
||||||
|
|
||||||
/* Remove generic event mask allocations */
|
/* Remove generic event mask allocations */
|
||||||
if (pWin->optional->geMasks)
|
if (pWin->optional->geMasks)
|
||||||
gmask = pWin->optional->geMasks->geClients;
|
gmask = pWin->optional->geMasks->geClients;
|
||||||
|
@ -3467,9 +3458,6 @@ CheckWindowOptionalNeed (WindowPtr w)
|
||||||
pNode = pNode->next;
|
pNode = pNode->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (optional->access.nperm != 0 ||
|
|
||||||
optional->access.ndeny != 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (optional->geMasks != NULL)
|
if (optional->geMasks != NULL)
|
||||||
return;
|
return;
|
||||||
|
@ -3530,11 +3518,6 @@ MakeWindowOptional (WindowPtr pWin)
|
||||||
optional->geMasks->eventMasks[i] = 0;
|
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;
|
parentOptional = FindWindowWithOptional(pWin)->optional;
|
||||||
optional->visual = parentOptional->visual;
|
optional->visual = parentOptional->visual;
|
||||||
if (!pWin->cursorIsNone)
|
if (!pWin->cursorIsNone)
|
||||||
|
|
|
@ -89,14 +89,6 @@ typedef struct _GenericClientMasks {
|
||||||
GenericMaskPtr geClients;
|
GenericMaskPtr geClients;
|
||||||
} GenericClientMasksRec, *GenericClientMasksPtr;
|
} GenericClientMasksRec, *GenericClientMasksPtr;
|
||||||
|
|
||||||
typedef struct _WindowAccessRec {
|
|
||||||
int defaultRule; /* WindowAccessDenyAll */
|
|
||||||
DeviceIntPtr* perm;
|
|
||||||
int nperm;
|
|
||||||
DeviceIntPtr* deny;
|
|
||||||
int ndeny;
|
|
||||||
} WindowAccessRec, *WindowAccessPtr;
|
|
||||||
|
|
||||||
typedef struct _WindowOpt {
|
typedef struct _WindowOpt {
|
||||||
VisualID visual; /* default: same as parent */
|
VisualID visual; /* default: same as parent */
|
||||||
CursorPtr cursor; /* default: window.cursorNone */
|
CursorPtr cursor; /* default: window.cursorNone */
|
||||||
|
@ -114,7 +106,6 @@ typedef struct _WindowOpt {
|
||||||
struct _OtherInputMasks *inputMasks; /* default: NULL */
|
struct _OtherInputMasks *inputMasks; /* default: NULL */
|
||||||
DevCursorList deviceCursors; /* default: NULL */
|
DevCursorList deviceCursors; /* default: NULL */
|
||||||
struct _GenericClientMasks *geMasks; /* default: NULL */
|
struct _GenericClientMasks *geMasks; /* default: NULL */
|
||||||
WindowAccessRec access;
|
|
||||||
} WindowOptRec, *WindowOptPtr;
|
} WindowOptRec, *WindowOptPtr;
|
||||||
|
|
||||||
#define BackgroundPixel 2L
|
#define BackgroundPixel 2L
|
||||||
|
|
Loading…
Reference in New Issue
Block a user