X Strike Force Xcursor SVN commit: r44 - vendor
Author: branden
Date: 2004-04-19 11:57:53 -0500 (Mon, 19 Apr 2004)
New Revision: 44
Added:
vendor/.cvsignore
vendor/COPYING
vendor/INSTALL
vendor/Xcursor-def.cpp
vendor/config-subst
Modified:
vendor/ChangeLog
vendor/Makefile.am
vendor/Xcursor.h
vendor/autogen.sh
vendor/configure.ac
vendor/cursor.c
vendor/file.c
vendor/library.c
vendor/xcursorint.h
Log:
Import Xcursor 1.1.2 (upstream CVS tag XCURSOR-1_1_2-RELEASE).
Added: vendor/.cvsignore
===================================================================
--- vendor/.cvsignore 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/.cvsignore 2004-04-19 16:57:53 UTC (rev 44)
@@ -0,0 +1,25 @@
+*.lo
+*.la
+xcursor.pc
+xcursor*.tar.gz
+stamp-h1
+mkinstalldirs
+missing
+install-sh
+ltmain.sh
+libtool
+depcomp
+configure
+config.sub
+config.status
+config.log
+config.h.in
+config.h
+config.guess
+autom4te.cache
+autom4te.guess
+aclocal.m4
+Makefile.in
+Makefile
+.libs
+.deps
Added: vendor/COPYING
===================================================================
--- vendor/COPYING 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/COPYING 2004-04-19 16:57:53 UTC (rev 44)
@@ -0,0 +1,19 @@
+Copyright � 2002 Keith Packard
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Keith Packard not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Keith Packard makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
Modified: vendor/ChangeLog
===================================================================
--- vendor/ChangeLog 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/ChangeLog 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,3 +1,42 @@
+2004-01-17 Daniel Stone <daniel@fooishbar.org>
+ * Xcursor.h:
+ * configure.ac:
+ Bump package version to 1.1.2, slated for first fd.o platform release.
+
+2004-01-15 Harold L Hunt II <huntharo@msu.edu>
+ * Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
+
+2003-11-10 Keith Packard <keithp@keithp.com>
+
+ * library.c: (_XcursorBuildThemeDir):
+ Make sure the allocated path has space for directory separators
+
+2003-10-29 Keith Packard <keithp@keithp.com>
+
+ * Xcursor.h:
+ * configure.ac:
+ Bump package version to 1.1.1 and library info to 1.2.0 as
+ the library exports new name-based APIs and uses Xfixes
+
+2003-10-28 Keith Packard <keithp@keithp.com>
+
+ * Makefile.am:
+ * Xcursor.h:
+ * configure.ac:
+ * cursor.c: (XcursorImagesLoadCursor):
+ * file.c: (XcursorImagesCreate), (XcursorImagesDestroy),
+ (XcursorImagesSetName):
+ * library.c: (XcursorLibraryLoadImages),
+ (XcursorLibraryLoadCursor):
+ Add support for XFixes version 2 cursor naming functions
+
+2003-10-16 23:45 fredrik
+
+ * Xcursor-def.cpp, Xcursor.h, configure.ac, library.c:
+ Rename _XcursorLibraryPath() to XcursorLibraryPath() and make
+ it a public function, since it's useful for theme selectors.
+ Bump version to 1.1.0
+
2003-05-21 10:21 keithp
* Makefile.am, Xcursor.h, configure.ac, xcursorint.h: Package
Added: vendor/INSTALL
===================================================================
--- vendor/INSTALL 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/INSTALL 2004-04-19 16:57:53 UTC (rev 44)
@@ -0,0 +1,229 @@
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+ By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc. You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
Modified: vendor/Makefile.am
===================================================================
--- vendor/Makefile.am 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/Makefile.am 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.am,v 1.4 2003/05/21 17:21:36 keithp Exp $
+# $Id: Makefile.am,v 1.6 2004/01/15 04:32:39 harold Exp $
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@@ -21,7 +21,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(XRENDER_CFLAGS) $(X_CFLAGS)
+AM_CFLAGS = $(XRENDER_CFLAGS) $(XFIXES_CFLAGS) $(X_CFLAGS)
lib_LTLIBRARIES = libXcursor.la
@@ -29,12 +29,12 @@
libXcursor_la_SOURCES = xcursorint.h cursor.c display.c file.c library.c xlib.c
-libXcursor_la_LIBADD = $(XRENDER_LIBS)
+libXcursor_la_LIBADD = $(XRENDER_LIBS) $(XFIXES_LIBS) $(X_LIBS)
#
# Shared library version info. This is not the same as the package version
#
-libXcursor_la_LDFLAGS = -version-info @LT_VERSION_INFO@
+libXcursor_la_LDFLAGS = -version-info @LT_VERSION_INFO@ -no-undefined
libXcursorincludedir = $(includedir)/X11/Xcursor
libXcursorinclude_HEADERS = Xcursor.h
Added: vendor/Xcursor-def.cpp
===================================================================
--- vendor/Xcursor-def.cpp 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/Xcursor-def.cpp 2004-04-19 16:57:53 UTC (rev 44)
@@ -0,0 +1,55 @@
+LIBRARY Xcursor
+VERSION LIBRARY_VERSION
+EXPORTS
+XcursorAnimateCreate
+XcursorAnimateDestroy
+XcursorAnimateNext
+XcursorCursorsCreate
+XcursorCursorsDestroy
+XcursorFilenameLoadCursor
+XcursorFilenameLoadCursors
+XcursorImageLoadCursor
+XcursorImagesLoadCursors
+XcursorLibraryLoadCursor
+XcursorLibraryLoadCursors
+XcursorShapeLoadCursor
+XcursorShapeLoadCursors
+_XcursorCreateGlyphCursor
+XcursorGetDefaultSize
+XcursorGetTheme
+XcursorSetDefaultSize
+XcursorSetTheme
+XcursorSupportsARGB
+_XcursorGetDisplayInfo
+XcursorCommentCreate
+XcursorCommentDestroy
+XcursorCommentsCreate
+XcursorCommentsDestroy
+XcursorFileLoad
+XcursorFileLoadAllImages
+XcursorFileLoadImage
+XcursorFileLoadImages
+XcursorFileSave
+XcursorFileSaveImages
+XcursorFilenameLoad
+XcursorFilenameLoadAllImages
+XcursorFilenameLoadImage
+XcursorFilenameLoadImages
+XcursorFilenameSave
+XcursorFilenameSaveImages
+XcursorImageCreate
+XcursorImageDestroy
+XcursorImagesCreate
+XcursorImagesDestroy
+XcursorXcFileLoad
+XcursorXcFileLoadAllImages
+XcursorXcFileLoadImage
+XcursorXcFileLoadImages
+XcursorXcFileSave
+XcursorLibraryPath
+XcursorLibraryLoadImage
+XcursorLibraryLoadImages
+XcursorShapeLoadImage
+XcursorShapeLoadImages
+XcursorTryShapeCursor
+/* $Id: Xcursor-def.cpp,v 1.4 2003/10/15 21:58:22 fredrik Exp $ */
Modified: vendor/Xcursor.h
===================================================================
--- vendor/Xcursor.h 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/Xcursor.h 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
/*
- * $Id: Xcursor.h,v 1.7 2003/05/21 17:21:36 keithp Exp $
+ * $Id: Xcursor.h,v 1.11 2004/01/17 04:38:26 daniel Exp $
*
* Copyright � 2002 Keith Packard
*
@@ -76,7 +76,7 @@
*/
#define XCURSOR_LIB_MAJOR 1
-#define XCURSOR_LIB_MINOR 0
+#define XCURSOR_LIB_MINOR 1
#define XCURSOR_LIB_REVISION 2
#define XCURSOR_LIB_VERSION ((XCURSOR_LIB_MAJOR * 10000) + \
(XCURSOR_LIB_MINOR * 100) + \
@@ -197,6 +197,7 @@
typedef struct _XcursorImages {
int nimage; /* number of images */
XcursorImage **images; /* array of XcursorImage pointers */
+ char *name; /* name used to load images */
} XcursorImages;
typedef struct _XcursorCursors {
@@ -247,6 +248,9 @@
void
XcursorImagesDestroy (XcursorImages *images);
+void
+XcursorImagesSetName (XcursorImages *images, const char *name);
+
/*
* Manage Cursor objects
*/
@@ -367,6 +371,10 @@
/*
* Library/shape API
*/
+
+const char *
+XcursorLibraryPath (void);
+
int
XcursorLibraryShape (const char *library);
Modified: vendor/autogen.sh
===================================================================
--- vendor/autogen.sh 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/autogen.sh 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,61 +1,3 @@
#! /bin/sh
-#
-# $Id: autogen.sh,v 1.1 2003/05/06 17:49:08 keithp Exp $
-#
-# runs autotools to create ./configure and friends
-#
-
-PROJECT=Xrender
-
-srcdir=`dirname "$0"`
-test -z $srcdir && srcdir=.
-
-origdir=`pwd`
-cd "$srcdir"
-
-if test -z "$AUTOGEN_SUBDIR_MODE" && test -z "$*"
-then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-# Use the versioned executables if available.
-aclocal=aclocal-1.7
-automake=automake-1.7
-$aclocal --version </dev/null >/dev/null 2>&1 || aclocal=aclocal
-$automake --version </dev/null >/dev/null 2>&1 || automake=automake
-
-# require libtool >= 1.5
-libtool_version=`libtool --version | head -1 | awk '{print $4}'`
-libtool_major=`echo $libtool_version | awk -F . '{print $1}'`
-libtool_minor=`echo $libtool_version | awk -F . '{print $2}'`
-if [ $libtool_major -lt 1 ] || [ $libtool_major -eq 1 -a $libtool_minor -lt 5 ]
-then
- echo "libtool 1.5 or later is required. You have $libtool_version."
- exit 1
-fi
-
-rm -f config.guess config.sub depcomp install-sh missing mkinstalldirs
-rm -f config.cache acconfig.h
-rm -rf autom4te.cache
-
-set_option=':'
-test -n "${BASH_VERSION+set}" && set_option='set'
-
-$set_option -x
-
-$aclocal $ACLOCAL_FLAGS || exit 1
-libtoolize --force --copy || exit 1
-autoheader || exit 1
-$automake --foreign --add-missing --copy || exit 1
-autoconf || exit 1
-cd "$origdir" || exit 1
-
-if test -z "$AUTOGEN_SUBDIR_MODE"
-then
- "$srcdir/configure" "$@" || exit 1
- $set_option +x
-fi
-
-exit 0
-
+autoreconf -v --install || exit 1
+./configure --enable-maintainer-mode "$@"
Added: vendor/config-subst
===================================================================
--- vendor/config-subst 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/config-subst 2004-04-19 16:57:53 UTC (rev 44)
@@ -0,0 +1,10 @@
+#!/bin/sh
+script=config-subst.$$
+trap "rm $script" 0
+rm -f $script
+for i in ${1+"$@"}; do
+ var="`echo "$i" | sed 's/=.*$//'`"
+ val="`echo "$i" | sed 's/^[^=]*=//'`"
+ echo "s;@$var@;$val;" >> $script
+done
+sed -f $script
Modified: vendor/configure.ac
===================================================================
--- vendor/configure.ac 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/configure.ac 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
dnl
-dnl $Id: configure.ac,v 1.3 2003/05/21 17:21:36 keithp Exp $
+dnl $Id: configure.ac,v 1.11 2004/01/17 04:38:26 daniel Exp $
dnl
dnl Copyright © 2003 Keith Packard
dnl
@@ -23,21 +23,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.50])
-
-AC_INIT(Xcursor.h)
+AC_PREREQ([2.57])
dnl
dnl This is the package version number, not the shared library
dnl version. This same version number must appear in Xcursor.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xcursor.h
dnl
-AM_INIT_AUTOMAKE(xcursor, 1.0.2)
+AC_INIT([libXcursor],1.1.2,[keithp@keithp.com],[libXcursor])
+AM_INIT_AUTOMAKE([dist-bzip2])
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+AC_CONFIG_AUX_DIR(.)
dnl libtool versioning
+
LT_CURRENT=1
-LT_REVISION=1
+LT_REVISION=2
LT_AGE=0
AC_SUBST(LT_CURRENT)
@@ -55,11 +58,48 @@
AC_PROG_LIBTOOL
# Check for X
-AC_PATH_XTRA
+PKG_CHECK_MODULES(X, x11,
+ [x_found_with_pkgconfig=yes],
+ [x_found_with_pkgconfig=no])
+
+if test "$x_found_with_pkgconfig" = "no"
+then
+ AC_PATH_XTRA
+ X_LIBS="$X_LIBS -lX11"
-if test "x$no_x" = "xyes"
-then
- AC_MSG_ERROR([X is required, but it was either disabled or not found.])
+ if test "x$no_x" = "xyes"
+ then
+ AC_MSG_ERROR([X is required, but it was either disabled or not found.])
+ fi
+ # Check for XTHREADS
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ LIBS="$LIBS $X_LIBS"
+
+ AC_MSG_CHECKING([for XTHREADS in Xlib])
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]],
+ [[return XInitThreads() == 0 ? 0 : 1;]])],
+ [xthreads=no],
+ [xthreads=yes],
+ [xthreads=yes])
+
+ AC_MSG_RESULT($xthreads)
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ if test "x$xthreads" = "xyes"
+ then
+ X_CFLAGS="$X_CFLAGS -DXTHREADS"
+ fi
+
+ if test "x$no_x" = "xyes"
+ then
+ AC_MSG_ERROR([X is required, but it was either disabled or not found.])
+ fi
fi
PKG_CHECK_MODULES(XRENDER, xrender >= 0.8.2, [xrender_found_with_pkgconfig=yes],
@@ -92,8 +132,10 @@
esac
;;
esac
+PKG_CHECK_MODULES(XFIXES, xfixes)
-AC_SUBST(RENDER_CFLAGS)
+AC_SUBST(XRENDER_LIBS)
+AC_SUBST(XRENDER_CFLAGS)
AC_OUTPUT([Makefile
xcursor.pc])
Modified: vendor/cursor.c
===================================================================
--- vendor/cursor.c 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/cursor.c 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
/*
- * $Id: cursor.c,v 1.6 2003/05/06 18:09:55 keithp Exp $
+ * $Id: cursor.c,v 1.7 2003/10/29 00:21:48 keithp Exp $
*
* Copyright � 2002 Keith Packard
*
@@ -689,14 +689,14 @@
Cursor
XcursorImagesLoadCursor (Display *dpy, const XcursorImages *images)
{
+ Cursor cursor;
if (images->nimage == 1 || !XcursorSupportsAnim (dpy))
- return XcursorImageLoadCursor (dpy, images->images[0]);
+ cursor = XcursorImageLoadCursor (dpy, images->images[0]);
else
{
XcursorCursors *cursors = XcursorImagesLoadCursors (dpy, images);
XAnimCursor *anim;
int n;
- Cursor cursor;
if (!cursors)
return 0;
@@ -713,8 +713,12 @@
}
cursor = XRenderCreateAnimCursor (dpy, cursors->ncursor, anim);
free (anim);
- return cursor;
}
+#if XFIXES_MAJOR >= 2
+ if (images->name)
+ XFixesSetCursorName (dpy, cursor, images->name);
+#endif
+ return cursor;
}
Modified: vendor/file.c
===================================================================
--- vendor/file.c 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/file.c 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
/*
- * $Id: file.c,v 1.4 2003/05/06 18:09:55 keithp Exp $
+ * $Id: file.c,v 1.5 2003/10/29 00:21:48 keithp Exp $
*
* Copyright � 2002 Keith Packard
*
@@ -61,6 +61,7 @@
return 0;
images->nimage = 0;
images->images = (XcursorImage **) (images + 1);
+ images->name = 0;
return images;
}
@@ -71,9 +72,24 @@
for (n = 0; n < images->nimage; n++)
XcursorImageDestroy (images->images[n]);
+ if (images->name)
+ free (images->name);
free (images);
}
+void
+XcursorImagesSetName (XcursorImages *images, const char *name)
+{
+ char *new = malloc (strlen (name) + 1);
+
+ if (!new)
+ return;
+ strcpy (new, name);
+ if (images->name)
+ free (images->name);
+ images->name = new;
+}
+
XcursorComment *
XcursorCommentCreate (XcursorUInt comment_type, int length)
{
Modified: vendor/library.c
===================================================================
--- vendor/library.c 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/library.c 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
/*
- * $Id: library.c,v 1.3 2003/05/06 18:09:55 keithp Exp $
+ * $Id: library.c,v 1.6 2003/11/10 21:01:56 keithp Exp $
*
* Copyright � 2002 Keith Packard
*
@@ -32,8 +32,8 @@
#define CURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR
-static const char *
-_XcursorLibraryPath (void)
+const char *
+XcursorLibraryPath (void)
{
static const char *path;
@@ -105,7 +105,11 @@
dirlen--;
}
- len = homelen + dirlen + 1 + themelen + 1;
+ /*
+ * add space for any needed directory separators, one per component,
+ * and one for the trailing null
+ */
+ len = 1 + homelen + 1 + dirlen + 1 + themelen + 1;
full = malloc (len);
if (!full)
@@ -215,7 +219,7 @@
/*
* Scan this theme
*/
- for (path = _XcursorLibraryPath ();
+ for (path = XcursorLibraryPath ();
path && f == 0;
path = _XcursorNextPath (path))
{
@@ -285,6 +289,8 @@
if (f)
{
images = XcursorFileLoadImages (f, size);
+ if (images)
+ XcursorImagesSetName (images, file);
fclose (f);
}
return images;
@@ -309,6 +315,9 @@
}
cursor = XcursorImagesLoadCursor (dpy, images);
XcursorImagesDestroy (images);
+#if XFIXES_MAJOR >= 2
+ XFixesSetCursorName (dpy, cursor, file);
+#endif
return cursor;
}
Modified: vendor/xcursorint.h
===================================================================
--- vendor/xcursorint.h 2004-03-12 17:54:29 UTC (rev 43)
+++ vendor/xcursorint.h 2004-04-19 16:57:53 UTC (rev 44)
@@ -1,5 +1,5 @@
/*
- * $Id: xcursorint.h,v 1.6 2003/05/21 17:21:36 keithp Exp $
+ * $Id: xcursorint.h,v 1.7 2003/09/30 05:28:20 keithp Exp $
*
* Copyright � 2002 Keith Packard
*
@@ -25,6 +25,10 @@
#ifndef _XCURSORINT_H_
#define _XCURSORINT_H_
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
#include <X11/extensions/Xrender.h>
Reply to: