Hello community, here is the log from the commit of package xkill for openSUSE:Factory checked in at 2013-09-13 14:47:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xkill (Old) and /work/SRC/openSUSE:Factory/.xkill.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkill" Changes: -------- --- /work/SRC/openSUSE:Factory/xkill/xkill.changes 2012-05-08 12:05:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xkill.new/xkill.changes 2013-09-13 14:47:05.000000000 +0200 @@ -1,0 +2,25 @@ +Thu Sep 12 18:18:23 UTC 2013 - zai...@opensuse.org + +- Update to version 1.0.4: + + Explicitly cast tolower() return value to char before + storing in a char. + + Mark arguments to catch_window_errors as unused. + + Use man page sections in See Also references to libX11 man + pages. + + Add -version option to print version. + + Mark static string in verify_okay_to_kill as const. + + Mark msg argument to get_window_id as const, since it's just + printed out. + + Use strtoul instead of open coding it with sscanf. + + Mark Exit() and usage() as _X_NORETURN. + + Get rid of dpy global so we don't get shadow warnings from + every function. + + Remove unused variable cpp. + + config: move man pages into their own directory. + + man: + - Replace hard coded man page section with substitution + strings. + - Remove trailing spaces and tabs. +- Add pkgconfig(xproto) BuildRequires, new dependency. + +------------------------------------------------------------------- Old: ---- xkill-1.0.3.tar.bz2 New: ---- xkill-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkill.spec ++++++ --- /var/tmp/diff_new_pack.JPi5yt/_old 2013-09-13 14:47:05.000000000 +0200 +++ /var/tmp/diff_new_pack.JPi5yt/_new 2013-09-13 14:47:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xkill # -# 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,20 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xkill -Version: 1.0.3 +Version: 1.0.4 Release: 0 -License: MIT Summary: Utility to kill a client by its X resource -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 Source1: xkill.desktop BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xmuu) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.22 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xkill-1.0.3.tar.bz2 -> xkill-1.0.4.tar.bz2 ++++++ ++++ 14401 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/xkill-1.0.3/ChangeLog new/xkill-1.0.4/ChangeLog --- old/xkill-1.0.3/ChangeLog 2010-11-11 04:26:39.000000000 +0100 +++ new/xkill-1.0.4/ChangeLog 2013-09-08 18:51:35.000000000 +0200 @@ -1,3 +1,145 @@ +commit 3d990ebfd1dde829f9fda86c556aa51a0308188b +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Sep 8 09:51:15 2013 -0700 + + xkill 1.0.4 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 1b8bf0b5477c1f6ad38a7d57cd9ef354409472d1 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Sep 6 00:15:23 2013 -0700 + + Explicitly cast tolower() return value to char before storing in a char + + For ancient historical compatibility, the C standards define the + <ctype.h> functions as taking & returning ints, but limiting them + to the subset of values that fit in a char. + + Silences clang warning: + xkill.c:244:12: warning: implicit conversion loses integer precision: 'int' to + 'char' [-Wconversion] + *cp = _tolower (*cp); + ~ ^~~~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 1519db19e3d1ed1efc07c8c428c1e9013d93f285 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Sep 6 00:13:44 2013 -0700 + + Mark arguments to catch_window_errors as unused + + Arguments are required by the callback form, but not needed in this case. + + Clears clang compliants: + xkill.c:328:30: warning: unused parameter 'dpy' [-Wunused-parameter] + catch_window_errors(Display *dpy, XErrorEvent *ev) + ^ + xkill.c:328:48: warning: unused parameter 'ev' [-Wunused-parameter] + catch_window_errors(Display *dpy, XErrorEvent *ev) + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 8c669cdff3f32755cb9c383f5b16397a33183e64 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Aug 3 15:59:03 2013 -0700 + + Use man page sections in See Also references to libX11 man pages + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 411ea0142d62900528d314bc654945c94e4f034d +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Aug 3 15:57:06 2013 -0700 + + Add -version option to print version + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 000d4af7f036119cf19717cff105a2bd2efd01e2 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Jul 18 23:27:40 2013 -0700 + + Mark static string in verify_okay_to_kill as const + + Fixes gcc warning: + xkill.c: In function ‘verify_okay_to_kill’: + xkill.c:371:24: warning: initialization discards ‘const’ qualifier from pointer target type [enabled by default] + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f33703105f1a1e44c756fbaf150422132d56b1ca +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Feb 23 08:17:10 2013 -0800 + + Mark msg argument to get_window_id as const, since it's just printed out + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 718640ec0d212e8f3bf20005e35c1091646c9aea +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Feb 22 23:13:45 2013 -0800 + + Use strtoul instead of open coding it with sscanf + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 2e195507f5b17425d02af4dd6a4f151158d715c3 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Feb 22 23:01:53 2013 -0800 + + Mark Exit() and usage() as _X_NORETURN + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 07f1204a7d56e6b02098cf4b82f9f90576e7f289 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Feb 22 22:59:56 2013 -0800 + + Get rid of dpy global so we don't get shadow warnings from every function + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit acb8b93f9fe598bc58c050ca5272149fbca04b41 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Feb 22 22:55:00 2013 -0800 + + remove unused variable cpp + + Accidentally left behind by ea276533fbc9 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 0df97b3ed03c528ba99876cd312e20f3c80dff0f +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 19 10:06:56 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit a7347343c1e27f0f55f9198082bb64ab89b48587 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jan 13 17:15:36 2011 -0500 + + man: replace hard coded man page section with substitution strings + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 5d5c42bb6720df4cc4586535ae069ea706b2b30d +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jan 13 11:15:47 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit 6f00d84fb6d44bc76e50c111f8afc1c961778d7c Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Wed Nov 10 19:26:12 2010 -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/xkill-1.0.3/Makefile.am new/xkill-1.0.4/Makefile.am --- old/xkill-1.0.3/Makefile.am 2010-11-09 19:19:46.000000000 +0100 +++ new/xkill-1.0.4/Makefile.am 2013-09-08 18:51:19.000000000 +0200 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xkill AM_CFLAGS = $(CWARNFLAGS) $(XKILL_CFLAGS) @@ -27,24 +28,7 @@ xkill_SOURCES = \ xkill.c -appman_PRE = \ - xkill.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - .PHONY: ChangeLog INSTALL 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/xkill-1.0.3/compile new/xkill-1.0.4/compile --- old/xkill-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/xkill-1.0.4/compile 2013-09-08 18:51:24.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <tro...@cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <bug-autom...@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: 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/xkill-1.0.3/configure.ac new/xkill-1.0.4/configure.ac --- old/xkill-1.0.3/configure.ac 2010-11-11 04:26:04.000000000 +0100 +++ new/xkill-1.0.4/configure.ac 2013-09-08 18:51:19.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkill], [1.0.3], +AC_INIT([xkill], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkill]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -39,6 +39,9 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XKILL, x11 xmuu) +PKG_CHECK_MODULES(XKILL, [x11 xmuu xproto >= 7.0.22]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT 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/xkill-1.0.3/man/Makefile.am new/xkill-1.0.4/man/Makefile.am --- old/xkill-1.0.3/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xkill-1.0.4/man/Makefile.am 2013-09-08 18:51:19.000000000 +0200 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xkill.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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/xkill-1.0.3/man/xkill.man new/xkill-1.0.4/man/xkill.man --- old/xkill-1.0.3/man/xkill.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xkill-1.0.4/man/xkill.man 2013-09-08 18:51:19.000000000 +0200 @@ -0,0 +1,91 @@ +.\" Copyright 1988, 1998 The Open Group +.\" +.\" 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. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +.\" OTHER DEALINGS IN THE SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.TH XKILL 1 __xorgversion__ +.SH NAME +xkill - kill a client by its X resource +.SH SYNOPSIS +.B "xkill" +[\-display \fIdisplayname\fP] [\-id \fIresource\fP] [\-button number] [\-frame] [\-all] [\-version] +.SH DESCRIPTION +.PP +.I Xkill +is a utility for forcing the X server to close connections to clients. This +program is very dangerous, but is useful for aborting programs that have +displayed undesired windows on a user's screen. If no resource identifier +is given with \fI-id\fP, \fIxkill\fP will display a special cursor +as a prompt for the user to select a window to be killed. If a pointer button +is pressed over a non-root window, the server will close its connection to +the client that created the window. +.SH OPTIONS +.TP 8 +.B \-display \fIdisplayname\fP +This option specifies the name of the X server to contact. +.TP 8 +.B \-id \fIresource\fP +This option specifies the X identifier for the resource whose creator is +to be aborted. If no resource is specified, \fIxkill\fP will display a +special cursor with which you should select a window to be kill. +.TP 8 +.B \-button \fInumber\fP +This option specifies the number of pointer button +that should be used in selecting a window to kill. +If the word "any" is specified, any button on the pointer may be used. By +default, the first button in the pointer map (which is usually the leftmost +button) is used. +.TP 8 +.B \-all +This option indicates that all clients with top-level windows on the screen +should be killed. \fIXkill\fP will ask you to select the root window with +each of the currently defined buttons to give you several chances to abort. +Use of this option is highly discouraged. +.TP 8 +.B \-frame +This option indicates that xkill should ignore the standard conventions for +finding top-level client windows (which are typically nested inside a window +manager window), and simply believe that you want to kill direct children of +the root. +.TP 8 +.B \-version +This option makes xkill print its version and exit without killing anything. +.SH CAVEATS +This command does not provide any warranty that the application whose +connection to the X server is closed will abort nicely, or even abort +at all. All this command does is to close the connection to the X +server. Many existing applications do indeed abort when their +connection to the X server is closed, but some can choose to +continue. +.SH XDEFAULTS +.TP 8 +.B Button +Specifies a specific pointer button number or the word "any" to use when +selecting windows. +.SH "SEE ALSO" +X(__miscmansuffix__), xwininfo(__appmansuffix__), +XKillClient(__libmansuffix__), XGetPointerMapping(__libmansuffix__), +KillClient in the X Protocol Specification +.SH AUTHOR +Jim Fulton, MIT X Consortium +.br +Dana Chee, Bellcore 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/xkill-1.0.3/missing new/xkill-1.0.4/missing --- old/xkill-1.0.3/missing 2010-11-11 04:26:27.000000000 +0100 +++ new/xkill-1.0.4/missing 2013-09-08 18:51:24.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - 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] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-autom...@gnu.org>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # 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 - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - 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. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/xkill-1.0.3/xkill.c new/xkill-1.0.4/xkill.c --- old/xkill-1.0.3/xkill.c 2010-11-09 19:33:47.000000000 +0100 +++ new/xkill-1.0.4/xkill.c 2013-09-08 18:51:19.000000000 +0200 @@ -35,6 +35,10 @@ * Warning, this is a very dangerous client.... */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <stdio.h> #include <stdlib.h> #include <ctype.h> @@ -46,23 +50,21 @@ #include <X11/Xmu/WinUtil.h> -static Display *dpy = NULL; static char *ProgramName; #define SelectButtonAny (-1) #define SelectButtonFirst (-2) static int parse_button ( char *s, int *buttonp ); -static XID parse_id ( char *s ); -static XID get_window_id ( Display *dpy, int screen, int button, char *msg ); +static XID get_window_id ( Display *dpy, int screen, int button, const char *msg ); static int catch_window_errors ( Display *dpy, XErrorEvent *ev ); static int kill_all_windows ( Display *dpy, int screenno, Bool top ); static int verify_okay_to_kill ( Display *dpy, int screenno ); static Bool wm_state_set ( Display *dpy, Window win ); static Bool wm_running ( Display *dpy, int screenno ); -static void -Exit(int code) +static void _X_NORETURN +Exit(int code, Display *dpy) { if (dpy) { XCloseDisplay (dpy); @@ -70,7 +72,7 @@ exit (code); } -static void +static void _X_NORETURN usage(void) { const char *options = @@ -80,18 +82,19 @@ " -frame don't ignore window manager frames\n" " -button number specific button to be pressed to select window\n" " -all kill all clients with top level windows\n" +" -version print version and exit\n" "\n"; - char **cpp; fprintf (stderr, "usage: %s [-option ...]\n%s", ProgramName, options); - Exit (1); + Exit (1, NULL); } int main(int argc, char *argv[]) { int i; /* iterator, temp variable */ + Display *dpy = NULL; char *displayname = NULL; /* name of server to contact */ int screenno; /* screen number of dpy */ XID id = None; /* resource to kill */ @@ -114,7 +117,12 @@ continue; case 'i': /* -id resourceid */ if (++i >= argc) usage (); - id = parse_id (argv[i]); + id = strtoul (argv[i], NULL, 0); + if (id == 0 || id >= 0xFFFFFFFFU) { + fprintf (stderr, "%s: invalid id \"%s\"\n", + ProgramName, argv[i]); + Exit (1, dpy); + } continue; case 'b': /* -button number */ if (++i >= argc) usage (); @@ -126,6 +134,9 @@ case 'a': /* -all */ kill_all = True; continue; + case 'v': + puts(PACKAGE_STRING); + exit(0); default: usage (); } @@ -138,14 +149,14 @@ if (!dpy) { fprintf (stderr, "%s: unable to open display \"%s\"\n", ProgramName, XDisplayName (displayname)); - Exit (1); + Exit (1, dpy); } screenno = DefaultScreen (dpy); if (kill_all) { if (verify_okay_to_kill (dpy, screenno)) kill_all_windows (dpy, screenno, top); - Exit (0); + Exit (0, dpy); } /* @@ -159,7 +170,7 @@ if (button_name && !parse_button (button_name, &button)) { fprintf (stderr, "%s: invalid button specification \"%s\"\n", ProgramName, button_name); - Exit (1); + Exit (1, dpy); } if (button >= 0 || button == SelectButtonFirst) { @@ -173,7 +184,7 @@ fprintf (stderr, "%s: no pointer mapping, can't select window\n", ProgramName); - Exit (1); + Exit (1, dpy); } if (button >= 0) { /* check button */ @@ -184,7 +195,7 @@ fprintf (stderr, "%s: no button number %u in pointer map, can't select window\n", ProgramName, ub); - Exit (1); + Exit (1, dpy); } } else { /* get first entry */ button = (int) ((unsigned int) pointer_map[0]); @@ -216,7 +227,7 @@ XSync (dpy, 0); } - Exit (0); + Exit (0, dpy); /*NOTREACHED*/ return 0; } @@ -230,9 +241,9 @@ for (cp = s; *cp; cp++) { if (isascii (*cp) && isupper (*cp)) { #ifdef _tolower - *cp = _tolower (*cp); + *cp = (char) _tolower (*cp); #else - *cp = tolower (*cp); + *cp = (char) tolower (*cp); #endif /* _tolower */ } } @@ -251,23 +262,8 @@ return (1); } - -static XID -parse_id(char *s) -{ - XID retval = None; - char *fmt = "%ld"; /* since XID is long */ - - if (s) { - if (*s == '0') s++, fmt = "%lo"; - if (*s == 'x' || *s == 'X') s++, fmt = "%lx"; - sscanf (s, fmt, &retval); - } - return (retval); -} - static XID -get_window_id(Display *dpy, int screen, int button, char *msg) +get_window_id(Display *dpy, int screen, int button, const char *msg) { Cursor cursor; /* cursor to use when selecting */ Window root; /* the current root */ @@ -282,7 +278,7 @@ if (cursor == None) { fprintf (stderr, "%s: unable to create selection cursor\n", ProgramName); - Exit (1); + Exit (1, dpy); } printf ("Select %s with ", msg); @@ -296,7 +292,7 @@ if (XGrabPointer (dpy, root, False, MASK, GrabModeSync, GrabModeAsync, None, cursor, CurrentTime) != GrabSuccess) { fprintf (stderr, "%s: unable to grab cursor\n", ProgramName); - Exit (1); + Exit (1, dpy); } /* from dsimple.c in xwininfo */ @@ -329,7 +325,7 @@ static int -catch_window_errors(Display *dpy, XErrorEvent *ev) +catch_window_errors(_X_UNUSED Display *dpy, _X_UNUSED XErrorEvent *ev) { return 0; } @@ -380,7 +376,7 @@ int count = XGetPointerMapping (dpy, pointer_map, 256); int i; int button; - static char *msg = "the root window"; + const char *msg = "the root window"; Window root = RootWindow (dpy, screenno); int okay = 0; 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/xkill-1.0.3/xkill.man new/xkill-1.0.4/xkill.man --- old/xkill-1.0.3/xkill.man 2010-10-07 05:36:26.000000000 +0200 +++ new/xkill-1.0.4/xkill.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,87 +0,0 @@ -.\" Copyright 1988, 1998 The Open Group -.\" -.\" 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. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -.\" OTHER DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.TH XKILL 1 __xorgversion__ -.SH NAME -xkill - kill a client by its X resource -.SH SYNOPSIS -.B "xkill" -[\-display \fIdisplayname\fP] [\-id \fIresource\fP] [\-button number] [\-frame] [\-all] -.SH DESCRIPTION -.PP -.I Xkill -is a utility for forcing the X server to close connections to clients. This -program is very dangerous, but is useful for aborting programs that have -displayed undesired windows on a user's screen. If no resource identifier -is given with \fI-id\fP, \fIxkill\fP will display a special cursor -as a prompt for the user to select a window to be killed. If a pointer button -is pressed over a non-root window, the server will close its connection to -the client that created the window. -.SH OPTIONS -.TP 8 -.B \-display \fIdisplayname\fP -This option specifies the name of the X server to contact. -.TP 8 -.B \-id \fIresource\fP -This option specifies the X identifier for the resource whose creator is -to be aborted. If no resource is specified, \fIxkill\fP will display a -special cursor with which you should select a window to be kill. -.TP 8 -.B \-button \fInumber\fP -This option specifies the number of pointer button -that should be used in selecting a window to kill. -If the word "any" is specified, any button on the pointer may be used. By -default, the first button in the pointer map (which is usually the leftmost -button) is used. -.TP 8 -.B \-all -This option indicates that all clients with top-level windows on the screen -should be killed. \fIXkill\fP will ask you to select the root window with -each of the currently defined buttons to give you several chances to abort. -Use of this option is highly discouraged. -.TP 8 -.B \-frame -This option indicates that xkill should ignore the standard conventions for -finding top-level client windows (which are typically nested inside a window -manager window), and simply believe that you want to kill direct children of -the root. -.SH CAVEATS -This command does not provide any warranty that the application whose -connection to the X server is closed will abort nicely, or even abort -at all. All this command does is to close the connection to the X -server. Many existing applications do indeed abort when their -connection to the X server is closed, but some can choose to -continue. -.SH XDEFAULTS -.TP 8 -.B Button -Specifies a specific pointer button number or the word "any" to use when -selecting windows. -.SH "SEE ALSO" -X(__miscmansuffix__), xwininfo(1), XKillClient and XGetPointerMapping in the Xlib Programmers -Manual, KillClient in the X Protocol Specification -.SH AUTHOR -Jim Fulton, MIT X Consortium -.br -Dana Chee, Bellcore -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
