frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xselinux: Rename window-related requests that now support pixmaps. 

Renamed requests:
	SetWindowCreateContext -> SetDrawableCreateContext
	GetWindowCreateContext -> GetDrawableCreateContext
	GetWindowContext -> GetDrawableContext

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eamon Walsh 2010-02-03 15:38:57 -05:00
parent ab68c707fd
commit a6cbcf6e78
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xext/xselinux.h
View File

@ -33,9 +33,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define X_SELinuxGetDeviceCreateContext 2 #define X_SELinuxGetDeviceCreateContext 2
#define X_SELinuxSetDeviceContext 3 #define X_SELinuxSetDeviceContext 3
#define X_SELinuxGetDeviceContext 4 #define X_SELinuxGetDeviceContext 4
#define X_SELinuxSetWindowCreateContext 5 #define X_SELinuxSetDrawableCreateContext 5
#define X_SELinuxGetWindowCreateContext 6 #define X_SELinuxGetDrawableCreateContext 6
#define X_SELinuxGetWindowContext 7 #define X_SELinuxGetDrawableContext 7
#define X_SELinuxSetPropertyCreateContext 8 #define X_SELinuxSetPropertyCreateContext 8
#define X_SELinuxGetPropertyCreateContext 9 #define X_SELinuxGetPropertyCreateContext 9
#define X_SELinuxSetPropertyUseContext 10 #define X_SELinuxSetPropertyUseContext 10

22
Xext/xselinux_ext.c
View File

@ -221,7 +221,7 @@ ProcSELinuxGetDeviceContext(ClientPtr client)
} }
static int static int
ProcSELinuxGetWindowContext(ClientPtr client) ProcSELinuxGetDrawableContext(ClientPtr client)
{ {
DrawablePtr pDraw; DrawablePtr pDraw;
PrivateRec **privatePtr; PrivateRec **privatePtr;
@ -486,12 +486,12 @@ ProcSELinuxDispatch(ClientPtr client)
return ProcSELinuxSetDeviceContext(client); return ProcSELinuxSetDeviceContext(client);
case X_SELinuxGetDeviceContext: case X_SELinuxGetDeviceContext:
return ProcSELinuxGetDeviceContext(client); return ProcSELinuxGetDeviceContext(client);
case X_SELinuxSetWindowCreateContext: case X_SELinuxSetDrawableCreateContext:
return ProcSELinuxSetCreateContext(client, CTX_WIN); return ProcSELinuxSetCreateContext(client, CTX_WIN);
case X_SELinuxGetWindowCreateContext: case X_SELinuxGetDrawableCreateContext:
return ProcSELinuxGetCreateContext(client, CTX_WIN); return ProcSELinuxGetCreateContext(client, CTX_WIN);
case X_SELinuxGetWindowContext: case X_SELinuxGetDrawableContext:
return ProcSELinuxGetWindowContext(client); return ProcSELinuxGetDrawableContext(client);
case X_SELinuxSetPropertyCreateContext: case X_SELinuxSetPropertyCreateContext:
return ProcSELinuxSetCreateContext(client, CTX_PRP); return ProcSELinuxSetCreateContext(client, CTX_PRP);
case X_SELinuxGetPropertyCreateContext: case X_SELinuxGetPropertyCreateContext:
@ -574,14 +574,14 @@ SProcSELinuxGetDeviceContext(ClientPtr client)
} }
static int static int
SProcSELinuxGetWindowContext(ClientPtr client) SProcSELinuxGetDrawableContext(ClientPtr client)
{ {
REQUEST(SELinuxGetContextReq); REQUEST(SELinuxGetContextReq);
int n; int n;
REQUEST_SIZE_MATCH(SELinuxGetContextReq); REQUEST_SIZE_MATCH(SELinuxGetContextReq);
swapl(&stuff->id, n); swapl(&stuff->id, n);
return ProcSELinuxGetWindowContext(client); return ProcSELinuxGetDrawableContext(client);
} }
static int static int
@ -648,12 +648,12 @@ SProcSELinuxDispatch(ClientPtr client)
return SProcSELinuxSetDeviceContext(client); return SProcSELinuxSetDeviceContext(client);
case X_SELinuxGetDeviceContext: case X_SELinuxGetDeviceContext:
return SProcSELinuxGetDeviceContext(client); return SProcSELinuxGetDeviceContext(client);
case X_SELinuxSetWindowCreateContext: case X_SELinuxSetDrawableCreateContext:
return SProcSELinuxSetCreateContext(client, CTX_WIN); return SProcSELinuxSetCreateContext(client, CTX_WIN);
case X_SELinuxGetWindowCreateContext: case X_SELinuxGetDrawableCreateContext:
return ProcSELinuxGetCreateContext(client, CTX_WIN); return ProcSELinuxGetCreateContext(client, CTX_WIN);
case X_SELinuxGetWindowContext: case X_SELinuxGetDrawableContext:
return SProcSELinuxGetWindowContext(client); return SProcSELinuxGetDrawableContext(client);
case X_SELinuxSetPropertyCreateContext: case X_SELinuxSetPropertyCreateContext:
return SProcSELinuxSetCreateContext(client, CTX_PRP); return SProcSELinuxSetCreateContext(client, CTX_PRP);
case X_SELinuxGetPropertyCreateContext: case X_SELinuxGetPropertyCreateContext: