Update to xwd 1.0.3

This commit is contained in:
matthieu 2009-10-24 15:34:20 +00:00
parent d5162c9a3c
commit 5c52321f03
14 changed files with 4351 additions and 2844 deletions

View File

@ -1,12 +1,44 @@
This is a stub file. This package has not yet had its complete licensing
information compiled. Please see the individual source files for details on
your rights to use and modify this software.
Copyright 1987, 1988, 1993, 1994, 1996, 1998 The Open Group
Copyright 1994 Hewlett-Packard Co.
Please submit updated COPYING files to the Xorg bugzilla:
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.
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
All licensing questions regarding this software should be directed at the
Xorg mailing list:
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.
http://lists.freedesktop.org/mailman/listinfo/xorg
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.
Copyright 2007 Kim woelders
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting documentation, and
that the name of the copyright holders not be used in advertising or
publicity pertaining to distribution of the software without specific,
written prior permission. The copyright holders make no representations
about the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS SOFTWARE.

View File

@ -21,7 +21,7 @@
bin_PROGRAMS = xwd
xwd_CFLAGS = $(XWD_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS)
xwd_LDADD = $(XWD_LIBS)
xwd_SOURCES = \
@ -69,7 +69,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@ -77,6 +77,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
$(CHANGELOG_CMD)
dist-hook: ChangeLog

View File

