tomka's i18n fixes

util/Makefile.am

@@ -3,12 +3,12 @@ AUTOMAKE_OPTIONS = no-dependencies
 
 pkgdatadir  = $(datadir)/@PACKAGE@
 
-bin_PROGRAMS = wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
+bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
 
-bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
+bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl
 
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
-		wkdemenu.pl
+		wkdemenu.pl wmchlocale.in
 
 INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
 	@HEADER_SEARCH_PATH@ \
@@ -21,6 +21,8 @@ liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
 
 wdwrite_LDADD = $(liblist)
 
+wdread_LDADD = $(liblist)
+
 wxcopy_LDADD = @XLFLAGS@ @XLIBS@ 
 
 wxpaste_LDADD = @XLFLAGS@ @XLIBS@
@@ -51,7 +53,7 @@ wmsetbg_LDADD = \
 	@LIBPL@ \
 	@DLLIBS@
 
-CLEANFILES = wmaker.inst
+CLEANFILES = wmaker.inst wmchlocale
 
 wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
 	-rm -f wmaker.inst
@@ -64,4 +66,9 @@ wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile
 
 	chmod 755 wmaker.inst
 
+wmchlocale: $(srcdir)/wmchlocale.in ./Makefile
+	-rm -f wmchlocale
+	sed -e "s|#pkgdatadir#|$(pkgdatadir)|" $(srcdir)/wmchlocale.in >wmchlocale
+
+	chmod 755 wmchlocale
 

util/README

@@ -27,6 +27,10 @@ wmsetbg- set the workspace background into a image and make it persist between
 
 wdwrite- write data into the defaults database (configuration files).
 
+wdread- read Simple data from defaults database (for use in scripts for example)
+
+wmchlocale- change locale dependent settings of Window Maker (menu & fonts)
+
 wsetfont- set locale the fonts needed for a specific locale for Window Maker
 
 wmagnify- a program to magnify the area near the mouse pointer,

util/wmaker.inst.in

@@ -4,13 +4,15 @@
 #
 
 # xx herbert
-if test x"$1" = x"--batch" ; then
+if test "x$1" = "x--batch" ; then
   BATCH="1"
 else
   BATCH=""
 fi
 # /xx herbert
 
+# name of menu file we install (menu, plmenu)
+inst_menu=""
 
 LOCALE=$LANG
 if [ -z "$LOCALE" ]; then
@@ -264,6 +266,8 @@ test -f ~$GSDIR/Library/WindowMaker/exitscript || \
     cp $GLOBALDIR/exitscript.sh $GSDIR/Library/WindowMaker/exitscript
 chmod +rx $GSDIR/Library/WindowMaker/exitscript
 
+wsetfont --auto
+
 # xx herbert
 if test -n "$BATCH" ; then
   echo "Installation Finished"
@@ -287,7 +291,13 @@ if test -z "#LITE#" ; then
  echo "the property list format. The plain text format is more flexible, but"
  echo "the menu in the property list format can be edited graphically. The"
  echo "menu that will be used by default is the property list one. Read"
- echo "$GSDIR/Library/WindowMaker/README for information on how to change it."
+ echo "    $GSDIR/Library/WindowMaker/README"
+ echo "for information on how to change it."
+    if [ "${inst_menu%.*}" == "menu" ]; then
+ echo "However, since you have locale set to $LOCALE and plmenu for such locale"
+ echo "was not found, your WMRootMenu contains path to text formated menu:"
+ echo "    $GSDIR/Library/WindowMaker/$inst_menu"
+    fi
 else
  echo "Your copy of Window Maker is configured especially for KDE."
  echo "Window Maker application menus are not available."

util/wsetfont

@@ -3,6 +3,14 @@
 # language/font setting script for Window Maker
 #
 # by MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
+# (rewriten slightly by judas@hell on Jan 27 2001
+#  -argument --nodef tries to change only font coding (limited!)
+#  -much easier to add new font codings
+#  -much harder to read code...
+#  -argument --auto gets locale by itself, but does not override if some
+#       coding is also given
+#  -argument --locale=?? takes locale code (ja, sk, ...)
+# )
 #
 # [Special Thanks To]
 # Korean fontset info from: