x11proto-fixes: Changes to 'upstream-experimental'
COPYING | 2 --
INSTALL | 4 ++--
Makefile.am | 2 --
README | 32 ++++++++++++++++++++++++--------
configure.ac | 13 +++++--------
fixesproto.txt | 16 ++++++++++++++--
xfixesproto.h | 2 --
xfixeswire.h | 2 --
8 files changed, 45 insertions(+), 28 deletions(-)
New commits:
commit 88cd481b5349fe4962ac609c8711a17d4323e42a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 12:13:58 2009 +1000
fixesproto 4.1.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index da5bc3e..d468ebb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([FixesProto], [4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FixesProto], [4.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit d76dd3834a9443ed2237fc26d6eff1cc429606b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 12:16:30 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/COPYING b/COPYING
index d2d23d5..a97b6e6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,3 @@
-$Id: COPYING,v 1.1 2003-10-09 01:48:22 keithp Exp $
-
Copyright © 2001,2003 Keith Packard
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/Makefile.am b/Makefile.am
index 3b0ff24..2991f95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id: Makefile.am,v 1.1 2003-10-09 01:48:22 keithp Exp $
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/configure.ac b/configure.ac
index c91c4a3..da5bc3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,3 @@
-dnl
-dnl $Id: configure.ac,v 1.7 2004-07-26 17:17:33 keithp Exp $
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
diff --git a/xfixesproto.h b/xfixesproto.h
index 545e325..1e9a983 100644
--- a/xfixesproto.h
+++ b/xfixesproto.h
@@ -1,6 +1,4 @@
/*
- * $XFree86: xc/include/extensions/xfixesproto.h,v 1.1 2002/11/30 06:21:43 keithp Exp $
- *
* Copyright � 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xfixeswire.h b/xfixeswire.h
index 6f20270..72e84a7 100644
--- a/xfixeswire.h
+++ b/xfixeswire.h
@@ -1,6 +1,4 @@
/*
- * $XFree86: xc/include/extensions/xfixeswire.h,v 1.1 2002/11/30 06:21:43 keithp Exp $
- *
* Copyright � 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 9fe9e1abb2ff3c839a6049fea39adf6d753c09c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 6 12:13:11 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 0d422d4..c91c4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,11 +28,10 @@ AC_INIT([FixesProto], [4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AC_OUTPUT([Makefile
fixesproto.pc])
commit 39d4e91171de13d4b7079d4609e7930e32948d99
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 19:21:42 2009 -0700
Add README with pointers to mailing lists, bugzilla, & git
Also correct INSTALL to list the right extension name
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/INSTALL b/INSTALL
index b94098a..3b1329a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-Render is built with the traditional configure script:
+xfixesproto is built with the traditional configure script:
- $ ./configure --prefix=/usr/X11R6
+ $ ./configure --prefix=/usr
This should generate valid Makefiles, then:
diff --git a/README b/README
index 9968c6b..1f0a27d 100644
--- a/README
+++ b/README
@@ -1,10 +1,26 @@
- RandR
- X RandR Extension
- Version 1.0
- 2002-10-4
-
-This package contains header files and documentation for the X RandR
+This package contains header files and documentation for the XFIXES
extension. Library and server implementations are separate.
-Keith Packard
-keithp@keithp.com
+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/fixesproto
+
+ http://cgit.freedesktop.org/xorg/proto/fixesproto
+
+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
+
commit 50921252322e05fea4f0f85c8ae8735b6df11860
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 31 08:53:51 2009 +1000
Document behaviour of CursorNotifies with XI2 servers.
CursorNotifies are only sent for the ClientPointer to avoid confusion in the
client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/fixesproto.txt b/fixesproto.txt
index 1571e1f..5ef8153 100644
--- a/fixesproto.txt
+++ b/fixesproto.txt
@@ -1,6 +1,6 @@
The XFIXES Extension
Version 4.0
- Document Revision 1
+ Document Revision 2
2006-12-14
Keith Packard
keithp@keithp.com
@@ -187,6 +187,11 @@ SelectCursorInput
with different serial numbers may have different images. Timestamp
is the time of the cursor change.
+ Servers supporting the X Input Extension Version 2.0 or higher only
+ notify the clients of cursor change events for the ClientPointer, not
+ of any other master pointer (see Section 4.4. in the XI2 protocol
+ specificiation).
+
GetCursorImage
->
commit beebe5339ee97b36c3d5b2a5c2b2f140d03f2003
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 31 08:21:14 2009 +1000
Hide/ShowCursor works on all master pointers in XI2.
Servers supporting XI2 will hide all cursors when a client requests
HideCursor. This is arguably closest to the original intent of the request -
to not display a cursor above the given window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/fixesproto.txt b/fixesproto.txt
index ededc8a..1571e1f 100644
--- a/fixesproto.txt
+++ b/fixesproto.txt
@@ -537,6 +537,11 @@ HideCursor
When a client with outstanding cursor hiding requests
terminates its connection these requests will be deleted.
+ Servers supporting the X Input Extension Version 2.0 or higher hide
+ all visible cursors in response to a HideCursor request. If a master
+ pointer is created while the cursors are hidden, this master pointer's
+ cursor will be hidden as well.
+
ShowCursor
window: WINDOW
@@ -553,7 +558,9 @@ ShowCursor
If the client has made no outstanding HideCursor requests
a BadMatch error is generated.
-
+ Servers supporting the X Input Extension Version 2.0 or higher show
+ all visible cursors in response to a ShowCursor request.
+
99. Future compatibility
This extension is not expected to remain fixed. Future changes will
Reply to: