libxrandr: Changes to 'upstream-unstable'
.gitignore | 1
ChangeLog | 231 ----------------------------------------
Makefile.am | 12 +-
configure.ac | 4
include/X11/extensions/Xrandr.h | 10 -
man/Makefile.am | 3
man/Xrandr.man | 11 -
src/Xrandr.c | 26 ++--
8 files changed, 35 insertions(+), 263 deletions(-)
New commits:
commit bf476779616b24c6456339bc77896460f1a2545a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 15:28:08 2008 -0400
libXrandr 1.2.3
diff --git a/configure.ac b/configure.ac
index c71515d..299eff8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 203fc002b6948c3942f0461a0346dd07b633222d
Author: thb <thb@openoffice.org>
Date: Mon Jun 23 13:25:12 2008 -0400
Bug #16430: Ignore ConfigureNotify on non-root windows in UpdateConfiguration
diff --git a/src/Xrandr.c b/src/Xrandr.c
index 8896675..c7bbc8e 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -395,9 +395,11 @@ int XRRUpdateConfiguration(XEvent *event)
if (event->type == ConfigureNotify) {
rcevent = (XConfigureEvent *) event;
snum = XRRRootToScreen(dpy, rcevent->window);
- dpy->screens[snum].width = rcevent->width;
- dpy->screens[snum].height = rcevent->height;
- return 1;
+ if (snum != -1) {
+ dpy->screens[snum].width = rcevent->width;
+ dpy->screens[snum].height = rcevent->height;
+ return 1;
+ }
}
info = XRRFindDisplay(dpy);
commit 332eee90c4d00be3b11049e0261323abe89a96dc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 17:34:36 2008 +0930
Rename parameters to clarify QueryVersion/QueryExtension.
These parameters are not treated as input. Rename them to make the inner
workings slightly more obvious.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index 58dc75d..77a7d04 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -119,10 +119,12 @@ typedef struct {
/* internal representation is private to the library */
typedef struct _XRRScreenConfiguration XRRScreenConfiguration;
-Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep);
+Bool XRRQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return);
Status XRRQueryVersion (Display *dpy,
- int *major_versionp,
- int *minor_versionp);
+ int *major_version_return,
+ int *minor_version_return);
XRRScreenConfiguration *XRRGetScreenInfo (Display *dpy,
Window window);
diff --git a/man/Xrandr.man b/man/Xrandr.man
index 0c6a105..f5b1034 100644
--- a/man/Xrandr.man
+++ b/man/Xrandr.man
@@ -35,11 +35,11 @@
.nf
.sp
Bool XRRQueryExtension \^(\^Display *\fIdpy\fP,
- int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+ int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.sp
Status XRRQueryVersion \^(\^Display *\fIdpy\fP,
- int *\fImajor_versionp\fP,
- int *\fIminor_versionp\fP\^);
+ int *\fImajor_version_return\fP,
+ int *\fIminor_version_return\fP\^);
.sp
XRRScreenConfiguration *XRRGetScreenInfo \^(\^Display *dpy,
Drawable \fIdraw\fP\^);
diff --git a/src/Xrandr.c b/src/Xrandr.c
index b6068dc..8896675 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -272,13 +272,15 @@ int XRRRootToScreen(Display *dpy, Window root)
}
-Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep)
+Bool XRRQueryExtension (Display *dpy,
+ int *event_base_return,
+ int *error_base_return)
{
XExtDisplayInfo *info = XRRFindDisplay (dpy);
if (XextHasExtension(info)) {
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
return True;
} else {
return False;
commit 824f3d4a3a4669526a5c391c6668df0384b49cdb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 5 15:37:32 2008 +0100
Bug #14388: Remove XRRScreenConfig() and XRRConfig() from Xrandr.h.
It seems that they were never actually implemented.
Also remove the corresponding manpage symlinks.
diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index d87976b..58dc75d 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -177,8 +177,6 @@ int XRRRootToScreen(Display *dpy, Window root);
*/
-XRRScreenConfiguration *XRRScreenConfig(Display *dpy, int screen);
-XRRScreenConfiguration *XRRConfig(Screen *screen);
void XRRSelectInput(Display *dpy, Window window, int mask);
/*
diff --git a/man/Makefile.am b/man/Makefile.am
index c922fef..f9928b3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -70,8 +70,6 @@ Xrandr_shadows = \
XRRConfigCurrentConfiguration \
XRRConfigCurrentRate \
XRRRootToScreen \
- XRRScreenConfig \
- XRRConfig \
XRRSelectInput
shadows.DONE:
diff --git a/man/Xrandr.man b/man/Xrandr.man
index 00fe5f1..0c6a105 100644
--- a/man/Xrandr.man
+++ b/man/Xrandr.man
@@ -90,11 +90,6 @@ int XRRRootToScreen\^(\^
Display *\fIdpy\fP,
Window \fIroot\fP\^);
.sp
-XRRScreenConfiguration *XRRScreenConfig\^(\^
- Display *\fIdpy\fP, int \fIscreen\fP\^);
-.sp
-XRRScreenConfiguration *XRRConfig\^(\^Screen *\fIscreen\fP\^);
-.sp
void XRRSelectInput\^(\^Display *\fIdpy\fP, Window \fIwindow\fP, int \fImask\fP\^);
.sp
/\(**
commit dc0ce2e363dbdac560fc2a8c1296c5468d75f644
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:37:17 2008 +0100
nuke RCS Ids
diff --git a/Makefile.am b/Makefile.am
index e6c6632..bef1d41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id$
-#
# 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 f1e3d39..c71515d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
dnl
-dnl $Id$
-dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/man/Makefile.am b/man/Makefile.am
index cd175c5..c922fef 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 23a47035818390ca197179a9a69a54badb370990
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 5 15:35:30 2008 +0100
Hide some private symbols.
XExtensionInfo, XRRExtensionName, XRRFindDisplay, _XRRHasRates and
_XRRVersionHandler are internal to libXrandr. Don't export them.
diff --git a/src/Xrandr.c b/src/Xrandr.c
index fdaa80d..b6068dc 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -36,8 +36,8 @@
#include <X11/extensions/Xrender.h>
#include "Xrandrint.h"
-XExtensionInfo XRRExtensionInfo;
-char XRRExtensionName[] = RANDR_NAME;
+_X_HIDDEN XExtensionInfo XRRExtensionInfo;
+_X_HIDDEN char XRRExtensionName[] = RANDR_NAME;
static Bool XRRWireToEvent(Display *dpy, XEvent *event, xEvent *wire);
static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire);
@@ -210,7 +210,7 @@ static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire)
return False;
}
-XExtDisplayInfo *
+_X_HIDDEN XExtDisplayInfo *
XRRFindDisplay (Display *dpy)
{
XExtDisplayInfo *dpyinfo;
@@ -285,7 +285,7 @@ Bool XRRQueryExtension (Display *dpy, int *event_basep, int *error_basep)
}
}
-Bool
+_X_HIDDEN Bool
_XRRHasRates (int major, int minor)
{
return major > 1 || (major == 1 && minor >= 1);
@@ -330,7 +330,7 @@ Status XRRQueryVersion (Display *dpy,
return 1;
}
-Bool
+_X_HIDDEN Bool
_XRRVersionHandler (Display *dpy,
xReply *rep,
char *buf,
commit 732ae92882383b33384791c2e9136a54e0fd06f3
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:42 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 3979214..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,231 +0,0 @@
-2006-02-12 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * man/Makefile.am:
- Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xrandr.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
- * configure.ac:
- Update dependencies to work with separate build roots.
-
-2005-11-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- * src/Makefile.am:
- Fix pkgconfig deps for separate build roots.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- * src/Makefile.am:
- Update pkgcheck dependencies to work with separate build roots.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-10-12 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * configure.ac:
- * man/Makefile.am:
- Use sed to fill in variables in man page
- Add shadow man pages for man pages that document multiple functions.
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
-
-2005-06-09 Alexander Gottwald <ago@freedesktop.org>
-
- * configure.ac:
- Require renderproto instead of render for pkgconfig
-
-2005-01-16 Chris Larson <kergoth@handhelds.org>
-
- * configure.ac: Fix to work with automake 1.9.x.
-
-2004-09-19 Carlos Romero <kidcrash@freedesktop.org>
-
- * Makefile.am:
- Include man pages in EXTRA_DIST.
-
-2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS: Get a author's list.
-
-2004-01-15 Daniel Stone <daniel@fooishbar.org>
- * Tag release 1.0.2 for first freedesktop.org clientside lib release.
-
-2004-01-15 Harold L Hunt II <huntharo@msu.edu>
- * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. Add
- -lXext and -lXrender to LIBADD.
-
-2003-06-12 07:12 eich
-
- * Xrandr.man: 214. Changed any occurance of x86_64 to AMD64, the
- official name of the
- architecture (Egbert Eich).
- 213. Removed Copyright sign from man pages as this causes some
- formatters
- to choke (Egbert Eich).
-
-2003-05-29 14:48 herrb
-
- * Xrandr.man: Fix manual pages typos (Bugzilla #316, Jens
- Schweikhardt).
-
-2003-05-29 08:04 dawes
-
- * Xrandr.man: Remove reference to non-existent Xrender(3) man page
- (reported to webmaster).
-
-2003-05-27 15:26 tsi
-
- * Xrandr.c: 194. IRIX 6.5 build fixes and noise reductions (Marc
- La France).
-
-2003-03-24 20:18 dawes
-
- * Xrandr-def.cpp: 26. Updates for building on OS/2 (#5650, Frank
- Giessler).
-
-2003-02-07 03:21 eich
-
- * Xrandr.c: - followup for patch 844 - fixed typo in savage driver
-
-2003-02-05 04:59 eich
-
- * Xrandr.c: 844. Fixing a double free in libXRandr (Egbert Eich).
-
-2002-11-29 18:27 tsi
-
- * Xrandr.c: Build fix
-
-2002-11-26 21:37 keithp
-
- * Xrandr.c: LockDisplay re-executed during configuration fetching
-
-2002-11-03 16:21 keithp
-
- * Xrandr.c: correct randr reply length computation
-
-2002-10-14 11:01 keithp
-
- * Xrandr.c, Xrandr.h, Xrandrint.h: Add refresh rates to RandR
- (v1.1)
-
-2002-10-08 06:00 keithp
-
- * Xrandr.man: Add comments about interaction of reflection and
- rotation (from Jim Gettys)
-
-2002-10-02 15:11 tsi
-
- * Xrandr.man: Fix man page
-
-2002-10-02 09:55 keithp
-
- * Imakefile, Xrandr.man: Add Xrandr manual, update xrandr manual
-
-2002-10-01 11:24 keithp
-
- * Xrandr.h: Remove spurious member from XRRScreenSize structure.
-
-2002-09-29 16:39 keithp
-
- * Xrandr.c, Xrandr.h, Xrandrint.h: Update RandR to 1.0 (library
- version 2.0)
-
-2001-11-23 15:26 keithp
-
- * Xrandr.h: Add C++ support to RandR library header
-
-2001-08-19 08:22 alanh
-
- * Xrandr-def.cpp: new file
-
-2001-08-06 14:46 dawes
-
- * test.c: missing ident lines
-
-2001-07-31 17:44 tsi
-
- * Xrandr.h: 168. Fix 16bpp colour maps on Mach64's (Marc La
- France).
- 167. Fix Mach64 DPMS bug (Marc La France).
- 166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc
- La France).
- 165. Document what a ChipAdjustFrame() function should to to
- prevent moving
- of hardware cursors during mode switches (Marc La France).
- 164. -Wimplicit warning cleanup [`make World` >required<] (Marc La
- France).
- 163. Ensure installed headers can find the headers they, in turn,
- #include
- (Marc La France).
- 162. Make imake pass its -W* flags to cpp (Marc La France).
- 161. More accomodations for newer GCC's (Mike A. Harris).
-
-2001-06-10 18:37 keithp
-
- * Xrandr.c, Xrandr.h: Add XRRCurrentConfig to get current setup,
- implement XRRTimes as per header
-
-2001-06-07 10:54 keithp
-
- * Xrandr.c, Xrandr.h: Change randr event and set config reply
-
-2001-06-07 08:33 keithp
-
- * Xrandr.c, Xrandr.h, Xrandrint.h: Update Xrandr library to add
- events
-
-2001-06-03 14:52 keithp
-
- * Xrandr.c, Xrandr.h: Update RandR protocol
-
-2001-05-25 18:25 keithp
-
- * Xrandr.c, Xrandr.h: Add initial RandR support to Xvesa
-
-2001-05-22 20:29 keithp
-
- * Imakefile, Xrandr.c, Xrandr.h, Xrandrint.h, test.c: Add RandR
- extension
-
diff --git a/Makefile.am b/Makefile.am
index 14bebfc..e6c6632 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,3 +29,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrandr.pc
EXTRA_DIST = xrandr.pc.in autogen.sh
+
+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 27b91d1d62acb70da7d131ee4b6da265d64cb835
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:48 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 118b016..a8f6f22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ missing
mkinstalldirs
stamp-h1
xrandr.pc
+*~
Reply to: