Hello community, here is the log from the commit of package xev for openSUSE:Factory checked in at 2013-02-04 21:05:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xev (Old) and /work/SRC/openSUSE:Factory/.xev.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xev", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xev/xev.changes 2012-05-08 12:02:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xev.new/xev.changes 2013-02-04 21:05:53.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 4 10:14:05 UTC 2013 - sndirsch@suse.com + +- Update to version 1.2.1 + * This release adds a "-event" option that can be used to filter + which events are printed. For example, to listen only for RandR + events, use "xev -event randr". The -event parameter can be + specified multiple times. Please see the manual page for the + list of available event filters. + * This release also contains a few code fixes. + +------------------------------------------------------------------- Old: ---- xev-1.2.0.tar.bz2 New: ---- xev-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xev.spec ++++++ --- /var/tmp/diff_new_pack.sSbeXo/_old 2013-02-04 21:05:54.000000000 +0100 +++ /var/tmp/diff_new_pack.sSbeXo/_new 2013-02-04 21:05:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xev # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xev -Version: 1.2.0 -Release: 1 -License: MIT +Version: 1.2.1 +Release: 0 Summary: Utility to print contents of X events -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(x11) ++++++ xev-1.2.0.tar.bz2 -> xev-1.2.1.tar.bz2 ++++++ ++++ 15781 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.2.0/ChangeLog new/xev-1.2.1/ChangeLog --- old/xev-1.2.0/ChangeLog 2012-02-22 06:12:53.000000000 +0100 +++ new/xev-1.2.1/ChangeLog 2013-01-29 22:55:16.000000000 +0100 @@ -1,3 +1,59 @@ +commit ea6c49b7635e21ab97c5ee41963d5024466e0106 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Tue Jan 29 13:42:40 2013 -0800 + + xev 1.2.1 + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + +commit f02bf10367271b6713cdf231771e5320474fcc15 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jan 14 23:28:22 2013 -0800 + + Use strncasecmp instead of a tolower loop & strncmp + + v2: Since strncasecmp is in Unix98, assume it is always available, + and drop fallback code for systems without it. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6731b622587e83572452c96423195528579fd98d +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Jan 14 23:21:43 2013 -0800 + + Fix clang warnings about converting size_t to int and back again + + xev.c:909:15: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + int len = strlen (s); + ~~~ ^~~~~~~~~~ + xev.c:917:34: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if (strncmp (s, "notuseful", len) == 0) return (NotUseful); + ~~~~~~~ ^~~ + xev.c:918:35: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if (strncmp (s, "whenmapped", len) == 0) return (WhenMapped); + ~~~~~~~ ^~~ + xev.c:919:31: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if (strncmp (s, "always", len) == 0) return (Always); + ~~~~~~~ ^~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit d33b2c81bd931d581e5ce4b36f99ee60a76e740d +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Mon Jun 25 15:36:23 2012 -0700 + + Add a -event parameter to control the event mask + + It's annoying to have to sift through a lot of unrelated events if all you care + about is one specific class of events (e.g. RandR events). Add a -event + parameter that can be used to tune which events to select. When not specified, + all events are selected. + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Andy Ritger <aritger@nvidia.com> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + commit 96b24e2c353bb4c9b7a0e2fff4f13d015fdb25b9 Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Tue Feb 21 20:51:23 2012 -0800 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.2.0/config.h.in new/xev-1.2.1/config.h.in --- old/xev-1.2.0/config.h.in 2012-02-22 05:51:52.000000000 +0100 +++ new/xev-1.2.1/config.h.in 2013-01-29 22:46:41.000000000 +0100 @@ -60,5 +60,37 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.2.0/configure.ac new/xev-1.2.1/configure.ac --- old/xev-1.2.0/configure.ac 2012-02-22 05:51:07.000000000 +0100 +++ new/xev-1.2.1/configure.ac 2013-01-29 22:42:22.000000000 +0100 @@ -22,10 +22,11 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xev], [1.2.0], +AC_INIT([xev], [1.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xev]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.2.0/man/xev.man new/xev-1.2.1/man/xev.man --- old/xev-1.2.0/man/xev.man 2011-09-29 06:34:08.000000000 +0200 +++ new/xev-1.2.1/man/xev.man 2012-06-26 00:31:30.000000000 +0200 @@ -52,6 +52,15 @@ .TP 8 .B \-rv This option specifies that the window should be in reverse video. +.TP 8 +.B \-event \fIevent_mask\fP +Select which events to display. +The +.B \-event +option can be specified multiple times to select multiple types of events. +When not specified, all events are selected. +Available event masks: keyboard mouse expose visibility structure substructure +focus property colormap owner_grab_button randr .SH "SEE ALSO" X(__miscmansuffix__), xwininfo(__appmansuffix__), xdpyinfo(__appmansuffix__), Xlib Programmers Manual, X Protocol Specification diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.2.0/missing new/xev-1.2.1/missing --- old/xev-1.2.0/missing 2012-02-22 05:51:53.000000000 +0100 +++ new/xev-1.2.1/missing 2013-01-29 22:46:43.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xev-1.2.0/xev.c new/xev-1.2.1/xev.c --- old/xev-1.2.0/xev.c 2012-02-16 00:30:39.000000000 +0100 +++ new/xev-1.2.1/xev.c 2013-01-29 22:36:27.000000000 +0100 @@ -32,6 +32,9 @@ * Author: Jim Fulton, MIT X Consortium */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include <stdio.h> #include <stdlib.h> #include <ctype.h> @@ -75,6 +78,12 @@ Bool have_rr; int rr_event_base, rr_error_base; +enum EventMaskIndex { + EVENT_MASK_INDEX_CORE, + EVENT_MASK_INDEX_RANDR, + NUM_EVENT_MASKS +}; + static void usage (void) _X_NORETURN; static void @@ -878,6 +887,12 @@ " -s set save-unders attribute", " -name string window name", " -rv reverse video", +" -event event_mask select 'event_mask' events", +" Supported event masks: keyboard mouse expose visibility structure", +" substructure focus property colormap", +" owner_grab_button randr", +" This option can be specified multiple times to select multiple", +" event masks.", "", NULL}; const char **cpp; @@ -894,21 +909,75 @@ static int parse_backing_store (char *s) { - int len = strlen (s); - char *cp; + size_t len = strlen (s); - for (cp = s; *cp; cp++) { - if (isascii (*cp) && isupper (*cp)) - *cp = tolower (*cp); - } - - if (strncmp (s, "notuseful", len) == 0) return (NotUseful); - if (strncmp (s, "whenmapped", len) == 0) return (WhenMapped); - if (strncmp (s, "always", len) == 0) return (Always); + if (strncasecmp (s, "NotUseful", len) == 0) return (NotUseful); + if (strncasecmp (s, "WhenMapped", len) == 0) return (WhenMapped); + if (strncasecmp (s, "Always", len) == 0) return (Always); usage (); } +static Bool +parse_event_mask (const char *s, long event_masks[]) +{ + const struct { + const char *name; + enum EventMaskIndex mask_index; + long mask; + } events[] = { + { "keyboard", + EVENT_MASK_INDEX_CORE, + KeyPressMask | KeyReleaseMask | KeymapStateMask }, + { "mouse", + EVENT_MASK_INDEX_CORE, + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + LeaveWindowMask | PointerMotionMask | Button1MotionMask | + Button2MotionMask | Button3MotionMask | Button4MotionMask | + Button5MotionMask | ButtonMotionMask }, + { "expose", + EVENT_MASK_INDEX_CORE, + ExposureMask }, + { "visibility", + EVENT_MASK_INDEX_CORE, + VisibilityChangeMask }, + { "structure", + EVENT_MASK_INDEX_CORE, + StructureNotifyMask }, + { "substructure", + EVENT_MASK_INDEX_CORE, + SubstructureNotifyMask | SubstructureRedirectMask }, + { "focus", + EVENT_MASK_INDEX_CORE, + FocusChangeMask }, + { "property", + EVENT_MASK_INDEX_CORE, + PropertyChangeMask }, + { "colormap", + EVENT_MASK_INDEX_CORE, + ColormapChangeMask }, + { "owner_grab_button", + EVENT_MASK_INDEX_CORE, + OwnerGrabButtonMask }, + { "randr", + EVENT_MASK_INDEX_RANDR, + RRScreenChangeNotifyMask | RRCrtcChangeNotifyMask | + RROutputChangeNotifyMask | RROutputPropertyNotifyMask }, + { NULL, 0, 0 } + }; + int i; + + for (i = 0; events[i].name; i++) { + if (!s || !strcmp(s, events[i].name)) { + event_masks[events[i].mask_index] |= events[i].mask; + if (s) + return True; + } + } + + return False; +} + int main (int argc, char **argv) { @@ -931,6 +1000,8 @@ XIMStyle xim_style = 0; char *modifiers; char *imvalret; + long event_masks[NUM_EVENT_MASKS]; + Bool event_mask_specified = False; ProgramName = argv[0]; @@ -939,6 +1010,8 @@ ProgramName); } + memset(event_masks, 0, sizeof(event_masks)); + w = 0; for (i = 1; i < argc; i++) { char *arg = argv[i]; @@ -995,6 +1068,12 @@ attr.save_under = True; mask |= CWSaveUnder; continue; + case 'e': /* -event */ + if (++i >= argc) usage (); + if (!parse_event_mask (argv[i], event_masks)) + usage (); + event_mask_specified = True; + continue; default: usage (); } /* end switch on - */ @@ -1002,6 +1081,10 @@ usage (); } /* end for over argc */ + /* if no -event options were specified, pretend all of them were */ + if (!event_mask_specified) + parse_event_mask (NULL, event_masks); + dpy = XOpenDisplay (displayname); if (!dpy) { fprintf (stderr, "%s: unable to open display '%s'\n", @@ -1046,19 +1129,7 @@ screen = DefaultScreen (dpy); - /* select for all events */ - attr.event_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | - ButtonReleaseMask | EnterWindowMask | - LeaveWindowMask | PointerMotionMask | - Button1MotionMask | - Button2MotionMask | Button3MotionMask | - Button4MotionMask | Button5MotionMask | - ButtonMotionMask | KeymapStateMask | - ExposureMask | VisibilityChangeMask | - StructureNotifyMask | /* ResizeRedirectMask | */ - SubstructureNotifyMask | SubstructureRedirectMask | - FocusChangeMask | PropertyChangeMask | - ColormapChangeMask | OwnerGrabButtonMask; + attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE]; if (use_root) w = RootWindow(dpy, screen); @@ -1126,12 +1197,14 @@ int rr_major, rr_minor; if (XRRQueryVersion (dpy, &rr_major, &rr_minor)) { - int rr_mask = RRScreenChangeNotifyMask; + int rr_mask = event_masks[EVENT_MASK_INDEX_RANDR]; + + if (rr_major == 1 && rr_minor <= 1) { + rr_mask &= ~(RRCrtcChangeNotifyMask | + RROutputChangeNotifyMask | + RROutputPropertyNotifyMask); + } - if (rr_major > 1 - || (rr_major == 1 && rr_minor >= 2)) - rr_mask |= RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | - RROutputPropertyNotifyMask; XRRSelectInput (dpy, w, rr_mask); } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org