@ -62,7 +62,7 @@ bin_PROGRAMS = xwd$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
compile config.guess config.sub depcomp install-sh missing \
config.guess config.sub depcomp install-sh missing \
mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -77,8 +77,8 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xwd_OBJECTS = xwd-clientwin.$(OBJEXT) xwd-dsimple.$(OBJEXT) \
xwd-list.$(OBJEXT) xwd-multiVis.$(OBJEXT) xwd-xwd.$(OBJEXT)
am_xwd_OBJECTS = clientwin.$(OBJEXT) dsimple.$(OBJEXT) list.$(OBJEXT) \
multiVis.$(OBJEXT) xwd.$(OBJEXT)
xwd_OBJECTS = $(am_xwd_OBJECTS)
am__DEPENDENCIES_1 =
xwd_DEPENDENCIES = $(am__DEPENDENCIES_1)
@ -111,7 +111,6 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@ -127,7 +126,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@ -136,9 +138,11 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -171,8 +175,6 @@ VERSION = @VERSION@
XWD_CFLAGS = @XWD_CFLAGS@
XWD_LIBS = @XWD_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@ -187,28 +189,36 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
xwd_CFLAGS = $(XWD_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(XWD_CFLAGS)
xwd_LDADD = $(XWD_LIBS)
xwd_SOURCES = \
clientwin.c \
@ -337,11 +347,11 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwd-clientwin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwd-dsimple.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwd-list.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwd-multiVis.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwd-xwd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clientwin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsimple.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiVis.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwd.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -356,76 +366,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
xwd-clientwin.o: clientwin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-clientwin.o -MD -MP -MF "$(DEPDIR)/xwd-clientwin.Tpo" -c -o xwd-clientwin.o `test -f 'clientwin.c' || echo '$(srcdir)/'`clientwin.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-clientwin.Tpo" "$(DEPDIR)/xwd-clientwin.Po"; else rm -f "$(DEPDIR)/xwd-clientwin.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clientwin.c' object='xwd-clientwin.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-clientwin.o `test -f 'clientwin.c' || echo '$(srcdir)/'`clientwin.c
xwd-clientwin.obj: clientwin.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-clientwin.obj -MD -MP -MF "$(DEPDIR)/xwd-clientwin.Tpo" -c -o xwd-clientwin.obj `if test -f 'clientwin.c'; then $(CYGPATH_W) 'clientwin.c'; else $(CYGPATH_W) '$(srcdir)/clientwin.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-clientwin.Tpo" "$(DEPDIR)/xwd-clientwin.Po"; else rm -f "$(DEPDIR)/xwd-clientwin.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clientwin.c' object='xwd-clientwin.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-clientwin.obj `if test -f 'clientwin.c'; then $(CYGPATH_W) 'clientwin.c'; else $(CYGPATH_W) '$(srcdir)/clientwin.c'; fi`
xwd-dsimple.o: dsimple.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-dsimple.o -MD -MP -MF "$(DEPDIR)/xwd-dsimple.Tpo" -c -o xwd-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-dsimple.Tpo" "$(DEPDIR)/xwd-dsimple.Po"; else rm -f "$(DEPDIR)/xwd-dsimple.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xwd-dsimple.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c
xwd-dsimple.obj: dsimple.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-dsimple.obj -MD -MP -MF "$(DEPDIR)/xwd-dsimple.Tpo" -c -o xwd-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-dsimple.Tpo" "$(DEPDIR)/xwd-dsimple.Po"; else rm -f "$(DEPDIR)/xwd-dsimple.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xwd-dsimple.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`
xwd-list.o: list.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-list.o -MD -MP -MF "$(DEPDIR)/xwd-list.Tpo" -c -o xwd-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-list.Tpo" "$(DEPDIR)/xwd-list.Po"; else rm -f "$(DEPDIR)/xwd-list.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='list.c' object='xwd-list.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c
xwd-list.obj: list.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-list.obj -MD -MP -MF "$(DEPDIR)/xwd-list.Tpo" -c -o xwd-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-list.Tpo" "$(DEPDIR)/xwd-list.Po"; else rm -f "$(DEPDIR)/xwd-list.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='list.c' object='xwd-list.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi`
xwd-multiVis.o: multiVis.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-multiVis.o -MD -MP -MF "$(DEPDIR)/xwd-multiVis.Tpo" -c -o xwd-multiVis.o `test -f 'multiVis.c' || echo '$(srcdir)/'`multiVis.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-multiVis.Tpo" "$(DEPDIR)/xwd-multiVis.Po"; else rm -f "$(DEPDIR)/xwd-multiVis.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='multiVis.c' object='xwd-multiVis.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-multiVis.o `test -f 'multiVis.c' || echo '$(srcdir)/'`multiVis.c
xwd-multiVis.obj: multiVis.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-multiVis.obj -MD -MP -MF "$(DEPDIR)/xwd-multiVis.Tpo" -c -o xwd-multiVis.obj `if test -f 'multiVis.c'; then $(CYGPATH_W) 'multiVis.c'; else $(CYGPATH_W) '$(srcdir)/multiVis.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-multiVis.Tpo" "$(DEPDIR)/xwd-multiVis.Po"; else rm -f "$(DEPDIR)/xwd-multiVis.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='multiVis.c' object='xwd-multiVis.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-multiVis.obj `if test -f 'multiVis.c'; then $(CYGPATH_W) 'multiVis.c'; else $(CYGPATH_W) '$(srcdir)/multiVis.c'; fi`
xwd-xwd.o: xwd.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-xwd.o -MD -MP -MF "$(DEPDIR)/xwd-xwd.Tpo" -c -o xwd-xwd.o `test -f 'xwd.c' || echo '$(srcdir)/'`xwd.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-xwd.Tpo" "$(DEPDIR)/xwd-xwd.Po"; else rm -f "$(DEPDIR)/xwd-xwd.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xwd.c' object='xwd-xwd.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-xwd.o `test -f 'xwd.c' || echo '$(srcdir)/'`xwd.c
xwd-xwd.obj: xwd.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -MT xwd-xwd.obj -MD -MP -MF "$(DEPDIR)/xwd-xwd.Tpo" -c -o xwd-xwd.obj `if test -f 'xwd.c'; then $(CYGPATH_W) 'xwd.c'; else $(CYGPATH_W) '$(srcdir)/xwd.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwd-xwd.Tpo" "$(DEPDIR)/xwd-xwd.Po"; else rm -f "$(DEPDIR)/xwd-xwd.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xwd.c' object='xwd-xwd.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwd_CFLAGS) $(CFLAGS) -c -o xwd-xwd.obj `if test -f 'xwd.c'; then $(CYGPATH_W) 'xwd.c'; else $(CYGPATH_W) '$(srcdir)/xwd.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@ -725,12 +665,12 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.

View File

@ -0,0 +1,25 @@
xwd - dump an image of an X window
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/xwd
http://cgit.freedesktop.org/xorg/app/xwd
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

166
app/xwd/aclocal.m4 vendored
View File

@ -740,34 +740,6 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 3
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
@ -1023,6 +995,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
@ -1059,27 +1032,24 @@ dnl of the copyright holder.
# your configure.ac with the minimum required version, such as:
# XORG_MACROS_VERSION(1.1)
#
# To force at least a version with this macro defined, also add:
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
# To ensure that this macro is defined, also add:
# m4_ifndef([XORG_MACROS_VERSION],
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
#
#
# See the "minimum version" comment for each macro you use to see what
# version you require.
AC_DEFUN([XORG_MACROS_VERSION],[
[XORG_MACROS_needed_version=$1
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.6
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
fi
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
fi
AC_MSG_RESULT([yes, $XORG_MACROS_version])
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.3.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
m4_if(m4_version_compare(vers_have, [$1]), -1,
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
m4_undefine([vers_have])
m4_undefine([maj_have])
m4_undefine([maj_needed])
]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
@ -1104,6 +1074,10 @@ else
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS=-undef
AC_MSG_RESULT([yes])
# under Cygwin unix is still defined even with -undef
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS="-undef -ansi"
AC_MSG_RESULT([yes, with -ansi])
else
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
fi
@ -1216,7 +1190,9 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
@ -1272,7 +1248,9 @@ AC_SUBST(MAKE_HTML)
# indicates whether the necessary tools and files are found and, if set,
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
AC_DEFUN([XORG_CHECK_DOCBOOK],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
BUILDTXTDOC=no
BUILDPDFDOC=no
@ -1338,7 +1316,7 @@ AC_SUBST(MAKE_HTML)
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
AC_ARG_ENABLE(malloc0returnsnull,
AC_HELP_STRING([--enable-malloc0returnsnull],
AS_HELP_STRING([--enable-malloc0returnsnull],
[malloc(0) returns NULL (default: auto)]),
[MALLOC_ZERO_RETURNS_NULL=$enableval],
[MALLOC_ZERO_RETURNS_NULL=auto])
@ -1390,7 +1368,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
AC_DEFUN([XORG_WITH_LINT],[
# Allow checking code with lint, sparse, etc.
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
[Use a lint-style source code checker (default: disabled)])],
[use_lint=$withval], [use_lint=no])
if test "x$use_lint" = "xyes" ; then
@ -1431,7 +1409,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
AC_DEFUN([XORG_LINT_LIBRARY],[
AC_REQUIRE([XORG_WITH_LINT])
# Build lint "library" for more indepth checks of programs calling this library
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
[Create lint library (default: disabled)])],
[make_lint_lib=$enableval], [make_lint_lib=no])
if test "x$make_lint_lib" != "xno" ; then
@ -1449,6 +1427,75 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
]) # XORG_LINT_LIBRARY
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
#
# Defines CWARNFLAGS to enable C compiler warnings.
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
-Wbad-function-cast"
case `$CC -dumpversion` in
3.4.* | 4.*)
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
;;
esac
else
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
fi
AC_SUBST(CWARNFLAGS)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
]) # XORG_CWARNFLAGS
# XORG_STRICT_OPTION
# -----------------------
# Minimum version: 1.3.0
#
# Add configure option to enable strict compilation
AC_DEFUN([XORG_STRICT_OPTION], [
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CC_C99])
AC_REQUIRE([XORG_CWARNFLAGS])
AC_ARG_ENABLE(strict-compilation,
AS_HELP_STRING([--enable-strict-compilation],
[Enable all warnings from compiler and make them errors (default: disabled)]),
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
if test "x$STRICT_COMPILE" = "xyes"; then
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
if test "x$GCC" = xyes ; then
STRICT_CFLAGS="-pedantic -Werror"
elif test "x$SUNCC" = "xyes"; then
STRICT_CFLAGS="-errwarn"
elif test "x$INTELCC" = "xyes"; then
STRICT_CFLAGS="-Werror"
fi
fi
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
AC_SUBST([CWARNFLAGS])
]) # XORG_STRICT_OPTION
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
#
# Defines default options for X.Org modules.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
XORG_CHANGELOG
XORG_MANPAGE_SECTIONS
]) # XORG_DEFAULT_OPTIONS
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -1483,7 +1530,7 @@ dnl
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
AC_HELP_STRING([--with-release-version=STRING],
AS_HELP_STRING([--with-release-version=STRING],
[Use release version string in package name]),
[RELEASE_VERSION="$withval"],
[RELEASE_VERSION=""])
@ -1511,3 +1558,20 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
[Patch version of this package])
])
# XORG_CHANGELOG()
# ----------------
# Minimum version: 1.2.0
#
# Defines the variable CHANGELOG_CMD as the command to generate
# ChangeLog from git.
#
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
#
AC_DEFUN([XORG_CHANGELOG], [
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
echo 'git directory not found: installing possibly empty changelog.' >&2)"
AC_SUBST([CHANGELOG_CMD])
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
]) # XORG_CHANGELOG

