use x-terminal-emulator instead of xterm

diff --git a/debian/changelog b/debian/changelog
index 81198d1..5ea2a65 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc (0.9-5) unstable; urgency=low
+
+  * Replace all xterm commands in configuration files with
+    x-terminal-emulator. Notice: /etc/alternatives/x-terminal-emulator
+    should point to /usr/bin/lxterm which is a locale-sensitive wrapper
+    for xterm. So let's get ready for utf8 as default...
+
+ -- Michael Prokop <mika@grml.org>  Sat, 16 Dec 2006 16:52:27 +0100
+
 grml-etc (0.9-4) unstable; urgency=low
 
   * /etc/runlevel.conf.hdinstall: add /etc/init.d/farpd

diff --git a/etc/X11/windowlab/windowlab.menurc b/etc/X11/windowlab/windowlab.menurc
index 4be6ee3..4a79da0 100644 (file)
--- a/etc/X11/windowlab/windowlab.menurc
+++ b/etc/X11/windowlab/windowlab.menurc
@@ -1,5 +1,5 @@
 # make sure each line ends in LF not CRLF!
-xterm:xterm
+xterm:x-terminal-emulator
 gvim:gvim
 firefox:mozilla-firefox
 grml-info:grml-info

diff --git a/etc/skel/.fluxbox/keys b/etc/skel/.fluxbox/keys
index 47de508..83d954d 100644 (file)
--- a/etc/skel/.fluxbox/keys
+++ b/etc/skel/.fluxbox/keys
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sun May 14 15:01:40 CEST 2006 [mika]
+# Latest change: Sam Dez 16 16:45:20 CET 2006 [mika]
 ################################################################################
 
 # Mod1 = Alt key
