qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to editres 1.0.4

Browse Source
This commit is contained in:
matthieu 2010-05-31 19:33:38 +00:00
parent c91db26221
commit 4783a13dfe
23 changed files with 4747 additions and 3450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/editres/AUTHORS
View File

@ -0,0 +1 @@
Chris D. Peterson, MIT X Consortium

74
app/editres/ChangeLog
View File

@ -1,3 +1,77 @@
commit aebe52fd87925353c687fbd26c5547410d4b96c1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 22 20:05:21 2009 -0700
editres 1.0.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit e919068b70411167e3f239ad32d1fd4ad2a0c10d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 22 20:05:04 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 086d2257cc5ad59f1e2aa7362a912e4855edc4be
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 22 20:04:19 2009 -0700
Fill in AUTHORS & README
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit b86d1b71813cfa582aa28356ee6a2196a67ba8d4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Jan 12 17:32:36 2009 -0200
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
commit 82c17cd232a016f0c552f38453774abfb0bf17fe
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Aug 20 10:32:48 2008 -0400
xaw8 is gone, use xaw7
commit 332e17ae6ebec0dbb7c13d63dd4758cb2979bcdc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 16 14:20:03 2008 +0200
$(builddir) is the current directory
Apparently automake doesn't always export the builddir variable.
This fixes my previous commit.
commit 3b8c583e5a3d8733419cf5517d22b40f31c93e4c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 19:41:13 2008 +0200
Fix build with builddir != srcdir
commit a0e6c84ab34146b71c1b52b10452987ba1cc869a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 20:07:29 2008 -0700
Build fix for file systems that are not case sensitive
commit 724c09e17dde32d5713388d6e9de0ad3fc004870
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:04 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
commit 4c6a0418e2499f01a1b2ef06bdec77ef208fe15b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:16:43 2007 -0700
Change editres_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Makefile.am:27: compiling `actions.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
commit 960a84a735daedd7b4df009c46d2f8a751335676
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 23 17:00:54 2007 -0800

28
app/editres/Makefile.am
View File

@ -21,7 +21,7 @@
bin_PROGRAMS = editres
editres_CFLAGS = $(EDITRES_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(EDITRES_CFLAGS)
editres_LDADD = $(EDITRES_LIBS)
editres_SOURCES = \
@ -42,26 +42,22 @@ appman_PRE = \
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
APPDEFAULTFILES = \
Editres-color \
Editres
dist_appdefault_DATA = \
app-defaults/Editres-color \
app-defaults/Editres
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh
EXTRA_DIST = ChangeLog autogen.sh
SUFFIXES = .ad
.ad:
cp $< $@
appdefault_DATA = $(APPDEFAULTFILES)
CLEANFILES = $(APPDEFAULTFILES)
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
@ -70,7 +66,7 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
CLEANFILES = $(appman_DATA)
SED = sed
@ -91,7 +87,7 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES += .$(APP_MAN_SUFFIX) .man
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@

296
app/editres/Makefile.in
View File

@ -59,10 +59,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = editres$(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
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS config.guess config.sub depcomp \
install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -73,15 +74,14 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
"$(DESTDIR)$(appmandir)"
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
"$(DESTDIR)$(appdefaultdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_editres_OBJECTS = editres-actions.$(OBJEXT) editres-comm.$(OBJEXT) \
editres-editres.$(OBJEXT) editres-geometry.$(OBJEXT) \
editres-handler.$(OBJEXT) editres-setvalues.$(OBJEXT) \
editres-svpopup.$(OBJEXT) editres-utils.$(OBJEXT) \
editres-widgets.$(OBJEXT) editres-wtree.$(OBJEXT)
am_editres_OBJECTS = actions.$(OBJEXT) comm.$(OBJEXT) \
editres.$(OBJEXT) geometry.$(OBJEXT) handler.$(OBJEXT) \
setvalues.$(OBJEXT) svpopup.$(OBJEXT) utils.$(OBJEXT) \
widgets.$(OBJEXT) wtree.$(OBJEXT)
editres_OBJECTS = $(am_editres_OBJECTS)
am__DEPENDENCIES_1 =
editres_DEPENDENCIES = $(am__DEPENDENCIES_1)
@ -100,9 +100,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
appdefaultDATA_INSTALL = $(INSTALL_DATA)
appmanDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appdefault_DATA) $(appman_DATA)
dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appman_DATA) $(dist_appdefault_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -115,7 +115,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@
@ -133,7 +132,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@
@ -144,9 +146,11 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EDITRES_CFLAGS = @EDITRES_CFLAGS@
EDITRES_LIBS = @EDITRES_LIBS@
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@
@ -175,14 +179,10 @@ PKG_CONFIG = @PKG_CONFIG@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TMP_XAW_CFLAGS = @TMP_XAW_CFLAGS@
TMP_XAW_LIBS = @TMP_XAW_LIBS@
VERSION = @VERSION@
XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
XAW_CFLAGS = @XAW_CFLAGS@
XAW_LIBS = @XAW_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@
@ -190,8 +190,6 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
# App default files (*.ad)
appdefaultdir = @appdefaultdir@
bindir = @bindir@
build = @build@
@ -200,28 +198,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@
editres_CFLAGS = $(EDITRES_CFLAGS)
AM_CFLAGS = $(CWARNFLAGS) $(EDITRES_CFLAGS)
editres_LDADD = $(EDITRES_LIBS)
editres_SOURCES = \
actions.c \
@ -239,18 +245,18 @@ editres_SOURCES = \
appman_PRE = \
editres.man
APPDEFAULTFILES = \
Editres-color \
Editres
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh \
$(appman_PRE)
SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
appdefault_DATA = $(APPDEFAULTFILES)
CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
dist_appdefault_DATA = \
app-defaults/Editres-color \
app-defaults/Editres
EXTRA_DIST = ChangeLog autogen.sh $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
CLEANFILES = $(appman_DATA)
SED = sed
# Strings to replace in man pages
@ -269,11 +275,12 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@ -357,16 +364,16 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-actions.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-comm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-editres.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-geometry.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-handler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-setvalues.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-svpopup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-utils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-widgets.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres-wtree.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editres.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geometry.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setvalues.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svpopup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wtree.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -381,164 +388,7 @@ 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) '$<'`
editres-actions.o: actions.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-actions.o -MD -MP -MF "$(DEPDIR)/editres-actions.Tpo" -c -o editres-actions.o `test -f 'actions.c' || echo '$(srcdir)/'`actions.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-actions.Tpo" "$(DEPDIR)/editres-actions.Po"; else rm -f "$(DEPDIR)/editres-actions.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actions.c' object='editres-actions.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-actions.o `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
editres-actions.obj: actions.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-actions.obj -MD -MP -MF "$(DEPDIR)/editres-actions.Tpo" -c -o editres-actions.obj `if test -f 'actions.c'; then $(CYGPATH_W) 'actions.c'; else $(CYGPATH_W) '$(srcdir)/actions.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-actions.Tpo" "$(DEPDIR)/editres-actions.Po"; else rm -f "$(DEPDIR)/editres-actions.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='actions.c' object='editres-actions.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-actions.obj `if test -f 'actions.c'; then $(CYGPATH_W) 'actions.c'; else $(CYGPATH_W) '$(srcdir)/actions.c'; fi`
editres-comm.o: comm.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-comm.o -MD -MP -MF "$(DEPDIR)/editres-comm.Tpo" -c -o editres-comm.o `test -f 'comm.c' || echo '$(srcdir)/'`comm.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-comm.Tpo" "$(DEPDIR)/editres-comm.Po"; else rm -f "$(DEPDIR)/editres-comm.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comm.c' object='editres-comm.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-comm.o `test -f 'comm.c' || echo '$(srcdir)/'`comm.c
editres-comm.obj: comm.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-comm.obj -MD -MP -MF "$(DEPDIR)/editres-comm.Tpo" -c -o editres-comm.obj `if test -f 'comm.c'; then $(CYGPATH_W) 'comm.c'; else $(CYGPATH_W) '$(srcdir)/comm.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-comm.Tpo" "$(DEPDIR)/editres-comm.Po"; else rm -f "$(DEPDIR)/editres-comm.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='comm.c' object='editres-comm.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-comm.obj `if test -f 'comm.c'; then $(CYGPATH_W) 'comm.c'; else $(CYGPATH_W) '$(srcdir)/comm.c'; fi`
editres-editres.o: editres.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-editres.o -MD -MP -MF "$(DEPDIR)/editres-editres.Tpo" -c -o editres-editres.o `test -f 'editres.c' || echo '$(srcdir)/'`editres.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-editres.Tpo" "$(DEPDIR)/editres-editres.Po"; else rm -f "$(DEPDIR)/editres-editres.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='editres.c' object='editres-editres.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-editres.o `test -f 'editres.c' || echo '$(srcdir)/'`editres.c
editres-editres.obj: editres.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-editres.obj -MD -MP -MF "$(DEPDIR)/editres-editres.Tpo" -c -o editres-editres.obj `if test -f 'editres.c'; then $(CYGPATH_W) 'editres.c'; else $(CYGPATH_W) '$(srcdir)/editres.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-editres.Tpo" "$(DEPDIR)/editres-editres.Po"; else rm -f "$(DEPDIR)/editres-editres.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='editres.c' object='editres-editres.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-editres.obj `if test -f 'editres.c'; then $(CYGPATH_W) 'editres.c'; else $(CYGPATH_W) '$(srcdir)/editres.c'; fi`
editres-geometry.o: geometry.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-geometry.o -MD -MP -MF "$(DEPDIR)/editres-geometry.Tpo" -c -o editres-geometry.o `test -f 'geometry.c' || echo '$(srcdir)/'`geometry.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-geometry.Tpo" "$(DEPDIR)/editres-geometry.Po"; else rm -f "$(DEPDIR)/editres-geometry.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='geometry.c' object='editres-geometry.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-geometry.o `test -f 'geometry.c' || echo '$(srcdir)/'`geometry.c
editres-geometry.obj: geometry.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-geometry.obj -MD -MP -MF "$(DEPDIR)/editres-geometry.Tpo" -c -o editres-geometry.obj `if test -f 'geometry.c'; then $(CYGPATH_W) 'geometry.c'; else $(CYGPATH_W) '$(srcdir)/geometry.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-geometry.Tpo" "$(DEPDIR)/editres-geometry.Po"; else rm -f "$(DEPDIR)/editres-geometry.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='geometry.c' object='editres-geometry.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-geometry.obj `if test -f 'geometry.c'; then $(CYGPATH_W) 'geometry.c'; else $(CYGPATH_W) '$(srcdir)/geometry.c'; fi`
editres-handler.o: handler.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-handler.o -MD -MP -MF "$(DEPDIR)/editres-handler.Tpo" -c -o editres-handler.o `test -f 'handler.c' || echo '$(srcdir)/'`handler.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-handler.Tpo" "$(DEPDIR)/editres-handler.Po"; else rm -f "$(DEPDIR)/editres-handler.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='handler.c' object='editres-handler.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-handler.o `test -f 'handler.c' || echo '$(srcdir)/'`handler.c
editres-handler.obj: handler.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-handler.obj -MD -MP -MF "$(DEPDIR)/editres-handler.Tpo" -c -o editres-handler.obj `if test -f 'handler.c'; then $(CYGPATH_W) 'handler.c'; else $(CYGPATH_W) '$(srcdir)/handler.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-handler.Tpo" "$(DEPDIR)/editres-handler.Po"; else rm -f "$(DEPDIR)/editres-handler.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='handler.c' object='editres-handler.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-handler.obj `if test -f 'handler.c'; then $(CYGPATH_W) 'handler.c'; else $(CYGPATH_W) '$(srcdir)/handler.c'; fi`
editres-setvalues.o: setvalues.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-setvalues.o -MD -MP -MF "$(DEPDIR)/editres-setvalues.Tpo" -c -o editres-setvalues.o `test -f 'setvalues.c' || echo '$(srcdir)/'`setvalues.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-setvalues.Tpo" "$(DEPDIR)/editres-setvalues.Po"; else rm -f "$(DEPDIR)/editres-setvalues.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='setvalues.c' object='editres-setvalues.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-setvalues.o `test -f 'setvalues.c' || echo '$(srcdir)/'`setvalues.c
editres-setvalues.obj: setvalues.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-setvalues.obj -MD -MP -MF "$(DEPDIR)/editres-setvalues.Tpo" -c -o editres-setvalues.obj `if test -f 'setvalues.c'; then $(CYGPATH_W) 'setvalues.c'; else $(CYGPATH_W) '$(srcdir)/setvalues.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-setvalues.Tpo" "$(DEPDIR)/editres-setvalues.Po"; else rm -f "$(DEPDIR)/editres-setvalues.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='setvalues.c' object='editres-setvalues.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-setvalues.obj `if test -f 'setvalues.c'; then $(CYGPATH_W) 'setvalues.c'; else $(CYGPATH_W) '$(srcdir)/setvalues.c'; fi`
editres-svpopup.o: svpopup.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-svpopup.o -MD -MP -MF "$(DEPDIR)/editres-svpopup.Tpo" -c -o editres-svpopup.o `test -f 'svpopup.c' || echo '$(srcdir)/'`svpopup.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-svpopup.Tpo" "$(DEPDIR)/editres-svpopup.Po"; else rm -f "$(DEPDIR)/editres-svpopup.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='svpopup.c' object='editres-svpopup.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-svpopup.o `test -f 'svpopup.c' || echo '$(srcdir)/'`svpopup.c
editres-svpopup.obj: svpopup.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-svpopup.obj -MD -MP -MF "$(DEPDIR)/editres-svpopup.Tpo" -c -o editres-svpopup.obj `if test -f 'svpopup.c'; then $(CYGPATH_W) 'svpopup.c'; else $(CYGPATH_W) '$(srcdir)/svpopup.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-svpopup.Tpo" "$(DEPDIR)/editres-svpopup.Po"; else rm -f "$(DEPDIR)/editres-svpopup.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='svpopup.c' object='editres-svpopup.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-svpopup.obj `if test -f 'svpopup.c'; then $(CYGPATH_W) 'svpopup.c'; else $(CYGPATH_W) '$(srcdir)/svpopup.c'; fi`
editres-utils.o: utils.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-utils.o -MD -MP -MF "$(DEPDIR)/editres-utils.Tpo" -c -o editres-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-utils.Tpo" "$(DEPDIR)/editres-utils.Po"; else rm -f "$(DEPDIR)/editres-utils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='editres-utils.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
editres-utils.obj: utils.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-utils.obj -MD -MP -MF "$(DEPDIR)/editres-utils.Tpo" -c -o editres-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-utils.Tpo" "$(DEPDIR)/editres-utils.Po"; else rm -f "$(DEPDIR)/editres-utils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='editres-utils.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`
editres-widgets.o: widgets.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-widgets.o -MD -MP -MF "$(DEPDIR)/editres-widgets.Tpo" -c -o editres-widgets.o `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-widgets.Tpo" "$(DEPDIR)/editres-widgets.Po"; else rm -f "$(DEPDIR)/editres-widgets.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widgets.c' object='editres-widgets.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-widgets.o `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
editres-widgets.obj: widgets.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-widgets.obj -MD -MP -MF "$(DEPDIR)/editres-widgets.Tpo" -c -o editres-widgets.obj `if test -f 'widgets.c'; then $(CYGPATH_W) 'widgets.c'; else $(CYGPATH_W) '$(srcdir)/widgets.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-widgets.Tpo" "$(DEPDIR)/editres-widgets.Po"; else rm -f "$(DEPDIR)/editres-widgets.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='widgets.c' object='editres-widgets.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-widgets.obj `if test -f 'widgets.c'; then $(CYGPATH_W) 'widgets.c'; else $(CYGPATH_W) '$(srcdir)/widgets.c'; fi`
editres-wtree.o: wtree.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-wtree.o -MD -MP -MF "$(DEPDIR)/editres-wtree.Tpo" -c -o editres-wtree.o `test -f 'wtree.c' || echo '$(srcdir)/'`wtree.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-wtree.Tpo" "$(DEPDIR)/editres-wtree.Po"; else rm -f "$(DEPDIR)/editres-wtree.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wtree.c' object='editres-wtree.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-wtree.o `test -f 'wtree.c' || echo '$(srcdir)/'`wtree.c
editres-wtree.obj: wtree.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(editres_CFLAGS) $(CFLAGS) -MT editres-wtree.obj -MD -MP -MF "$(DEPDIR)/editres-wtree.Tpo" -c -o editres-wtree.obj `if test -f 'wtree.c'; then $(CYGPATH_W) 'wtree.c'; else $(CYGPATH_W) '$(srcdir)/wtree.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/editres-wtree.Tpo" "$(DEPDIR)/editres-wtree.Po"; else rm -f "$(DEPDIR)/editres-wtree.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wtree.c' object='editres-wtree.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) $(editres_CFLAGS) $(CFLAGS) -c -o editres-wtree.obj `if test -f 'wtree.c'; then $(CYGPATH_W) 'wtree.c'; else $(CYGPATH_W) '$(srcdir)/wtree.c'; fi`
uninstall-info-am:
install-appdefaultDATA: $(appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
@list='$(appdefault_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
$(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
uninstall-appdefaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(appdefault_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@ -556,6 +406,23 @@ uninstall-appmanDATA:
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
done
install-dist_appdefaultDATA: $(dist_appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
$(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
uninstall-dist_appdefaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -608,6 +475,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/app-defaults
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@ -738,7 +606,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)"; do \
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@ -788,7 +656,7 @@ info: info-am
info-am:
install-data-am: install-appdefaultDATA install-appmanDATA
install-data-am: install-appmanDATA install-dist_appdefaultDATA
install-exec-am: install-binPROGRAMS
@ -817,8 +685,8 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-info-am
uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-dist_appdefaultDATA uninstall-info-am
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
@ -826,21 +694,21 @@ uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-info-am
install-appmanDATA install-binPROGRAMS install-data \
install-data-am install-dist_appdefaultDATA install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
uninstall-info-am
.ad:
cp $< $@
.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

25
app/editres/README
View File

@ -10,3 +10,28 @@ module, but if you have not included that module into your library you
will need to edit the makefile to make sure that editres links in this
file.
------------------------------------------------------------
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/editres
http://cgit.freedesktop.org/xorg/app/editres
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

214
app/editres/aclocal.m4 vendored
View File

@ -995,72 +995,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation.
dnl
dnl The above copyright notice and this permission notice shall be included
dnl in all copies or substantial portions of the Software.
dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
dnl OTHER DEALINGS IN THE SOFTWARE.
dnl
dnl Except as contained in this notice, the name of the copyright holders shall
dnl not be used in advertising or otherwise to promote the sale, use or
dnl other dealings in this Software without prior written authorization
dnl from the copyright holders.
dnl
# XAW_CHECK_XPRINT_SUPPORT()
# --------------------------
# Adds --enable/disable-xprint and selects the appropriate version of the Xaw
# library. If neither --enable-xprint nor --disable-xprint are given,
# the presence of an Xaw with Xprint support will be auto detected
AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
[use_xprint=$enableval],[use_xprint=auto])
if test "x$use_xprint" = "xyes"; then
TMP_CHECK1=xaw8
TMP_CHECK2=
xaw_use_xprint=yes
elif test "x$use_xprint" = "xno"; then
TMP_CHECK1=xaw7
TMP_CHECK2=
xaw_use_xprint=no
else
TMP_CHECK1=xaw8
TMP_CHECK2=xaw7
xaw_use_xprint=yes
fi
PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
if [[ ! -z $TMP_CHECK2 ]] ; then
if test $success = no ; then
PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
xaw_use_xprint=no
fi
fi
if test "x$success" = "xyes"; then
$1_CFLAGS=$TMP_XAW_CFLAGS
$1_LIBS=$TMP_XAW_LIBS
AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
else
AC_MSG_ERROR([No suitable version of Xaw found])
fi
])
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
@ -1097,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.5
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()
@ -1142,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
@ -1254,10 +1190,16 @@ 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=
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@ -1306,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
@ -1372,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])
@ -1424,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
@ -1465,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
@ -1483,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
@ -1517,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=""])
@ -1529,14 +1542,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@ -1545,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