View File

@ -22,6 +22,8 @@
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include "clientwin.h"
static Atom atom_wm_state = None;
/*
@ -68,7 +70,7 @@ Window_Is_Viewable(Display * dpy, Window win)
* Children are searched in top-down stacking order.
* The first matching window is returned, None if no match is found.
*/
Window
static Window
Find_Client_In_Children(Display * dpy, Window win)
{
Window root, parent;
@ -114,7 +116,7 @@ Find_Client_In_Children(Display * dpy, Window win)
/*
* Find virtual roots (_NET_VIRTUAL_ROOTS)
*/
unsigned long *
static unsigned long *
Find_Roots(Display * dpy, Window root, unsigned int *num)
{
Atom type_ret;

View File

@ -1,142 +0,0 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@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, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# 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-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
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-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
eat=
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 -e 's|^.*/||' -e '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
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
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-end: "$"
# End:

View File

@ -1,7 +1,31 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
@ -30,5 +54,8 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION

6350
app/xwd/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -22,22 +22,25 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xwd,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwd)
AC_INIT(xwd, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwd)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XWD, x11)
AC_SUBST(XWD_CFLAGS)
AC_SUBST(XWD_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])

View File

@ -109,8 +109,7 @@ Display *Open_Display(const char *display_name)
if (d == NULL) {
fprintf (stderr, "%s: unable to open display '%s'\n",
program_name, XDisplayName (display_name));
usage ();
/* doesn't return */
exit(1);
}
return(d);

