.gitignore | 9 ++++ COPYING | 1 ChangeLog | 85 ---------------------------------------- Makefile.am | 14 ++++-- README | 24 +++++++++++ configure.ac | 19 +++----- include/X11/extensions/Xfixes.h | 8 ++- man/.gitignore | 2 man/Makefile.am | 3 - man/Xfixes.man | 6 +- src/.gitignore | 7 --- src/Cursor.c | 12 ++--- src/Makefile.am | 4 - src/Region.c | 8 +-- src/Xfixes.c | 18 ++++---- 15 files changed, 79 insertions(+), 141 deletions(-)
New commits: commit ed2f91926bcef1610abe3c9cef61b1bb1c918ec8 Author: Alan Coopersmith <[email protected]> Date: Thu Oct 8 08:45:02 2009 -0700 libXfixes 4.0.4 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index acd52a5..a73bf6e 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n, dnl that 'revision' number appears in Xfixes.h and has to be manually dnl synchronized. dnl -AC_INIT(libXfixes, 4.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes) +AC_INIT(libXfixes, 4.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE commit dc9e2c696121f677065919bc5b011eb650791831 Author: Alan Coopersmith <[email protected]> Date: Thu Oct 8 08:44:24 2009 -0700 Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 754ef2c..acd52a5 100644 --- a/configure.ac +++ b/configure.ac @@ -36,15 +36,17 @@ AC_INIT(libXfixes, 4.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_CWARNFLAGS, 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) +# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Check fixesext configuration, strip extra digits from package version to # find the required protocol version @@ -52,14 +54,9 @@ XORG_CWARNFLAGS FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(FIXESEXT_VERSION) PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto x11) -FIXESEXT_CFLAGS="$CWARNFLAGS $FIXESEXT_CFLAGS" AC_SUBST(FIXESEXT_CFLAGS) AC_SUBST(FIXESEXT_LIBS) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile man/Makefile diff --git a/man/Makefile.am b/man/Makefile.am index 6668aff..3d95e5f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -47,4 +47,4 @@ MAN_SUBSTS = \ SUFFIXES = .$(LIB_MAN_SUFFIX) .man .man.$(LIB_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 3ba9522..544230f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,7 +9,7 @@ libXfixes_la_SOURCES = \ Xfixesint.h libXfixes_la_LIBADD = @FIXESEXT_LIBS@ -AM_CFLAGS = @FIXESEXT_CFLAGS@ +AM_CFLAGS = $(CWARNFLAGS) @FIXESEXT_CFLAGS@ INCLUDES = -I$(top_srcdir)/include/X11/extensions commit c83a721ba0b142177b3f01dd0c0a5e47e06a991a Author: Alan Coopersmith <[email protected]> Date: Mon Feb 2 20:34:33 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/README b/README index 67cf1d8..ea00b68 100644 --- a/README +++ b/README @@ -8,3 +8,27 @@ extension. Library and server implementations are separate. Keith Packard [email protected] + +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/lib/libXfixes + + http://cgit.freedesktop.org/xorg/lib/libXfixes + +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 9784df5ba9f04163da7486c005eaf2383c37b127 Author: Paulo Cesar Pereira de Andrade <[email protected]> Date: Thu Jan 29 17:40:24 2009 -0200 Janitor: Correct make distcheck and gcc/sparse warnings. diff --git a/.gitignore b/.gitignore index e28ffe9..61e8e53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -20,3 +22,10 @@ mkinstalldirs stamp-h1 xfixes.pc *~ +*.3 +*.o +*.la +*.lo +libXfixes-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 70b07e1..6b357b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,21 +19,17 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -AM_CFLAGS = $(FIXESEXT_CFLAGS) $(X_CFLAGS) - SUBDIRS = src man pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfixes.pc -EXTRA_DIST = xfixes.pc.in autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = xfixes.pc.in 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) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 3f491cd..754ef2c 100644 --- a/configure.ac +++ b/configure.ac @@ -36,29 +36,29 @@ AC_INIT(libXfixes, 4.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, 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) AM_CONFIG_HEADER(config.h) # Check for progs AC_PROG_CC AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11) - -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) +XORG_CWARNFLAGS # Check fixesext configuration, strip extra digits from package version to # find the required protocol version FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(FIXESEXT_VERSION) -PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto) +PKG_CHECK_MODULES(FIXESEXT, xproto [fixesproto >= $FIXESEXT_VERSION] xextproto x11) +FIXESEXT_CFLAGS="$CWARNFLAGS $FIXESEXT_CFLAGS" AC_SUBST(FIXESEXT_CFLAGS) AC_SUBST(FIXESEXT_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/man/.gitignore b/man/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/man/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index b956f41..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -.deps -.libs -libXfixes.la -*.lo -Makefile -Makefile.in -*~ diff --git a/src/Cursor.c b/src/Cursor.c index dac1f1c..5fd8efe 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -79,7 +79,7 @@ XFixesGetCursorImage (Display *dpy) XFixesCursorImage *image; char *name; - XFixesCheckExtension (dpy, info, 0); + XFixesCheckExtension (dpy, info, NULL); LockDisplay (dpy); GetReq (XFixesGetCursorImageAndName, req); req->reqType = info->codes->major_opcode; @@ -91,7 +91,7 @@ XFixesGetCursorImage (Display *dpy) { UnlockDisplay (dpy); SyncHandle (); - return 0; + return NULL; } if (info->major_version < 2) { @@ -115,7 +115,7 @@ XFixesGetCursorImage (Display *dpy) _XEatData (dpy, nbytes); UnlockDisplay (dpy); SyncHandle (); - return 0; + return NULL; } image->x = rep.x; image->y = rep.y; @@ -171,9 +171,9 @@ XFixesGetCursorName (Display *dpy, Cursor cursor, Atom *atom) xXFixesGetCursorNameReply rep; char *name; - XFixesCheckExtension (dpy, info, 0); + XFixesCheckExtension (dpy, info, NULL); if (info->major_version < 2) - return 0; + return NULL; LockDisplay (dpy); GetReq (XFixesGetCursorName, req); req->reqType = info->codes->major_opcode; @@ -183,7 +183,7 @@ XFixesGetCursorName (Display *dpy, Cursor cursor, Atom *atom) { UnlockDisplay (dpy); SyncHandle (); - return 0; + return NULL; } *atom = rep.atom; if ((name = (char *) Xmalloc(rep.nbytes+1))) { diff --git a/src/Makefile.am b/src/Makefile.am index 27ba027..3ba9522 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,8 @@ libXfixes_la_SOURCES = \ Xfixes.c \ Xfixesint.h -libXfixes_la_LIBADD = @X_LIBS@ -AM_CFLAGS = @X_CFLAGS@ @FIXESEXT_CFLAGS@ +libXfixes_la_LIBADD = @FIXESEXT_LIBS@ +AM_CFLAGS = @FIXESEXT_CFLAGS@ INCLUDES = -I$(top_srcdir)/include/X11/extensions diff --git a/src/Region.c b/src/Region.c index e75e1c1..842da06 100644 --- a/src/Region.c +++ b/src/Region.c @@ -316,7 +316,7 @@ XFixesFetchRegionAndBounds (Display *dpy, long nbytes; long nread; - XFixesCheckExtension (dpy, info, 0); + XFixesCheckExtension (dpy, info, NULL); LockDisplay (dpy); GetReq (XFixesFetchRegion, req); req->reqType = info->codes->major_opcode; @@ -327,7 +327,7 @@ XFixesFetchRegionAndBounds (Display *dpy, { UnlockDisplay (dpy); SyncHandle (); - return 0; + return NULL; } bounds->x = rep.x; bounds->y = rep.y; @@ -342,7 +342,7 @@ XFixesFetchRegionAndBounds (Display *dpy, _XEatData (dpy, nbytes); UnlockDisplay (dpy); SyncHandle (); - return 0; + return NULL; } _XRead16 (dpy, (short *) rects, nrects << 3); /* skip any padding */ diff --git a/src/Xfixes.c b/src/Xfixes.c index 05bfac2..b9b0fb6 100644 --- a/src/Xfixes.c +++ b/src/Xfixes.c @@ -87,7 +87,7 @@ XFixesExtAddDisplay (XFixesExtInfo *extinfo, UnlockDisplay (dpy); SyncHandle (); Xfree(info); - return 0; + return NULL; } info->major_version = rep.majorVersion; info->minor_version = rep.minorVersion; commit 839ef4a38dceec053c3fb33878e59eb26bd8d580 Author: Peter Hutterer <[email protected]> Date: Mon May 19 17:31:04 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/Xfixes.h b/include/X11/extensions/Xfixes.h index 7c4a2ab..873aab3 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.h @@ -113,10 +113,12 @@ typedef struct { _XFUNCPROTOBEGIN -Bool XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep); +Bool XFixesQueryExtension (Display *dpy, + int *event_base_return, + int *error_base_return); Status XFixesQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp); + int *major_version_return, + int *minor_version_return); int XFixesVersion (void); diff --git a/man/Xfixes.man b/man/Xfixes.man index f081cc5..9722236 100644 --- a/man/Xfixes.man +++ b/man/Xfixes.man @@ -35,11 +35,11 @@ XFixes \- Augmented versions of core protocol requests .nf .sp Bool XFixesQueryExtension \^(\^Display *\fIdpy\fP, - int *\fIevent_basep\fP, int *\fIerror_basep\fP\^); + int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^); .sp Status XFixesQueryVersion \^(\^Display *\fIdpy\fP, - int *\fImajor_versionp\fP, - int *\fIminor_versionp\fP\^); + int *\fImajor_version_return\fP, + int *\fIminor_version_return\fP\^); .sp void XFixesChangeSaveSet \^(\^Display *dpy, Window \fIwindow\fP, diff --git a/src/Xfixes.c b/src/Xfixes.c index cf56b5a..05bfac2 100644 --- a/src/Xfixes.c +++ b/src/Xfixes.c @@ -297,14 +297,16 @@ XFixesEventToWire(Display *dpy, XEvent *event, xEvent *wire) } Bool -XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep) +XFixesQueryExtension (Display *dpy, + int *event_base_return, + int *error_base_return) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); if (XFixesHasExtension(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 @@ -313,15 +315,15 @@ XFixesQueryExtension (Display *dpy, int *event_basep, int *error_basep) Status XFixesQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp) + int *major_version_return, + int *minor_version_return) { XFixesExtDisplayInfo *info = XFixesFindDisplay (dpy); XFixesCheckExtension (dpy, info, 0); - *major_versionp = info->major_version; - *minor_versionp = info->minor_version; + *major_version_return = info->major_version; + *minor_version_return = info->minor_version; return 1; } commit d7778d80356f9a7f0bc4ffd0f0cf0bfa86928249 Author: Matthieu Herrb <[email protected]> Date: Sun Mar 9 08:19:27 2008 +0100 nuke RCS Ids diff --git a/COPYING b/COPYING index 4ee13ed..e506314 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,3 @@ -$Id$ Copyright © 2001,2003 Keith Packard diff --git a/Makefile.am b/Makefile.am index 174b099..70b07e1 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 e7a7029..3f491cd 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 f5079cf..6668aff 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,4 +1,3 @@ -# $Id$ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff --git a/src/Region.c b/src/Region.c index 0bbc1a2..e75e1c1 100644 --- a/src/Region.c +++ b/src/Region.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its commit e211f3647823d89dd25a1cff8981c3154a6c429d Author: James Cloos <[email protected]> Date: Thu Dec 6 16:38:28 2007 -0500 Replace static ChangeLog with dist-hook to generate from git log diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 32bec6b..0000000 --- a/ChangeLog +++ /dev/null @@ -1,85 +0,0 @@ -2006-05-12 Adam Jackson <[email protected]> - - * src/Makefile.am: - Fix the soversion to 3.1.0. - -2006-04-11 Adam Jackson <[email protected]> - - Bump to 4.0 for release. - -2006-04-02 Adam Jackson <[email protected]> - - * src/Xfixes.c: - Coverity #576: Plug a leak on the error path. - -2006-3-13 Deron Johnson <[email protected]> - - * configure.ac - * include/X11/extensions/Xfixes.h - * src/Cursor.c - Composite Version 0.3: CompositeGetOverlayWindow, CompositeReleaseOverlayWindow - 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. - -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-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * xfixes.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-12 Alan Coopersmith <[email protected]> - - * man/Makefile.am: - * configure.ac: - Use sed to substitute variables in man pages. - -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-26 Adam Jackson <[email protected]> - - * configure.ac: - Add check for xproto. - -2005-07-08 Keith Packard <[email protected]> - - * .cvsignore: - * man/.cvsignore: - * src/.cvsignore: - * src/Makefile.am: - Add .cvsignore files - Switch _la_CFLAGS for AM_CFLAGS to clean up directory - -2005-05-17 <[email protected]> - - * configure.ac: Remove rest of half-removed if statement - - * ChangeLog: remove irrelevant entries - -2005-04-16 Josh Triplett <[email protected]> - - * Makefile.am: Tell automake about the manpage. diff --git a/Makefile.am b/Makefile.am index ce5edbf..174b099 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,3 +29,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfixes.pc EXTRA_DIST = xfixes.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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