@@ -63,13 +63,13 @@ Control Shift s :ExecCommand import -window root `date +shot-%Y-%m-%d-%H%M%S.jpg
 Mod1 c         :ExecCommand fbrun
 
 # terminals:
-Mod1 Escape    :ExecCommand xterm
-Mod1 t         :ExecCommand xterm -fn '-misc-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-iso8859-15'
-Control Mod1 t :ExecCommand xterm -fn '-*-terminus-medium-*-*-*-16-*-*-*-*-*-iso8859-15'
+Mod1 Escape    :ExecCommand x-terminal-emulator
+Mod1 t         :ExecCommand x-terminal-emulator -fn '-misc-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-iso8859-15'
+Control Mod1 t :ExecCommand x-terminal-emulator -fn '-*-terminus-medium-*-*-*-16-*-*-*-*-*-iso8859-15'
 
 # None F13                  :ExecCommand x-terminal-emulator -T "aumix" -e aumix
 # None F14                  :ExecCommand mozilla-firefox
-# None F15                  :ExecCommand xterm
+# None F15                  :ExecCommand x-terminal-emulator
 None XF86AudioMedia       :ExecCommand xsay
 None XF86AudioRaiseVolume :ExecCommand XF86AudioRaiseVolume
 None XF86AudioLowerVolume :ExecCommand XF86AudioLowerVolume

diff --git a/etc/skel/.fluxbox/menu b/etc/skel/.fluxbox/menu
index 5f82662..eb6ec32 100644 (file)
--- a/etc/skel/.fluxbox/menu
+++ b/etc/skel/.fluxbox/menu
@@ -1,5 +1,5 @@
 [begin] (Fluxbox) {} <>
-    [exec] (xterm) {xterm} <>
+    [exec] (xterm) {x-terminal-emulator} <>
     [submenu] (handy stuff) {} <>
         [exec] (dillo webbrowser) {dillo} 
         [exec] (firefox webbrowser) {firefox} 

diff --git a/etc/skel/.fvwm-crystal/userconfig b/etc/skel/.fvwm-crystal/userconfig
index f7ded05..42ac24d 100644 (file)
--- a/etc/skel/.fvwm-crystal/userconfig
+++ b/etc/skel/.fvwm-crystal/userconfig
@@ -13,15 +13,15 @@
 
 # Run default terminal emulator via ctrl-alt-x:
 Key X A MC Exec exec x-terminal-emulator
-# ctrl-alt-p - run xterm in presentation mode (set via ~/.Xresources):
-Key P A MC Exec exec xterm -name presentation -geometry 65
+# ctrl-alt-p - run x-terminal-emulator in presentation mode (set via ~/.Xresources):
+Key P A MC Exec exec x-terminal-emulator -name presentation -geometry 65
 
 # Start application with specific geometry:
 # Key M A MC Exec exec mrxvt -lk --geometry 148x65
 # Key F A MC Exec exec firefox --geometry 1332x997-68-27
 
 # Special keys
-Key XF86AudioMedia A N Exec xterm
+Key XF86AudioMedia A N Exec x-terminal-emulator
 Key XF86AudioMute A N Exec XF86AudioMute
 Key XF86AudioLowerVolume A N Exec XF86AudioLowerVolume
 Key XF86AudioRaiseVolume A N Exec XF86AudioRaiseVolume

diff --git a/etc/skel/.fvwm/userconfig b/etc/skel/.fvwm/userconfig
index f7ded05..f547e7b 100644 (file)
--- a/etc/skel/.fvwm/userconfig
+++ b/etc/skel/.fvwm/userconfig
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Jun 12 18:42:31 CEST 2006 [mika]
+# Latest change: Sam Dez 16 16:47:23 CET 2006 [mika]
 ################################################################################
 # Bind applications to specific desktop:
 # Style vmware StartsOnPage 3 0
@@ -13,15 +13,15 @@
 
 # Run default terminal emulator via ctrl-alt-x:
 Key X A MC Exec exec x-terminal-emulator
-# ctrl-alt-p - run xterm in presentation mode (set via ~/.Xresources):
-Key P A MC Exec exec xterm -name presentation -geometry 65
+# ctrl-alt-p - run x-terminal-emulator in presentation mode (set via ~/.Xresources):
+Key P A MC Exec exec x-terminal-emulator -name presentation -geometry 65
 
 # Start application with specific geometry:
 # Key M A MC Exec exec mrxvt -lk --geometry 148x65
 # Key F A MC Exec exec firefox --geometry 1332x997-68-27
 
 # Special keys
-Key XF86AudioMedia A N Exec xterm
+Key XF86AudioMedia A N Exec x-terminal-emulator
 Key XF86AudioMute A N Exec XF86AudioMute
 Key XF86AudioLowerVolume A N Exec XF86AudioLowerVolume
 Key XF86AudioRaiseVolume A N Exec XF86AudioRaiseVolume

diff --git a/etc/skel/.gkrellm2/user-config b/etc/skel/.gkrellm2/user-config
index ef3ecf7..6ddf17c 100644 (file)
--- a/etc/skel/.gkrellm2/user-config
+++ b/etc/skel/.gkrellm2/user-config
@@ -114,7 +114,7 @@ battery tooltip_comment
 battery alert_units_percent 0
 battery display_mode 0 0
 # gkrellshoot xlock_cmd xscreensaver-command -lock
-gkrellshoot xlock_cmd xterm -e grml-lock
+gkrellshoot xlock_cmd x-terminal-emulator -e grml-lock
 gkrellshoot active_panels 1
 gkrellshoot window_or_full 1
 gkrellshoot view_image 1

diff --git a/etc/skel/.ion2/ion-bindings.lua b/etc/skel/.ion2/ion-bindings.lua
index 928eff1..4637fc6 100644 (file)
--- a/etc/skel/.ion2/ion-bindings.lua
+++ b/etc/skel/.ion2/ion-bindings.lua
@@ -51,7 +51,7 @@ global_bindings{
                                       exec_in(scr, m.." ion")
                                   end
                               end),
-    kpress(SECOND_MOD.."F2", make_exec_fn("xterm -fg white -bg black")),
+    kpress(SECOND_MOD.."F2", make_exec_fn("x-terminal-emulator -fg white -bg black")),
     
     -- Create a new workspace with a default name.
     kpress(DEFAULT_MOD.."F9", 
@@ -71,7 +71,7 @@ global_bindings{
     --kpress(DEFAULT_MOD.."Menu", make_bigmenu_fn("mainmenu")),
     --kpress(SECOND_MOD..KEYF11, querylib.query_restart),
     --kpress(SECOND_MOD..KEYF12, querylib.query_exit),
-    kpress(DEFAULT_MOD.."Escape", make_exec_fn("xterm")),
+    kpress(DEFAULT_MOD.."Escape", make_exec_fn("x-terminal-emulator")),
 }
 
 

diff --git a/etc/skel/.ion2/ion-menus.lua b/etc/skel/.ion2/ion-menus.lua
index 47361c4..0589a88 100644 (file)
--- a/etc/skel/.ion2/ion-menus.lua
+++ b/etc/skel/.ion2/ion-menus.lua
@@ -22,7 +22,7 @@ defmenu("mainmenu", {
 
 -- Application menu
 defmenu("appmenu", {
-    menuentry("XTerm", make_exec_fn("xterm")),
+    menuentry("XTerm", make_exec_fn("x-terminal-emulator")),
     menuentry("Mozilla Firefox", make_exec_fn("firefox")),
     -- The query module must also be loaded for this binding to work.
     menuentry("Run...", querylib.query_exec),

diff --git a/etc/skel/.ion2/pwm-bindings.lua b/etc/skel/.ion2/pwm-bindings.lua
index 7393b4d..a2c8980 100644 (file)
--- a/etc/skel/.ion2/pwm-bindings.lua
+++ b/etc/skel/.ion2/pwm-bindings.lua
@@ -51,7 +51,7 @@ global_bindings{
                                       exec_in(scr, m.." pwm")
                                   end
                               end),
-    kpress("F2", make_exec_fn("xterm")),
+    kpress("F2", make_exec_fn("x-terminal-emulator")),
     
     -- Create a new workspace with a default name.
     kpress(DEFAULT_MOD.."F9", 

diff --git a/etc/skel/.ion2/pwm-menus.lua b/etc/skel/.ion2/pwm-menus.lua
index 1f012fc..050a753 100644 (file)
--- a/etc/skel/.ion2/pwm-menus.lua
+++ b/etc/skel/.ion2/pwm-menus.lua
@@ -19,7 +19,7 @@ defmenu("mainmenu", {
 
 -- Application menu
 defmenu("appmenu", {
-    menuentry("XTerm", make_exec_fn("xterm")),
+    menuentry("XTerm", make_exec_fn("x-terminal-emulator")),
     menuentry("Mozilla Firefox", make_exec_fn("firefox")),
     menuentry("Xdvi", make_exec_fn("xdvi")),
     menuentry("GV", make_exec_fn("gv")),

diff --git a/etc/skel/.pekwm/keys b/etc/skel/.pekwm/keys
index c2c2327..c4326ef 100644 (file)
--- a/etc/skel/.pekwm/keys
+++ b/etc/skel/.pekwm/keys
@@ -1,5 +1,5 @@
-$TERM="xterm"
-#$TERM="xterm -fn fixed +sb -bg white -fg black"
+$TERM="x-terminal-emulator"
+#$TERM="x-terminal-emulator -fn fixed +sb -bg white -fg black"
 
 Global {
 # - - ----------------------------------------------- - -
@@ -73,7 +73,7 @@ Global {
        # KeyPress = "XF86AudioLowerVolume" { Actions = "Exec aumix -w-5" }
        # KeyPress = "XF86AudioRaiseVolume" { Actions = "Exec aumix -w+5" }
        # KeyPress = "XF86AudioMute" { Actions = "Exec aumix -w0" }
-       # KeyPress = "XF86AudioStop" { Actions = "Exec xterm" }
+       # KeyPress = "XF86AudioStop" { Actions = "Exec x-terminal-emulator" }
        # Pekwm control
        KeyPress = "Ctrl Mod1 Delete" { Actions = "Reload" }
        KeyPress = "Mod4 D" { Actions = "ShowCmdDialog" }

diff --git a/etc/skel/.pekwm/menu b/etc/skel/.pekwm/menu
index ea22fc5..2db4538 100644 (file)
--- a/etc/skel/.pekwm/menu
+++ b/etc/skel/.pekwm/menu
@@ -1,8 +1,8 @@
 # Menu config for pekwm
 
 # Variables
-$TERM = "xterm"
-#$TERM = "/usr/bin/xterm -bg black -fg yellow -fn -misc-fixed-medium-r-normal--14-140-75-75-c-90-iso8859-15 -ah"
+$TERM = "x-terminal-emulator"
+#$TERM = "x-terminal-emulator -bg black -fg yellow -fn -misc-fixed-medium-r-normal--14-140-75-75-c-90-iso8859-15 -ah"
 $XCONSOLE = "xconsole -daemon -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole"
 
 RootMenu = "Pekwm @ grml" {

diff --git a/etc/skel/.wmi/actions.conf b/etc/skel/.wmi/actions.conf
index b29233c..41a7165 100644 (file)
--- a/etc/skel/.wmi/actions.conf
+++ b/etc/skel/.wmi/actions.conf
@@ -13,7 +13,7 @@
   chain.xlock.seq="exec+/usr/X11R6/bin/xlock"
 
 # ``-R'' reattach if possible, otherwise start a new session
-  extern.screen.cmd="xterm -e screen -R"
+  extern.screen.cmd="x-terminal-emulator -e screen -R"
   extern.screen.keys=mod1+F1
 
 # Start firefox with Alt+F2

diff --git a/etc/skel/.wmi/actions.session b/etc/skel/.wmi/actions.session
index 51e5b0e..8452195 100644 (file)
--- a/etc/skel/.wmi/actions.session
+++ b/etc/skel/.wmi/actions.session
@@ -10,7 +10,7 @@ chain.selws4.keys=alt+4
 chain.selws4.seq="select-workspace+workspace 4"
 chain.shrink-full.keys=shift+alt+r::f
 chain.shrink-full.seq=shrink-left,shrink-right,shrink-up,shrink-down
-extern.xterm.cmd=xterm
+extern.xterm.cmd=x-terminal-emulator
 extern.xterm.keys=alt+x
 intern.attach-last-client.keys=alt+a
 intern.cycle-client-next.keys=alt+Tab

diff --git a/etc/skel/.wmi/common.conf b/etc/skel/.wmi/common.conf
index b19a951..01fbf7d 100644 (file)
--- a/etc/skel/.wmi/common.conf
+++ b/etc/skel/.wmi/common.conf
@@ -18,4 +18,4 @@ slot.style=transparent
 slot.tabs=default
 startup.chain=
 statusbar.alignment=bottom
-terminal="xterm -e"
+terminal="x-terminal-emulator -e"

diff --git a/etc/skel/.xinitrc b/etc/skel/.xinitrc
index 777015f..669521a 100755 (executable)
--- a/etc/skel/.xinitrc
+++ b/etc/skel/.xinitrc
@@ -4,11 +4,11 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Die Nov 14 13:32:00 CET 2006 [mika]
+# Latest change: Sam Dez 16 16:45:54 CET 2006 [mika]
 ################################################################################
 
-# is something goes wrong fall back to plain xterm:
-#  failsafe="xterm -ls -T failsafe -geometry 80x24-0-0"
+# is something goes wrong fall back to plain x-terminal-emulator:
+#  failsafe="x-terminal-emulator -ls -T failsafe -geometry 80x24-0-0"
 #  trap "exec $failsafe" EXIT 1 2 13 15
 
 # set wallpaper