.gitignore            |    1 
 ChangeLog             |   34 ++++++++++++++++++++++++++++
 composite.h           |   10 ++------
 compositeproto.h      |   48 ----------------------------------------
 compositeproto.txt    |   59 +++++++++++++++-----------------------------------
 configure             |   20 ++++++++--------
 configure.ac          |    2 -
 debian/changelog      |   12 +++++++++-
 debian/control        |    2 -
 debian/xsfbs/xsfbs.mk |   27 +++++++++++++++-------
 debian/xsfbs/xsfbs.sh |    7 -----
 11 files changed, 97 insertions(+), 125 deletions(-)

New commits:
commit e855952a1b0e324cf33d8e7a01f0e72e0f263698
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Fri Sep 14 22:25:01 2007 +0200

    Prepare changelog for upload to unstable

diff --git a/debian/changelog b/debian/changelog
index cfcb23c..9bed8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-composite (1:0.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Add myself to Uploaders, and remove Branden with his permission.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Fri, 14 Sep 2007 22:24:44 +0200
+
 x11proto-composite (1:0.4-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index a1b7d38..4e8e8ef 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-composite
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-composite

commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Wed Aug 29 09:36:00 2007 +0200

    Do not call laptop-detect, let the only user call it directly

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
 
 ARCHITECTURE="$(dpkg --print-installation-architecture)"
 
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
-    if laptop-detect >/dev/null; then
-       LAPTOP=true
-    fi
-fi
-
 if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
   RECONFIGURE="true"
 else

commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Jul 12 16:06:22 2007 +0200

    Fix "display the output of quilt push/pop".
    
    Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
    return value of quilt, not the one of tee.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
        fi; \
        if $(QUILT) next >/dev/null 2>&1; then \
          echo -n "Applying patches..."; \
-         if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+         if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+           cat $(STAMP_DIR)/log/patch; \
            echo "successful."; \
          else \
+           cat $(STAMP_DIR)/log/patch; \
            echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
            exit 1; \
          fi; \
@@ -164,9 +166,11 @@ unpatch:
        rm -f $(STAMP_DIR)/patch
        @echo -n "Unapplying patches..."; \
        if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
-         if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+         if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+           cat $(STAMP_DIR)/log/unpatch; \
            echo "successful."; \
          else \
+           cat $(STAMP_DIR)/log/unpatch; \
            echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
            exit 1; \
          fi; \

commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Mon Jul 9 21:50:47 2007 +0200

    Minor fixes in the patching system.
    
     * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as 
in #369920).
     * Display which patches are applied and removed instead of just the first 
one (for #428090).

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
 # Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
 export DH_OPTIONS
 
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
 # Set up parameters for the upstream build environment.
 
 # Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
                echo "Couldn't find quilt. Please install it or add it to the 
build-depends for this package."; \
                exit 1; \
        fi; \
-       if quilt next >/dev/null 2>&1; then \
+       if $(QUILT) next >/dev/null 2>&1; then \
          echo -n "Applying patches..."; \
-         if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+         if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
        rm -f $(STAMP_DIR)/patch
        @echo -n "Unapplying patches..."; \
        if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
-         if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+         if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
        @echo -n "Auditing patches..."; \
        >$(STAMP_DIR)/log/patch; \
        FUZZY=; \
-       while [ -n "$$(quilt next)" ]; do \
-         RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk 
| sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+       while [ -n "$$($(QUILT) next)" ]; do \
+         RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep 
^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
          case "$$RESULT" in \
            succeeded) \
-             echo "fuzzy patch: $$(quilt top)" \
-               | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+             echo "fuzzy patch: $$($(QUILT) top)" \
+               | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
              FUZZY=yes; \
              ;; \
            FAILED) \
-             echo "broken patch: $$(quilt next)" \
-               | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+             echo "broken patch: $$($(QUILT) next)" \
+               | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
              exit 1; \
              ;; \
          esac; \

commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Mon Jul 9 19:06:05 2007 +0200

    Fix displaying of patches applied by quilt.
    
    As requested in bug #428090, we silence the output of quilt next
    and display the output of quilt push/pop.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
                echo "Couldn't find quilt. Please install it or add it to the 
build-depends for this package."; \
                exit 1; \
        fi; \
-       if quilt next; then \
+       if quilt next >/dev/null 2>&1; then \
          echo -n "Applying patches..."; \
-         if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+         if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
        rm -f $(STAMP_DIR)/patch
        @echo -n "Unapplying patches..."; \
        if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
-         if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+         if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \

commit 8b76a077e58b431d161135b3a0429ee045e17cef
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Wed Jul 4 12:53:29 2007 +0200

    Update the upstream changelog.

diff --git a/ChangeLog b/ChangeLog
index 43e8fff..a091416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+commit 25e8047e25652be388dc66d85c180dcc4ccea4f6
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date:   Tue Jul 3 14:11:10 2007 -0700
+
+    Bump version in configure.ac to 0.4
+
+commit 1838412121d0bac8ce443d362e75439d58a93a4d
+Author: Keith Packard <[EMAIL PROTECTED]>
+Date:   Tue Jul 3 14:09:41 2007 -0700
+
+    Define new manual-redirect clipping semantics and bump version to 0.4.
+    
+    Manual-redirect windows no longer clip their parents, nor do they affect
+    expose event computation. This makes it possible to create 
application-level
+    composited windows which can be damaged by other window manipulations.
+    
+    This patch also removes the coordinate transformation stuff which was never
+    released.
+
+commit bca9592612d60142e3c624b90649475b561b8eda
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 17 20:48:18 2007 -0700
+
+    Add *~ to .gitignore to skip emacs/patch droppings
+
+commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date:   Tue Apr 17 20:47:50 2007 -0700
+
+    Protocol spec nit cleanups
+    
+    Fix versioning from 0.3/0.4 merge
+    Update description of RedirectWindow to match names in protocol diagrams
+
 commit dd2133540f8dd0f0f66ecf24e01113184045af83
 Author: Eric Anholt <[EMAIL PROTECTED]>
 Date:   Tue Jan 9 10:42:31 2007 -0800

commit 868e9bda6317b24faf9eeda02e99b5557ffdea9f
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jul 3 20:43:58 2007 -0400

    autoreconf

diff --git a/configure b/configure
index a1e9fd9..a5507c2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for CompositeProto 0.3.
+# Generated by GNU Autoconf 2.61 for CompositeProto 0.4.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='CompositeProto'
 PACKAGE_TARNAME='compositeproto'
-PACKAGE_VERSION='0.3'
-PACKAGE_STRING='CompositeProto 0.3'
+PACKAGE_VERSION='0.4'
+PACKAGE_STRING='CompositeProto 0.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_subst_vars='SHELL
@@ -1147,7 +1147,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures CompositeProto 0.3 to adapt to many kinds of systems.
+\`configure' configures CompositeProto 0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1213,7 +1213,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of CompositeProto 0.3:";;
+     short | recursive ) echo "Configuration of CompositeProto 0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1290,7 +1290,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-CompositeProto configure 0.3
+CompositeProto configure 0.4
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1304,7 +1304,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by CompositeProto $as_me 0.3, which was
+It was created by CompositeProto $as_me 0.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1974,7 +1974,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='compositeproto'
- VERSION='0.3'
+ VERSION='0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2620,7 +2620,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by CompositeProto $as_me 0.3, which was
+This file was extended by CompositeProto $as_me 0.4, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2663,7 +2663,7 @@ Report bugs to <[EMAIL PROTECTED]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-CompositeProto config.status 0.3
+CompositeProto config.status 0.4
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/debian/changelog b/debian/changelog
index 5e35410..8a6389a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-composite (1:0.4-1) UNRELEASED; urgency=low
+x11proto-composite (1:0.4-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * Bump the epoch so that this can be synced to Ubuntu in the future.
@@ -12,7 +12,7 @@ x11proto-composite (1:0.4-1) UNRELEASED; urgency=low
   [ David Nusinow ]
   * New upstream release
 
- -- David Nusinow <[EMAIL PROTECTED]>  Tue, 03 Jul 2007 20:39:45 -0400
+ -- David Nusinow <[EMAIL PROTECTED]>  Tue, 03 Jul 2007 20:42:22 -0400
 
 x11proto-composite (0.3.1-2) unstable; urgency=low
 

commit e3a4424d472909bfb13b6b0e0e2b2fd816a23817
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Tue Jul 3 20:40:39 2007 -0400

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index c6ec117..5e35410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-composite (1:0.3.1-3) UNRELEASED; urgency=low
+x11proto-composite (1:0.4-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Bump the epoch so that this can be synced to Ubuntu in the future.
@@ -9,7 +9,10 @@ x11proto-composite (1:0.3.1-3) UNRELEASED; urgency=low
   * Add XS-Vcs-*; drop obsolete CVS info from the description.
   * Remove Fabio from Uploaders, with his permission.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Fri, 04 May 2007 12:20:23 +0200
+  [ David Nusinow ]
+  * New upstream release
+
+ -- David Nusinow <[EMAIL PROTECTED]>  Tue, 03 Jul 2007 20:39:45 -0400
 
 x11proto-composite (0.3.1-2) unstable; urgency=low
 

commit 25e8047e25652be388dc66d85c180dcc4ccea4f6
Author: Keith Packard <[EMAIL PROTECTED]>
Date:   Tue Jul 3 14:11:10 2007 -0700

    Bump version in configure.ac to 0.4

diff --git a/configure.ac b/configure.ac
index 581ad12..3a5fc5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT([CompositeProto], [0.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([CompositeProto], [0.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 1838412121d0bac8ce443d362e75439d58a93a4d
Author: Keith Packard <[EMAIL PROTECTED]>
Date:   Tue Jul 3 14:09:41 2007 -0700

    Define new manual-redirect clipping semantics and bump version to 0.4.
    
    Manual-redirect windows no longer clip their parents, nor do they affect
    expose event computation. This makes it possible to create application-level
    composited windows which can be damaged by other window manipulations.
    
    This patch also removes the coordinate transformation stuff which was never
    released.

diff --git a/composite.h b/composite.h
index 009007b..30b190f 100644
--- a/composite.h
+++ b/composite.h
@@ -49,7 +49,7 @@
 
 #define COMPOSITE_NAME                         "Composite"
 #define COMPOSITE_MAJOR                                0
-#define COMPOSITE_MINOR                                3
+#define COMPOSITE_MINOR                                4
 
 #define CompositeRedirectAutomatic             0
 #define CompositeRedirectManual                        1
@@ -63,13 +63,9 @@
 #define X_CompositeNameWindowPixmap            6
 #define X_CompositeGetOverlayWindow             7
 #define X_CompositeReleaseOverlayWindow         8
-#define X_CompositeRedirectCoordinate          9
-#define X_CompositeTransformCoordinate         10
 
-#define CompositeNumberRequests            (X_CompositeTransformCoordinate + 1)
+#define CompositeNumberRequests            (X_CompositeReleaseOverlayWindow + 
1)
 
-#define CompositeTransformCoordinateNotify     0
-
-#define CompositeNumberEvents                  1
+#define CompositeNumberEvents                  0
 
 #endif /* _COMPOSITE_H_ */
diff --git a/compositeproto.h b/compositeproto.h
index b7c605b..c57628c 100644
--- a/compositeproto.h
+++ b/compositeproto.h
@@ -185,54 +185,6 @@ typedef struct {
 
 #define sz_xCompositeReleaseOverlayWindowReq 
sizeof(xCompositeReleaseOverlayWindowReq)
 
-/* Version 0.4 additions */
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   compositeReqType;
-    CARD16  length;
-    Window  window B32;
-    BOOL    redirect;
-    BYTE    unused1;
-    CARD16  unused2 B16;
-} xCompositeRedirectCoordinateReq;
-
-#define sz_xCompositeRedirectCoordinateReq         12
-
-typedef struct {
-    CARD8   type;
-    CARD8   subtype;   /* XXX use this? */
-    CARD16  sequenceNumber B16;
-    Time    time B32;
-    Window  window B32;
-    Window  child B32;
-    CARD32  serialNumber B32;
-    CARD32  count B32;
-    CARD16  x B16;
-    CARD16  y B16;
-    CARD32  pad1 B32;
-} xCompositeTransformCoordinateNotifyEvent;
-
-typedef struct {
-    Window  window B32;
-    CARD16  x B16;
-    CARD16  y B16;
-} xCompositeCoordinate;
-
-#define sz_xCompositeCoordinate        8
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   compositeReqType;
-    CARD16  length;
-    Window  window B32;
-    CARD32  serialNumber B32;
-    CARD16  x B16;
-    CARD16  y B16;
-} xCompositeTransformCoordinateReq;
-
-#define sz_xCompositeTransformCoordinateReq    16
-
 #undef Window
 #undef Region
 
diff --git a/compositeproto.txt b/compositeproto.txt
index 8740920..4b86621 100644
--- a/compositeproto.txt
+++ b/compositeproto.txt
@@ -1,6 +1,6 @@
                         Composite Extension
                             Version 0.4
-                             2007-4-17
+                             2007-7-3
                            Keith Packard
                          [EMAIL PROTECTED]
                            Deron Johnson
@@ -34,6 +34,9 @@ both early prototypes and the final design include:
  +     Deron Johnson for the Looking Glass implementation and
        a prototype of the coordinate transformation mechanism.
 
+ +     Ryan Lortie for helping figure out reasonable parent clipping
+       semantics in the presense of manual redirected children.
+
 3. Architecture
 
 The composite extension provides three related mechanisms:
@@ -129,11 +132,16 @@ redefine its input region, but the specific arbitration 
rules followed
 by these clients is not defined by this specification; these policies
 should be defined by the clients themselves.
 
-3.3 Coordinate transform redirection
+3.3 Clipping semantics redefined
 
-Version 0.4 of the protocol adds the coordinate transformation redirection
-portions of the protocol which externalize the relationship between
-parent and child positions with respect to pointer coordinates.
+Version 0.4 of the protocol changes the semantics of clipping in the
+presense of manual redirect children. In version 0.3, a parent was always
+clipped to child windows, independent of the kind of redirection going on.
+With version 0.4, the parent is no longer clipped to child windows which are
+manually redirected. This means the parent can draw in the child region 
without using
+IncludeInferiors mode, and (perhaps more importantly), it will receive
+expose events in those regions caused by other actions. This new behaviour
+is not selectable.
 
 4. Errors
 
@@ -147,34 +155,6 @@ The composite extension does not define any new errors.
                child:                  Window
                x, y:                   CARD16
 
-6. Events
-
-Version 0.4 of the Composite protocol defines one new event
-
-    TransformCoordinateNotify
-    
-               subtype:                COORDINATEEVENT
-               window:                 Window
-               child:                  Window
-               time:                   Timestamp
-               serialNumber:           CARD32
-               count:                  CARD32
-               x, y:                   INT16
-       
-       This event is delivered to the client requesting for coordinate
-       redirection for 'window'. 'x' and 'y' are a location in 'child' if
-       not None, else in 'window'. 'time' is the time of any related
-       pointer event. 'serialNumber' serves to sequence transformations.
-       'count' indicates the number of events still to be delivered for
-       'window' to satisfy a particular operation within the server
-
-       The client must respond to this event with a suitable
-       TransformCoordinate request that includes matching 'window', 'child'
-       and serialNumber fields.
-
-       'serialNumber' may be repeated in multiple events, indicating that
-       the server needs to redo the same transformation for some reason.
-
 7. Extension Initialization
 
 The client must negotiate the version of the extension before executing

commit bca9592612d60142e3c624b90649475b561b8eda
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Tue Apr 17 20:48:18 2007 -0700

    Add *~ to .gitignore to skip emacs/patch droppings

diff --git a/.gitignore b/.gitignore
index 521ba35..4945c82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ config.status
 configure
 install-sh
 missing
+*~

commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date:   Tue Apr 17 20:47:50 2007 -0700

    Protocol spec nit cleanups
    
    Fix versioning from 0.3/0.4 merge
    Update description of RedirectWindow to match names in protocol diagrams

diff --git a/compositeproto.txt b/compositeproto.txt
index 77b1b85..8740920 100644
--- a/compositeproto.txt
+++ b/compositeproto.txt
@@ -1,11 +1,8 @@
-                       Composite Extension
-                           Version 0.4
-                             2006-2-24
+                        Composite Extension
+                            Version 0.4
+                             2007-4-17
                            Keith Packard
                          [EMAIL PROTECTED]
-
-                           Version 0.3
-                             2006-5-13
                            Deron Johnson
                        [EMAIL PROTECTED]
 
@@ -152,7 +149,7 @@ The composite extension does not define any new errors.
 
 6. Events
 
-Version 0.3 of the Composite protocol defines one new event
+Version 0.4 of the Composite protocol defines one new event
 
     TransformCoordinateNotify
     
@@ -213,9 +210,9 @@ operations other than QueryVersion.
                errors: Window, Access, Match
 
        The hierarchy starting at 'window' is directed to off-screen
-       storage. 'automatic-update' specifies whether the contents
-       are mirrored to the parent window automatically or not. Only
-       one client may specify this flag, another attempt will result in an
+       storage. 'update' specifies whether the contents are mirrored to 
+       the parent window automatically or not. Only one client may specify 
+       an update type of Manual, another attempt will result in an
        Access error. When all clients enabling redirection terminate,
        the redirection will automatically be disabled.
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to