xextproto 7.0.3. tested by naddy@ on a bulk ports build
This commit is contained in:
matthieu
parent
25849b0cd5
commit
171eb28c04
@ -1,4 +1,185 @@
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit db08133016b421ef12c65db9c4a2819078f01b06
|
||||
Author: Peter Hutterer <peter@cs.unisa.edu.au>
|
||||
Date: Wed May 28 17:18:14 2008 +0930
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
Bump to 7.0.3.
|
||||
|
||||
commit 801650f0d15b4497c63d056559ad98a8ca82f271
|
||||
Author: Peter Hutterer <peter@cs.unisa.edu.au>
|
||||
Date: Mon May 12 17:26:02 2008 +0930
|
||||
|
||||
Xge: replace copyrights with standard format from xserver COPYING.
|
||||
|
||||
commit 9dc48efe2b3136756613ae00afd706f9a52d6f10
|
||||
Merge: 69356e4... a07a30f...
|
||||
Author: Peter Hutterer <peter@cs.unisa.edu.au>
|
||||
Date: Mon May 12 17:22:14 2008 +0930
|
||||
|
||||
Merge branch 'master' into xge
|
||||
|
||||
commit a07a30f9922e9768e2cf00cc2e479978242c58a8
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 16:39:10 2007 -0500
|
||||
|
||||
Replace static ChangeLog with dist-hook to generate from git log
|
||||
|
||||
commit 087c2ccc7e348e530422a578059173c959aa5a78
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Mon Sep 3 05:54:25 2007 -0400
|
||||
|
||||
Add *~ to .gitignore to skip patch/emacs droppings
|
||||
|
||||
commit 69356e4165f11f3ed4b377d29df038549191a91e
|
||||
Author: Peter Hutterer <peter@cs.unisa.edu.au>
|
||||
Date: Thu May 17 19:40:15 2007 +0930
|
||||
|
||||
Add XGE header files and protocol description.
|
||||
|
||||
commit 88c24404b44def76a56f52a216a8cf2e0991c3e6
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jul 14 18:56:41 2006 -0700
|
||||
|
||||
renamed: .cvsignore -> .gitignore
|
||||
|
||||
commit a63b4a9d7ebc5929ce9172b10743396cd36addb8
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Tue Jun 27 16:25:22 2006 +0000
|
||||
|
||||
Remove Xserver API for appgroup extension [Will break Xorg server builds
|
||||
prior to 2006-06-21 / git commit
|
||||
77c947b900faf34f425eef1549d8210c475e093b]
|
||||
|
||||
commit 7bcd3400a8043dee6399680ddc6592747b30f599
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Wed Jun 21 21:20:22 2006 +0000
|
||||
|
||||
Remove Xserver API for security extension (#ifdef _SECURITY_SERVER) [Will
|
||||
break Xorg server builds prior to 2006-06-20 / git commit
|
||||
d44b2a0a57fb89741173c31676af0ccc822387dc]
|
||||
|
||||
commit cb67dc36362b018f3a9faa5c4558ce99dbfb2334
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:39 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit 9f8dd222022cfafe3ca6467e02232af7d4d7934b
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:48:15 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit cba4432f0d088517f2475881e93cf4dda96a7f94
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Tue Aug 2 19:19:40 2005 +0000
|
||||
|
||||
Add basic .cvsignore files for proto modules.
|
||||
|
||||
commit 790de7da644c6f9114a715b99789253a9c79b0a5
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:57 2005 +0000
|
||||
|
||||
Various changes preparing packages for RC0:
|
||||
- Verify and update package version numbers as needed
|
||||
- Implement versioning scheme
|
||||
- Change bug address to point to bugzilla bug entry form
|
||||
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||
reenable it)
|
||||
- Fix makedepend to use pkgconfig and pass distcheck
|
||||
- Update build script to build macros first
|
||||
- Update modular Xorg version
|
||||
|
||||
commit cf67142f46ec2f754f2b3347b21139b66b7167cf
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Jun 10 04:01:14 2005 +0000
|
||||
|
||||
Bug #2799: Input shape. (Keith Packard)
|
||||
|
||||
commit b855e49cf845cf814fa1d8a9abcd65cb14356644
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu May 19 00:22:40 2005 +0000
|
||||
|
||||
revert last change, didn't do right thing at all, sorry for the noise
|
||||
|
||||
commit 1e1659043f908d2e648d0ee73f7f33f5fc79813b
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Thu May 19 00:10:19 2005 +0000
|
||||
|
||||
Require automake 1.7 in AM_INIT_AUTOMAKE
|
||||
|
||||
commit 1d316d39381cf0981b2f9687cd2f0200c92961ea
|
||||
Author: Josh Triplett <josh@speakeasy.net>
|
||||
Date: Wed May 18 08:09:13 2005 +0000
|
||||
|
||||
Add COPYING file for XExt. Note that there are several similar but
|
||||
subtly-different licenses included; in particular, there are some
|
||||
copyright holders with multiple slightly-different licenses included.
|
||||
|
||||
commit f3c7759e6dc671ab6db160e739d00133e9996296
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon May 9 18:20:06 2005 +0000
|
||||
|
||||
Change all the protonames from <extension>Ext to <extension>Proto.
|
||||
|
||||
commit 474a31667a8addb29a0f115790df2910400c4081
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri May 6 01:46:32 2005 +0000
|
||||
|
||||
Initial build system files for proto module.
|
||||
|
||||
commit be09530f849ec00001fc0575816030b7a5dde05c
|
||||
Author: Roland Mainz <roland.mainz@nrubsig.org>
|
||||
Date: Tue Dec 7 23:37:37 2004 +0000
|
||||
|
||||
//bugs.freedesktop.org/show_bug.cgi?id=830): Get DPMS header file
|
||||
(include/extensions/dpms.h) working with C++ applications. Patch by
|
||||
Kevin DeKorte <kdekorte@yahoo.com> and Roland Mainz
|
||||
<roland.mainz@nrubsig.org>.
|
||||
|
||||
commit da24110547ed45c08d707dbffb2972f043dbc1b1
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 18:43:06 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit 8fc2a0fd8ac1b777a35b01d65934ee100b304d20
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:31:36 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit e7af2a9e4c47a46b3a68a2efebb171dc7872c341
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:10:54 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit abb02cac08ca1d7d3a64b361df5d1be6f15c6440
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:35:14 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit c9d6200d559e57f4ca67291213cd282c7437c3c7
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:22:28 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit 023a09fe640f876478157e5b4cd9cfec1452da4b
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Tue Nov 25 19:28:02 2003 +0000
|
||||
|
||||
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
|
||||
|
||||
commit 343e78e15048e6a25791449bfc7566c07ccddf28
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:43 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit 9a41c9c6452753ac1911a585e59982e8e5186c6b
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:35 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2008/09/14 07:32:43 matthieu Exp $
|
||||
|
||||
HEADERS_SUBDIR= X11/extensions/
|
||||
HEADERS= dpms.h dpmsstr.h extutil.h lbxbuf.h lbxbufstr.h \
|
||||
HEADERS= dpms.h dpmsstr.h extutil.h ge.h geproto.h Xge.h \
|
||||
lbxbuf.h lbxbufstr.h \
|
||||
lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h \
|
||||
MITMisc.h mitmiscstr.h multibuf.h multibufst.h security.h \
|
||||
securstr.h shape.h shapestr.h shmstr.h sync.h syncstr.h \
|
||||
Xag.h Xagsrv.h Xagstr.h Xcup.h Xcupstr.h Xdbe.h \
|
||||
Xag.h Xagstr.h Xcup.h Xcupstr.h Xdbe.h \
|
||||
Xdbeproto.h XEVI.h XEVIstr.h Xext.h XLbx.h XShm.h \
|
||||
xtestext1.h XTest.h xteststr.h
|
||||
PKGCONFIG= xextproto.pc
|
||||
|
||||
@ -3,6 +3,9 @@ xext_HEADERS = \
|
||||
dpms.h \
|
||||
dpmsstr.h \
|
||||
extutil.h \
|
||||
ge.h \
|
||||
geproto.h \
|
||||
Xge.h \
|
||||
lbxbuf.h \
|
||||
lbxbufstr.h \
|
||||
lbxdeltastr.h \
|
||||
@ -22,7 +25,6 @@ xext_HEADERS = \
|
||||
sync.h \
|
||||
syncstr.h \
|
||||
Xag.h \
|
||||
Xagsrv.h \
|
||||
Xagstr.h \
|
||||
Xcup.h \
|
||||
Xcupstr.h \
|
||||
@ -41,3 +43,13 @@ pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xextproto.pc
|
||||
|
||||
EXTRA_DIST = autogen.sh xextproto.pc.in
|
||||
|
||||
EXTRA_DIST += ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.5 2003/07/16 01:38:24 dawes Exp $ */
|
||||
/*
|
||||
Copyright 1996, 1998 The Open Group
|
||||
|
||||
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.
|
||||
*/
|
||||
/* $Xorg: Xagsrv.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
|
||||
|
||||
#ifndef _XAGSRV_H_
|
||||
#define _XAGSRV_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 */
|
||||
);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
#endif /* _XAGSRV_H_ */
|
||||
|
||||
54
proto/xextproto/Xge.h
Normal file
54
proto/xextproto/Xge.h
Normal file
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright ?2007-2008 Peter Hutterer
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
|
||||
*
|
||||
* Authors: Peter Hutterer, University of South Australia, NICTA
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/* XGE Client interfaces */
|
||||
|
||||
#ifndef _XGE_H_
|
||||
#define _XGE_H_
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xfuncproto.h>
|
||||
|
||||
_XFUNCPROTOBEGIN
|
||||
|
||||
/**
|
||||
* Generic Event mask.
|
||||
* To be used whenever a list of masks per extension has to be provided.
|
||||
*/
|
||||
typedef struct {
|
||||
CARD8 extension;
|
||||
CARD8 pad0;
|
||||
CARD16 pad1;
|
||||
CARD32 evmask;
|
||||
} XGenericEventMask;
|
||||
|
||||
Bool XGEQueryExtension(Display* dpy, int *event_basep, int *err_basep);
|
||||
Bool XGEQueryVersion(Display* dpy, int *major, int* minor);
|
||||
|
||||
_XFUNCPROTOEND
|
||||
|
||||
#endif /* _XGE_H_ */
|
||||
@ -1,5 +1,5 @@
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT([XExtProto], [7.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
|
||||
AC_INIT([XExtProto], [7.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
62
proto/xextproto/ge.h
Normal file
62
proto/xextproto/ge.h
Normal file
@ -0,0 +1,62 @@
|
||||
/*
|
||||
* Copyright © 2007-2008 Peter Hutterer
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
|
||||
*
|
||||
* Authors: Peter Hutterer, University of South Australia, NICTA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _GE_H_
|
||||
#define _GE_H_
|
||||
|
||||
#define GE_NAME "Generic Event Extension"
|
||||
#define GE_MAJOR 1
|
||||
#define GE_MINOR 0
|
||||
|
||||
/*********************************************************
|
||||
*
|
||||
* Requests
|
||||
*
|
||||
*/
|
||||
|
||||
#define X_GEQueryVersion 0
|
||||
|
||||
#define GENumberRequests (X_GEQueryVersion + 1)
|
||||
|
||||
/*********************************************************
|
||||
*
|
||||
* Events
|
||||
*
|
||||
*/
|
||||
|
||||
#define X_GenericEvent 0
|
||||
|
||||
#define GENumberEvents (X_GenericEvent + 1)
|
||||
|
||||
/*********************************************************
|
||||
*
|
||||
* Errors
|
||||
*
|
||||
*/
|
||||
|
||||
#define GENumberErrors 0
|
||||
|
||||
#endif /* _GE_H_ */
|
||||
85
proto/xextproto/geproto.h
Normal file
85
proto/xextproto/geproto.h
Normal file
@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright © 2007-2008 Peter Hutterer
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
|
||||
*
|
||||
* Authors: Peter Hutterer, University of South Australia, NICTA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _GEPROTO_H_
|
||||
#define _GEPROTO_H_
|
||||
|
||||
#include<X11/Xproto.h>
|
||||
#include<X11/X.h>
|
||||
#include<X11/extensions/ge.h>
|
||||
|
||||
|
||||
/*********************************************************
|
||||
*
|
||||
* Protocol request constants
|
||||
*
|
||||
*/
|
||||
|
||||
#define X_GEGetExtensionVersion 1
|
||||
|
||||
/*********************************************************
|
||||
*
|
||||
* XGE protocol requests/replies
|
||||
*
|
||||
*/
|
||||
|
||||
/* generic request */
|
||||
typedef struct {
|
||||
CARD8 reqType;
|
||||
CARD8 ReqType;
|
||||
CARD16 length B16;
|
||||
} xGEReq;
|
||||
|
||||
|
||||
/* QueryVersion */
|
||||
typedef struct {
|
||||
CARD8 reqType; /* input extension major code */
|
||||
CARD8 ReqType; /* always X_GEQueryVersion */
|
||||
CARD16 length B16;
|
||||
CARD16 majorVersion B16;
|
||||
CARD16 minorVersion B16;
|
||||
} xGEQueryVersionReq;
|
||||
|
||||
#define sz_xGEQueryVersionReq 8
|
||||
|
||||
typedef struct {
|
||||
CARD8 repType; /* X_Reply */
|
||||
CARD8 RepType; /* always X_GEQueryVersion */
|
||||
CARD16 sequenceNumber B16;
|
||||
CARD32 length B32;
|
||||
CARD16 majorVersion B16;
|
||||
CARD16 minorVersion B16;
|
||||
CARD32 pad00 B32;
|
||||
CARD32 pad01 B32;
|
||||
CARD32 pad02 B32;
|
||||
CARD32 pad03 B32;
|
||||
CARD32 pad04 B32;
|
||||
} xGEQueryVersionReply;
|
||||
|
||||
#define sz_xGEQueryVersionReply 32
|
||||
|
||||
#endif /* _GEPROTO_H_ */
|
||||
|
||||
@ -106,90 +106,6 @@ typedef struct {
|
||||
XSecurityAuthorization auth_id; /* revoked authorization id */
|
||||
} XSecurityAuthorizationRevokedEvent;
|
||||
|
||||
#else /* _SECURITY_SERVER */
|
||||
|
||||
#include "input.h" /* for DeviceIntPtr */
|
||||
#include "property.h" /* for PropertyPtr */
|
||||
#include "pixmap.h" /* for DrawablePtr */
|
||||
#include "resource.h" /* for RESTYPE */
|
||||
|
||||
/* resource type to pass in LookupIDByType for authorizations */
|
||||
extern RESTYPE SecurityAuthorizationResType;
|
||||
|
||||
/* this is what we store for an authorization */
|
||||
typedef struct {
|
||||
XID id; /* resource ID */
|
||||
CARD32 timeout; /* how long to live in seconds after refcnt == 0 */
|
||||
unsigned int trustLevel; /* trusted/untrusted */
|
||||
XID group; /* see embedding extension */
|
||||
unsigned int refcnt; /* how many clients connected with this auth */
|
||||
unsigned int secondsRemaining; /* overflow time amount for >49 days */
|
||||
OsTimerPtr timer; /* timer for this auth */
|
||||
struct _OtherClients *eventClients; /* clients wanting events */
|
||||
} SecurityAuthorizationRec, *SecurityAuthorizationPtr;
|
||||
|
||||
/* The following callback is called when a GenerateAuthorization request
|
||||
* is processed to sanity check the group argument. The call data will
|
||||
* be a pointer to a SecurityValidateGroupInfoRec (below).
|
||||
* Functions registered on this callback are expected to examine the
|
||||
* group and set the valid field to TRUE if they recognize the group as a
|
||||
* legitimate group. If they don't recognize it, they should not change the
|
||||
* valid field.
|
||||
*/
|
||||
extern CallbackListPtr SecurityValidateGroupCallback;
|
||||
typedef struct {
|
||||
XID group; /* the group that was sent in GenerateAuthorization */
|
||||
Bool valid; /* did anyone recognize it? if so, set to TRUE */
|
||||
} SecurityValidateGroupInfoRec;
|
||||
|
||||
/* Proc vectors for untrusted clients, swapped and unswapped versions.
|
||||
* These are the same as the normal proc vectors except that extensions
|
||||
* that haven't declared themselves secure will have ProcBadRequest plugged
|
||||
* in for their major opcode dispatcher. This prevents untrusted clients
|
||||
* from guessing extension major opcodes and using the extension even though
|
||||
* the extension can't be listed or queried.
|
||||
*/
|
||||
extern int (*UntrustedProcVector[256])(ClientPtr client);
|
||||
extern int (*SwappedUntrustedProcVector[256])(ClientPtr client);
|
||||
|
||||
extern Bool SecurityCheckDeviceAccess(ClientPtr client, DeviceIntPtr dev,
|
||||
Bool fromRequest);
|
||||
|
||||
extern void SecurityAudit(char *format, ...);
|
||||
|
||||
#ifdef LBX
|
||||
extern Bool SecuritySameLevel(ClientPtr client, XID authId);
|
||||
#endif
|
||||
|
||||
extern int XSecurityOptions(int argc, char **argv, int i);
|
||||
|
||||
/* Give this value or higher to the -audit option to get security messages */
|
||||
#define SECURITY_AUDIT_LEVEL 4
|
||||
|
||||
extern void SecurityCensorImage(
|
||||
ClientPtr client,
|
||||
RegionPtr pVisibleRegion,
|
||||
long widthBytesLine,
|
||||
DrawablePtr pDraw,
|
||||
int x, int y, int w, int h,
|
||||
unsigned int format,
|
||||
char * pBuf);
|
||||
|
||||
#define SecurityAllowOperation 0
|
||||
#define SecurityIgnoreOperation 1
|
||||
#define SecurityErrorOperation 2
|
||||
|
||||
char
|
||||
SecurityCheckPropertyAccess(
|
||||
ClientPtr client,
|
||||
WindowPtr pWin,
|
||||
ATOM propertyName,
|
||||
Mask access_mode);
|
||||
|
||||
#define SECURITY_POLICY_FILE_VERSION "version-1"
|
||||
|
||||
char **SecurityGetSitePolicyStrings(int *n);
|
||||
|
||||
#endif /* _SECURITY_SERVER */
|
||||
|
||||
#endif /* _SECURITY_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user