View File

@ -79,7 +79,7 @@ int add_to_list(list_ptr lp, void *item)
Creates a new list and sets its pointers to NULL.
Returns a pointer to the new list.
-------------------------------------------------------------------- **/
list_ptr new_list ()
list_ptr new_list (void)
{
list_ptr lp;

View File

@ -170,8 +170,7 @@ static void destroy_image_region(
/* End of Prototype Declarations */
void initFakeVisual(Vis)
Visual *Vis ;
void initFakeVisual(Visual *Vis)
{
Vis->ext_data=NULL;
Vis->class = DirectColor ;
@ -183,12 +182,8 @@ Visual *Vis ;
}
static int
QueryColorMap(disp,src_cmap,src_vis,src_colors,rShift,gShift,bShift)
Display *disp ;
Visual *src_vis ;
Colormap src_cmap ;
XColor **src_colors ;
int *rShift, *gShift, *bShift;
QueryColorMap(Display *disp, Colormap src_cmap, Visual *src_vis,
XColor **src_colors, int *rShift, int *gShift, int *bShift)
{
int ncolors,i ;
unsigned long redMask, greenMask, blueMask;
@ -246,25 +241,20 @@ int *rShift, *gShift, *bShift;
}
int
GetMultiVisualRegions(disp,srcRootWinid, x, y, width, height,
transparentOverlays,numVisuals, pVisuals,numOverlayVisuals, pOverlayVisuals,
numImageVisuals, pImageVisuals,vis_regions,vis_image_regions,allImage)
Display *disp;
Window srcRootWinid; /* root win on which grab was done */
int x; /* root rel UL corner of bounding box of grab */
int y;
unsigned int width; /* size of bounding box of grab */
unsigned int height;
int *transparentOverlays ;
int *numVisuals;
XVisualInfo **pVisuals;
int *numOverlayVisuals;
OverlayInfo **pOverlayVisuals;
int *numImageVisuals;
XVisualInfo ***pImageVisuals;
list_ptr *vis_regions; /* list of regions to read from */
list_ptr *vis_image_regions ;
int *allImage ;
GetMultiVisualRegions(Display *disp,
/* root win on which grab was done */
Window srcRootWinid,
/* root rel UL corner of bounding box of grab */
int x, int y,
/* size of bounding box of grab */
unsigned int width, unsigned int height,
int *transparentOverlays, int *numVisuals,
XVisualInfo **pVisuals, int *numOverlayVisuals,
OverlayInfo **pOverlayVisuals,
int *numImageVisuals, XVisualInfo ***pImageVisuals,
/* list of regions to read from */
list_ptr *vis_regions,
list_ptr *vis_image_regions, int *allImage)
{
int hasNonDefault;
XRectangle bbox; /* bounding box of grabbed area */
@ -304,12 +294,10 @@ GetMultiVisualRegions(disp,srcRootWinid, x, y, width, height,
}
static void TransferImage(disp,reg_image,srcw,srch,reg,
target_image,dst_x,dst_y)
Display *disp;
XImage *reg_image,*target_image ;
image_region_type *reg;
int srcw,srch,dst_x , dst_y ;
static void TransferImage(Display *disp, XImage *reg_image,
int srcw, int srch,
image_region_type *reg, XImage *target_image,
int dst_x, int dst_y)
{
int i,j,old_pixel,new_pixel,red_ind,green_ind,blue_ind ;
XColor *colors;
@ -388,13 +376,10 @@ int srcw,srch,dst_x , dst_y ;
}
static XImage *
ReadRegionsInList(disp,fakeVis,depth,format,width,height,bbox,regions)
Display *disp ;
Visual *fakeVis ;
int depth , width , height ;
int format ;
XRectangle bbox; /* bounding box of grabbed area */
list_ptr regions;/* list of regions to read from */
ReadRegionsInList(Display *disp, Visual *fakeVis, int depth, int format,
int width,int height,
XRectangle bbox, /* bounding box of grabbed area */
list_ptr regions) /* list of regions to read from */
{
image_region_type *reg;
int dst_x, dst_y; /* where in pixmap to write (UL) */
@ -471,26 +456,21 @@ list_ptr regions;/* list of regions to read from */
/** ------------------------------------------------------------------------
------------------------------------------------------------------------ **/
XImage *ReadAreaToImage(disp, srcRootWinid, x, y, width, height,
numVisuals,pVisuals,numOverlayVisuals,pOverlayVisuals,numImageVisuals,
pImageVisuals,vis_regions,vis_image_regions,format,allImage)
Display *disp;
Window srcRootWinid; /* root win on which grab was done */
int x; /* root rel UL corner of bounding box of grab */
int y;
unsigned int width; /* size of bounding box of grab */
unsigned int height;
/** int transparentOverlays; ***/
int numVisuals;
XVisualInfo *pVisuals;
int numOverlayVisuals;
OverlayInfo *pOverlayVisuals;
int numImageVisuals;
XVisualInfo **pImageVisuals;
list_ptr vis_regions; /* list of regions to read from */
list_ptr vis_image_regions ;/* list of regions to read from */
int format;
int allImage ;
XImage *ReadAreaToImage(Display *disp,
/* root win on which grab was done */
Window srcRootWinid,
/* root rel UL corner of bounding box of grab */
int x, int y,
/* size of bounding box of grab */
unsigned int width, unsigned int height,
int numVisuals, XVisualInfo *pVisuals,
int numOverlayVisuals, OverlayInfo *pOverlayVisuals,
int numImageVisuals, XVisualInfo **pImageVisuals,
/* list of regions to read from */
list_ptr vis_regions,
/* list of regions to read from */
list_ptr vis_image_regions,
int format, int allImage)
{
image_region_type *reg;
XRectangle bbox; /* bounding box of grabbed area */
@ -664,17 +644,15 @@ XImage *ReadAreaToImage(disp, srcRootWinid, x, y, width, height,
image_wins must point to an existing list struct that's already
been zeroed (zero_list()).
------------------------------------------------------------------------ **/
static void make_src_list( disp, image_wins, bbox, curr, x_rootrel, y_rootrel,
curr_attrs, pclip)
Display *disp;
list_ptr image_wins;
XRectangle *bbox; /* bnding box of area we want */
Window curr;
int x_rootrel; /* pos of curr WRT root */
int y_rootrel;
XWindowAttributes *curr_attrs;
XRectangle *pclip; /* visible part of curr, not */
/* obscurred by ancestors */
static void make_src_list(Display *disp, list_ptr image_wins,
/* bnding box of area we want */
XRectangle *bbox,
Window curr,
/* pos of curr WRT root */
int x_rootrel, int y_rootrel,
XWindowAttributes *curr_attrs,
/* visible part of curr, not obscurred by ancestors */
XRectangle *pclip)
{
XWindowAttributes child_attrs;
Window root, parent, *child; /* variables for XQueryTree() */
@ -760,15 +738,9 @@ static void make_src_list( disp, image_wins, bbox, curr, x_rootrel, y_rootrel,
there will be two regions in the list.
Returns a pointer to the list.
------------------------------------------------------------------------ **/
static list_ptr make_region_list( disp, win, bbox, hasNonDefault,
numImageVisuals, pImageVisuals, allImage)
Display *disp;
Window win;
XRectangle *bbox;
int *hasNonDefault;
int numImageVisuals;
XVisualInfo **pImageVisuals;
int *allImage;
static list_ptr make_region_list(Display *disp, Window win, XRectangle *bbox,
int *hasNonDefault, int numImageVisuals,
XVisualInfo **pImageVisuals, int *allImage)
{
XWindowAttributes win_attrs;
list image_wins;
@ -863,8 +835,7 @@ static list_ptr make_region_list( disp, win, bbox, hasNonDefault,
/** ------------------------------------------------------------------------
Destructor called from destroy_region_list().
------------------------------------------------------------------------ **/
static void destroy_image_region(image_region)
image_region_type *image_region;
static void destroy_image_region(image_region_type *image_region)
{
XDestroyRegion( image_region->visible_region);
free( (void *) image_region);
@ -873,8 +844,7 @@ static void destroy_image_region(image_region)
/** ------------------------------------------------------------------------
Destroys the region list, destroying all the regions contained in it.
------------------------------------------------------------------------ **/
static void destroy_region_list( rlist)
list_ptr rlist;
static void destroy_region_list(list_ptr rlist)
{
delete_list_destroying( rlist, (DESTRUCT_FUNC_PTR)destroy_image_region);
}
@ -886,12 +856,8 @@ static void destroy_region_list( rlist)
only provides a way to subtract one region from another, not a
rectangle from a region.
------------------------------------------------------------------------ **/
static void subtr_rect_from_image_region( image_region, x, y, width, height)
image_region_type *image_region;
int x;
int y;
int width;
int height;
static void subtr_rect_from_image_region(image_region_type *image_region,
int x, int y, int width, int height)
{
XRectangle rect;
Region rect_region;
@ -911,12 +877,8 @@ static void subtr_rect_from_image_region( image_region, x, y, width, height)
/** ------------------------------------------------------------------------
Adds the specified rectangle to the region in image_region.
------------------------------------------------------------------------ **/
static void add_rect_to_image_region( image_region, x, y, width, height)
image_region_type *image_region;
int x;
int y;
int width;
int height;
static void add_rect_to_image_region(image_region_type *image_region,
int x, int y, int width, int height)
{
XRectangle rect;
@ -933,9 +895,7 @@ static void add_rect_to_image_region( image_region, x, y, width, height)
Returns TRUE if the given src's visual is already represented in
the image_regions list, FALSE otherwise.
------------------------------------------------------------------------ **/
static int src_in_region_list( src, image_regions)
image_win_type *src;
list_ptr image_regions;
static int src_in_region_list(image_win_type *src, list_ptr image_regions)
{
image_region_type *ir;
@ -954,20 +914,10 @@ static int src_in_region_list( src, image_regions)
/** ------------------------------------------------------------------------
Makes a new entry in image_wins with the given fields filled in.
------------------------------------------------------------------------ **/
static void add_window_to_list( image_wins, w, xrr, yrr, x_vis, y_vis,
width, height, border_width,vis, cmap, parent)
list_ptr image_wins;
Window w;
int xrr;
int yrr;
int x_vis;
int y_vis;
int width;
int height;
int border_width;
Visual *vis;
Colormap cmap;
Window parent;
static void add_window_to_list(list_ptr image_wins, Window w,
int xrr, int yrr, int x_vis, int y_vis,
int width, int height, int border_width,
Visual *vis, Colormap cmap, Window parent)
{
image_win_type *new_src;
@ -993,10 +943,8 @@ static void add_window_to_list( image_wins, w, xrr, yrr, x_vis, y_vis,
Returns TRUE if the given src's visual is in the image planes,
FALSE otherwise.
------------------------------------------------------------------------ **/
static int src_in_image( src, numImageVisuals, pImageVisuals)
image_win_type *src;
int numImageVisuals;
XVisualInfo **pImageVisuals;
static int src_in_image(image_win_type *src, int numImageVisuals,
XVisualInfo **pImageVisuals)
{
int i;
@ -1013,13 +961,9 @@ static int src_in_image( src, numImageVisuals, pImageVisuals)
Returns TRUE if the given src's visual is in the overlay planes
and transparency is possible, FALSE otherwise.
------------------------------------------------------------------------ **/
static int src_in_overlay( src, numOverlayVisuals, pOverlayVisuals,
transparentColor, transparentType)
image_region_type *src;
int numOverlayVisuals;
OverlayInfo *pOverlayVisuals;
int *transparentColor;
int *transparentType;
static int src_in_overlay(image_region_type *src, int numOverlayVisuals,
OverlayInfo *pOverlayVisuals,
int *transparentColor, int *transparentType)
{
int i;
@ -1087,29 +1031,27 @@ static int weCreateServerOverlayVisualsProperty = False;
*
******************************************************************************/
int GetXVisualInfo(display, screen, transparentOverlays,
numVisuals, pVisuals,
numOverlayVisuals, pOverlayVisuals,
numImageVisuals, pImageVisuals)
Display *display; /* Which X server (aka "display"). */
int screen; /* Which screen of the "display". */
int *transparentOverlays; /* Non-zero if there's at least one
* overlay visual and if at least one
* of those supports a transparent
* pixel. */
int *numVisuals; /* Number of XVisualInfo struct's
* pointed to to by pVisuals. */
XVisualInfo **pVisuals; /* All of the device's visuals. */
int *numOverlayVisuals; /* Number of OverlayInfo's pointed
* to by pOverlayVisuals. If this
* number is zero, the device does
* not have overlay planes. */
OverlayInfo **pOverlayVisuals; /* The device's overlay plane visual
* information. */
int *numImageVisuals; /* Number of XVisualInfo's pointed
* to by pImageVisuals. */
XVisualInfo ***pImageVisuals; /* The device's image visuals. */
int GetXVisualInfo(/* Which X server (aka "display"). */
Display *display,
/* Which screen of the "display". */
int screen,
/* Non-zero if there's at least one overlay visual and
* if at least one of those supports a transparent pixel. */
int *transparentOverlays,
/* Number of XVisualInfo struct's pointed to by pVisuals. */
int *numVisuals,
/* All of the device's visuals. */
XVisualInfo **pVisuals,
/* Number of OverlayInfo's pointed to by pOverlayVisuals.
* If this number is zero, the device does not have
* overlay planes. */
int *numOverlayVisuals,
/* The device's overlay plane visual information. */
OverlayInfo **pOverlayVisuals,
/* Number of XVisualInfo's pointed to by pImageVisuals. */
int *numImageVisuals,
/* The device's image visuals. */
XVisualInfo ***pImageVisuals)
{
XVisualInfo getVisInfo; /* Paramters of XGetVisualInfo */
int mask;
@ -1221,11 +1163,8 @@ int GetXVisualInfo(display, screen, transparentOverlays,
*
******************************************************************************/
void FreeXVisualInfo(pVisuals, pOverlayVisuals, pImageVisuals)
XVisualInfo *pVisuals;
OverlayInfo *pOverlayVisuals;
XVisualInfo **pImageVisuals;
void FreeXVisualInfo(XVisualInfo *pVisuals, OverlayInfo *pOverlayVisuals,
XVisualInfo **pImageVisuals)
{
XFree(pVisuals);
if (weCreateServerOverlayVisualsProperty)

View File

@ -91,14 +91,14 @@ typedef unsigned long Pixel;
/* Setable Options */
int format = ZPixmap;
Bool nobdrs = False;
Bool on_root = False;
Bool standard_out = True;
Bool debug = False;
Bool silent = False;
Bool use_installed = False;
long add_pixel_value = 0;
static int format = ZPixmap;
static Bool nobdrs = False;
static Bool on_root = False;
static Bool standard_out = True;
static Bool debug = False;
static Bool silent = False;
static Bool use_installed = False;
static long add_pixel_value = 0;
extern int main(int, char **);
@ -112,8 +112,7 @@ static int Get24bitDirectColors(XColor **);
static int ReadColors(Visual *, Colormap, XColor **);
static long parse_long (s)
char *s;
static long parse_long (char *s)
{
char *fmt = "%lu";
long retval = 0L;
@ -129,9 +128,7 @@ static long parse_long (s)
}
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
register int i;
Window target_win;
@ -215,8 +212,7 @@ main(argc, argv)
}
static int
Get24bitDirectColors(colors)
XColor **colors ;
Get24bitDirectColors(XColor **colors)
{
int i , ncolors = 256 ;
XColor *tcol ;
@ -239,9 +235,7 @@ XColor **colors ;
*/
void
Window_Dump(window, out)
Window window;
FILE *out;
Window_Dump(Window window, FILE *out)
{
unsigned long swaptest = 1;
XColor *colors;
@ -515,7 +509,7 @@ Window_Dump(window, out)
* Report the syntax for calling xwd.
*/
void
usage()
usage(void)
{
fprintf (stderr,
"usage: %s [-display host:dpy] [-debug] [-help] %s [-nobdrs] [-out <file>]",
@ -529,8 +523,7 @@ usage()
* Determine the pixmap size.
*/
int Image_Size(image)
XImage *image;
int Image_Size(XImage *image)
{
if (image->format != ZPixmap)
return(image->bytes_per_line * image->height * image->depth);
@ -541,10 +534,7 @@ int Image_Size(image)
#define lowbit(x) ((x) & (~(x) + 1))
static int
ReadColors(vis,cmap,colors)
Visual *vis ;
Colormap cmap ;
XColor **colors ;
ReadColors(Visual *vis, Colormap cmap, XColor **colors)
{
int i,ncolors ;
@ -589,9 +579,7 @@ XColor **colors ;
/*
* Get the XColors of all pixels in image - returns # of colors
*/
int Get_XColors(win_info, colors)
XWindowAttributes *win_info;
XColor **colors;
int Get_XColors(XWindowAttributes *win_info, XColor **colors)
{
int i, ncolors;
Colormap cmap = win_info->colormap;
@ -606,9 +594,7 @@ int Get_XColors(win_info, colors)
}
void
_swapshort (bp, n)
register char *bp;
register unsigned n;
_swapshort (register char *bp, register unsigned n)
{
register char c;
register char *ep = bp + n;
@ -622,9 +608,7 @@ _swapshort (bp, n)
}
void
_swaplong (bp, n)
register char *bp;
register unsigned n;
_swaplong (register char *bp, register unsigned n)
{
register char c;
register char *ep = bp + n;