[xiph-commits] r17671 - trunk/squishyball

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-11-28 06:14:43 -0800 (Sun, 28 Nov 2010)
New Revision: 17671

Modified:
   trunk/squishyball/squishyball.1
   trunk/squishyball/tty.c
Log:
fixes/clarifications ot keymap printing.


Modified: trunk/squishyball/squishyball.1
===================================================================
--- trunk/squishyball/squishyball.1	2010-11-28 00:25:43 UTC (rev 17670)
+++ trunk/squishyball/squishyball.1	2010-11-28 14:14:43 UTC (rev 17671)
@@ -134,7 +134,7 @@
 .IP "\fBS"
 Reset start playback time to beginning of sample.
 .IP "\fB?"
-Print this keymap.
+Print this keymap.  The keymap will not be printed if the terminal has insufficient rows to do so.
 .IP "\fB^c"
 Abort testing early.
 

Modified: trunk/squishyball/tty.c
===================================================================
--- trunk/squishyball/tty.c	2010-11-28 00:25:43 UTC (rev 17670)
+++ trunk/squishyball/tty.c	2010-11-28 14:14:43 UTC (rev 17671)
@@ -555,8 +555,9 @@
 
 static int p_keymap=0;
 void panel_toggle_keymap(){
-  int l=18;
+  int l=8;
   int o=1;
+  int x=(columns-70)/2;
   if(!p_keymap){
     if(min_panel_expand(l,0))return;
     p_keymap = !p_keymap;
@@ -565,56 +566,37 @@
     toprow+=l;
     boxrow+=l;
     fliprow+=l;
-    min_panel_expand(l,0);
     min_fg(COLOR_CYAN);
-    min_mvcur(0,o++);
-    min_putstrb("     a b x     ");
-    min_putstr(": Switch playback between A, B [and X] samples");
-    min_mvcur(0,o++);
-    min_putstrb("      A B      ");
-    min_putstr(": Choose A or B sample for A/B[/X] trial result");
-    min_mvcur(0,o++);
-    min_putstrb("    1 2 3...   ");
-    min_putstr(": Switch between first, second, etc samples");
-    min_mvcur(0,o++);
-    min_putstrb("     ! @ #     ");
-    min_putstr(": Choose sample 1, 2, or 3 for X/X/Y trial result");
-    min_mvcur(0,o++);
-    min_putstrb("  <ins> <del>  ");
-    min_putstr(": Undo/redo last trial result selection");
-    min_mvcur(0,o++);
-    min_putstrb("    <enter>    ");
-    min_putstr(": Choose current sample for this trial");
-    min_mvcur(0,o++);
-    min_putstrb("     <- ->     ");
-    min_putstr(": Seek back/forward two seconds, +shift for 10 seconds");
-    min_mvcur(0,o++);
-    min_putstrb("   <up/down>   ");
-    min_putstr(": Select sample from list (casual mode)");
-    min_mvcur(0,o++);
-    min_putstrb("    <space>    ");
-    min_putstr(": Pause/resume playback");
-    min_mvcur(0,o++);
-    min_putstrb("   <backspc>   ");
-    min_putstr(": Reset playback to start point");
-    min_mvcur(0,o++);
-    min_putstrb("      e E      ");
-    min_putstr(": set/reset end playback loop point");
-    min_mvcur(0,o++);
-    min_putstrb("       f       ");
-    min_putstr(": Toggle through beep-/mark-/seamless-flip modes");
-    min_mvcur(0,o++);
-    min_putstrb("       r       ");
-    min_putstr(": Toggle through restart-after/every/no-restart");
-    min_mvcur(0,o++);
-    min_putstrb("      s S      ");
-    min_putstr(": set/reset start playback loop point");
-    min_mvcur(0,o++);
-    min_putstrb("       ?       ");
-    min_putstr(": Print this keymap");
-    min_mvcur(0,o++);
-    min_putstrb("      ^-c      ");
-    min_putstr(": Quit");
+    min_mvcur(x,o++);
+    min_putstrb(" a b x 1 2 3... ");
+    min_putstr (": Flip sample    ");
+    min_putstrb("      A B ! @ # ");
+    min_putstr (": Choose sample  ");
+    min_mvcur(x,o++);
+    min_putstrb("        <enter> ");
+    min_putstr (": Choose current ");
+    min_putstrb("      <ins/del> ");
+    min_putstr (": Undo/redo trial");
+    min_mvcur(x,o++);
+    min_putstrb("   <left/right> ");
+    min_putstr (": Seek           ");
+    min_putstrb("      <up/down> ");
+    min_putstr (": Flip (casual)  ");
+    min_mvcur(x,o++);
+    min_putstrb("        <space> ");
+    min_putstr (": Pause/resume   ");
+    min_putstrb("      <backspc> ");
+    min_putstr (": Seek to start  ");
+    min_mvcur(x,o++);
+    min_putstrb("        s S e E ");
+    min_putstr (": set start/end  ");
+    min_putstrb("            f r ");
+    min_putstr (": Toggle modes   ");
+    min_mvcur(x,o++);
+    min_putstrb("              ? ");
+    min_putstr (": Toggle keymap  ");
+    min_putstrb("      Control-c ");
+    min_putstr (": Quit           ");
     min_unset();
   }else{
     p_keymap = !p_keymap;