From e93e16de06b6af36f3095190f2b61836d5b72cf4 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 23 Oct 2004 00:00:02 +0000 Subject: [PATCH] removed some more obsoleted scripts and their manual pages --- ChangeLog | 4 +- doc/Makefile.am | 2 - doc/cs/Makefile.am | 1 - doc/cs/seznam.txt | 10 --- doc/cs/wsetfont.1x | 33 ---------- doc/sk/Makefile.am | 1 - doc/sk/wsetfont.1x | 31 ---------- doc/wcopy.1x | 58 ----------------- doc/wsetfont.1x | 30 --------- util/Makefile.am | 13 +--- util/convertfonts.c | 1 + util/wmchlocale.in | 148 -------------------------------------------- 12 files changed, 7 insertions(+), 325 deletions(-) delete mode 100644 doc/cs/seznam.txt delete mode 100644 doc/cs/wsetfont.1x delete mode 100644 doc/sk/wsetfont.1x delete mode 100644 doc/wcopy.1x delete mode 100644 doc/wsetfont.1x delete mode 100644 util/wmchlocale.in diff --git a/ChangeLog b/ChangeLog index f75f46bd..b309f748 100644 --- a/ChangeLog +++ b/ChangeLog @@ -163,7 +163,9 @@ Changes since version 0.80.2: - moved out font name conversion code from getstyle/setstyle/convertfonts and made it support fontsets - Converted all menu and po files to UTF-8 - Updated de.po (Thomas Otto <3.1415926535897932384626433832@gmx.net>) -- fixed a crash bug when switching workspaces +- Fixed a crash bug when switching workspaces +- Removed some obsoleted scripts from util + Changes since version 0.80.1: ............................. diff --git a/doc/Makefile.am b/doc/Makefile.am index 91e2fcae..acab6dee 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -7,11 +7,9 @@ man_MANS = \ getstyle.1x \ seticons.1x \ setstyle.1x \ - wcopy.1x \ wdwrite.1x \ wmaker.1x \ wmsetbg.1x \ - wsetfont.1x \ wxcopy.1x \ wxpaste.1x diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am index 8548fb9c..480bdb63 100644 --- a/doc/cs/Makefile.am +++ b/doc/cs/Makefile.am @@ -9,7 +9,6 @@ man_MANS = \ getstyle.1x \ wdwrite.1x \ wmsetbg.1x \ - wsetfont.1x \ seticons.1x \ wmaker.1x \ wxcopy.1x diff --git a/doc/cs/seznam.txt b/doc/cs/seznam.txt deleted file mode 100644 index 4bfe3a42..00000000 --- a/doc/cs/seznam.txt +++ /dev/null @@ -1,10 +0,0 @@ -x geticonset.1x -x getstyle.1x -x seticons.1x -x setstyle.1x -x wdwrite.1x -x wmaker.1x -x wmsetbg.1x -x wsetfont.1x -x wxcopy.1x -x wxpaste.1x diff --git a/doc/cs/wsetfont.1x b/doc/cs/wsetfont.1x deleted file mode 100644 index ecf39181..00000000 --- a/doc/cs/wsetfont.1x +++ /dev/null @@ -1,33 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.TH wsetfont 1x "Leden 1999" "Window Maker utilities" -.SH JMÉNO -wsetfont \- nástroj pro nastavení fontů/jazyka Window Makera -.SH SYNTAXE -\fBwsetfont\fP \fIsada\-fontů\fP -.SH POPIS -\fBwsetfont\fP nastaví fonty, které používá WINGs a Window Maker -na sady fontů odpovedající různým znakovým sadám. Rozpoznáva -nasledující znakové sady: \fIlatin1\fP, \fIlatin2\fP, \fIgreek\fP, -\fIjapanese\fP, \fIkorean\fP, \fIkorean2\fP, \fIrussian\fP, -\fIturkish\fP. -.PP -Zapíše nastavení do databáze WMGLOBAL a WindowMaker. -.SH SOUBORY -.TP -.B GNUstep/Defaults/WMGLOBAL -Společné nastavení pro knihovnu WINGs a Window Maker -.TP -.B GNUstep/Defaults/WindowMaker -Nastavení specifické pro Window Maker -.PP -Prosím, přečtěte si \fBwmaker\fP(1x), kde najdete umístění těchto -souborů. -.SH PODÍVEJTE SE TAKÉ -.BR wmaker (1x) -.SH AUTOR -Autorem Window Makera je Alfredo K. Kojima . -Autorem wsetfont je MANOME Tomonori -.PP -Tuto manuálovou stránku napsal Marcelo Magallon . -.PP -Do češtiny přeložil Jiří Hnídek . diff --git a/doc/sk/Makefile.am b/doc/sk/Makefile.am index a3a1af7e..eae74a94 100644 --- a/doc/sk/Makefile.am +++ b/doc/sk/Makefile.am @@ -9,7 +9,6 @@ man_MANS = \ getstyle.1x \ wdwrite.1x \ wmsetbg.1x \ - wsetfont.1x \ seticons.1x \ wmaker.1x \ wxcopy.1x diff --git a/doc/sk/wsetfont.1x b/doc/sk/wsetfont.1x deleted file mode 100644 index d36b5e03..00000000 --- a/doc/sk/wsetfont.1x +++ /dev/null @@ -1,31 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.TH wsetfont 1x "January 1999" "Window Maker utilities" -.SH MENO -wsetfont \- nástroj na nastavenie fontov/jazyka pre Window Maker -.SH SYNTAX -\fBwsetfont\fP \fIsada\-fontov\fP -.SH DESCRIPTION -\fBwsetfont\fP nastaví fonty, ktoré používa WINGs a Window Maker -na sady fontov zodpovedajúce rôznym znakovým sadám. Rozpoznáva -nasledovné znakové sady: \fIlatin1\fP, \fIlatin2\fP, \fIgreek\fP, -\fIjapanese\fP, \fIkorean\fP, \fIkorean2\fP, \fIrussian\fP, -\fIturkish\fP. -.PP -Zapíše nastavenia do databáz WMGLOBAL a WindowMaker. -.SH SÚBORY -.TP -.B GNUstep/Defaults/WMGLOBAL -Spoločné nastavenia pre knižnicu WINGs Window Maker -.TP -.B GNUstep/Defaults/WindowMaker -Nastavenia špecifické pre Window Maker -.PP -Prosím, prečítajte si \fBwmaker\fP(1x), kde nájdete umiestnenia týchto -súborov. -.SH POZRI TIEŽ -.BR wmaker (1x) -.SH AUTOR -Autorom Window Makera je Alfredo K. Kojima . -Autorom wsetfont je MANOME Tomonori -.PP -Túto manuálovú stránku napísal Marcelo Magallon . diff --git a/doc/wcopy.1x b/doc/wcopy.1x deleted file mode 100644 index f7d36fe0..00000000 --- a/doc/wcopy.1x +++ /dev/null @@ -1,58 +0,0 @@ -.TH wcopy,wpaste 1 04/09/01 -.UC 4 -.SH NAME -wcopy \- copy stdin to an X11 cut buffer -wpaste \- paste X11 cut buffer to stdout -.SH SYNOPSIS -.B wcopy [ [0-9]... ] [wxcopy's normal args] -.SH DESCRIPTION -\fBwcopy\fP reads from standard input and copies it to the nominated -X11 cut buffers. -The default is the first cut buffer. -.PP -\fBwpaste\fP pastes the nominated X11 cut buffers(s) -to standard output. -The default is the first cut buffer. -.PP -Note that the cut buffers are numbered starting from 0. -.PP -Simple integer arguments pick a cut-buffer. -.PP -For \fBwcopy\fP, -the argument number picks a cut-buffer to copy the standard input to. -(Subsequent copies are taken from the first nominated buffer \- -it does not try to re-read the input!)) -.SH EXAMPLES -.TP 1.5i -.B echo fred | wcopy 1 2 -This puts the word "fred" into the 2nd and 3rd cut-buffers. -.TP 1.5i -.B wpaste | tr "A-Z" "a-z" | wcopy 1 -This copies the clipboard then translates all upper case letters to lower in -the 1st -cut buffer and copies the result into the 2nd. -.TP 1.5i -.B wpaste 0 | fmt -w 66 | sed 's/^/> /' | wcopy 1 -This reformats the clipboard to paragraphs with lines no longer than 66 -characters, inserts typical email quoting characters, and copies the -output to the 2nd cut-buffer. -.TP 1.5i -.B wpaste | sed 's/^> *//' | wcopy -This removes email quotes from the start of lines in the clipboard -and replaces the clipboard with the un-quoted material. -.TP 1.5i -.B wpaste > ~/.myclipboard -Copies the clipboard into a location where it can be pixked up from other -computers (e.g. even from a Windows machine) \- as per the file permissions -you choose for the ".myclipboard" file. -.SH ENVIRONMENT -If WXCOPY_DEFS or WXPASTE_DEFS are defined in your environment, -they will always be provided as the first argument(s) to the -respective underlying command. -.SH BUGS -Don't use "-cutbuffer N" notation as per wxcopy/wxpaste: -stick to just using the plain unadorned number(s) that wcopy/wpaste expect. -.SH SEE ALSO -wxcopy(1), wxpaste(1), xcb(1) -.SH AUTHOR -Luke Kendall diff --git a/doc/wsetfont.1x b/doc/wsetfont.1x deleted file mode 100644 index 31727c5c..00000000 --- a/doc/wsetfont.1x +++ /dev/null @@ -1,30 +0,0 @@ -.\" Hey, Emacs! This is an -*- nroff -*- source file. -.TH wsetfont 1x "January 1999" "Window Maker utilities" -.SH NAME -wsetfont \- font/language setting utility for Window Maker -.SH SYNOPSIS -\fBwsetfont\fP \fIfontset\fP -.SH DESCRIPTION -\fBwsetfont\fP sets the fonts used by WINGs and Window Maker according -to some preset fontsents appropiate for different charsets. It knows -about the following charsets: \fIlatin1\fP, \fIlatin2\fP, \fIgreek\fP, -\fIjapanese\fP, \fIkorean\fP, \fIkorean2\fP, \fIrussian\fP, -\fIturkish\fP. -.PP -It writes this settings to the WMGLOBAL and WindowMaker databases. -.SH FILES -.TP -.B GNUstep/Defaults/WMGLOBAL -Global settings read by the WINGs library and Window Maker -.TP -.B GNUstep/Defaults/WindowMaker -Window Maker specific settings -.PP -Please read \fBwmaker\fP(1x) for the location of this files. -.SH SEE ALSO -.BR wmaker (1x) -.SH AUTHOR -Window Maker was written by Alfredo K. Kojima . -wsetfont was written by MANOME Tomonori -.PP -This man page was written by Marcelo Magallon . diff --git a/util/Makefile.am b/util/Makefile.am index 12e69db2..13f56616 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -6,10 +6,9 @@ pkgdatadir = $(datadir)/@PACKAGE@ bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle convertfonts \ seticons geticonset wmsetbg wmsetup wmagnify -bin_SCRIPTS = wmaker.inst wm-oldmenu2new wmchlocale wkdemenu.pl wcopy wpaste +bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl -EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c \ - wkdemenu.pl wmchlocale.in wcopy wpaste +EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \ @HEADER_SEARCH_PATH@ \ @@ -58,7 +57,7 @@ wmsetbg_LDADD = \ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ @INTLIBS@ @DLLIBS@ -CLEANFILES = wmaker.inst wmchlocale +CLEANFILES = wmaker.inst wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile -rm -f wmaker.inst @@ -71,9 +70,3 @@ 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 - diff --git a/util/convertfonts.c b/util/convertfonts.c index c2339514..21a67f2e 100644 --- a/util/convertfonts.c +++ b/util/convertfonts.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "../src/wconfig.h" diff --git a/util/wmchlocale.in b/util/wmchlocale.in deleted file mode 100644 index a9e34d7a..00000000 --- a/util/wmchlocale.in +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh -# -# Change locale-dependent settings of WindowMaker. -# -# v0.1 by Jan "judas" Tomka on Jan 28 2001 -# -# v0.2 by Jan "judas" Tomka on Feb 22 2001 -# - removed --nodef option -# - better error recognizing -# - added --test switch like in wsetfont -# -# v0.3 by Jan "judas" Tomka on May 04 2001 -# - bad bugs with --test found and corrected -# - -PROGRAM=`basename $0` -VERSION="0.3" - -if [ "x$GNUSTEP_USER_ROOT" = "x" ]; then - GSDIR="$HOME/GNUstep" -else - GSDIR="$GNUSTEP_USER_ROOT" - if [ ! -d "GSDIR" ]; then - echo "GNUSTEP_USER_ROOT variable does not contain path to valid directory..." >/dev/stderr - exit 1 - fi -fi -GLOBALDIR="#pkgdatadir#" -LOCALDIR="$GSDIR/Library/WindowMaker" - -help_msg() { - echo -e "\n"\ - "$PROGRAM, v$VERSION by Jan \"judas\" Tomka\n"\ - "Syntax:\n"\ - " $PROGRAM [--auto] [--test] [ | default]\n"\ - "\n"\ - " locale you want WindowMaker to move to (e.g. ja or default)\n"\ - "--auto use current locale\n"\ - "--test don't write anything\n" - exit 0 -} - -if [ $# -eq 0 ]; then - help_msg -fi - -for i in $*; do - case $i in - --auto) - auto="YES";; - --test) - test="--test";; - *) - if [ -z "$new_locale" ]; then - new_locale="$i" - else - echo -e "\nUnrecognized command line argument, run without arguments to see help.\n" - exit 1 - fi;; - esac -done -if [ "$new_locale" = "default" ]; then - new_locale="" - default="YES" -fi - -if [ -n "$auto" ] && [ -z "$new_locale" ]; then - new_locale=$LANG - if [ -z "$new_locale" ]; then - new_locale="${LC_ALL%_*}" - fi -fi - -if [ -z "$new_locale" ]; then - if [ -z "$default" ]; then - echo -e "\nNo locale is set, using default...\n" >/dev/stderr - fi -elif ! (locale -a |grep "^$new_locale$" &>/dev/null); then - if [ -z "$auto" ]; then - echo -e "\n"\ - "Locale $new_locale is not supported on your system..."\ - "\n" >/dev/stderr - else - echo -e "\n"\ - "Locale $new_locale currently set is not supported on your system...\n"\ - "Check your LANG and LC_ALL variables or install your locale support\n"\ - "\n" >/dev/stderr - fi - exit 1 -fi - -echo -n "Setting Window Maker root menu... " - -if [ -z "$new_locale" ] || [ "$new_locale" = "en" ]; then - menu_list="plmenu menu" - args="default" -else - menu_list="plmenu.$new_locale menu.$new_locale plmenu menu" - args="--locale=$new_locale" -fi - -echo -n "Setting Window Maker root menu... " - -for new_menu in $menu_list; do - for wm_dir in $LOCALDIR $GLOBALDIR; do - if [ -f "$wm_dir/$new_menu" ]; then - if [ -z "$new_locale" ] || ( [ -n "$new_locale" ] && echo "$new_menu" |grep "menu.$new_locale" &>/dev/null ); then - echo "success" - else - echo "fail (copying default)" - fi - new_menu_tmp=$new_menu - # Set new_menu_tmp to first 4 letters of $new_menu. - while [ ${#new_menu_tmp} -gt 4 ]; do - new_menu_tmp=${new_menu_tmp%?} - done - if [ "${new_menu_tmp}" = "menu" ]; then # plain - echo "\"$wm_dir/$new_menu\"" >"$GSDIR/Defaults/WMRootMenu" - else # proplist - cp -f "$wm_dir/$new_menu" "$GSDIR/Defaults/WMRootMenu" - fi - any_found="YES" - break 2 - fi - done -done -if [ -z "$any_found" ]; then - echo "fail (no menu found)" -fi - -echo -n "Setting Window Maker fonts... " - -if [ -z "$new_locale" ] || [ "$new_locale" = "en" ]; then - args="default $nodef" -else - args="--locale=$new_locale $nodef" -fi -if wsetfont "$args" &>/dev/null; then - echo "success" -else - echo -n "fail" - if wsetfont default "$test" &>/dev/null; then - echo " (setting default)" - else - echo " (totally)" - fi -fi -