3 files that where re-added in xextproto 7.1.2 and missed by cvs commit.
This commit is contained in:
matthieu
parent
b645239963
commit
b85dade6c3
@ -212,6 +212,220 @@ Date: Tue Nov 3 14:41:33 2009 -0800
|
|||||||
Signed-off-by: Keith Packard <keithp@keithp.com>
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
|
||||||
|
commit 35741d9dc745532dc4af37cc07e256392e3880da
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Tue Aug 3 11:03:49 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol geproto.txt to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 260da6ca1dec9abde11c064d0aeac01f695a1596
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 15:10:04 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol xtest.ms from xorg-docs to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 4240526710d837cf06502521ee58c6a4538c6c0e
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 13:43:32 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol buffer.ms from xorg-docs to DocBook XML
|
||||||
|
|
||||||
|
multibuf.xml
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit c86700c0c87de8d6ec7f085d06e9a48558bb5118
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 13:35:26 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol evi.ms from xorg-docs to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit f825b85bd8bde4b78c6e3d0b05b713e6f48a2ff5
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 13:28:07 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol appgroup.ms from xorg-docs to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 99a5fde423a301167cb825edbf718de7af9f1158
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 13:21:31 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol tog-cup.ms from xorg-docs to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit fc2c585ab9bfe0815a917c897e0b463bf04f8475
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 10:46:54 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol dpms.ms specs from xorg-docs module to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 7c9b2197cbb0f787b6330243eb777f612251064d
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Mon Aug 2 10:40:47 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol shm.ms specs from xorg-docs module to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit cf083a0d35da6665b2aebc6eea4f65009c32411b
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Sun Aug 1 20:41:48 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol shape.ms specs from xorg-docs module to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 69996150256954ef71c45ee7727fea96e02f8db2
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Wed Jun 30 13:39:21 2010 -0400
|
||||||
|
|
||||||
|
specs: move geproto.txt in the specs directory
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 3f1718e39c73475fb8384e61b6dc78f313d926f9
|
||||||
|
Author: Matt Dew <matt@osource.org>
|
||||||
|
Date: Wed Jun 30 13:21:28 2010 -0400
|
||||||
|
|
||||||
|
specs: convert protocol .ms specs from xorg-docs module to DocBook XML
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit c4595fad1d79c0957d3f4dff6ef56d72ae8cc38d
|
||||||
|
Author: Aaron Plattner <aplattner@nvidia.com>
|
||||||
|
Date: Tue Mar 30 09:54:26 2010 -0700
|
||||||
|
|
||||||
|
XGE: Don't reserve an extension event.
|
||||||
|
|
||||||
|
The Generic Event Extension extension uses the "GenericEvent" core event type,
|
||||||
|
so it doesn't need to also reserve an extension event.
|
||||||
|
|
||||||
|
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
|
||||||
|
commit 5f2cc1e2b99d45a612204a86583abb386907be04
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Mar 28 19:25:52 2010 -0400
|
||||||
|
|
||||||
|
config: update AC_PREREQ statement to 2.60
|
||||||
|
|
||||||
|
Unrelated to the previous patches, the new value simply reflects
|
||||||
|
the reality that the minimum level for autoconf to configure
|
||||||
|
all x.org modules is 2.60 dated June 2006.
|
||||||
|
|
||||||
|
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 21f7dc38add3bda551216a0fa6319d9f3f9af99a
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Mar 28 19:00:31 2010 -0400
|
||||||
|
|
||||||
|
config: remove the pkgconfig pc.in file from EXTRA_DIST
|
||||||
|
|
||||||
|
Automake always includes it in the tarball.
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 650615405c327398b5708787bc19198cbb864d20
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Mar 28 17:51:29 2010 -0400
|
||||||
|
|
||||||
|
config: install and distribute geproto.txt
|
||||||
|
|
||||||
|
It will now be installed in $docdir in addition
|
||||||
|
to being distributed in the tarball.
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 37f6affde561251df61c7011f9d1d83b006d2fbe
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Nov 22 19:24:48 2009 -0500
|
||||||
|
|
||||||
|
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||||
|
|
||||||
|
Now that the INSTALL file is generated.
|
||||||
|
Allows running make maintainer-clean.
|
||||||
|
|
||||||
|
commit e9fa939ef8515bca5f8cde85a91b3ae0ae456de7
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Mon Nov 16 11:13:30 2009 -0500
|
||||||
|
|
||||||
|
README: file created or updated #24206
|
||||||
|
|
||||||
|
Contains a set of URLs to freedesktop.org.
|
||||||
|
|
||||||
|
commit 3690603986929a706acd76fc0b33132fe0178129
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Nov 15 19:45:27 2009 -0500
|
||||||
|
|
||||||
|
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
|
||||||
|
|
||||||
|
ChangeLog filename is known to Automake and requires no further
|
||||||
|
coding in the makefile.
|
||||||
|
|
||||||
|
commit e52cb6ef1baa65c1688b3160727214efae57b0e2
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Nov 15 18:31:29 2009 -0500
|
||||||
|
|
||||||
|
Makefile.am: INSTALL file is missing or incorrect #24206
|
||||||
|
|
||||||
|
The standard GNU file on building/installing tarball is copied
|
||||||
|
using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
|
||||||
|
Add INSTALL target
|
||||||
|
|
||||||
|
commit bfaecf2a80ef1bcbfa6243fdb1bfc2e335f86a10
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Nov 15 18:11:36 2009 -0500
|
||||||
|
|
||||||
|
configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
|
||||||
|
|
||||||
|
This macro aggregate a number of existing macros that sets commmon
|
||||||
|
X.Org components configuration options. It shields the configuration file from
|
||||||
|
future changes.
|
||||||
|
|
||||||
|
commit 182e739d8ff1f9bb8ddb8fcff8737dabde96c47f
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sun Nov 15 13:55:25 2009 -0500
|
||||||
|
|
||||||
|
configure.ac: AM_MAINTAINER_MODE missing #24238
|
||||||
|
|
||||||
|
This turns off maintainer mode build rules in tarballs.
|
||||||
|
Works in conjunction with autogen.sh --enable-maintainer-mode
|
||||||
|
|
||||||
|
commit 4b0b3afee88fdefaab2d9aa690dc5dc465964316
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Sat Nov 14 18:26:47 2009 -0500
|
||||||
|
|
||||||
|
.gitignore: use common defaults with custom section # 24239
|
||||||
|
|
||||||
|
Using common defaults will reduce errors and maintenance.
|
||||||
|
Only the very small or inexistent custom section need periodic maintenance
|
||||||
|
when the structure of the component changes. Do not edit defaults.
|
||||||
|
|
||||||
|
commit 9d5e140111ef0e7e0c9d30d7e0acf8c43a248816
|
||||||
|
Author: Keith Packard <keithp@keithp.com>
|
||||||
|
Date: Tue Nov 3 14:41:33 2009 -0800
|
||||||
|
|
||||||
|
Allow old servers to build with new headers
|
||||||
|
|
||||||
|
This provides header compatibility back to X server version 1.6 at
|
||||||
|
least (that's all I tested).
|
||||||
|
|
||||||
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||||
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
|
||||||
commit 987aeb9bd1915a655f31e250ee9c02d04927b150
|
commit 987aeb9bd1915a655f31e250ee9c02d04927b150
|
||||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
Date: Tue Aug 25 09:30:15 2009 +1000
|
Date: Tue Aug 25 09:30:15 2009 +1000
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
SUBDIRS=specs
|
SUBDIRS=specs
|
||||||
|
|
||||||
|
SUBDIRS=specs
|
||||||
|
|
||||||
xextdir = $(includedir)/X11/extensions
|
xextdir = $(includedir)/X11/extensions
|
||||||
xext_HEADERS = \
|
xext_HEADERS = \
|
||||||
dpmsconst.h \
|
dpmsconst.h \
|
||||||
|
|||||||
@ -17,6 +17,48 @@ TOG-CUP
|
|||||||
XC-APPGROUP
|
XC-APPGROUP
|
||||||
XTEST
|
XTEST
|
||||||
|
|
||||||
|
All questions regarding this software should be directed at the
|
||||||
|
Xorg mailing list:
|
||||||
|
|
||||||
|
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||||
|
|
||||||
|
Please submit bug reports to the Xorg bugzilla:
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||||
|
|
||||||
|
The master development code repository can be found at:
|
||||||
|
|
||||||
|
git://anongit.freedesktop.org/git/xorg/proto/xextproto
|
||||||
|
|
||||||
|
http://cgit.freedesktop.org/xorg/proto/xextproto
|
||||||
|
|
||||||
|
For patch submission instructions, see:
|
||||||
|
|
||||||
|
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||||
|
|
||||||
|
For more information on the git code manager, see:
|
||||||
|
|
||||||
|
http://wiki.x.org/wiki/GitPage
|
||||||
|
|
||||||
|
X Protocol Extensions
|
||||||
|
|
||||||
|
Extension names:
|
||||||
|
|
||||||
|
DOUBLE-BUFFER
|
||||||
|
DPMS
|
||||||
|
Extended-Visual-Information
|
||||||
|
Generic Event Extension
|
||||||
|
LBX
|
||||||
|
MIT-SHM
|
||||||
|
MIT-SUNDRY-NONSTANDARD
|
||||||
|
Multi-Buffering
|
||||||
|
SECURITY
|
||||||
|
SHAPE
|
||||||
|
SYNC
|
||||||
|
TOG-CUP
|
||||||
|
XC-APPGROUP
|
||||||
|
XTEST
|
||||||
|
|
||||||
All questions regarding this software should be directed at the
|
All questions regarding this software should be directed at the
|
||||||
Xorg mailing list:
|
Xorg mailing list:
|
||||||
|
|
||||||
|
|||||||
8
proto/xextproto/shapestr.h
Normal file
8
proto/xextproto/shapestr.h
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#ifndef _SHAPESTR_H_
|
||||||
|
#define _SHAPESTR_H_
|
||||||
|
|
||||||
|
#warning "shapestr.h is obsolete and may be removed in the future."
|
||||||
|
#warning "include <X11/extensions/shapeproto.h> for the protocol defines."
|
||||||
|
#include <X11/extensions/shapeproto.h>
|
||||||
|
|
||||||
|
#endif /* _SHAPESTR_H_ */
|
||||||
66
proto/xextproto/shmstr.h
Normal file
66
proto/xextproto/shmstr.h
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */
|
||||||
|
/************************************************************
|
||||||
|
|
||||||
|
Copyright 1989, 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.
|
||||||
|
|
||||||
|
********************************************************/
|
||||||
|
|
||||||
|
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
|
||||||
|
|
||||||
|
#ifndef _SHMSTR_H_
|
||||||
|
#define _SHMSTR_H_
|
||||||
|
|
||||||
|
/* $Xorg: shmstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
|
||||||
|
|
||||||
|
#include <X11/extensions/shmproto.h>
|
||||||
|
|
||||||
|
#ifdef _XSHM_SERVER_
|
||||||
|
#define XSHM_PUT_IMAGE_ARGS \
|
||||||
|
DrawablePtr /* dst */, \
|
||||||
|
GCPtr /* pGC */, \
|
||||||
|
int /* depth */, \
|
||||||
|
unsigned int /* format */, \
|
||||||
|
int /* w */, \
|
||||||
|
int /* h */, \
|
||||||
|
int /* sx */, \
|
||||||
|
int /* sy */, \
|
||||||
|
int /* sw */, \
|
||||||
|
int /* sh */, \
|
||||||
|
int /* dx */, \
|
||||||
|
int /* dy */, \
|
||||||
|
char * /* data */
|
||||||
|
|
||||||
|
#define XSHM_CREATE_PIXMAP_ARGS \
|
||||||
|
ScreenPtr /* pScreen */, \
|
||||||
|
int /* width */, \
|
||||||
|
int /* height */, \
|
||||||
|
int /* depth */, \
|
||||||
|
char * /* addr */
|
||||||
|
|
||||||
|
typedef struct _ShmFuncs {
|
||||||
|
PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
|
||||||
|
void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
|
||||||
|
} ShmFuncs, *ShmFuncsPtr;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _SHMSTR_H_ */
|
||||||
184
proto/xextproto/syncstr.h
Normal file
184
proto/xextproto/syncstr.h
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
|
||||||
|
/*
|
||||||
|
|
||||||
|
Copyright 1991, 1993, 1994, 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.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
/***********************************************************
|
||||||
|
Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||||
|
and Olivetti Research Limited, Cambridge, England.
|
||||||
|
|
||||||
|
All Rights Reserved
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software and its
|
||||||
|
documentation for any purpose and without fee is hereby granted,
|
||||||
|
provided that the above copyright notice appear in all copies and that
|
||||||
|
both that copyright notice and this permission notice appear in
|
||||||
|
supporting documentation, and that the names of Digital or Olivetti
|
||||||
|
not be used in advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
||||||
|
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||||
|
FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||||
|
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
|
||||||
|
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||||
|
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
|
PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
|
******************************************************************/
|
||||||
|
/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
|
||||||
|
|
||||||
|
#ifndef _SYNCSTR_H_
|
||||||
|
#define _SYNCSTR_H_
|
||||||
|
|
||||||
|
#include <X11/extensions/syncproto.h>
|
||||||
|
|
||||||
|
#ifdef _SYNC_SERVER
|
||||||
|
|
||||||
|
#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
|
||||||
|
|
||||||
|
typedef struct _SyncCounter {
|
||||||
|
ClientPtr client; /* Owning client. 0 for system counters */
|
||||||
|
XSyncCounter id; /* resource ID */
|
||||||
|
CARD64 value; /* counter value */
|
||||||
|
struct _SyncTriggerList *pTriglist; /* list of triggers */
|
||||||
|
Bool beingDestroyed; /* in process of going away */
|
||||||
|
struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
|
||||||
|
} SyncCounter;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The System Counter interface
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
XSyncCounterNeverChanges,
|
||||||
|
XSyncCounterNeverIncreases,
|
||||||
|
XSyncCounterNeverDecreases,
|
||||||
|
XSyncCounterUnrestricted
|
||||||
|
} SyncCounterType;
|
||||||
|
|
||||||
|
typedef struct _SysCounterInfo {
|
||||||
|
char *name;
|
||||||
|
CARD64 resolution;
|
||||||
|
CARD64 bracket_greater;
|
||||||
|
CARD64 bracket_less;
|
||||||
|
SyncCounterType counterType; /* how can this counter change */
|
||||||
|
void (*QueryValue)(
|
||||||
|
pointer /*pCounter*/,
|
||||||
|
CARD64 * /*freshvalue*/
|
||||||
|
);
|
||||||
|
void (*BracketValues)(
|
||||||
|
pointer /*pCounter*/,
|
||||||
|
CARD64 * /*lessthan*/,
|
||||||
|
CARD64 * /*greaterthan*/
|
||||||
|
);
|
||||||
|
} SysCounterInfo;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct _SyncTrigger {
|
||||||
|
SyncCounter *pCounter;
|
||||||
|
CARD64 wait_value; /* wait value */
|
||||||
|
unsigned int value_type; /* Absolute or Relative */
|
||||||
|
unsigned int test_type; /* transition or Comparision type */
|
||||||
|
CARD64 test_value; /* trigger event threshold value */
|
||||||
|
Bool (*CheckTrigger)(
|
||||||
|
struct _SyncTrigger * /*pTrigger*/,
|
||||||
|
CARD64 /*newval*/
|
||||||
|
);
|
||||||
|
void (*TriggerFired)(
|
||||||
|
struct _SyncTrigger * /*pTrigger*/
|
||||||
|
);
|
||||||
|
void (*CounterDestroyed)(
|
||||||
|
struct _SyncTrigger * /*pTrigger*/
|
||||||
|
);
|
||||||
|
} SyncTrigger;
|
||||||
|
|
||||||
|
typedef struct _SyncTriggerList {
|
||||||
|
SyncTrigger *pTrigger;
|
||||||
|
struct _SyncTriggerList *next;
|
||||||
|
} SyncTriggerList;
|
||||||
|
|
||||||
|
typedef struct _SyncAlarmClientList {
|
||||||
|
ClientPtr client;
|
||||||
|
XID delete_id;
|
||||||
|
struct _SyncAlarmClientList *next;
|
||||||
|
} SyncAlarmClientList;
|
||||||
|
|
||||||
|
typedef struct _SyncAlarm {
|
||||||
|
SyncTrigger trigger;
|
||||||
|
ClientPtr client;
|
||||||
|
XSyncAlarm alarm_id;
|
||||||
|
CARD64 delta;
|
||||||
|
int events;
|
||||||
|
int state;
|
||||||
|
SyncAlarmClientList *pEventClients;
|
||||||
|
} SyncAlarm;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
ClientPtr client;
|
||||||
|
CARD32 delete_id;
|
||||||
|
int num_waitconditions;
|
||||||
|
} SyncAwaitHeader;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
SyncTrigger trigger;
|
||||||
|
CARD64 event_threshold;
|
||||||
|
SyncAwaitHeader *pHeader;
|
||||||
|
} SyncAwait;
|
||||||
|
|
||||||
|
typedef union {
|
||||||
|
SyncAwaitHeader header;
|
||||||
|
SyncAwait await;
|
||||||
|
} SyncAwaitUnion;
|
||||||
|
|
||||||
|
|
||||||
|
extern pointer SyncCreateSystemCounter(
|
||||||
|
char * /* name */,
|
||||||
|
CARD64 /* inital_value */,
|
||||||
|
CARD64 /* resolution */,
|
||||||
|
SyncCounterType /* change characterization */,
|
||||||
|
void (* /*QueryValue*/ ) (
|
||||||
|
pointer /* pCounter */,
|
||||||
|
CARD64 * /* pValue_return */), /* XXX prototype */
|
||||||
|
void (* /*BracketValues*/) (
|
||||||
|
pointer /* pCounter */,
|
||||||
|
CARD64 * /* pbracket_less */,
|
||||||
|
CARD64 * /* pbracket_greater */)
|
||||||
|
);
|
||||||
|
|
||||||
|
extern void SyncChangeCounter(
|
||||||
|
SyncCounter * /* pCounter*/,
|
||||||
|
CARD64 /* new_value */
|
||||||
|
);
|
||||||
|
|
||||||
|
extern void SyncDestroySystemCounter(
|
||||||
|
pointer pCounter
|
||||||
|
);
|
||||||
|
extern void InitServertime(void);
|
||||||
|
|
||||||
|
#endif /* _SYNC_SERVER */
|
||||||
|
|
||||||
|
#endif /* _SYNCSTR_H_ */
|
||||||
Loading…
Reference in New Issue
Block a user