x11proto-xext: Changes to 'debian-unstable'
.cvsignore | 10 -----
.gitignore | 11 +++++
ChangeLog | 4 --
Makefile.am | 14 +++++++
Xagsrv.h | 76 ----------------------------------------
Xge.h | 54 +++++++++++++++++++++++++++++
configure.ac | 2 -
debian/changelog | 6 +++
ge.h | 62 +++++++++++++++++++++++++++++++++
geproto.h | 85 +++++++++++++++++++++++++++++++++++++++++++++
geproto.txt | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
security.h | 84 ---------------------------------------------
12 files changed, 334 insertions(+), 176 deletions(-)
New commits:
commit 9555e4a178ff0d1dbc907ef7cad080087b5dd41a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Dec 9 23:59:53 2008 +0200
Update the changelog for a new release.
diff --git a/debian/changelog b/debian/changelog
index c176abe..8bc18e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-xext (7.0.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Dec 2008 23:58:19 +0200
+
x11proto-xext (7.0.2-6) unstable; urgency=low
[ Brice Goglin ]
commit db08133016b421ef12c65db9c4a2819078f01b06
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 17:18:14 2008 +0930
Bump to 7.0.3.
diff --git a/configure.ac b/configure.ac
index b08240e..8f0c242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
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.
diff --git a/Xge.h b/Xge.h
index 8b9fb3c..84fa250 100644
--- a/Xge.h
+++ b/Xge.h
@@ -1,23 +1,27 @@
/*
- * Copyright � 2007 Peter Hutterer
+ * Copyright � 2007-2008 Peter Hutterer
*
- * 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, and that the name of the author not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. The author makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
+ * 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
*
- * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE AUTHOR 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.
*/
diff --git a/ge.h b/ge.h
index 38652a0..6521698 100644
--- a/ge.h
+++ b/ge.h
@@ -1,30 +1,28 @@
-/*
-
-Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
-
-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 AUTHOR 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 author 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 author.
-
-*/
+/*
+ * 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_
diff --git a/geproto.h b/geproto.h
index d9d79a1..54107df 100644
--- a/geproto.h
+++ b/geproto.h
@@ -1,30 +1,28 @@
-/*
-
-Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
-
-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 AUTHOR 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 author 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 author.
-
-*/
+/*
+ * 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_
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
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ef3ad1f..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2006-06-27 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * Makefile.am:
- * Xagsrv.h [REMOVED]:
- Remove Xserver API for appgroup extension
- [Will break Xorg server builds prior to 2006-06-21 / git commit
- 77c947b900faf34f425eef1549d8210c475e093b]
-
-2006-06-20 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * security.h:
- Remove Xserver API for security extension (#ifdef _SECURITY_SERVER)
- [Will break Xorg server builds prior to 2006-06-20 / git commit
- d44b2a0a57fb89741173c31676af0ccc822387dc]
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index 782b7d4..bddcacc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,3 +40,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
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
diff --git a/.gitignore b/.gitignore
index a76ccb0..c857636 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
xextproto.pc
+*~
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.
diff --git a/Makefile.am b/Makefile.am
index 782b7d4..2fa1920 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,9 @@ xext_HEADERS = \
dpms.h \
dpmsstr.h \
extutil.h \
+ ge.h \
+ geproto.h \
+ Xge.h \
lbxbuf.h \
lbxbufstr.h \
lbxdeltastr.h \
diff --git a/Xge.h b/Xge.h
new file mode 100644
index 0000000..8b9fb3c
--- /dev/null
+++ b/Xge.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright � 2007 Peter Hutterer
+ *
+ * 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, and that the name of the author not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission. The author makes no
+ * representations about the suitability of this software for any purpose. It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHOR 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.
+ */
+
+
+/* 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_ */
diff --git a/ge.h b/ge.h
new file mode 100644
index 0000000..38652a0
--- /dev/null
+++ b/ge.h
@@ -0,0 +1,64 @@
+/*
+
+Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
+
+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 AUTHOR 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 author 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 author.
+
+*/
+
+#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_ */
diff --git a/geproto.h b/geproto.h
new file mode 100644
index 0000000..d9d79a1
--- /dev/null
+++ b/geproto.h
@@ -0,0 +1,87 @@
+/*
+
+Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
+
+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 AUTHOR 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 author 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 author.
+
+*/
+
+#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_ */
+
diff --git a/geproto.txt b/geproto.txt
new file mode 100644
index 0000000..e30a68d
--- /dev/null
+++ b/geproto.txt
@@ -0,0 +1,102 @@
+ X Generic Event Extension
+ Peter Hutterer
+ peter@cs.unisa.edu.au
+
+
+1. Introduction
+2. Requests
+3. Events
+4. Usage from other extensions - server side
+5. Usage from other extensions - client side
+6. Notes
+
+_____________________________________________________________________________
+1. Introduction
+
+X was designed to provide 64 event opcodes for all extensions. With the
+increasing number of extensions, event opcodes are running out and future
+extensions will not be able to send events to the client.
+
+The Generic Event Extension is a template for future extensions to re-use a
+single opcode. GE does not actually do much but provide headers and a few API
+calls. The majority of the work is still to be done in the extensions.
+
+Standard X events are limited to 32 bytes. GenericEvents have the same size
+restrictions as requests, with a minimum of 32 bytes, followed by an arbitrary
+amount of data specified in the length field (see Section 3.)
+
+_____________________________________________________________________________
+2. Requests
+
+GEQueryVersion:
+ CARD8 reqType
+ CARD8 ReqType X_GEQueryVersion
+ CARD16 length
+ CARD32 majorVersion
+ CARD32 minorVersion
+
+GEQueryVersion reply:
+ CARD8 repType
+ CARD8 RepType X_GEQueryVersion
+ CARD16 sequenceNumber
+ CARD32 length
+ CARD16 major_version
+ CARD16 minor_version
+_____________________________________________________________________________
+3. Events
+
+GE defines a single event, to be used by all extensions. The event's structure
+is similar to a request.
+
+GenericEvent
+ BYTE type
+ CARD8 extension
+ CARD16 sequenceNumber
+ CARD32 length;
+ CARD16 evtype;
+ CARD16 pad1;
+ CARD32 pad2;
+ CARD32 pad3;
+ CARD32 pad4;
+ CARD32 pad5;
+ CARD32 pad6;
+
+The field 'extension' is to be set to the major opcode of the extension.
+The 'evtype' field is the actual opcode of the event.
+This event is to be type-cast by an extension to it's real format.
+The length field specifies the number of 4-byte blocks after the initial 32
+bytes.
+
+_____________________________________________________________________________
+4. Usage from other extensions - server side
+
+GERegisterExtension(major_opcode, swap)
+ An extension needs to register at the GE. This should be done after
+ calling AddExtension().
+ major_opcode is the major opcode for all extension requests.
+ The swap function will be called when an event has to be converted for a
+ client with different byte ordering.
+
+_____________________________________________________________________________
+5. Usage from other extensions - client side
+
+None. The event conversion rules of the extension however should be able to
+handle events of type GenericEvent as well.
+
+Internally, when an extension is initialized, it needs to call XExtAddDisplay
+and provide a set of hooks that are to be called for events conversion and
+other stuff. XGE hooks into XExtAddDisplay and stores the hooks provided by
+the extension. Should a GenericEvent come along, XGE receives it but relays
+the call to the real extension to handle it.
+
+_____________________________________________________________________________
+6. Notes
+
+Although the wire event is of arbitrary length, the actual size of an XEvent
+is restricted to sizeof(XEvent) [96 bytes, see Xlib.h]. If an extension
+converts a wire event to an XEvent > 96 bytes, it will overwrite the space
+acllocated for the event. See struct _XSQEvent in Xlibint.h for details.
+
+Extensions need to malloc additional data and fill the XEvent structure with
+pointers to the malloc'd data. The client then needs to free the data, only
+the XEvent structure will be released by Xlib.
commit 88c24404b44def76a56f52a216a8cf2e0991c3e6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 14 18:56:41 2006 -0700
renamed: .cvsignore -> .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index a76ccb0..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-install-sh
-missing
-xextproto.pc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a76ccb0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+xextproto.pc
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]
diff --git a/ChangeLog b/ChangeLog
index f36412e..ef3ad1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-27 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * Makefile.am:
+ * Xagsrv.h [REMOVED]:
+ Remove Xserver API for appgroup extension
+ [Will break Xorg server builds prior to 2006-06-21 / git commit
+ 77c947b900faf34f425eef1549d8210c475e093b]
+
2006-06-20 Alan Coopersmith <alan.coopersmith@sun.com>
* security.h:
diff --git a/Makefile.am b/Makefile.am
index 7ce6d66..782b7d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,6 @@ xext_HEADERS = \
sync.h \
syncstr.h \
Xag.h \
- Xagsrv.h \
Xagstr.h \
Xcup.h \
Xcupstr.h \
diff --git a/Xagsrv.h b/Xagsrv.h
deleted file mode 100644
index b9c50aa..0000000
--- a/Xagsrv.h
+++ /dev/null
@@ -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_ */
-
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]
diff --git a/ChangeLog b/ChangeLog
index c722b51..f36412e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-20 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * security.h:
+ Remove Xserver API for security extension (#ifdef _SECURITY_SERVER)
+ [Will break Xorg server builds prior to 2006-06-20 / git commit
+ d44b2a0a57fb89741173c31676af0ccc822387dc]
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/security.h b/security.h
index 188ad55..fc7ade2 100644
--- a/security.h
+++ b/security.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 */
Reply to: