Update to xwininfo 1.1.5
This commit is contained in:
matthieu
parent
6993267f7f
commit
73599d9e9d
@ -1,3 +1,95 @@
|
||||
commit 985a3a70918038bf2569e0a5ebe3fa14d720e4de
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Jul 14 13:51:36 2019 -0700
|
||||
|
||||
xwininfo 1.1.5
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 1a50edf62c9511a2bee8b7cc3b72e5185f7b593f
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Jun 9 10:21:39 2019 -0700
|
||||
|
||||
Clear -Wsign-compare warnings from gcc 7.3
|
||||
|
||||
dsimple.c: In function ‘recursive_Window_With_Name’:
|
||||
dsimple.c:298:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
if ((namelen == prop_name_len) &&
|
||||
^~
|
||||
dsimple.c:336:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
if ((namelen == prop_name_len) &&
|
||||
^~
|
||||
dsimple.c:371:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
for (i = 0; i < nchildren; i++) {
|
||||
^
|
||||
dsimple.c:380:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
for (i = 0; i < nchildren; i++) {
|
||||
^
|
||||
dsimple.c:390:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
for (/* keep previous i */; i < nchildren; i++) {
|
||||
^
|
||||
dsimple.c: In function ‘Get_Atom’:
|
||||
dsimple.c:616:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
if (a->atom == -1) /* internal error */
|
||||
^~
|
||||
|
||||
xwininfo.c: In function ‘wm_size_hints_reply’:
|
||||
xwininfo.c:730:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
if (length > sizeof(wm_size_hints_t))
|
||||
^
|
||||
xwininfo.c: In function ‘Display_Event_Mask’:
|
||||
xwininfo.c:1229:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
for (bit=0, bit_mask=1; bit < sizeof(long)*8; bit++, bit_mask <<= 1)
|
||||
^
|
||||
xwininfo.c: In function ‘wm_hints_reply’:
|
||||
xwininfo.c:1633:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
if (length > sizeof(wm_hints_t))
|
||||
^
|
||||
xwininfo.c: In function ‘is_valid_utf8’:
|
||||
xwininfo.c:1843:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
|
||||
for (i = 0; i < len; i++) {
|
||||
^
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 58213a0cd39dc4ba044f48fab52ed3256ab9a9bd
|
||||
Author: Stéphane Aulery <lkppo@free.fr>
|
||||
Date: Wed Jul 3 00:29:17 2013 +0200
|
||||
|
||||
Improve manpage and -h option
|
||||
|
||||
- Rename windows and display args.
|
||||
- Mention of short (-d) -display option.
|
||||
|
||||
Signed-off-by: Stéphane Aulery <lkppo@free.fr>
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit d19200c0b0ff638edbb16555e711d2353625bd4a
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Wed Nov 21 17:21:49 2018 -0800
|
||||
|
||||
Update configure.ac bug URL for gitlab migration
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 015b29ca761102c95c722928557336e101a4a6e1
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Nov 16 23:32:24 2018 -0800
|
||||
|
||||
Update README for gitlab migration
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit f8c9f340421883f659b820214ddf8a21d5022a3a
|
||||
Author: David Hill <dhill@mindcry.org>
|
||||
Date: Wed Dec 11 04:05:19 2013 +0000
|
||||
|
||||
In Find_Client, if (win == XCB_WINDOW_NONE), roots should be freed.
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=72583
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 919665db8ceb8e2c38a1a4ce4686eb224ddf5234
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Mar 9 20:41:31 2018 -0800
|
||||
|
||||
@ -32,7 +32,7 @@ xwininfo_SOURCES = \
|
||||
dsimple.h \
|
||||
xwininfo.c
|
||||
|
||||
EXTRA_DIST = strnlen.h
|
||||
EXTRA_DIST = strnlen.h README.md
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
@ -73,7 +73,7 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
bin_PROGRAMS = xwininfo$(EXEEXT)
|
||||
subdir = .
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog INSTALL compile \
|
||||
config.guess config.rpath config.sub depcomp install-sh \
|
||||
@ -323,7 +323,7 @@ xwininfo_SOURCES = \
|
||||
dsimple.h \
|
||||
xwininfo.c
|
||||
|
||||
EXTRA_DIST = strnlen.h
|
||||
EXTRA_DIST = strnlen.h README.md
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
xwininfo prints information about windows on an X server.
|
||||
Various information is displayed depending on which options are selected.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/app/xwininfo
|
||||
|
||||
http://cgit.freedesktop.org/xorg/app/xwininfo
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
||||
18
app/xwininfo/README.md
Normal file
18
app/xwininfo/README.md
Normal file
@ -0,0 +1,18 @@
|
||||
xwininfo prints information about windows on an X server.
|
||||
Various information is displayed depending on which options are selected.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
https://lists.x.org/mailman/listinfo/xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
https://gitlab.freedesktop.org/xorg/app/xwininfo
|
||||
|
||||
Please submit bug reports and requests to merge patches there.
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
https://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
1235
app/xwininfo/aclocal.m4
vendored
1235
app/xwininfo/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
@ -219,8 +219,10 @@ Find_Client(xcb_connection_t * dpy, xcb_window_t root, xcb_window_t subwin)
|
||||
if (subwin != roots[i])
|
||||
continue;
|
||||
win = Find_Child_At_Pointer(dpy, subwin);
|
||||
if (win == XCB_WINDOW_NONE)
|
||||
if (win == XCB_WINDOW_NONE) {
|
||||
free (roots);
|
||||
return subwin; /* No child - Return virtual root. */
|
||||
}
|
||||
subwin = win;
|
||||
break;
|
||||
}
|
||||
|
||||
575
app/xwininfo/configure
vendored
575
app/xwininfo/configure
vendored
@ -1,8 +1,8 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xwininfo 1.1.4.
|
||||
# Generated by GNU Autoconf 2.69 for xwininfo 1.1.5.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xwininfo/issues>.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
@ -267,7 +267,7 @@ fi
|
||||
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
||||
else
|
||||
$as_echo "$0: Please tell bug-autoconf@gnu.org and
|
||||
$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
$0: https://gitlab.freedesktop.org/xorg/app/xwininfo/issues
|
||||
$0: about your system, including any error possibly output
|
||||
$0: before this message. Then install a modern shell, or
|
||||
$0: manually run the script under such a shell if you do
|
||||
@ -581,9 +581,9 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xwininfo'
|
||||
PACKAGE_TARNAME='xwininfo'
|
||||
PACKAGE_VERSION='1.1.4'
|
||||
PACKAGE_STRING='xwininfo 1.1.4'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
PACKAGE_VERSION='1.1.5'
|
||||
PACKAGE_STRING='xwininfo 1.1.5'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xwininfo/issues'
|
||||
PACKAGE_URL=''
|
||||
|
||||
ac_unique_file="Makefile.am"
|
||||
@ -1321,7 +1321,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 xwininfo 1.1.4 to adapt to many kinds of systems.
|
||||
\`configure' configures xwininfo 1.1.5 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1391,7 +1391,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xwininfo 1.1.4:";;
|
||||
short | recursive ) echo "Configuration of xwininfo 1.1.5:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1448,7 +1448,7 @@ Some influential environment variables:
|
||||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
||||
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xwininfo/issues>.
|
||||
_ACEOF
|
||||
ac_status=$?
|
||||
fi
|
||||
@ -1511,7 +1511,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xwininfo configure 1.1.4
|
||||
xwininfo configure 1.1.5
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -1671,7 +1671,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
|
||||
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
|
||||
( $as_echo "## ---------------------------------------------------------------------- ##
|
||||
## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
|
||||
## Report this to https://gitlab.freedesktop.org/xorg/app/xwininfo/issues ##
|
||||
## ---------------------------------------------------------------------- ##"
|
||||
) | sed "s/^/$as_me: WARNING: /" >&2
|
||||
;;
|
||||
@ -1926,7 +1926,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xwininfo $as_me 1.1.4, which was
|
||||
It was created by xwininfo $as_me 1.1.5, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -4066,7 +4066,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xwininfo'
|
||||
VERSION='1.1.4'
|
||||
VERSION='1.1.5'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -4372,38 +4372,12 @@ if test "${PATH_SEPARATOR+set}" != set; then
|
||||
}
|
||||
fi
|
||||
|
||||
ac_prog=ld
|
||||
if test "$GCC" = yes; then
|
||||
# Check if gcc -print-prog-name=ld gives a path.
|
||||
if test -n "$LD"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
|
||||
$as_echo_n "checking for ld... " >&6; }
|
||||
elif test "$GCC" = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
|
||||
$as_echo_n "checking for ld used by $CC... " >&6; }
|
||||
case $host in
|
||||
*-*-mingw*)
|
||||
# gcc leaves a trailing carriage return which upsets mingw
|
||||
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
||||
*)
|
||||
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
||||
esac
|
||||
case $ac_prog in
|
||||
# Accept absolute paths.
|
||||
[\\/]* | ?:[\\/]*)
|
||||
re_direlt='/[^/][^/]*/\.\./'
|
||||
# Canonicalize the pathname of ld
|
||||
ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
|
||||
while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
||||
done
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
;;
|
||||
"")
|
||||
# If it fails, then pretend we aren't using GCC.
|
||||
ac_prog=ld
|
||||
;;
|
||||
*)
|
||||
# If it is relative, then search for the first ld in PATH.
|
||||
with_gnu_ld=unknown
|
||||
;;
|
||||
esac
|
||||
elif test "$with_gnu_ld" = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
|
||||
$as_echo_n "checking for GNU ld... " >&6; }
|
||||
@ -4411,44 +4385,129 @@ else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
|
||||
$as_echo_n "checking for non-GNU ld... " >&6; }
|
||||
fi
|
||||
if ${acl_cv_path_LD+:} false; then :
|
||||
if test -n "$LD"; then
|
||||
# Let the user override the test with a path.
|
||||
:
|
||||
else
|
||||
if ${acl_cv_path_LD+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -z "$LD"; then
|
||||
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
||||
for ac_dir in $PATH; do
|
||||
IFS="$acl_save_ifs"
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
||||
acl_cv_path_LD="$ac_dir/$ac_prog"
|
||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
||||
# but apparently some variants of GNU ld only accept -v.
|
||||
# Break only if it was the GNU/non-GNU ld that we prefer.
|
||||
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
test "$with_gnu_ld" != no && break
|
||||
;;
|
||||
*)
|
||||
test "$with_gnu_ld" != yes && break
|
||||
;;
|
||||
|
||||
acl_cv_path_LD= # Final result of this test
|
||||
ac_prog=ld # Program to search in $PATH
|
||||
if test "$GCC" = yes; then
|
||||
# Check if gcc -print-prog-name=ld gives a path.
|
||||
case $host in
|
||||
*-*-mingw*)
|
||||
# gcc leaves a trailing carriage return which upsets mingw
|
||||
acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
||||
*)
|
||||
acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
|
||||
esac
|
||||
case $acl_output in
|
||||
# Accept absolute paths.
|
||||
[\\/]* | ?:[\\/]*)
|
||||
re_direlt='/[^/][^/]*/\.\./'
|
||||
# Canonicalize the pathname of ld
|
||||
acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
|
||||
while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
|
||||
done
|
||||
# Got the pathname. No search in PATH is needed.
|
||||
acl_cv_path_LD="$acl_output"
|
||||
ac_prog=
|
||||
;;
|
||||
"")
|
||||
# If it fails, then pretend we aren't using GCC.
|
||||
;;
|
||||
*)
|
||||
# If it is relative, then search for the first ld in PATH.
|
||||
with_gnu_ld=unknown
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
IFS="$acl_save_ifs"
|
||||
else
|
||||
acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
||||
if test -n "$ac_prog"; then
|
||||
# Search for $ac_prog in $PATH.
|
||||
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
||||
for ac_dir in $PATH; do
|
||||
IFS="$acl_save_ifs"
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
||||
acl_cv_path_LD="$ac_dir/$ac_prog"
|
||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
||||
# but apparently some variants of GNU ld only accept -v.
|
||||
# Break only if it was the GNU/non-GNU ld that we prefer.
|
||||
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
test "$with_gnu_ld" != no && break
|
||||
;;
|
||||
*)
|
||||
test "$with_gnu_ld" != yes && break
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
IFS="$acl_save_ifs"
|
||||
fi
|
||||
case $host in
|
||||
*-*-aix*)
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __powerpc64__ || defined _ARCH_PPC64
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
# The compiler produces 64-bit code. Add option '-b64' so that the
|
||||
# linker groks 64-bit object files.
|
||||
case "$acl_cv_path_LD " in
|
||||
*" -b64 "*) ;;
|
||||
*) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
|
||||
esac
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
sparc64-*-netbsd*)
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __sparcv9 || defined __arch64__
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
|
||||
else
|
||||
# The compiler produces 32-bit code. Add option '-m elf32_sparc'
|
||||
# so that the linker groks 32-bit object files.
|
||||
case "$acl_cv_path_LD " in
|
||||
*" -m elf32_sparc "*) ;;
|
||||
*) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
|
||||
esac
|
||||
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
esac
|
||||
|
||||
fi
|
||||
|
||||
LD="$acl_cv_path_LD"
|
||||
LD="$acl_cv_path_LD"
|
||||
fi
|
||||
if test -n "$LD"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
|
||||
$as_echo "$LD" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
|
||||
fi
|
||||
test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
|
||||
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
|
||||
if ${acl_cv_prog_gnu_ld+:} false; then :
|
||||
@ -4505,67 +4564,324 @@ fi
|
||||
|
||||
|
||||
|
||||
acl_libdirstem=lib
|
||||
acl_libdirstem2=
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
|
||||
$as_echo_n "checking 32-bit host C ABI... " >&6; }
|
||||
if ${gl_cv_host_cpu_c_abi_32bit+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$gl_cv_host_cpu_c_abi"; then
|
||||
case "$gl_cv_host_cpu_c_abi" in
|
||||
i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
|
||||
gl_cv_host_cpu_c_abi_32bit=yes ;;
|
||||
*)
|
||||
gl_cv_host_cpu_c_abi_32bit=no ;;
|
||||
esac
|
||||
else
|
||||
case "$host_cpu" in
|
||||
|
||||
i[4567]86 )
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
;;
|
||||
|
||||
x86_64 )
|
||||
# On x86_64 systems, the C compiler may be generating code in one of
|
||||
# these ABIs:
|
||||
# - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
|
||||
# - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
|
||||
# with native Windows (mingw, MSVC).
|
||||
# - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
|
||||
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if (defined __x86_64__ || defined __amd64__ \
|
||||
|| defined _M_X64 || defined _M_AMD64) \
|
||||
&& !(defined __ILP32__ || defined _ILP32)
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
arm* | aarch64 )
|
||||
# Assume arm with EABI.
|
||||
# On arm64 systems, the C compiler may be generating code in one of
|
||||
# these ABIs:
|
||||
# - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
|
||||
# - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
|
||||
# - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
|
||||
# On hppa, the C compiler may be generating 32-bit code or 64-bit
|
||||
# code. In the latter case, it defines _LP64 and __LP64__.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#ifdef __LP64__
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
ia64* )
|
||||
# On ia64 on HP-UX, the C compiler may be generating 64-bit code or
|
||||
# 32-bit code. In the latter case, it defines _ILP32.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#ifdef _ILP32
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
mips* )
|
||||
# We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
|
||||
# at 32.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
powerpc* )
|
||||
# Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
|
||||
# No need to distinguish them here; the caller may distinguish
|
||||
# them based on the OS.
|
||||
# On powerpc64 systems, the C compiler may still be generating
|
||||
# 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
|
||||
# be generating 64-bit code.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __powerpc64__ || defined _ARCH_PPC64
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
rs6000 )
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
;;
|
||||
|
||||
riscv32 | riscv64 )
|
||||
# There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
|
||||
# Size of 'long' and 'void *':
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __LP64__
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
s390* )
|
||||
# On s390x, the C compiler may be generating 64-bit (= s390x) code
|
||||
# or 31-bit (= s390) code.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __LP64__ || defined __s390x__
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
sparc | sparc64 )
|
||||
# UltraSPARCs running Linux have `uname -m` = "sparc64", but the
|
||||
# C compiler still generates 32-bit code.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#if defined __sparcv9 || defined __arch64__
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
else
|
||||
gl_cv_host_cpu_c_abi_32bit=yes
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
;;
|
||||
|
||||
*)
|
||||
gl_cv_host_cpu_c_abi_32bit=no
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
|
||||
$as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; }
|
||||
|
||||
HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
case "$host_os" in
|
||||
solaris*)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
|
||||
$as_echo_n "checking for 64-bit host... " >&6; }
|
||||
if ${gl_cv_solaris_64bit+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#ifdef _LP64
|
||||
sixtyfour bits
|
||||
#endif
|
||||
int ok;
|
||||
#else
|
||||
error fail
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "sixtyfour bits" >/dev/null 2>&1; then :
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
gl_cv_solaris_64bit=yes
|
||||
else
|
||||
gl_cv_solaris_64bit=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
|
||||
$as_echo "$gl_cv_solaris_64bit" >&6; }
|
||||
if test $gl_cv_solaris_64bit = yes; then
|
||||
acl_libdirstem=lib/64
|
||||
case "$host_cpu" in
|
||||
sparc*) acl_libdirstem2=lib/sparcv9 ;;
|
||||
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
|
||||
if test -n "$searchpath"; then
|
||||
acl_save_IFS="${IFS= }"; IFS=":"
|
||||
for searchdir in $searchpath; do
|
||||
if test -d "$searchdir"; then
|
||||
case "$searchdir" in
|
||||
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
|
||||
*/../ | */.. )
|
||||
# Better ignore directories of this form. They are misleading.
|
||||
;;
|
||||
*) searchdir=`cd "$searchdir" && pwd`
|
||||
case "$searchdir" in
|
||||
*/lib64 ) acl_libdirstem=lib64 ;;
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
IFS="$acl_save_IFS"
|
||||
fi
|
||||
;;
|
||||
$as_echo "$gl_cv_solaris_64bit" >&6; };;
|
||||
esac
|
||||
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
|
||||
$as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
|
||||
if ${acl_cv_libdirstems+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
acl_libdirstem=lib
|
||||
acl_libdirstem2=
|
||||
case "$host_os" in
|
||||
solaris*)
|
||||
if test $gl_cv_solaris_64bit = yes; then
|
||||
acl_libdirstem=lib/64
|
||||
case "$host_cpu" in
|
||||
sparc*) acl_libdirstem2=lib/sparcv9 ;;
|
||||
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if test "$HOST_CPU_C_ABI_32BIT" != yes; then
|
||||
searchpath=`(if test -f /usr/bin/gcc \
|
||||
&& LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
|
||||
LC_ALL=C /usr/bin/gcc -print-search-dirs; \
|
||||
else \
|
||||
LC_ALL=C $CC -print-search-dirs; \
|
||||
fi) 2>/dev/null \
|
||||
| sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
|
||||
if test -n "$searchpath"; then
|
||||
acl_save_IFS="${IFS= }"; IFS=":"
|
||||
for searchdir in $searchpath; do
|
||||
if test -d "$searchdir"; then
|
||||
case "$searchdir" in
|
||||
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
|
||||
*/../ | */.. )
|
||||
# Better ignore directories of this form. They are misleading.
|
||||
;;
|
||||
*) searchdir=`cd "$searchdir" && pwd`
|
||||
case "$searchdir" in
|
||||
*/lib64 ) acl_libdirstem=lib64 ;;
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
IFS="$acl_save_IFS"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
|
||||
acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
|
||||
$as_echo "$acl_cv_libdirstems" >&6; }
|
||||
# Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
|
||||
acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
|
||||
acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
|
||||
|
||||
|
||||
|
||||
@ -4614,7 +4930,7 @@ if test "${with_libiconv_prefix+set}" = set; then :
|
||||
additional_includedir="$withval/include"
|
||||
additional_libdir="$withval/$acl_libdirstem"
|
||||
if test "$acl_libdirstem2" != "$acl_libdirstem" \
|
||||
&& ! test -d "$withval/$acl_libdirstem"; then
|
||||
&& test ! -d "$withval/$acl_libdirstem"; then
|
||||
additional_libdir="$withval/$acl_libdirstem2"
|
||||
fi
|
||||
fi
|
||||
@ -5036,7 +5352,6 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
am_save_CPPFLAGS="$CPPFLAGS"
|
||||
|
||||
for element in $INCICONV; do
|
||||
@ -5237,15 +5552,27 @@ int result = 0;
|
||||
#endif
|
||||
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
||||
provided. */
|
||||
if (/* Try standardized names. */
|
||||
iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
|
||||
/* Try IRIX, OSF/1 names. */
|
||||
&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
|
||||
/* Try AIX names. */
|
||||
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
||||
/* Try HP-UX names. */
|
||||
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
||||
result |= 16;
|
||||
{
|
||||
/* Try standardized names. */
|
||||
iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
|
||||
/* Try IRIX, OSF/1 names. */
|
||||
iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
|
||||
/* Try AIX names. */
|
||||
iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
|
||||
/* Try HP-UX names. */
|
||||
iconv_t cd4 = iconv_open ("utf8", "eucJP");
|
||||
if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
|
||||
&& cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
|
||||
result |= 16;
|
||||
if (cd1 != (iconv_t)(-1))
|
||||
iconv_close (cd1);
|
||||
if (cd2 != (iconv_t)(-1))
|
||||
iconv_close (cd2);
|
||||
if (cd3 != (iconv_t)(-1))
|
||||
iconv_close (cd3);
|
||||
if (cd4 != (iconv_t)(-1))
|
||||
iconv_close (cd4);
|
||||
}
|
||||
return result;
|
||||
|
||||
;
|
||||
@ -5335,13 +5662,15 @@ fi
|
||||
$am_cv_proto_iconv" >&5
|
||||
$as_echo "
|
||||
$am_cv_proto_iconv" >&6; }
|
||||
else
|
||||
am_cv_proto_iconv_arg1=""
|
||||
fi
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define ICONV_CONST $am_cv_proto_iconv_arg1
|
||||
_ACEOF
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
@ -12496,7 +12825,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xwininfo $as_me 1.1.4, which was
|
||||
This file was extended by xwininfo $as_me 1.1.5, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -12556,13 +12885,13 @@ $config_headers
|
||||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>."
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xwininfo/issues>."
|
||||
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xwininfo config.status 1.1.4
|
||||
xwininfo config.status 1.1.5
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -23,8 +23,8 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xwininfo], [1.1.4],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xwininfo])
|
||||
AC_INIT([xwininfo], [1.1.5],
|
||||
[https://gitlab.freedesktop.org/xorg/app/xwininfo/issues], [xwininfo])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
@ -279,7 +279,7 @@ recursive_Window_With_Name (
|
||||
{
|
||||
xcb_window_t *children;
|
||||
unsigned int nchildren;
|
||||
int i;
|
||||
unsigned int i;
|
||||
xcb_window_t w = 0;
|
||||
xcb_generic_error_t *err;
|
||||
xcb_query_tree_reply_t *tree;
|
||||
@ -295,7 +295,7 @@ recursive_Window_With_Name (
|
||||
int prop_name_len = xcb_get_property_value_length (prop);
|
||||
|
||||
/* can't use strcmp, since prop.name is not null terminated */
|
||||
if ((namelen == prop_name_len) &&
|
||||
if ((namelen == (size_t) prop_name_len) &&
|
||||
memcmp (prop_name, name, namelen) == 0) {
|
||||
w = window;
|
||||
}
|
||||
@ -317,7 +317,7 @@ recursive_Window_With_Name (
|
||||
if (xcb_icccm_get_wm_name_reply (dpy, cookies->get_wm_name,
|
||||
&nameprop, &err)) {
|
||||
/* can't use strcmp, since nameprop.name is not null terminated */
|
||||
if ((namelen == nameprop.name_len) &&
|
||||
if ((namelen == (size_t) nameprop.name_len) &&
|
||||
memcmp (nameprop.name, name, namelen) == 0) {
|
||||
w = window;
|
||||
}
|
||||
@ -333,7 +333,7 @@ recursive_Window_With_Name (
|
||||
int prop_name_len = xcb_get_property_value_length (prop);
|
||||
|
||||
/* can't use strcmp, since prop.name is not null terminated */
|
||||
if ((namelen == prop_name_len) &&
|
||||
if ((namelen == (size_t) prop_name_len) &&
|
||||
memcmp (prop_name, name, namelen) == 0) {
|
||||
w = window;
|
||||
}
|
||||
@ -610,10 +610,10 @@ xcb_atom_t Get_Atom (xcb_connection_t * dpy, const char *name)
|
||||
a->atom = reply->atom;
|
||||
free (reply);
|
||||
} else {
|
||||
a->atom = -1;
|
||||
a->atom = (xcb_atom_t) -1;
|
||||
}
|
||||
}
|
||||
if (a->atom == -1) /* internal error */
|
||||
if (a->atom == (xcb_atom_t) -1) /* internal error */
|
||||
return XCB_ATOM_NONE;
|
||||
|
||||
return a->atom;
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
xwininfo \- window information utility for X
|
||||
.SH SYNOPSIS
|
||||
.B "xwininfo"
|
||||
[\-help] [\-id \fIid\fP] [\-root] [\-name \fIname\fP] [\-int]
|
||||
[\-help] [\-id \fIwdid\fP] [\-root] [\-name \fIwdname\fP] [\-int]
|
||||
[\-children] [\-tree] [\-stats] [\-bits] [\-events] [\-size] [\-wm] [\-shape]
|
||||
[\-frame] [\-all]
|
||||
[\-english] [\-metric]
|
||||
[\-display \fIdisplay\fP] [\-version]
|
||||
[\-display \fIhost:dpy\fP] [\-version]
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
.I Xwininfo
|
||||
@ -55,16 +55,16 @@ on the screen's root window.
|
||||
Print out the `Usage:' command syntax summary.
|
||||
.PP
|
||||
.TP 8
|
||||
.B "\-id \fIid\fP"
|
||||
This option allows the user to specify a target window \fIid\fP on the
|
||||
.B "\-id \fIwdid\fP"
|
||||
This option allows the user to specify a target window \fIwdid\fP on the
|
||||
command line rather than using the mouse to select the target window.
|
||||
This is very useful in debugging X applications where the target
|
||||
window is not mapped to the screen or where the use of the mouse might
|
||||
be impossible or interfere with the application.
|
||||
.PP
|
||||
.TP 8
|
||||
.B "\-name \fIname\fP"
|
||||
This option allows the user to specify that the window named \fIname\fP
|
||||
.B "\-name \fIwdname\fP"
|
||||
This option allows the user to specify that the window named \fIwdname\fP
|
||||
is the target window on the command line rather than using the mouse to
|
||||
select the target window.
|
||||
.PP
|
||||
@ -152,9 +152,9 @@ same time.
|
||||
This option is a quick way to ask for all information possible.
|
||||
.PP
|
||||
.TP 8
|
||||
.B \-display \fIdisplay\fP
|
||||
.B "\-d, \-display" \fIhost:dpy\fP
|
||||
This option allows you to specify the server to connect to; see \fIX(__miscmansuffix__)\fP.
|
||||
PP
|
||||
.PP
|
||||
.TP 8
|
||||
.B \-version
|
||||
This option indicates that
|
||||
|
||||
@ -285,25 +285,25 @@ usage (void)
|
||||
fprintf (stderr,
|
||||
"usage: %s [-options ...]\n\n"
|
||||
"where options include:\n"
|
||||
" -help print this message\n"
|
||||
" -version print version message\n"
|
||||
" -display host:dpy X server to contact\n"
|
||||
" -root use the root window\n"
|
||||
" -id windowid use the window with the specified id\n"
|
||||
" -name windowname use the window with the specified name\n"
|
||||
" -int print window id in decimal\n"
|
||||
" -children print parent and child identifiers\n"
|
||||
" -tree print children identifiers recursively\n"
|
||||
" -stats print window geometry [DEFAULT]\n"
|
||||
" -bits print window pixel information\n"
|
||||
" -events print events selected for on window\n"
|
||||
" -size print size hints\n"
|
||||
" -wm print window manager hints\n"
|
||||
" -shape print shape extents\n"
|
||||
" -frame don't ignore window manager frames\n"
|
||||
" -english print sizes in english units\n"
|
||||
" -metric print sizes in metric units\n"
|
||||
" -all -tree, -stats, -bits, -events, -wm, -size, -shape\n"
|
||||
" -help print this message\n"
|
||||
" -version print version message\n"
|
||||
" -d[isplay] <host:dpy> X server to contact\n"
|
||||
" -root use the root window\n"
|
||||
" -id <wdid> use the window with the specified id\n"
|
||||
" -name <wdname> use the window with the specified name\n"
|
||||
" -int print window id in decimal\n"
|
||||
" -children print parent and child identifiers\n"
|
||||
" -tree print children identifiers recursively\n"
|
||||
" -stats print window geometry [DEFAULT]\n"
|
||||
" -bits print window pixel information\n"
|
||||
" -events print events selected for on window\n"
|
||||
" -size print size hints\n"
|
||||
" -wm print window manager hints\n"
|
||||
" -shape print shape extents\n"
|
||||
" -frame don't ignore window manager frames\n"
|
||||
" -english print sizes in english units\n"
|
||||
" -metric print sizes in metric units\n"
|
||||
" -all -tree, -stats, -bits, -events, -wm, -size, -shape\n"
|
||||
"\n",
|
||||
program_name);
|
||||
exit (1);
|
||||
@ -716,7 +716,7 @@ wm_size_hints_reply (xcb_connection_t *wshr_dpy, xcb_get_property_cookie_t cooki
|
||||
wm_size_hints_t *hints_return, xcb_generic_error_t **wshr_err)
|
||||
{
|
||||
xcb_get_property_reply_t *prop = xcb_get_property_reply (wshr_dpy, cookie, wshr_err);
|
||||
int length;
|
||||
size_t length;
|
||||
|
||||
if (!prop || (prop->type != XCB_ATOM_WM_SIZE_HINTS) ||
|
||||
(prop->format != 32)) {
|
||||
@ -726,7 +726,7 @@ wm_size_hints_reply (xcb_connection_t *wshr_dpy, xcb_get_property_cookie_t cooki
|
||||
|
||||
memset (hints_return, 0, sizeof(wm_size_hints_t));
|
||||
|
||||
length = xcb_get_property_value_length(prop);
|
||||
length = (size_t) xcb_get_property_value_length(prop);
|
||||
if (length > sizeof(wm_size_hints_t))
|
||||
length = sizeof(wm_size_hints_t);
|
||||
memcpy (hints_return, xcb_get_property_value (prop), length);
|
||||
@ -1224,7 +1224,7 @@ static const binding _event_mask_names[] = {
|
||||
static void
|
||||
Display_Event_Mask (long mask)
|
||||
{
|
||||
long bit, bit_mask;
|
||||
unsigned long bit, bit_mask;
|
||||
|
||||
for (bit=0, bit_mask=1; bit < sizeof(long)*8; bit++, bit_mask <<= 1)
|
||||
if (mask & bit_mask)
|
||||
@ -1620,7 +1620,7 @@ wm_hints_reply (xcb_connection_t *whr_dpy, xcb_get_property_cookie_t cookie,
|
||||
wm_hints_t *hints_return, xcb_generic_error_t **whr_err)
|
||||
{
|
||||
xcb_get_property_reply_t *prop = xcb_get_property_reply (whr_dpy, cookie, whr_err);
|
||||
int length;
|
||||
size_t length;
|
||||
|
||||
if (!prop || (prop->type != XCB_ATOM_WM_HINTS) || (prop->format != 32)) {
|
||||
free (prop);
|
||||
@ -1629,7 +1629,7 @@ wm_hints_reply (xcb_connection_t *whr_dpy, xcb_get_property_cookie_t cookie,
|
||||
|
||||
memset (hints_return, 0, sizeof(wm_hints_t));
|
||||
|
||||
length = xcb_get_property_value_length(prop);
|
||||
length = (size_t) xcb_get_property_value_length(prop);
|
||||
if (length > sizeof(wm_hints_t))
|
||||
length = sizeof(wm_hints_t);
|
||||
memcpy (hints_return, xcb_get_property_value (prop), length);
|
||||
@ -1836,7 +1836,8 @@ static int
|
||||
is_valid_utf8 (const char *string, size_t len)
|
||||
{
|
||||
unsigned long codepoint;
|
||||
int rem, i;
|
||||
int rem;
|
||||
size_t i;
|
||||
unsigned char c;
|
||||
|
||||
rem = 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user