hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-22 20:35:43 +00:00
Code Issues Projects Releases Wiki Activity

dix: add new, combined resource lookup function. Move all dix lookup API

Browse source 
deprecated so far to a new file dix/deprecated.c.  Remove the deprecation
warnings for the time being.
This commit is contained in:
Eamon Walsh 2007-04-04 12:00:15 -04:00 • committed by Eamon Walsh
commit ed75b05651
7 changed files with 265 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

43
include/dix.h
View file

@ -233,17 +233,6 @@ extern int dixLookupClient(
ClientPtr client,
Mask access_mode);
/*
* These are deprecated compatibility functions and will be removed soon!
* Please use the new dixLookup*() functions above.
*/
extern WindowPtr SecurityLookupWindow(XID, ClientPtr, Mask);
extern WindowPtr LookupWindow(XID, ClientPtr);
extern pointer SecurityLookupDrawable(XID, ClientPtr, Mask);
extern pointer LookupDrawable(XID, ClientPtr);
extern ClientPtr LookupClient(XID, ClientPtr);
/* end deprecated functions */
extern void NoopDDA(void);
extern int AlterSaveSetForClient(
@ -641,4 +630,36 @@ extern int xstrcasecmp(char *s1, char *s2);
/* ffs.c */
extern int ffs(int i);
/*
* These are deprecated compatibility functions and will be removed soon!
* Please use the noted replacements instead.
*/
/* replaced by dixLookupWindow */
extern WindowPtr SecurityLookupWindow(
XID id,
ClientPtr client,
Mask access_mode);
/* replaced by dixLookupWindow */
extern WindowPtr LookupWindow(
XID id,
ClientPtr client);
/* replaced by dixLookupDrawable */
extern pointer SecurityLookupDrawable(
XID id,
ClientPtr client,
Mask access_mode);
/* replaced by dixLookupDrawable */
extern pointer LookupDrawable(
XID id,
ClientPtr client);
/* replaced by dixLookupClient */
extern ClientPtr LookupClient(
XID id,
ClientPtr client);
#endif /* DIX_H */

55
include/resource.h
View file

@ -212,32 +212,18 @@ extern Bool LegalNewID(
XID /*id*/,
ClientPtr /*client*/);
extern pointer LookupIDByType(
XID /*id*/,
RESTYPE /*rtype*/);
extern pointer LookupIDByClass(
XID /*id*/,
RESTYPE /*classes*/);
extern pointer LookupClientResourceComplex(
ClientPtr client,
RESTYPE type,
FindComplexResType func,
pointer cdata);
extern pointer SecurityLookupIDByType(
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*rtype*/,
Mask /*access_mode*/);
extern pointer SecurityLookupIDByClass(
ClientPtr /*client*/,
XID /*id*/,
RESTYPE /*classes*/,
Mask /*access_mode*/);
extern int dixLookupResource(
pointer *result,
XID id,
RESTYPE rtype,
ClientPtr client,
Mask access_mode);
extern void GetXIDRange(
int /*client*/,
@ -258,5 +244,34 @@ extern Atom *ResourceNames;
void RegisterResourceName(RESTYPE type, char* name);
#endif
/*
* These are deprecated compatibility functions and will be removed soon!
* Please use the noted replacements instead.
*/
/* replaced by dixLookupResource */
extern pointer SecurityLookupIDByType(
ClientPtr client,
XID id,
RESTYPE rtype,
Mask access_mode);
/* replaced by dixLookupResource */
extern pointer SecurityLookupIDByClass(
ClientPtr client,
XID id,
RESTYPE classes,
Mask access_mode);
/* replaced by dixLookupResource */
extern pointer LookupIDByType(
XID id,
RESTYPE rtype);
/* replaced by dixLookupResource */
extern pointer LookupIDByClass(
XID id,
RESTYPE classes);
#endif /* RESOURCE_H */