From 4aab415a58eaae3b3d388faee97991e3cd7d5fde Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 19 Apr 2008 16:59:34 +0000 Subject: [PATCH] update to xev 1.0.3 --- app/xev/ChangeLog | 209 ++++++++++++++++++++++++++++++++++++++----- app/xev/Makefile.am | 9 +- app/xev/Makefile.in | 17 +++- app/xev/aclocal.m4 | 12 ++- app/xev/configure | 24 ++--- app/xev/configure.ac | 3 +- app/xev/xev.c | 24 ++++- 7 files changed, 253 insertions(+), 45 deletions(-) diff --git a/app/xev/ChangeLog b/app/xev/ChangeLog index b7f7baa83..646debcd8 100644 --- a/app/xev/ChangeLog +++ b/app/xev/ChangeLog @@ -1,34 +1,201 @@ -2006-06-02 Daniel Stone +commit d82fb133b9cd4d3284db553a0afdd530b466073e +Author: James Cloos +Date: Thu Dec 6 15:51:06 2007 -0500 - * configure.ac: - Bump to 1.0.2. + Add missing PHONY line for automatic ChangeLog generation - * xev.c: - Bug #6598: Run XFilterEvent() on all events, not just KeyPresses. - (Samuel Thibault) +commit 29a316c91b55a0ca193c9e902491f2ae78f33b76 +Author: James Cloos +Date: Thu Dec 6 05:13:52 2007 -0500 -2005-12-20 Kevin E. Martin + Replace static ChangeLog with dist-hook to generate from git log - * configure.ac: - Update package version for X11R7 release. +commit 49658a2112957b2b4874d2a9faccb6e501a0cda5 +Author: Noah Levitt +Date: Thu Dec 6 05:03:41 2007 -0500 -2005-12-14 Kevin E. Martin + Handle WM_DELETE_WINDOW + From bug 319¹: + + Make xev exit on WM_DELETE_WINDOW. + + 1] https://bugs.freedesktop.org/show_bug.cgi?id=319 + + Signed-off-by: James Cloos - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 990e7b0b33e894eeb395b4023cd4d0b67773777b +Author: James Cloos +Date: Mon Sep 3 05:51:20 2007 -0400 -2005-12-06 Kevin E. Martin + Add *~ to .gitignore to skip patch/emacs droppings - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. +commit ce1a508f11923e2bb29c8bd4fa87db57833ff5ec +Author: James Cloos +Date: Thu Aug 23 19:24:45 2007 -0400 -2005-12-03 Kevin E. Martin + Rename .cvsignore to .gitignore - * configure.ac: - Update package version number for X11R7 RC3 release. +commit ada7026e755141f534ba3ea00aee5bf90be997da +Author: Daniel Stone +Date: Thu Jun 1 23:26:44 2006 +0000 -2005-10-18 Kevin E. Martin + Run XFilterEvent() on all events. (Samuel Thibault). Bump to 1.0.2. - * configure.ac: - Update package version number for RC1 release. +commit dd3eacf61876e6220aec7820ae16c534241a93ae +Author: Kevin E Martin +Date: Wed Dec 21 02:29:49 2005 +0000 + Update package version for X11R7 release. + +commit d089b9b850eda5dd221f2c4567a2d0022bd2c92d +Author: Adam Jackson +Date: Mon Dec 19 16:22:43 2005 +0000 + + Stub COPYING files + +commit 8d5e61ab1da7bc4e5083a6ae86cb427df847e70a +Author: Kevin E Martin +Date: Thu Dec 15 00:24:06 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 810bc490f049b3a631eb84a57ea8a29537daef3f +Author: Kevin E Martin +Date: Tue Dec 6 22:48:21 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit d87e1dafa7c9b26417e5742badbcb9219142e33b +Author: Kevin E Martin +Date: Sat Dec 3 05:49:19 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit a620a594b3603353c997ca466bf2a8ed3a52d11c +Author: Alan Coopersmith +Date: Mon Nov 28 22:01:41 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 281463c1c846f943bb2851734f601479ca5ed08e +Author: Eric Anholt +Date: Mon Nov 21 10:35:00 2005 +0000 + + Another pass at .cvsignores for apps. + +commit 50d5b9aa3c716de9062b83969ba2531b8557f944 +Author: Eric Anholt +Date: Sun Nov 20 22:08:52 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit e6de376cb8b61d53f39b5c8b9a1f234c5b067304 +Author: Kevin E Martin +Date: Wed Oct 19 02:47:53 2005 +0000 + + Update package version number for RC1 release. + +commit c435fcfb82d56ec362e937c498129f9593c4b57c +Author: Alan Coopersmith +Date: Mon Oct 17 23:56:22 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 930548b75a4223298810d4fb4a8c56dede7cf351 +Author: Alan Coopersmith +Date: Fri Oct 14 00:25:44 2005 +0000 + + Use sed to fill in variables in man page + +commit 95d839f5a07fbef63001f969c1972b43219e4451 +Author: Alan Coopersmith +Date: Mon Aug 1 20:25:29 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit f7296eec10d316c0bd94999aa261d92f6c51b3e8 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:32 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit b6296a1f365eb956f9716b7e72c33d2a026c0728 +Author: Adam Jackson +Date: Wed Jul 20 19:31:52 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 275174c66316b789f96ec23974de50499ea3c5a2 +Author: Søren Sandmann Pedersen +Date: Wed Jul 6 19:58:25 2005 +0000 + + Build system for xev + +commit ce51f5174dc2adea8b3f30478a4990dca53575e7 +Author: Egbert Eich +Date: Fri Apr 23 19:54:46 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 9a0286eaf44816896f13fe2a82760d5be6615220 +Author: Egbert Eich +Date: Sun Mar 14 08:35:19 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 0cff5a293401d7e4b720e4212778f17727c21f04 +Author: Egbert Eich +Date: Wed Mar 3 12:13:05 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit b4731d643c59e950f2bc464ee111ac925844ed3e +Author: Egbert Eich +Date: Thu Feb 26 13:36:24 2004 +0000 + + readding XFree86's cvs IDs + +commit 66f2ab4130a03c321aa8aff19259584896c624d9 +Author: Egbert Eich +Date: Thu Feb 26 09:24:06 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 47403c0b506c2dde081952ea9e771fb0270c69a0 +Author: Kaleb Keithley +Date: Mon Feb 23 20:35:40 2004 +0000 + + Import most of XFree86 4.4RC3. This import excludes files which have the + new license. If we want to, later we can import 4.4RC3 again and pick + up the files that have the new license, but for now the vendor branch + is "pure." + +commit 6c04e15469f547b18ccb393a0c740b7ac00132fb +Author: Kaleb Keithley +Date: Tue Nov 25 19:29:12 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit a6c94bc03a1bb14661b1b0a26fbc5dab3f5e03b6 +Author: Kaleb Keithley +Date: Fri Nov 14 16:49:22 2003 +0000 + + XFree86 4.3.0.1 + +commit f0692725ed2a9ce9d8909584bc673b7a4bcdad62 +Author: Kaleb Keithley +Date: Fri Nov 14 16:49:22 2003 +0000 + + Initial revision diff --git a/app/xev/Makefile.am b/app/xev/Makefile.am index ea7ed668a..3af1bdaeb 100644 --- a/app/xev/Makefile.am +++ b/app/xev/Makefile.am @@ -35,8 +35,9 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog SED = sed @@ -61,3 +62,9 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + +.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 diff --git a/app/xev/Makefile.in b/app/xev/Makefile.in index 9186efa87..1d669ce34 100644 --- a/app/xev/Makefile.in +++ b/app/xev/Makefile.in @@ -216,8 +216,9 @@ appman_PRE = \ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) +MAINTAINERCLEANFILES = ChangeLog SED = sed # Strings to replace in man pages @@ -450,6 +451,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -579,6 +583,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-binPROGRAMS clean-generic mostlyclean-am @@ -634,8 +639,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ - dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ + dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-compile distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-appmanDATA install-binPROGRAMS install-data \ @@ -650,6 +655,12 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \ .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ + +.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 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/xev/aclocal.m4 b/app/xev/aclocal.m4 index 5419cfb3c..48f9f8de2 100644 --- a/app/xev/aclocal.m4 +++ b/app/xev/aclocal.m4 @@ -1042,7 +1042,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.5 + [XORG_MACROS_version=1.1.6 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -1191,7 +1191,11 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[ XORG_SGML_PATH=$prefix/share/sgml HAVE_DEFS_ENT= -AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +if test x"$cross_compiling" = x"yes" ; then + HAVE_DEFS_ENT=no +else + AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) +fi AC_PATH_PROG(LINUXDOC, linuxdoc) AC_PATH_PROG(PS2PDF, ps2pdf) @@ -1463,14 +1467,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [`echo $PACKAGE_VERSION | cut -d . -f 1`], [Major version of this package]) - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], [$PVM], [Minor version of this package]) - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi diff --git a/app/xev/configure b/app/xev/configure index d1d23daaf..470f07e6a 100644 --- a/app/xev/configure +++ b/app/xev/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xev 1.0.2. +# Generated by GNU Autoconf 2.59 for xev 1.0.3. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xev' PACKAGE_TARNAME='xev' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='xev 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='xev 1.0.3' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE PKG_CONFIG ac_pt_PKG_CONFIG XEV_CFLAGS XEV_LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' @@ -750,7 +750,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xev 1.0.2 to adapt to many kinds of systems. +\`configure' configures xev 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -816,7 +816,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xev 1.0.2:";; + short | recursive ) echo "Configuration of xev 1.0.3:";; esac cat <<\_ACEOF @@ -944,7 +944,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xev configure 1.0.2 +xev configure 1.0.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -958,7 +958,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xev $as_me 1.0.2, which was +It was created by xev $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1556,7 +1556,7 @@ fi # Define the identity of the package. PACKAGE='xev' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -3263,7 +3263,7 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF - PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1` if test "x$PVM" = "x"; then PVM="0" fi @@ -3272,7 +3272,7 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MINOR $PVM _ACEOF - PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi @@ -3667,7 +3667,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xev $as_me 1.0.2, which was +This file was extended by xev $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3730,7 +3730,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xev config.status 1.0.2 +xev config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/app/xev/configure.ac b/app/xev/configure.ac index 119768678..c9e21d3f0 100644 --- a/app/xev/configure.ac +++ b/app/xev/configure.ac @@ -1,4 +1,3 @@ - dnl Copyright 2005 Red Hat, Inc. dnl dnl Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +21,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xev,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xev) +AC_INIT(xev,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xev) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff --git a/app/xev/xev.c b/app/xev/xev.c index 8ecf14881..5b9a5cc8f 100644 --- a/app/xev/xev.c +++ b/app/xev/xev.c @@ -70,6 +70,9 @@ int screen; XIC xic = NULL; +Atom wm_delete_window; +Atom wm_protocols; + static void prologue (XEvent *eventp, char *event_name) { @@ -581,10 +584,23 @@ do_ClientMessage (XEvent *eventp) XClientMessageEvent *e = (XClientMessageEvent *) eventp; char *mname = XGetAtomName (dpy, e->message_type); - printf (" message_type 0x%lx (%s), format %d\n", - e->message_type, mname ? mname : Unknown, e->format); + if (e->message_type == wm_protocols) { + char *message = XGetAtomName (dpy, e->data.l[0]); + printf (" message_type 0x%lx (%s), format %d, message 0x%lx (%s)\n", + e->message_type, mname ? mname : Unknown, e->format, e->data.l[0], message); + if (message) XFree (message); + } + else { + printf (" message_type 0x%lx (%s), format %d\n", + e->message_type, mname ? mname : Unknown, e->format); + } if (mname) XFree (mname); + + if (e->format == 32 + && e->message_type == wm_protocols + && (Atom) e->data.l[0] == wm_delete_window) + exit (0); } static void @@ -885,6 +901,10 @@ main (int argc, char **argv) INNER_WINDOW_BORDER, attr.border_pixel, attr.background_pixel); + wm_protocols = XInternAtom(dpy, "WM_PROTOCOLS", False); + wm_delete_window = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + XSetWMProtocols(dpy, w, &wm_delete_window, 1); + XMapWindow (dpy, subw); /* map before w so that it appears */ XMapWindow (dpy, w);