Latest fixes for released 0.51.0

2025-12-27 00:42:32 +01:00 · 1999-01-29 08:11:17 +00:00
parent d694d6fe1c
commit 931a37b124
56 changed files with 2916 additions and 2383 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,6 @@ CPPFLAGS = @CPPFLAGS@ @DFLAGS@
 	

 INCLUDES = \
-	-I$(top_srcdir)/libPropList \
 	-I$(top_srcdir)/wrlib \
 	-I$(top_srcdir)/WINGs @XCFLAGS@ 

@@ -110,7 +109,7 @@ INCLUDES = \
 wmaker_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.a\
 	$(top_builddir)/wrlib/libwraster.la\
-	$(top_builddir)/libPropList/libPropList.la\
+	@LIBPL@ \
 	@GFXLFLAGS@ \
 	@XLFLAGS@ \
 	@GFXLIBS@ \
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am

-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in 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.
@@ -11,7 +11,7 @@
 # PARTICULAR PURPOSE.


-SHELL = /bin/sh
+SHELL = @SHELL@

 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -32,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include

-DISTDIR =
+DESTDIR =

 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -46,7 +46,7 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
@@ -68,6 +68,7 @@ GFXLIBS = @GFXLIBS@
 ICONEXT = @ICONEXT@
 INTLIBS = @INTLIBS@
 LD = @LD@
+LIBPL = @LIBPL@
 LIBTOOL = @LIBTOOL@
 LITE = @LITE@
 LN_S = @LN_S@
@@ -94,115 +95,16 @@ bin_PROGRAMS = wmaker

 EXTRA_DIST = wmnotify.c wmnotdef.h wmnotify.h

-wmaker_SOURCES = 	\
-	GNUstep.h \
-	WindowMaker.h \
-	actions.c \
-	actions.h \
-	appicon.c \
-	appicon.h \
-	application.c \
-	application.h \
-	appmenu.c \
-	appmenu.h \
-	balloon.c \
-	balloon.h \
-	client.c \
-	client.h \
-	colormap.c \
-	def_pixmaps.h \
-	defaults.c \
-	defaults.h \
-	dialog.c \
-	dialog.h \
-	dock.c \
-	dockedapp.c \
-	dock.h \
-	event.c \
-	framewin.c \
-	framewin.h \
-	gnome.c \
-	gnome.h \
-	funcs.h \
-	icon.c \
-	icon.h \
-	keybind.h \
-	kwm.h \
-	kwm.c \
-	list.c \
-	list.h \
-	main.c \
-	menu.c \
-	menu.h \
-	misc.c \
-	motif.c \
-	motif.h \
-	moveres.c \
-	openlook.c \
-	openlook.h \
-	pixmap.c \
-	pixmap.h \
-	placement.c \
-	properties.c \
-	properties.h \
-	proplist.c \
-	resources.c \
-	resources.h \
-	rootmenu.c \
-	screen.c \
-	screen.h \
-	session.h \
-	session.c \
-	shutdown.c \
-	stacking.c \
-	stacking.h \
-	startup.c \
-	superfluous.c \
-	superfluous.h \
-	switchmenu.c \
-	texture.c \
-	texture.h \
-	xde.h \
-	xde.c \
-	xmodifier.h \
-	xmodifier.c \
-	xutil.c \
-	xutil.h \
-	wconfig.h \
-	wcore.c \
-	wcore.h \
-	wdefaults.c \
-	wdefaults.h \
-	window.c \
-	window.h \
-	winmenu.c \
-	winspector.h \
-	winspector.c \
-	workspace.c \
-	workspace.h \
-	wmsound.c \
-	wmsound.h \
-	text.c \
-	text.h 
+wmaker_SOURCES =  	GNUstep.h 	WindowMaker.h 	actions.c 	actions.h 	appicon.c 	appicon.h 	application.c 	application.h 	appmenu.c 	appmenu.h 	balloon.c 	balloon.h 	client.c 	client.h 	colormap.c 	def_pixmaps.h 	defaults.c 	defaults.h 	dialog.c 	dialog.h 	dock.c 	dockedapp.c 	dock.h 	event.c 	framewin.c 	framewin.h 	gnome.c 	gnome.h 	funcs.h 	icon.c 	icon.h 	keybind.h 	kwm.h 	kwm.c 	list.c 	list.h 	main.c 	menu.c 	menu.h 	misc.c 	motif.c 	motif.h 	moveres.c 	openlook.c 	openlook.h 	pixmap.c 	pixmap.h 	placement.c 	properties.c 	properties.h 	proplist.c 	resources.c 	resources.h 	rootmenu.c 	screen.c 	screen.h 	session.h 	session.c 	shutdown.c 	stacking.c 	stacking.h 	startup.c 	superfluous.c 	superfluous.h 	switchmenu.c 	texture.c 	texture.h 	xde.h 	xde.c 	xmodifier.h 	xmodifier.c 	xutil.c 	xutil.h 	wconfig.h 	wcore.c 	wcore.h 	wdefaults.c 	wdefaults.h 	window.c 	window.h 	winmenu.c 	winspector.h 	winspector.c 	workspace.c 	workspace.h 	wmsound.c 	wmsound.h 	text.c 	text.h 
+

 CPPFLAGS = @CPPFLAGS@ @DFLAGS@

