diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-25 10:59:10 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-16 11:29:45 +1000 |
| commit | 38daa9d8d9d86f3b9df12dd5032959822b7c0a45 (patch) | |
| tree | 4a6a687553e130a0f32942d9269307ac07029f7d | |
| parent | 8cb2568c4a7df1eb0482009bf9150912e98969e6 (diff) | |
Xag: remove Xag.h library header, split into Xagconst.h
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | ag.h (renamed from Xag.h) | 82 | ||||
| -rw-r--r-- | agproto.h (renamed from Xagstr.h) | 30 |
3 files changed, 27 insertions, 89 deletions
diff --git a/Makefile.am b/Makefile.am index 14e7ff1..32b1295 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,8 @@ xext_HEADERS = \ shmproto.h \ sync.h \ syncstr.h \ - Xag.h \ - Xagstr.h \ + ag.h \ + agproto.h \ Xcup.h \ Xcupstr.h \ Xdbe.h \ @@ -26,18 +26,18 @@ from The Open Group. */ /* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ -#ifndef _XAG_H_ -#define _XAG_H_ +#ifndef _AG_H_ +#define _AG_H_ -#include <X11/Xfuncproto.h> +#define XAGNAME "XC-APPGROUP" -#define X_XagQueryVersion 0 -#define X_XagCreate 1 -#define X_XagDestroy 2 -#define X_XagGetAttr 3 -#define X_XagQuery 4 -#define X_XagCreateAssoc 5 -#define X_XagDestroyAssoc 6 +#define XAG_MAJOR_VERSION 1 /* current version numbers */ +#define XAG_MINOR_VERSION 0 + +#define XagWindowTypeX11 0 +#define XagWindowTypeMacintosh 1 +#define XagWindowTypeWin32 2 +#define XagWindowTypeWin16 3 #define XagBadAppGroup 0 #define XagNumberErrors (XagBadAppGroup + 1) @@ -50,65 +50,5 @@ from The Open Group. #define XagNwhitePixel 5 #define XagNappGroupLeader 6 -#ifndef _XAG_SERVER_ - -#include <stdarg.h> - -_XFUNCPROTOBEGIN - -typedef XID XAppGroup; - -Bool XagQueryVersion( - Display* /* dpy */, - int* /* major_version */, - int* /* minor_version */ -); - -Status XagCreateEmbeddedApplicationGroup( - Display* /* dpy */, - VisualID /* root_visual */, - Colormap /* default_colormap */, - unsigned long /* black_pixel */, - unsigned long /* white_pixel */, - XAppGroup* /* app_group_return */ -); - -Status XagCreateNonembeddedApplicationGroup( - Display* /* dpy */, - XAppGroup* /* app_group_return */ -); - -Status XagDestroyApplicationGroup( - Display* /* dpy */, - XAppGroup /* app_group */ -); - -Status XagGetApplicationGroupAttributes( - Display* /* dpy */, - XAppGroup /* app_group */, - ... -); - -Status XagQueryApplicationGroup( - Display* /* dpy */, - XID /* resource_base */, - XAppGroup* /* app_group_ret */ -); - -Status XagCreateAssociation( - Display* /* dpy */, - Window* /* window_ret */, - void* /* system_window */ -); - -Status XagDestroyAssociation( - Display* /* dpy */, - Window /* window */ -); - -_XFUNCPROTOEND - -#endif /* _XAG_SERVER_ */ - -#endif /* _XAG_H_ */ +#endif /* _AG_H_ */ @@ -26,22 +26,20 @@ from The Open Group. */ /* $Xorg: Xagstr.h,v 1.6 2001/02/09 02:03:24 xorgcvs Exp $ */ -#ifndef _XAGSTR_H_ /* { */ -#define _XAGSTR_H_ +#ifndef _AGPROTO_H_ /* { */ +#define _AGPROTO_H_ -#include <X11/extensions/Xag.h> +#include <X11/extensions/ag.h> -#define XAppGroup CARD32 - -#define XAGNAME "XC-APPGROUP" - -#define XAG_MAJOR_VERSION 1 /* current version numbers */ -#define XAG_MINOR_VERSION 0 +#define X_XagQueryVersion 0 +#define X_XagCreate 1 +#define X_XagDestroy 2 +#define X_XagGetAttr 3 +#define X_XagQuery 4 +#define X_XagCreateAssoc 5 +#define X_XagDestroyAssoc 6 -#define XagWindowTypeX11 0 -#define XagWindowTypeMacintosh 1 -#define XagWindowTypeWin32 2 -#define XagWindowTypeWin16 3 +#define XAppGroup CARD32 /* * Redefine some basic types used by structures defined herein. This allows @@ -49,11 +47,11 @@ from The Open Group. * thus preventing problems on 64-bit architectures where libXext sees this * data as 64 bits and the server sees it as 32 bits. */ - + #define Colormap CARD32 #define VisualID CARD32 #define Window CARD32 - + typedef struct _XagQueryVersion { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagQueryVersion */ @@ -178,5 +176,5 @@ typedef struct _XagDestroyAssoc { #undef Colormap #undef VisualID -#endif /* } _XAGSTR_H_ */ +#endif /* } _AGPROTO_H_ */ |