44
app/editres/actions.c
View File

@ -93,11 +93,7 @@ Boolean do_get_values = False;
/* ARGSUSED */
static void
EnableGetVal(w, event, params, num_params)
Widget w;
XEvent * event;
String * params;
Cardinal * num_params;
EnableGetVal(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
do_get_values = True;
}
@ -116,11 +112,7 @@ Cardinal * num_params;
/* ARGSUSED */
static void
SelectAction(w, event, params, num_params)
Widget w;
XEvent * event;
String * params;
Cardinal * num_params;
SelectAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
WNode * node;
int type;
@ -161,11 +153,7 @@ Cardinal * num_params;
/* ARGSUSED */
static void
RelabelAction(w, event, params, num_params)
Widget w;
XEvent * event;
String * params;
Cardinal * num_params;
RelabelAction(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
WNode * node;
int type;
@ -195,11 +183,8 @@ Cardinal * num_params;
/* ARGSUSED */
static void
PopdownFileDialogAction(w, event, params, num_params)
Widget w;
XEvent * event;
String * params;
Cardinal * num_params;
PopdownFileDialogAction(Widget w, XEvent *event,
String *params, Cardinal *num_params)
{
char buf[BUFSIZ];
Boolean val;
@ -239,11 +224,7 @@ Cardinal * num_params;
/* ARGSUSED */
static void
ActionQuit(w, event, params, num_params)
Widget w;
XEvent * event;
String * params;
Cardinal * num_params;
ActionQuit(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
if (w==global_toplevel) {
XtDestroyApplicationContext(XtWidgetToApplicationContext(w));
@ -273,8 +254,7 @@ static XtActionsRec actions[] = {
};
void
SetApplicationActions(app_con)
XtAppContext app_con;
SetApplicationActions(XtAppContext app_con)
{
XtAppAddActions(app_con, actions, XtNumber(actions));
@ -299,11 +279,8 @@ XtAppContext app_con;
*/
static Boolean
CheckAndFindEntry(action_name, params, num_params, table, num_table, type)
String * params, action_name;
Cardinal num_params, num_table;
struct ActionValues * table;
int * type;
CheckAndFindEntry(String action_name, String *params, Cardinal num_params,
struct ActionValues *table, Cardinal num_table, int *type)
{
char buf[BUFSIZ];
int i;
@ -345,8 +322,7 @@ int * type;
*/
static WNode *
FindTreeNodeFromWidget(w)
Widget w;
FindTreeNodeFromWidget(Widget w)
{
int ret_val;
XPointer data_return;

0
app/editres/Editres.ad → app/editres/app-defaults/Editres
View File

0
app/editres/Editres-color.ad → app/editres/app-defaults/Editres-color
View File

58
app/editres/comm.c
View File

@ -83,9 +83,7 @@ static char * DispatchEvent ( Event * event );
/* ARGSUSED */
static void
ClientTimedOut(data, id)
XtPointer data;
XtIntervalId * id;
ClientTimedOut(XtPointer data, XtIntervalId *id)
{
char msg[BUFSIZ];
Widget w = (Widget) data;
@ -108,9 +106,7 @@ XtIntervalId * id;
*/
Window
GetClientWindow(w, x, y)
Widget w;
int *x, *y;
GetClientWindow(Widget w, int *x, int *y)
{
int status;
Cursor cursor;
@ -187,10 +183,7 @@ int *x, *y;
/* ARGSUSED */
void
SetCommand(w, command, msg)
Widget w;
ResCommand command;
char * msg;
SetCommand(Widget w, ResCommand command, char *msg)
{
XClientMessageEvent client_event;
Display * dpy = XtDisplay(w);
@ -263,9 +256,7 @@ SetCommand(w, command, msg)
*/
static void
TellUserAboutMessage(label, command)
Widget label;
ResCommand command;
TellUserAboutMessage(Widget label, ResCommand command)
{
char msg[BUFSIZ], *str;
@ -306,12 +297,8 @@ ResCommand command;
/* ARGSUSED */
static Boolean
ConvertCommand(w,selection,target,type_ret, value_ret, length_ret, format_ret)
Widget w;
Atom * selection, * target, * type_ret;
XtPointer *value_ret;
unsigned long * length_ret;
int * format_ret;
ConvertCommand(Widget w, Atom *selection, Atom *target, Atom *type_ret,
XtPointer *value_ret, unsigned long *length_ret, int *format_ret)
{
if ((*selection != atom_comm) || (*target != atom_command))
return(FALSE);
@ -334,9 +321,7 @@ int * format_ret;
/* ARGSUSED */
static void
SelectionDone(w, sel, targ)
Widget w;
Atom *sel, *targ;
SelectionDone(Widget w, Atom *sel, Atom *targ)
{
/* Keep the toolkit from automaticaly freeing the selection value */
}
@ -352,9 +337,7 @@ SelectionDone(w, sel, targ)
*/
static void
LoseSelection(w, sel)
Widget w;
Atom * sel;
LoseSelection(Widget w, Atom *sel)
{
if (global_client.timeout != 0) {
XtRemoveTimeOut(global_client.timeout);
@ -384,12 +367,8 @@ static Boolean reset_protocol_level = True;
/* ARGSUSED */
static void
GetClientValue(w, data, selection, type, value, length, format)
Widget w;
XtPointer data, value;
Atom *selection, *type;
unsigned long *length;
int * format;
GetClientValue(Widget w, XtPointer data, Atom *selection, Atom *type,
XtPointer value, unsigned long *length, int *format)
{
Event * event;
ProtocolStream alloc_stream, *stream;
@ -490,8 +469,7 @@ int * format;
*/
static void
BuildHeader(client_data)
CurrentClient * client_data;
BuildHeader(CurrentClient *client_data)
{
unsigned long old_alloc, old_size;
unsigned char * old_current;
@ -561,8 +539,7 @@ CurrentClient * client_data;
*/
static Event *
BuildEvent(stream)
ProtocolStream * stream;
BuildEvent(ProtocolStream *stream)
{
int i;
Event * event = (Event *) XtCalloc(sizeof(Event), 1);
@ -793,8 +770,7 @@ ProtocolStream * stream;
*/
static void
FreeEvent(event)
Event * event;
FreeEvent(Event *event)
{
unsigned int i;
@ -894,8 +870,7 @@ Event * event;
*/
static char *
DispatchEvent(event)
Event * event;
DispatchEvent(Event *event)
{
char * error = NULL;
@ -938,8 +913,7 @@ Event * event;
*/
void
InternAtoms(dpy)
Display * dpy;
InternAtoms(Display * dpy)
{
atom_comm = XInternAtom(dpy, EDITRES_COMM_ATOM, False);
atom_command = XInternAtom(dpy, EDITRES_COMMAND_ATOM, False);
@ -949,7 +923,7 @@ Display * dpy;
}
ResIdent
GetNewIdent()
GetNewIdent(void)
{
static ResIdent ident = 1;

142
app/editres/compile
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:

30
app/editres/config.h.in
View File

@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* 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
@ -27,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

6787
app/editres/configure vendored
View File

File diff suppressed because it is too large Load Diff

22
app/editres/configure.ac
View File

@ -22,29 +22,35 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(editres,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],editres)
AC_INIT(editres,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],editres)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_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
AC_PROG_INSTALL
XAW_CHECK_XPRINT_SUPPORT(XAW)
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAW, xaw7)
PKG_CHECK_MODULES(EDITRES, x11 xt xmu)
EDITRES_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
EDITRES_LIBS="$DEP_LIBS $XAW_LIBS"
EDITRES_CFLAGS="$EDITRES_CFLAGS $XAW_CFLAGS"
EDITRES_LIBS="$EDITRES_LIBS $XAW_LIBS"
AC_SUBST(EDITRES_CFLAGS)
AC_SUBST(EDITRES_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])

10
app/editres/editres.c
View File

@ -65,7 +65,7 @@ AppResources global_resources;
static void Syntax ( XtAppContext app_con, char *call );
String fallback_resources[] = {
static String fallback_resources[] = {
NULL,
};
@ -87,9 +87,7 @@ static XtResource editres_resources[] = {
Atom wm_delete_window;
int
main(argc, argv)
int argc;
char **argv;
main(int argc, char **argv)
{
XtAppContext app_con;
@ -140,9 +138,7 @@ char **argv;
*/
static void
Syntax(app_con, call)
XtAppContext app_con;
char *call;
Syntax(XtAppContext app_con, char *call)
{
XtDestroyApplicationContext(app_con);
fprintf(stderr, "Usage: %s\n", call);

44
app/editres/editresP.h
View File

@ -315,25 +315,33 @@ typedef union _Event {
/*
* Global variables.
*/
extern int global_effective_protocol_version;
extern char* global_effective_toolkit;
extern int global_error_code;
extern unsigned long global_serial_num;
extern int (*global_old_error_handler)(Display *, XErrorEvent *);
extern Boolean global_resource_box_up;
#ifndef THIS_IS_MAIN
extern int global_effective_protocol_version;
extern char* global_effective_toolkit;
extern int global_error_code;
extern unsigned long global_serial_num;
extern int (*global_old_error_handler)(Display *, XErrorEvent *);
extern Boolean global_resource_box_up;
extern TreeInfo *global_tree_info;
extern CurrentClient global_client;
extern ScreenData global_screen_data;
extern Widget global_tree_parent;
extern Widget global_paned; /* named after toolkit */
extern Widget global_toplevel;
extern AppResources global_resources;
extern TreeInfo *global_tree_info;
extern CurrentClient global_client;
extern ScreenData global_screen_data;
extern Widget global_tree_parent;
extern Widget global_paned; /* named after toolkit */
extern Widget global_toplevel;
extern AppResources global_resources;
extern String res_labels[NUM_RES_LABELS];
extern String res_labels[NUM_RES_LABELS];
#endif
extern Boolean do_get_values;
extern Atom wm_delete_window;
/* number of entries in the command menu */
#define NUM_CM_ENTRIES 8
extern Widget CM_entries[NUM_CM_ENTRIES];
/* number of entries in the tree menu */
#define NUM_TM_ENTRIES 16
extern Widget TM_entries[NUM_TM_ENTRIES];
/*
* Macros.
@ -341,14 +349,10 @@ typedef union _Event {
#define streq(a, b) ( strcmp((a), (b)) == 0 )
/* number of entries in the command menu */
#define NUM_CM_ENTRIES 8
/* offset into CM entries for setting insensitive */
#define CM_OFFSET 1
/* number of CM entries to make insensitive */
#define CM_NUM 5
/* number of entries in the tree menu */
#define NUM_TM_ENTRIES 16
#define TM_OFFSET 0
#define TM_NUM 16

46
app/editres/geometry.c
View File

@ -58,8 +58,7 @@ static void FlashWidgetsCleanup ( XtPointer info_ptr, XtIntervalId * id );
*/
void
_FindWidget(w)
Widget w;
_FindWidget(Widget w)
{
char msg[BUFSIZ];
WNode * node;
@ -96,8 +95,7 @@ Widget w;
*/
void
DisplayChild(event)
Event * event;
DisplayChild(Event *event)
{
FindChildEvent * find_event = (FindChildEvent *) event;
WNode * node;
@ -129,8 +127,7 @@ Event * event;
*/
void
_FlashActiveWidgets(tree_info)
TreeInfo * tree_info;
_FlashActiveWidgets(TreeInfo *tree_info)
{
int i;
ProtocolStream * stream = &(global_client.stream);
@ -166,8 +163,7 @@ TreeInfo * tree_info;
*/
char *
HandleFlashWidget(event)
Event * event;
HandleFlashWidget(Event *event)
{
GetGeomEvent * geom_event = (GetGeomEvent *) event;
char * errors = NULL;
@ -190,10 +186,7 @@ Event * event;
*/
static void
AddToFlashList(tree_info, geom_info, errors)
TreeInfo * tree_info;
GetGeomInfo * geom_info;
char ** errors;
AddToFlashList(TreeInfo *tree_info, GetGeomInfo *geom_info, char **errors)
{
WNode * node;
char buf[BUFSIZ];
@ -235,12 +228,8 @@ char ** errors;
*/
static void
_AddToFlashList(tree_info, errors, node, x, y, width, height)
TreeInfo * tree_info;
char ** errors;
WNode * node;
int x, y;
unsigned int width, height;
_AddToFlashList(TreeInfo *tree_info, char **errors, WNode *node,
int x, int y, unsigned int width, unsigned int height)
{
Display * dpy = XtDisplay(tree_info->tree_widget);
Window window = (Window) node->window;
@ -304,10 +293,8 @@ unsigned int width, height;
#define MORE_FLASH_WIDGETS 5
static void
CreateFlashWidget(tree_info, x, y, width, height)
TreeInfo * tree_info;
int x, y;
unsigned int width, height;
CreateFlashWidget(TreeInfo *tree_info, int x, int y,
unsigned int width, unsigned int height)
{
Widget shell;
Arg args[3];
@ -350,8 +337,7 @@ unsigned int width, height;
*/
static void
FlashWidgets(tree_info)
TreeInfo * tree_info;
FlashWidgets(TreeInfo *tree_info)
{
int i;
unsigned long wait, half_flash;
@ -383,9 +369,7 @@ TreeInfo * tree_info;
/* ARGSUSED */
static void
FlashWidgetsOn(info_ptr, id)
XtPointer info_ptr;
XtIntervalId * id;
FlashWidgetsOn(XtPointer info_ptr, XtIntervalId *id)
{
int i;
@ -407,9 +391,7 @@ XtIntervalId * id;
/* ARGSUSED */
static void
FlashWidgetsOff(info_ptr, id)
XtPointer info_ptr;
XtIntervalId * id;
FlashWidgetsOff(XtPointer info_ptr, XtIntervalId *id)
{
int i;
TreeInfo * tree_info = (TreeInfo *) info_ptr;
@ -427,9 +409,7 @@ XtIntervalId * id;
/* ARGSUSED */
static void
FlashWidgetsCleanup(info_ptr, id)
XtPointer info_ptr;
XtIntervalId * id;
FlashWidgetsCleanup(XtPointer info_ptr, XtIntervalId *id)
{
int i;
TreeInfo * tree_info = (TreeInfo *) info_ptr;

107
app/editres/handler.c
View File

@ -63,9 +63,7 @@ static void SetOnlyMatchingWidgets ( WNode * node, XtPointer info_ptr );
/* ARGSUSED */
void
Quit(w, client_data, call_data)
Widget w;
XtPointer call_data, client_data;
Quit(Widget w, XtPointer client_data, XtPointer call_data)
{
XtDestroyApplicationContext(XtWidgetToApplicationContext(w));
exit(0);
@ -84,9 +82,7 @@ XtPointer call_data, client_data;
/* ARGSUSED */
void
SendTree(w, value, call_data)
Widget w;
XtPointer value, call_data;
SendTree(Widget w, XtPointer value, XtPointer call_data)
{
if ((Boolean)(long) value)
global_client.window = None;
@ -109,9 +105,7 @@ XtPointer value, call_data;
/* ARGSUSED */
void
FindWidget(w, client_data, call_data)
Widget w;
XtPointer client_data, call_data;
FindWidget(Widget w, XtPointer client_data, XtPointer call_data)
{
_FindWidget(XtParent(w)); /* Use parent since it is a "real"
@ -128,9 +122,7 @@ XtPointer client_data, call_data;
/* ARGSUSED */
void
InitSetValues(w, client_data, call_data)
Widget w;
XtPointer call_data, client_data;
InitSetValues(Widget w, XtPointer client_data, XtPointer call_data)
{
if (!XtIsWidget(w)) /* Make sure that we use a "Real" widget here. */
w = XtParent(w);
@ -148,9 +140,7 @@ XtPointer call_data, client_data;
/* ARGSUSED */
void
TreeSelect(w, client_data, call_data)
Widget w;
XtPointer call_data, client_data;
TreeSelect(Widget w, XtPointer client_data, XtPointer call_data)
{
SelectTypes type = (SelectTypes) (unsigned long) client_data;
@ -167,9 +157,7 @@ XtPointer call_data, client_data;
/* ARGSUSED */
void
TreeRelabel(w, client_data, call_data)
Widget w;
XtPointer call_data, client_data;
TreeRelabel(Widget w, XtPointer client_data, XtPointer call_data)
{
LabelTypes type = (LabelTypes) (unsigned long) client_data;
@ -186,9 +174,7 @@ XtPointer call_data, client_data;
/* ARGSUSED */
void
PannerCallback(w, closure, report_ptr)
Widget w;
XtPointer closure, report_ptr;
PannerCallback(Widget w, XtPointer closure, XtPointer report_ptr)
{
Arg args[2];
XawPannerReport *report = (XawPannerReport *) report_ptr;
@ -213,9 +199,7 @@ XtPointer closure, report_ptr;
/* ARGSUSED */
void
PortholeCallback(w, panner_ptr, report_ptr)
Widget w;
XtPointer panner_ptr, report_ptr;
PortholeCallback(Widget w, XtPointer panner_ptr, XtPointer report_ptr)
{
Arg args[10];
Cardinal n = 0;
@ -241,9 +225,7 @@ XtPointer panner_ptr, report_ptr;
/* ARGSUSED */
void
FlashActiveWidgets(w, junk, garbage)
Widget w;
XtPointer junk, garbage;
FlashActiveWidgets(Widget w, XtPointer junk, XtPointer garbage)
{
_FlashActiveWidgets(global_tree_info);
}
@ -256,9 +238,7 @@ XtPointer junk, garbage;
/* ARGSUSED */
void
GetResourceList(w, junk, garbage)
Widget w;
XtPointer junk, garbage;
GetResourceList(Widget w, XtPointer junk, XtPointer garbage)
{
WNode * node;
ProtocolStream * stream = &(global_client.stream);
@ -305,9 +285,7 @@ XtPointer junk, garbage;
/* ARGSUSED */
void
DumpTreeToFile(w, junk, garbage)
Widget w;
XtPointer junk, garbage;
DumpTreeToFile(Widget w, XtPointer junk, XtPointer garbage)
{
_PopupFileDialog(XtParent(w), "Enter the filename:", "",
_DumpTreeToFile, (XtPointer) global_tree_info);
@ -332,9 +310,7 @@ XtPointer junk, garbage;
/* ARGSUSED */
void
AnyChosen(w, any_info_ptr, state_ptr)
Widget w;
XtPointer any_info_ptr, state_ptr;
AnyChosen(Widget w, XtPointer any_info_ptr, XtPointer state_ptr)
{
AnyInfo * any_info = (AnyInfo *) any_info_ptr;
Boolean state = (Boolean)(long) state_ptr;
@ -396,8 +372,7 @@ XtPointer any_info_ptr, state_ptr;
static char *
GetResourceName(res_box)
ResourceBoxInfo * res_box;
GetResourceName(ResourceBoxInfo *res_box)
{
XawListReturnStruct * list_info;
char * result;
@ -430,9 +405,8 @@ ResourceBoxInfo * res_box;
*/
void
ActivateWidgetsAndSetResourceString(w, node_ptr, call_data)
Widget w;
XtPointer node_ptr, call_data;
ActivateWidgetsAndSetResourceString(Widget w,
XtPointer node_ptr, XtPointer call_data)
{
SetResourceString(w, node_ptr, call_data);
ActivateResourceWidgets(w, node_ptr, call_data);
@ -449,9 +423,7 @@ XtPointer node_ptr, call_data;
*/
void
SetResourceString(w, node_ptr, junk)
Widget w;
XtPointer node_ptr, junk;
SetResourceString(Widget w, XtPointer node_ptr, XtPointer junk)
{
static char * malloc_string; /* These are both inited to zero. */
static Cardinal malloc_size;
@ -532,9 +504,7 @@ XtPointer node_ptr, junk;
extern Boolean do_get_values;
void
ResourceListCallback(list, node_ptr, junk)
Widget list;
XtPointer node_ptr, junk;
ResourceListCallback(Widget list, XtPointer node_ptr, XtPointer junk)
{
Widget o_list;
WNode * node = (WNode *) node_ptr;
@ -568,9 +538,7 @@ XtPointer node_ptr, junk;
/* ARGSUSED */
void
PopdownResBox(w, shell_ptr, junk)
Widget w;
XtPointer shell_ptr, junk;
PopdownResBox(Widget w, XtPointer shell_ptr, XtPointer junk)
{
Widget shell = (Widget) shell_ptr;
@ -580,9 +548,7 @@ XtPointer shell_ptr, junk;
/* ARGSUSED */
static void
_AppendResourceString(w, res_box_ptr, filename_ptr)
Widget w;
XtPointer res_box_ptr, filename_ptr;
_AppendResourceString(Widget w, XtPointer res_box_ptr, XtPointer filename_ptr)
{
Arg args[1];
FILE * fp;
@ -629,9 +595,7 @@ XtPointer res_box_ptr, filename_ptr;
/* ARGSUSED */
void
SaveResource(w, res_box_ptr, junk)
Widget w;
XtPointer res_box_ptr, junk;
SaveResource(Widget w, XtPointer res_box_ptr, XtPointer junk)
{
/*
* If there is no filename the ask for one, otherwise just save to
@ -656,9 +620,7 @@ XtPointer res_box_ptr, junk;
/* ARGSUSED */
static void
_SetResourcesFile(w, junk, filename_ptr)
Widget w;
XtPointer junk, filename_ptr;
_SetResourcesFile(Widget w, XtPointer junk, XtPointer filename_ptr)
{
char *filename = (char *) filename_ptr;
@ -680,9 +642,7 @@ XtPointer junk, filename_ptr;
/* ARGSUSED */
void
SetFile(w, junk, garbage)
Widget w;
XtPointer junk, garbage;
SetFile(Widget w, XtPointer junk, XtPointer garbage)
{
/*
* If there is no filename the ask for one, otherwise just save to
@ -705,9 +665,7 @@ XtPointer junk, garbage;
/* ARGSUSED */
void
ApplyResource(w, node_ptr, junk)
Widget w;
XtPointer node_ptr, junk;
ApplyResource(Widget w, XtPointer node_ptr, XtPointer junk)
{
ProtocolStream * stream = &(global_client.stream);
ApplyResourcesInfo info;
@ -775,8 +733,7 @@ XtPointer node_ptr, junk;
/* ARGSUSED */
static void
ObtainResource(node_ptr)
XtPointer node_ptr;
ObtainResource(XtPointer node_ptr)
{
ProtocolStream * stream = &(global_client.stream);
ObtainResourcesInfo info;
@ -821,9 +778,7 @@ XtPointer node_ptr;
*/
static void
CreateSetValuesCommand(node, info_ptr)
WNode * node;
XtPointer info_ptr;
CreateSetValuesCommand(WNode *node, XtPointer info_ptr)
{
ApplyResourcesInfo * info = (ApplyResourcesInfo *) info_ptr;
XrmNameList name_quarks;
@ -855,9 +810,7 @@ XtPointer info_ptr;
/*****
static void
CreateGetValuesCommand(node, info_ptr)
WNode * node;
XtPointer info_ptr;
CreateGetValuesCommand(WNode *node, XtPointer info_ptr)
{
ApplyResourcesInfo * info = (ApplyResourcesInfo *) info_ptr;
XrmNameList name_quarks;
@ -891,9 +844,7 @@ XtPointer info_ptr;
/* ARGSUSED */
void
ActivateResourceWidgets(w, node_ptr, junk)
Widget w;
XtPointer node_ptr, junk;
ActivateResourceWidgets(Widget w, XtPointer node_ptr, XtPointer junk)
{
WNode * node = (WNode *) node_ptr;
ApplyResourcesInfo info;
@ -932,9 +883,7 @@ XtPointer node_ptr, junk;
*/
static void
SetOnlyMatchingWidgets(node, info_ptr)
WNode * node;
XtPointer info_ptr;
SetOnlyMatchingWidgets(WNode *node, XtPointer info_ptr)
{
ApplyResourcesInfo * info = (ApplyResourcesInfo *) info_ptr;
XrmNameList name_quarks;

7
app/editres/setvalues.c
View File

@ -49,8 +49,7 @@ in this Software without prior written authorization from The Open Group.
*/
char *
PrintSetValuesError(event)
Event * event;
PrintSetValuesError(Event *event)
{
char * errors = NULL;
WNode * node;
@ -86,9 +85,7 @@ Event * event;
*/
char *
GetResourceValueForSetValues(node, size)
WNode * node;
unsigned short * size;
GetResourceValueForSetValues(WNode *node, unsigned short *size)
{
Arg args[1];
char *ptr, *temp;

25
app/editres/svpopup.c
View File

@ -61,9 +61,7 @@ static void CancelSetValues ( Widget w, XtPointer junk, XtPointer garbage );
/* ARGSUSED */
void
PopupSetValues(parent, event)
Widget parent;
XEvent * event;
PopupSetValues(Widget parent, XEvent *event)
{
Arg args[1];
@ -107,11 +105,7 @@ XEvent * event;
/* ARGSUSED */
void
ModifySVEntry(w, event, params, num_params)
Widget w;
XEvent *event;
String * params;
Cardinal * num_params;
ModifySVEntry(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
Widget new, old;
char msg[BUFSIZ];
@ -156,8 +150,7 @@ Cardinal * num_params;
*/
static void
_SetField(new, old)
Widget new, old;
_SetField(Widget new, Widget old)
{
Arg args[2];
Pixel new_border, old_border, old_bg;
@ -199,9 +192,7 @@ Widget new, old;
*/
static void
CreateSetValuesPopup(parent, scr_data)
Widget parent;
ScreenData * scr_data;
CreateSetValuesPopup(Widget parent, ScreenData *scr_data)
{
Widget form, cancel, do_it, label;
Widget res_label;
@ -286,9 +277,7 @@ ScreenData * scr_data;
/* ARGSUSED */
static void
DoSetValues(w, junk, garbage)
Widget w;
XtPointer junk, garbage;
DoSetValues(Widget w, XtPointer junk, XtPointer garbage)
{
ProtocolStream * stream = &(global_client.stream);
char *res_name, *res_value;
@ -328,9 +317,7 @@ XtPointer junk, garbage;
/* ARGSUSED */
static void
CancelSetValues(w, junk, garbage)
Widget w;
XtPointer junk, garbage;
CancelSetValues(Widget w, XtPointer junk, XtPointer garbage)
{
XtPopdown(XtParent(XtParent(w)));
}

98
app/editres/utils.c
View File

@ -58,9 +58,7 @@ static void FreeResources ( WidgetResources * resources );
*/
void
SetMessage(w, str)
Widget w;
char * str;
SetMessage(Widget w, char *str)
{
Arg args[1];
@ -136,8 +134,7 @@ GetAllStrings(char *in, char sep, char ***out, int *num)
*/
void
AddString(str, add)
char ** str, *add;
AddString(char ** str, char *add)
{
int len_str, len_add;
char * ptr;
@ -158,10 +155,7 @@ char ** str, *add;
*/
WNode *
FindNode(top_node, ids, number)
WNode *top_node;
unsigned long * ids;
Cardinal number;
FindNode(WNode *top_node, unsigned long *ids, Cardinal number)
{
int i, j;
WNode *node;
@ -196,9 +190,7 @@ Cardinal number;
*/
WNode *
FindWidgetFromWindow(tree_info, win)
TreeInfo * tree_info;
Window win;
FindWidgetFromWindow(TreeInfo *tree_info, Window win)
{
if (tree_info == NULL)
return(NULL);
@ -214,9 +206,7 @@ Window win;
*/
static WNode *
FindWidgetFromWindowGivenNode(node, win)
WNode * node;
Window win;
FindWidgetFromWindowGivenNode(WNode *node, Window win)
{
int i;
WNode * ret_node;
@ -241,9 +231,7 @@ Window win;
/* ARGSUSED */
int
HandleXErrors(display, error)
Display * display;
XErrorEvent * error;
HandleXErrors(Display *display, XErrorEvent *error)
{
if (error->serial != global_serial_num) {
(*global_old_error_handler) (display, error);
@ -271,10 +259,7 @@ XErrorEvent * error;
/* ARGSUSED */
void
_DumpTreeToFile(w, tree_ptr, filename)
Widget w;
XtPointer tree_ptr;
XtPointer filename;
_DumpTreeToFile(Widget w, XtPointer tree_ptr, XtPointer filename)
{
TreeInfo * tree_info = (TreeInfo *) tree_ptr;
FILE * fp;
@ -325,11 +310,8 @@ typedef struct _FileDialogInfo {
} FileDialogInfo;
void
_PopupFileDialog(w, str, default_value, func, data)
Widget w;
String str, default_value;
XtCallbackProc func;
XtPointer data;
_PopupFileDialog(Widget w, String str, String default_value,
XtCallbackProc func, XtPointer data)
{
FileDialogInfo * file_info;
Widget shell, dialog;
@ -377,10 +359,7 @@ XtPointer data;
*/
void
PopupCentered(event, w, mode)
XEvent * event;
Widget w;
XtGrabKind mode;
PopupCentered(XEvent *event, Widget w, XtGrabKind mode)
{
Boolean get_from_cursor = FALSE;
Arg args[3];
@ -459,9 +438,7 @@ XtGrabKind mode;
/* ARGSUSED */
void
_PopdownFileDialog(w, client_data, junk)
Widget w;
XtPointer client_data, junk;
_PopdownFileDialog(Widget w, XtPointer client_data, XtPointer junk)
{
Widget dialog = XtParent(w);
XPointer file_info_ptr;
@ -504,9 +481,7 @@ XtPointer client_data, junk;
*/
void
GetNamesAndClasses(node, names, classes)
WNode * node;
char *** names, ***classes;
GetNamesAndClasses(WNode *node, char ***names, char ***classes)
{
int i, total_widgets;
WNode * temp = node;
@ -532,8 +507,7 @@ char *** names, ***classes;
*/
char *
HandleGetResources(event)
Event * event;
HandleGetResources(Event *event)
{
GetResourcesEvent * get_event = (GetResourcesEvent *) event;
char buf[BUFSIZ], * errors = NULL;
@ -575,9 +549,7 @@ Event * event;
*/
void
CreateResourceBox(node, errors)
WNode * node;
char ** errors;
CreateResourceBox(WNode *node, char **errors)
{
WidgetResources * resources = node->resources;
char ** names, ** cons_names;
@ -623,9 +595,7 @@ char ** errors;
*/
static WidgetResources *
ParseResources(info, error)
GetResourcesInfo * info;
char **error;
ParseResources(GetResourcesInfo *info, char **error)
{
WidgetResources * resources;
WidgetResourceInfo * normal;
@ -694,8 +664,7 @@ char **error;
*/
static int
CompareResourceEntries(e1, e2)
const void *e1, *e2;
CompareResourceEntries(const void *e1, const void *e2)
{
return (strcmp(((WidgetResourceInfo *)e1)->name,
((WidgetResourceInfo *)e2)->name));
@ -710,9 +679,7 @@ const void *e1, *e2;
*/
static void
AddResource(res_info, resource)
ResourceInfo * res_info;
WidgetResourceInfo * resource;
AddResource(ResourceInfo *res_info, WidgetResourceInfo *resource)
{
resource->name = res_info->name;
res_info->name = NULL; /* Keeps it from being deallocated. */
@ -730,8 +697,7 @@ WidgetResourceInfo * resource;
*/
static void
FreeResources(resources)
WidgetResources * resources;
FreeResources(WidgetResources *resources)
{
int i;
@ -765,9 +731,7 @@ WidgetResources * resources;
*/
Boolean
CheckDatabase(db, names, classes)
XrmDatabase db;
XrmQuarkList names, classes;
CheckDatabase(XrmDatabase db, XrmQuarkList names, XrmQuarkList classes)
{
XrmRepresentation junk;
XrmValue garbage;
@ -783,9 +747,7 @@ XrmQuarkList names, classes;
*/
XrmQuarkList
Quarkify(list, ptr)
char ** list;
char * ptr;
Quarkify(char **list, char *ptr)
{
int i;
char ** tlist;
@ -817,10 +779,8 @@ char * ptr;
*/
void
ExecuteOverAllNodes(top_node, func, data)
WNode * top_node;
void (*func)(WNode *, XtPointer);
XtPointer data;
ExecuteOverAllNodes(WNode *top_node, void (*func)(WNode *, XtPointer),
XtPointer data)
{
int i;
@ -839,15 +799,13 @@ XtPointer data;
*/
void
InsertWidgetFromNode(stream, node)
ProtocolStream * stream;
WNode * node;
InsertWidgetFromNode(ProtocolStream *stream, WNode *node)
{
WNode *temp;
unsigned long * widget_list;
register int i, num_widgets;
for (temp = node, i = 0; temp != 0; temp = temp->parent, i++) {}
for (temp = node, i = 0; temp != NULL; temp = temp->parent, i++) {}
num_widgets = i;
widget_list = (unsigned long *)
@ -858,7 +816,7 @@ WNode * node;
* Make sure that they are inserted in the list from parent -> child.
*/
for (i--, temp = node; temp != 0; temp = temp->parent, i--)
for (i--, temp = node; temp != NULL; temp = temp->parent, i--)
widget_list[i] = temp->id;
_XEditResPut16(stream, num_widgets); /* insert number of widgets. */
@ -875,8 +833,7 @@ WNode * node;
*/
char *
GetFailureMessage(stream)
ProtocolStream * stream;
GetFailureMessage(ProtocolStream *stream)
{
char * return_str;
@ -894,8 +851,7 @@ ProtocolStream * stream;
*/
char *
ProtocolFailure(stream)
ProtocolStream * stream;
ProtocolFailure(ProtocolStream *stream)
{
char buf[BUFSIZ];
unsigned char version;

62
app/editres/widgets.c
View File

@ -136,8 +136,7 @@ static XtResource resources[] = {
#undef Offset
void
RebuildMenusAndLabel(toolkit)
String toolkit;
RebuildMenusAndLabel(String toolkit)
{
if (strcmp(global_effective_toolkit, toolkit)) {
CreateCommandMenu(box, toolkit);
@ -164,8 +163,7 @@ RebuildMenusAndLabel(toolkit)
*/
void
BuildWidgetTree(parent)
Widget parent;
BuildWidgetTree(Widget parent)
{
Widget paned, porthole, panner;
@ -200,8 +198,7 @@ Widget parent;
static Widget
CreateTopArea(parent)
Widget parent;
CreateTopArea(Widget parent)
{
Widget panner;
@ -260,9 +257,7 @@ static Boolean CM_set_insensitive = True;
Widget CM_entries[NUM_CM_ENTRIES];
static void
CreateCommandMenu(parent, toolkit)
Widget parent;
String toolkit;
CreateCommandMenu(Widget parent, String toolkit)
{
Arg args[1];
@ -341,9 +336,7 @@ static Boolean TM_set_insensitive = True;
Widget TM_entries[NUM_TM_ENTRIES];
static void
CreateTreeCommandMenu(parent, toolkit)
Widget parent;
String toolkit;
CreateTreeCommandMenu(Widget parent, String toolkit)
{
int i, number;
static struct tree_ops_menu tree_menu[] = {
@ -422,8 +415,7 @@ static Pixmap old_pixmap;
*/
void
PrepareToLayoutTree(tree)
Widget tree;
PrepareToLayoutTree(Widget tree)
{
Arg args[1];
@ -445,8 +437,7 @@ Widget tree;
*/
void
LayoutTree(tree)
Widget tree;
LayoutTree(Widget tree)
{
Arg args[1];
@ -475,9 +466,7 @@ Widget tree;
*/
void
CreateResourceBoxWidgets(node, names, cons_names)
WNode * node;
char **names, **cons_names;
CreateResourceBoxWidgets(WNode *node, char **names, char **cons_names)
{
Widget pane, box, button, viewport, pane_child;
ResourceBoxInfo * res_box;
@ -553,9 +542,7 @@ char **names, **cons_names;
*/
static void
CreateResourceNameForm(parent, node)
Widget parent;
WNode * node;
CreateResourceNameForm(Widget parent, WNode *node)
{
ResourceBoxInfo * res_box = node->resources->res_box;
AnyInfo *new_info = NULL, *old_info;
@ -692,8 +679,7 @@ WNode * node;
*/
static void
SetToggleGroupLeaders(node)
WNode * node;
SetToggleGroupLeaders(WNode *node)
{
NameInfo *name;
ResourceBoxInfo * res_box = node->resources->res_box;
@ -721,9 +707,8 @@ WNode * node;
*/
static void
MakeBoxLookNice(dot, star, any, single, name, class, endbox)
Widget dot, star, any, single, name, class;
int endbox;
MakeBoxLookNice(Widget dot, Widget star, Widget any, Widget single,
Widget name, Widget class, int endbox)
{
#define MAX_HDIST 3
@ -834,10 +819,7 @@ int endbox;
static char* noneList[] = {"None"};
static void
CreateLists(parent, node, names, cons_names)
Widget parent;
WNode * node;
char **names, **cons_names;
CreateLists(Widget parent, WNode *node, char **names, char **cons_names)
{
Widget viewport;
Cardinal num_args;
@ -894,9 +876,7 @@ char **names, **cons_names;
*/
static void
CreateValueWidget(parent, node)
Widget parent;
WNode * node;
CreateValueWidget(Widget parent, WNode *node)
{
Widget form, label;
Cardinal num_args;
@ -938,12 +918,8 @@ WNode * node;
* Returns: none.
*/
extern Atom wm_delete_window;
static void
PopupOnNode(node, shell)
WNode * node;
Widget shell;
PopupOnNode(WNode *node, Widget shell)
{
Arg args[3];
Cardinal num_args;
@ -1003,9 +979,7 @@ Widget shell;
/* ARGSUSED */
static void
FreeClientData(w, ptr, junk)
Widget w;
XtPointer ptr, junk;
FreeClientData(Widget w, XtPointer ptr, XtPointer junk)
{
XtFree(ptr);
}
@ -1022,9 +996,7 @@ XtPointer ptr, junk;
/* ARGSUSED */
static void
FreeResBox(w, ptr, junk)
Widget w;
XtPointer ptr, junk;
FreeResBox(Widget w, XtPointer ptr, XtPointer junk)
{
WNode * node = (WNode *) ptr;
NameInfo *old_name, *name = node->resources->res_box->name_info;

59
app/editres/wtree.c
View File

@ -56,9 +56,7 @@ static WNode ** CopyActiveNodes ( TreeInfo * tree_info );
/* ARGSUSED */
void
BuildVisualTree(tree_parent, event)
Widget tree_parent;
Event * event;
BuildVisualTree(Widget tree_parent, Event *event)
{
WNode * top;
char msg[BUFSIZ];
@ -102,9 +100,7 @@ Event * event;
*/
void
AddTreeNode(tree, top)
Widget tree;
WNode * top;
AddTreeNode(Widget tree, WNode *top)
{
int i;
Arg args[1];
@ -146,9 +142,7 @@ WNode * top;
/* ARGSUSED */
void
TreeToggle(w, node_ptr, state_ptr)
Widget w;
XtPointer node_ptr, state_ptr;
TreeToggle(Widget w, XtPointer node_ptr, XtPointer state_ptr)
{
Boolean state = (Boolean)(long) state_ptr;
WNode * node = (WNode *) node_ptr;
@ -166,8 +160,7 @@ XtPointer node_ptr, state_ptr;
*/
static void
AddNodeToActiveList(node)
WNode * node;
AddNodeToActiveList(WNode *node)
{
TreeInfo * info = node->tree_info;
@ -191,8 +184,7 @@ WNode * node;
*/
static void
RemoveNodeFromActiveList(node)
WNode * node;
RemoveNodeFromActiveList(WNode *node)
{
TreeInfo * info = node->tree_info;
Boolean found_node = FALSE;
@ -218,8 +210,7 @@ WNode * node;
*/
static Boolean
IsActiveNode(node)
WNode * node;
IsActiveNode(WNode *node)
{
TreeInfo * info = node->tree_info;
int i;
@ -238,8 +229,7 @@ WNode * node;
*/
TreeInfo *
CreateTree(event)
Event * event;
CreateTree(Event *event)
{
SendWidgetTreeEvent * send_event = (SendWidgetTreeEvent *) event;
int i;
@ -268,8 +258,7 @@ Event * event;
*/
void
PrintNodes(top)
WNode * top;
PrintNodes(WNode *top)
{
int i;
@ -292,9 +281,7 @@ WNode * top;
*/
void
_TreeRelabel(tree_info, type)
TreeInfo * tree_info;
LabelTypes type;
_TreeRelabel(TreeInfo *tree_info, LabelTypes type)
{
WNode * top;
@ -471,9 +458,7 @@ _TreeRelabelNode(WNode *node, LabelTypes type, Boolean recurse)
*/
void
_TreeActivateNode(node, type)
WNode * node;
SelectTypes type;
_TreeActivateNode(WNode* node, SelectTypes type)
{
Arg args[1];
int i;
@ -519,10 +504,7 @@ SelectTypes type;
*/
static void
AddNode(top_node, info, tree_info)
WNode ** top_node;
WidgetTreeInfo * info;
TreeInfo * tree_info;
AddNode(WNode **top_node, WidgetTreeInfo *info, TreeInfo *tree_info)
{
WNode *node, *parent;
Boolean early_break = FALSE;
@ -569,10 +551,7 @@ TreeInfo * tree_info;
*/
static void
FillNode(info, node, tree_info)
WidgetTreeInfo * info;
WNode * node;
TreeInfo * tree_info;
FillNode(WidgetTreeInfo *info, WNode *node, TreeInfo *tree_info)
{
node->class = info->class;
info->class = NULL; /* keeps it from deallocating. */
@ -590,8 +569,7 @@ TreeInfo * tree_info;
*/
static void
AddChild(parent, child)
WNode * parent, * child;
AddChild(WNode *parent, WNode *child)
{
if (parent->num_children >= parent->alloc_children) {
parent->alloc_children += NUM_INC;
@ -618,8 +596,7 @@ WNode * parent, * child;
*/
static WNode **
CopyActiveNodes(tree_info)
TreeInfo * tree_info;
CopyActiveNodes(TreeInfo *tree_info)
{
WNode ** list;
int i;
@ -643,8 +620,7 @@ TreeInfo * tree_info;
*/
void
SetAndCenterTreeNode(node)
WNode * node;
SetAndCenterTreeNode(WNode *node)
{
Arg args[5];
Cardinal num_args;
@ -700,10 +676,7 @@ WNode * node;
*/
void
PerformTreeToFileDump(node, num_tabs, fp)
WNode * node;
int num_tabs;
FILE * fp;
PerformTreeToFileDump(WNode *node, int num_tabs, FILE *fp)
{
int i;