-INCLUDES = \
-	-I$(top_srcdir)/libPropList \
-	-I$(top_srcdir)/wrlib \
-	-I$(top_srcdir)/WINGs @XCFLAGS@ 
+INCLUDES =  	-I$(top_srcdir)/wrlib 	-I$(top_srcdir)/WINGs @XCFLAGS@ 
+
+
+wmaker_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@GFXLFLAGS@ 	@XLFLAGS@ 	@GFXLIBS@ 	@XLIBS@ 	@X_EXTRA_LIBS@ 	@INTLIBS@ 	-lm 

-wmaker_LDADD = \
-	$(top_builddir)/WINGs/libWINGs.a\
-	$(top_builddir)/wrlib/libwraster.la\
-	$(top_builddir)/libPropList/libPropList.la\
-	@GFXLFLAGS@ \
-	@XLFLAGS@ \
-	@GFXLIBS@ \
-	@XLIBS@ \
-	@X_EXTRA_LIBS@ \
-	@INTLIBS@ \
-	-lm 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =  wconfig.h
@@ -224,29 +126,28 @@ startup.o superfluous.o switchmenu.o texture.o xde.o xmodifier.o \
 xutil.o wcore.o wdefaults.o window.o winmenu.o winspector.o workspace.o \
 wmsound.o text.o
 wmaker_DEPENDENCIES =  $(top_builddir)/WINGs/libWINGs.a \
-$(top_builddir)/wrlib/libwraster.la \
-$(top_builddir)/libPropList/libPropList.la
+$(top_builddir)/wrlib/libwraster.la
 wmaker_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in config.h.in stamp-h.in \
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in \
 wconfig.h.in


 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

 TAR = tar
-GZIP = --best
+GZIP_ENV = --best
 SOURCES = $(wmaker_SOURCES)
 OBJECTS = $(wmaker_OBJECTS)

-all: Makefile $(PROGRAMS) config.h
-
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile

 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -255,16 +156,23 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status


 config.h: stamp-h
-	@:
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
 	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
+	@echo timestamp > stamp-h 2> /dev/null
 $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
 $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null

 mostlyclean-hdr:

@@ -275,7 +183,7 @@ distclean-hdr:

 maintainer-clean-hdr:
 wconfig.h: $(top_builddir)/config.status wconfig.h.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

 mostlyclean-binPROGRAMS:

@@ -291,15 +199,15 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done

 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done

 .c.o:
@@ -347,8 +255,12 @@ wmaker: $(wmaker_OBJECTS) $(wmaker_DEPENDENCIES)
 tags: TAGS

 ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+	  && mkid -f$$here/ID $$unique $(LISP)

 TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
@@ -376,75 +288,92 @@ subdir = src
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: install-binPROGRAMS
-	@$(NORMAL_INSTALL)
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+all-recursive-am: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive

-install-data: 
-	@$(NORMAL_INSTALL)
+install-exec-am: install-binPROGRAMS
+install-exec: install-exec-am

-install: install-exec install-data all
-	@:
-
-uninstall: uninstall-binPROGRAMS
+install-data-am:
+install-data: install-data-am

+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-binPROGRAMS
+uninstall: uninstall-am
+all-am: Makefile $(PROGRAMS) config.h
+all-redirect: all-am
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-	$(mkinstalldirs)  $(DATADIR)$(bindir)
+	$(mkinstalldirs)  $(DESTDIR)$(bindir)


 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-hdr mostlyclean-binPROGRAMS \
+mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
 		mostlyclean-compile mostlyclean-libtool \
 		mostlyclean-tags mostlyclean-generic

-clean:  clean-hdr clean-binPROGRAMS clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean
+mostlyclean: mostlyclean-am

-distclean:  distclean-hdr distclean-binPROGRAMS distclean-compile \
+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-libtool \
+		clean-tags clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
 		distclean-libtool distclean-tags distclean-generic \
-		clean
-	-rm -f config.status
+		clean-am
 	-rm -f libtool

-maintainer-clean:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-tags maintainer-clean-generic \
-		distclean
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."

+maintainer-clean: maintainer-clean-am
+
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
 mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean


--- a/src/config.h
+++ b/src/config.h
@@ -66,12 +66,6 @@
 * set by configure */
 #define NLSDIR "/usr/local/lib/locale"

-/* package name */
-#define PACKAGE "WindowMaker" 
-
-/* package version */
-#define VERSION "0.51.0" 
-
 /* define if you want GNOME stuff support */
 /* #undef GNOME_STUFF */

@@ -159,7 +153,7 @@
 #define HAVE_STRERROR 1

 /* Define if you have the strncasecmp function.  */
-#define HAVE_STRNCASECMP 1
+/* #undef HAVE_STRNCASECMP */

 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
@@ -184,3 +178,10 @@

 /* Define if you have the <sys/types.h> header file.  */
 #define HAVE_SYS_TYPES_H 1
+
+/* Name of package */
+#define PACKAGE "WindowMaker"
+
+/* Version number of package */
+#define VERSION "0.51.0"
+
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -65,12 +65,6 @@
 * set by configure */
 #undef NLSDIR

-/* package name */
-#undef PACKAGE 
-
-/* package version */
-#undef VERSION 
-
 /* define if you want GNOME stuff support */
 #undef GNOME_STUFF

@@ -183,3 +177,10 @@

 /* Define if you have the <sys/types.h> header file.  */
 #undef HAVE_SYS_TYPES_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
--- a/src/main.c
+++ b/src/main.c
@@ -251,8 +251,10 @@ wAbort(Bool dumpCore)
 void
 print_help()
 {
-    printf(_("usage: %s [options]\n"), ProgName);
-    puts(_("options:"));
+    printf(_("Usage: %s [options]\n"), ProgName);
+    puts(_("The Window Maker window manager for the X window system"));
+    puts("");
+    puts(_(" -display host:dpy	display to use"));
 #ifdef USECPP
    puts(_(" --no-cpp 		disable preprocessing of configuration files"));
 #endif
@@ -262,7 +264,6 @@ print_help()
    puts(_(" --locale locale		locale to use"));
    */
    puts(_(" --visual-id visualid	visual id of visual to use"));
-    puts(_(" -display host:dpy	display to use"));
    puts(_(" --static		do not update or save configurations"));
    puts(_(" --version		print version and exit"));
    puts(_(" --help			show this message"));
@@ -410,8 +411,9 @@ main(int argc, char **argv)
 		}
 #endif
 	    } else {
-		print_help();
-		exit(0);
+		printf(_("%s: invalid argument '%s'"), argv[0]);
+		printf(_("Try '%s --help' for more information"), argv[0]);
+		exit(1);
 	    }
 	}
    }