diff options
| -rw-r--r-- | Xext/appgroup.c | 1 | ||||
| -rw-r--r-- | Xext/appgroup.h | 85 | ||||
| -rw-r--r-- | Xext/security.c | 2 | ||||
| -rw-r--r-- | dix/dispatch.c | 2 | ||||
| -rw-r--r-- | dix/window.c | 2 | ||||
| -rw-r--r-- | os/connection.c | 2 |
6 files changed, 85 insertions, 9 deletions
diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 61c1aa0d5..9de355c59 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -43,7 +43,6 @@ from The Open Group. #include "servermd.h" #define _XAG_SERVER_ #include <X11/extensions/Xagstr.h> -#include <X11/extensions/Xagsrv.h> #include "securitysrv.h" #include <X11/Xfuncproto.h> diff --git a/Xext/appgroup.h b/Xext/appgroup.h index 05c9ef124..39087fe8e 100644 --- a/Xext/appgroup.h +++ b/Xext/appgroup.h @@ -1,10 +1,87 @@ -/* $XFree86$ */ +/* +Copyright 1996, 1998 The Open Group -void XagClientStateChange( +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization +from The Open Group. +*/ + +#ifndef _APPGROUP_SRV_H_ +#define _APPGROUP_SRV_H_ + +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + +extern void XagConnectionInfo( + ClientPtr /* client */, + xConnSetupPrefix** /* conn_prefix */, + char** /* conn_info */, + int* /* num_screens */ +); + +extern VisualID XagRootVisual( + ClientPtr /* client */ +); + +extern Colormap XagDefaultColormap( + ClientPtr /* client */ +); + +extern ClientPtr XagLeader( + ClientPtr /* client */ +); + +extern void XagCallClientStateChange( + ClientPtr /* client */ +); + +extern Bool XagIsControlledRoot ( + ClientPtr /* client */, + WindowPtr /* pParent */ +); + +extern XID XagId ( + ClientPtr /* client */ +); + +extern void XagGetDeltaInfo ( + ClientPtr /* client */, + CARD32* /* buf */ +); + +extern void XagClientStateChange( CallbackListPtr* pcbl, pointer nulldata, pointer calldata); -int ProcXagCreate ( + +extern int ProcXagCreate ( register ClientPtr client); -int ProcXagDestroy( + +extern int ProcXagDestroy( register ClientPtr client); + +_XFUNCPROTOEND + +#endif /* _APPGROUP_SRV_H_ */ + + + diff --git a/Xext/security.c b/Xext/security.c index 31f2b928b..187e80004 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group. #include <assert.h> #include <stdarg.h> #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include "appgroup.h" #endif #include <stdio.h> /* for file reading operations */ #include <X11/Xatom.h> /* for XA_STRING */ diff --git a/dix/dispatch.c b/dix/dispatch.c index 4b4eb2bc5..72d49950b 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -111,7 +111,7 @@ int ProcInitialConnection(); #include "securitysrv.h" #endif #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include "appgroup.h" #endif #ifdef XKB #ifndef XKB_IN_SERVER diff --git a/dix/window.c b/dix/window.c index 2be01df45..1cf14bcf5 100644 --- a/dix/window.c +++ b/dix/window.c @@ -127,7 +127,7 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include "appgroup.h" #endif #ifdef XCSECURITY #include "securitysrv.h" diff --git a/os/connection.c b/os/connection.c index 697ff4e74..ce765665f 100644 --- a/os/connection.c +++ b/os/connection.c @@ -148,7 +148,7 @@ extern __const__ int _nfiles; #include "opaque.h" #include "dixstruct.h" #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include "appgroup.h" #endif #ifdef XCSECURITY #include "securitysrv.h" |