/etc/grml/screenrc*: switch caption and hardstatus

diff --git a/debian/changelog b/debian/changelog
index a122eba..45f5a8e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ grml-etc-core (0.3.31) unstable; urgency=low
   * /etc/skel/.zshrc: use same pattern in function wikien as in wikide.
     (Thanks, wuehlmaus)
   * Added /etc/apt/apt.conf.example + /etc/apt/hg-snapshot-script
+  * /etc/grml/screenrc*: switch caption and hardstatus for better
+    use with splitted windows; thanks to Alexander 'z3ttacht' Steinböck
+    for the patch! [Closes: issue300]
   * /etc/grml/screenrc_acpi: fix usage of yacpi, thanks to
-    Alexander 'z3ttacht' Steinböck for the patch!
+    Alexander 'z3ttacht' Steinböck for the patch! [Closes: issue301]
 
  -- Michael Prokop <mika@grml.org>  Wed, 26 Sep 2007 22:48:07 +0200
 

diff --git a/etc/grml/screenrc b/etc/grml/screenrc
index c81be7d..5ec5c5f 100644 (file)
--- a/etc/grml/screenrc
+++ b/etc/grml/screenrc
@@ -8,10 +8,10 @@
 
   backtick 1 0 60   /usr/bin/cpu-screen
   backtick 2 0 60   /usr/bin/ip-screen
-  caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}net: %2`)  %-21=%{wk}%D %d.%m.%Y %0c"
-  hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}"
+  hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}net: %2`)  %-21=%{kw}%D %d.%m.%Y %0c"
+  caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?"
+# hardstatus alwayslastline "%{bw}%1`%= "
 
-#  hardstatus alwayslastline "%{bw}%1`%= "
 # detach on hangup
   autodetach            on              # default: on
   crlf                  off             # default: off

diff --git a/etc/grml/screenrc_acpi b/etc/grml/screenrc_acpi
index 4061b6c..0ae48c0 100644 (file)
--- a/etc/grml/screenrc_acpi
+++ b/etc/grml/screenrc_acpi
@@ -3,15 +3,14 @@
 # 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: Fre Sep 28 23:13:13 CEST 2007 [mika]
+# Latest change: Fre Sep 28 23:19:52 CEST 2007 [mika]
 ################################################################################
 
   backtick 1 60 60 /usr/bin/cpu-screen
   backtick 2 60 60 /usr/bin/yacpi -p -t
-  caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}acpi: %2`)  %-21=%{wk}%D %d.%m.%Y %0c"
-  hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}"
+  caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%?"
+  hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}acpi: %2`)  %-21=%{kw}%D %d.%m.%Y %0c"
 
-#  hardstatus alwayslastline "%{bw}%1`%= "
 # detach on hangup
   autodetach            on              # default: on
   crlf                  off             # default: off
@@ -142,3 +141,5 @@
 #
 # Welcome the user:
   echo "welcome BoFH!"
+
+# vim: ft=screen