x11proto-fixes: Changes to 'upstream-unstable'
.gitignore | 6 ++++-
COPYING | 2 -
ChangeLog | 64 -------------------------------------------------------
INSTALL | 4 +--
Makefile.am | 13 ++++++++---
README | 32 ++++++++++++++++++++-------
configure.ac | 9 ++++---
fixesproto.pc.in | 1
fixesproto.txt | 21 ++++++++++++++----
xfixesproto.h | 6 -----
xfixeswire.h | 2 -
11 files changed, 65 insertions(+), 95 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
commit 9a3f2e436481face8e79c80bffdfb3e00b48eeab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 23 08:44:54 2009 -0400
fixesproto 4.1
diff --git a/configure.ac b/configure.ac
index 4078f49..0d422d4 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([FixesProto], [4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([FixesProto], [4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit c7c9beab9a41d835008e1070c0ed8470293fe6ba
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 16 11:20:09 2009 +0100
fixesproto: adjust to split xext headers
Protocol constants for shape were moved to shapeconst.h.
Acked-By: Adam Jackson <ajax@redhat.com>
diff --git a/fixesproto.pc.in b/fixesproto.pc.in
index 454ed8d..fabce86 100644
--- a/fixesproto.pc.in
+++ b/fixesproto.pc.in
@@ -7,3 +7,4 @@ Name: FixesProto
Description: X Fixes extension headers
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
+Requires: xextproto >= 7.0.99.1
diff --git a/xfixesproto.h b/xfixesproto.h
index 571706e..545e325 100644
--- a/xfixesproto.h
+++ b/xfixesproto.h
@@ -47,9 +47,7 @@
#include <X11/Xmd.h>
#include <X11/extensions/xfixeswire.h>
-#define _SHAPE_SERVER_
-#include <X11/extensions/shape.h>
-#undef _SHAPE_SERVER_
+#include <X11/extensions/shapeconst.h>
#define Window CARD32
#define Drawable CARD32
commit a0aeb48945773d26f9a033a672eaf6f7917d0b83
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 20:08:44 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
index 044aa68..1e4c79e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,11 @@ autom4te.cache
config.log
config.status
configure
-fixesext.pc
+fixesproto.pc
install-sh
missing
mkinstalldirs
+*~
+fixesproto-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 74aa5dc..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2006-3-30 Deron Johnson <deron.johnson@sun.com>
-
- * configure.ac
- * xfixesproto.h
- * xfixeswire.h
- Xfixes Version 4.0: XFixesHideCursor, XFixesShowCursor
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2004-07-26 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * xfixesproto.h:
- * xfixeswire.h:
- Add XFixesExpandRegion
-
-2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS: Add contents to AUTHORS file
-
-2004-01-15 Daniel Stone <daniel@fooishbar.org>
- * Tag release 2.0.1 for first freedesktop.org clientside lib release.
-
-2003-11-21 Keith Packard <keithp@keithp.com>
-
- * protocol:
- * xfixesproto.h:
- * xfixeswire.h:
- Eliminate offset arguments in combining operators,
- create separate CopyRegion and TranslateRegion requests.
-
-2003-11-02 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * fixesext.pc.in:
- * protocol:
- * xfixesproto.h:
- * xfixeswire.h:
- Merge xfixes_2_branch back to head
-
-2003-10-19 Keith Packard <keithp@keithp.com>
-
- * configure.ac:
- * fixesext.pc.in:
- * protocol:
- * xfixesproto.h:
- * xfixeswire.h:
- Update to version 2.0.
- Add dependency on xextensions package
- Add region requests and cursor names
-
-
-2003-09-16 Anders Carlsson <andersca@gnome.org>
-
- * configure.ac:
- * randr-uninstalled.pc.in:
- Add uninstalled pc file.
-
-2003-04-21 Keith Packard <keithp@keithp.com>
-
- + Added ChangeLog
diff --git a/Makefile.am b/Makefile.am
index 44a88a9..3b0ff24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,5 +32,14 @@ fixesdoc_DATA = fixesproto.txt
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fixesproto.pc
-EXTRA_DIST = autogen.sh fixesproto.pc.in $(fixesdoc_DATA)
+EXTRA_DIST = fixesproto.pc.in $(fixesdoc_DATA)
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 36999d2..4078f49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,11 @@ AC_INIT([FixesProto], [4.0], [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
AC_OUTPUT([Makefile
fixesproto.pc])
commit 196061a586ed13189b68dec80c86c536ffc37ed7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 22 12:44:13 2008 -0700
ChangeSaveSet with map=Unmap means 'unmap', not 'don't remap'
The semantics in the spec were conflicting, and the implementation did the
'don't remap' version which was not useful. The server implementation has
been fixed, this change clarifies the specification to match that design.
diff --git a/fixesproto.txt b/fixesproto.txt
index 65f042c..ededc8a 100644
--- a/fixesproto.txt
+++ b/fixesproto.txt
@@ -86,8 +86,9 @@ to a window which won't be affected by the underlying window destruction.
XFIXES chooses the root window as the target.
Having embedded windows suddenly appear at the top level can confuse users,
-so XFIXES also permits these windows to remain unmapped instead of being
-remapped.
+so XFIXES also lets the client select whether the window should end up
+unmapped after the save set processing instead of unconditionally making
+them be mapped.
5.1 Requests
Reply to: