Changeset 478

Timestamp:

May 10, 2007 10:20:00 PM (6 years ago)

Author:

dkg

Message:

cereal: fixed a bug when creating second cereal console, fixed documentation, preparing for 0.6 tag.

Location:

trunk/cereal

Files:

• debian/changelog (modified) (1 diff)
• fs/etc/cereal/screenrc (modified) (3 diffs)
• fs/usr/share/cereal/common (modified) (1 diff)
• fs/usr/share/man/man1/cereal.1 (modified) (1 diff)

trunk/cereal/debian/changelog

@@ +1 @@
+cereal (0.6-1) unstable; urgency=low
+
+  * fixing bugs: the second cereal console creation was failing. 
+  * limited more features in screen, updated man page to match
+
+ -- Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>  Thu, 10 May 2007 21:58:11 -0400
+
 cereal (0.5-1) unstable; urgency=low
 

trunk/cereal/fs/etc/cereal/screenrc

@@ -4 +4 @@
 ### IMPORTANT CEREAL SETTINGS BELOW.  MODIFY WITH CAUTION ###
 
+# use C-\ as the escape character
+escape \034\034
+
 # necessary for cereal logging to work properly
 logfile ./socket
 logfile flush 1
-
-# set a reasonable escape sequence ("\")
-escape \034\034
 
 # unset important key bindings
@@ -29 +29 @@
 bind \\
 bind ^\
-## others
+## no lockscreen:
+bind ^x
+bind x
+## no monitor, prev, next:
+bind M
+bind ^@
+bind n
+bind ^N
+bind ' ' 
+bind ^H
+bind ^P
+bind p
+bind ^?
+# no number:
+bind N
+# no clear:
+bind C
+# no displays or dumptermcap:
+bind *
+bind .
+# no window switching:
+bind -
+bind 0
+bind 1
+bind 2
+bind 3
+bind 4
+bind 5
+bind 6
+bind 7
+bind 8
+bind 9
+## no window splitting:
 bind S
+# no title change
 bind A
+# no remove
+bind X
+# no windows:
+bind ^w
+bind w
+# no suspend:
+bind ^z
+# no focus:
+bind ^i
+# no windowlist:
+bind \"
 
 # set default shell to be /bin/false
@@ -38 +82 @@
 
 # set a nice, informative caption
-caption always "%{= bw}%{+b w}cereal console%{-} %= %{+b y}%t%{-} %= type \"C-\ d\" to detach"
+caption always "%{= bb}%{+s w}cereal console (C-\ d to detach) %= %{+b y}%t%{-b w} %= %Y-%m-%d %c"
 
 startup_message off

trunk/cereal/fs/usr/share/cereal/common

@@ -34 +34 @@
 check_is_session_tty() {
     TTY="$1"
+    local SESSION
     for SESSION in $(ls "$SESSIONDIR") ; do
         if grep -q "^$TTY$" "$SESSIONDIR/$SESSION/env/TTY" ; then

trunk/cereal/fs/usr/share/man/man1/cereal.1

@@ -12 +12 @@
 .TP
 .B attach SESSION
-Attach to (take control of) a cereal session named SESSION.  This puts the user
-into a cereal console, provided by a command-restricted screen session.  To
-detach from an attached session, use the screen detach key command ("C-a C-d" by
-default).  See \fBscreen\fP(1) for more info on how to use screen while in an
-attached session.  (`a' may be used in place of `attach'.)
+Attach to (take control of) a cereal session named SESSION.  This puts
+the user into a cereal console, provided by a command-restricted
+screen session.  To detach from an attached session, use "C-\\ d".  For
+help on other available commands, use "C-\\ ?".  Cereal uses a limited
+instance of screen to provide the console.  See \fBscreen\fP(1) for
+more info on the available commands.  (`a' may be used in place of
+`attach'.)
 .TP
 .B follow [options] SESSION