From 68dd0b52e13c844d662192654fb10cb993257a59 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 22 Jun 2015 09:36:08 +0200 Subject: Replace 'pointer' type with 'void *' This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt Rebased against NX: Mike Gabriel --- nx-X11/programs/Xserver/include/resource.h | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'nx-X11/programs/Xserver/include/resource.h') diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h index 49c189869..3aac8bb00 100644 --- a/nx-X11/programs/Xserver/include/resource.h +++ b/nx-X11/programs/Xserver/include/resource.h @@ -123,24 +123,24 @@ typedef unsigned long RESTYPE; #define BAD_RESOURCE 0xe0000000 typedef int (*DeleteType)( - pointer /*value*/, + void * /*value*/, XID /*id*/); typedef void (*FindResType)( - pointer /*value*/, + void * /*value*/, XID /*id*/, - pointer /*cdata*/); + void * /*cdata*/); typedef void (*FindAllRes)( - pointer /*value*/, + void * /*value*/, XID /*id*/, RESTYPE /*type*/, - pointer /*cdata*/); + void * /*cdata*/); typedef Bool (*FindComplexResType)( - pointer /*value*/, + void * /*value*/, XID /*id*/, - pointer /*cdata*/); + void * /*cdata*/); extern RESTYPE CreateNewResourceType( DeleteType /*deleteFunc*/); @@ -161,7 +161,7 @@ extern XID FakeClientID( extern Bool AddResource( XID /*id*/, RESTYPE /*type*/, - pointer /*value*/); + void * /*value*/); extern void FreeResource( XID /*id*/, @@ -175,18 +175,18 @@ extern void FreeResourceByType( extern Bool ChangeResourceValue( XID /*id*/, RESTYPE /*rtype*/, - pointer /*value*/); + void * /*value*/); extern void FindClientResourcesByType( ClientPtr /*client*/, RESTYPE /*type*/, FindResType /*func*/, - pointer /*cdata*/); + void * /*cdata*/); extern void FindAllClientResources( ClientPtr /*client*/, FindAllRes /*func*/, - pointer /*cdata*/); + void * /*cdata*/); extern void FreeClientNeverRetainResources( ClientPtr /*client*/); @@ -200,19 +200,19 @@ extern Bool LegalNewID( XID /*id*/, ClientPtr /*client*/); -extern pointer LookupIDByType( +extern void * LookupIDByType( XID /*id*/, RESTYPE /*rtype*/); -extern pointer LookupIDByClass( +extern void * LookupIDByClass( XID /*id*/, RESTYPE /*classes*/); -extern pointer LookupClientResourceComplex( +extern void * LookupClientResourceComplex( ClientPtr client, RESTYPE type, FindComplexResType func, - pointer cdata); + void * cdata); /* These are the access modes that can be passed in the last parameter * to SecurityLookupIDByType/Class. The Security extension doesn't @@ -229,13 +229,13 @@ extern pointer LookupClientResourceComplex( #ifdef XCSECURITY -extern pointer SecurityLookupIDByType( +extern void * SecurityLookupIDByType( ClientPtr /*client*/, XID /*id*/, RESTYPE /*rtype*/, Mask /*access_mode*/); -extern pointer SecurityLookupIDByClass( +extern void * SecurityLookupIDByClass( ClientPtr /*client*/, XID /*id*/, RESTYPE /*classes*/, -- cgit v1.2.3 From 6144b615dd7ae2acd786aaa08f66c9743870b709 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 5 Jul 2016 16:32:57 +0200 Subject: VCS info lines: Remove ancient X.org / XFree86 VCS info line from code files. This has already been started while replacing copyright info in file headers and has now been completed with this commit. --- nx-X11/programs/Xserver/include/resource.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs/Xserver/include/resource.h') diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h index 3aac8bb00..5e169e093 100644 --- a/nx-X11/programs/Xserver/include/resource.h +++ b/nx-X11/programs/Xserver/include/resource.h @@ -1,4 +1,3 @@ -/* $Xorg: resource.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 -- cgit v1.2.3 From 104a3e9e2dbafd31e7b1def3686d052a356fc74a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 15 Feb 2017 09:59:00 +0100 Subject: Naming change: Security*Access -> Dix*Access Backported from X.org: commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1 Author: Eamon Walsh Date: Thu Dec 14 14:45:42 2006 -0500 Naming change: Security*Access -> Dix*Access Backported-to-NX-by: Mike Gabriel --- nx-X11/programs/Xserver/include/resource.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/include/resource.h') diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h index 5e169e093..164e7ccfc 100644 --- a/nx-X11/programs/Xserver/include/resource.h +++ b/nx-X11/programs/Xserver/include/resource.h @@ -220,10 +220,10 @@ extern void * LookupClientResourceComplex( * simultaneously. */ -#define SecurityUnknownAccess 0 /* don't know intentions */ -#define SecurityReadAccess (1<<0) /* inspecting the object */ -#define SecurityWriteAccess (1<<1) /* changing the object */ -#define SecurityDestroyAccess (1<<2) /* destroying the object */ +#define DixUnknownAccess 0 /* don't know intentions */ +#define DixReadAccess (1<<0) /* inspecting the object */ +#define DixWriteAccess (1<<1) /* changing the object */ +#define DixDestroyAccess (1<<2) /* destroying the object */ #ifdef XCSECURITY -- cgit v1.2.3 From 3d8575c2114ed98e525c422bba88e04f0af7f029 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 19 Feb 2017 00:06:54 +0100 Subject: dix: fix incomplete commit The following commit turned out to be incomplete. This commit makes it complete by removing client->lastDrawable/lastGC everywhere thus fixing ArcticaProject/nx-libs#306 and #322 commit e6f2f6427122dc4bc802acebf26f8cec16cd2f62 Author: Mike Gabriel Date: Mon Jun 20 16:45:38 2016 +0200 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backported from X.org: commit 9a183d7ba50e31afa133cc03aee7991517a283ea Author: Eamon Walsh Date: Tue Aug 14 11:39:26 2007 -0400 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backport to nx-libs: Mike Gabriel --- nx-X11/programs/Xserver/include/resource.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/include/resource.h') diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h index 164e7ccfc..30ae624fb 100644 --- a/nx-X11/programs/Xserver/include/resource.h +++ b/nx-X11/programs/Xserver/include/resource.h @@ -71,9 +71,9 @@ typedef unsigned long RESTYPE; /* types for Resource routines */ -#define RT_WINDOW ((RESTYPE)1|RC_CACHED|RC_DRAWABLE) -#define RT_PIXMAP ((RESTYPE)2|RC_CACHED|RC_DRAWABLE) -#define RT_GC ((RESTYPE)3|RC_CACHED) +#define RT_WINDOW ((RESTYPE)1|RC_DRAWABLE) +#define RT_PIXMAP ((RESTYPE)2|RC_DRAWABLE) +#define RT_GC ((RESTYPE)3) #undef RT_FONT #undef RT_CURSOR #define RT_FONT ((RESTYPE)4) -- cgit v1.2.3