compact player controls

diff --git a/tetris.c b/tetris.c
index 9f2e90edf1fbb928e69e5f963743beb250682284..839293adcaaefda467a47cb3aac69c4338de6931 100644 (file)
--- a/tetris.c
+++ b/tetris.c
@@ -40,7 +40,7 @@ int xoffset = 1;
 int yoffset = 1;
 
 char *help =
-    "<c> Put down tile\n"
+    "<i> Put down tile\n"
     "<j> Move left tile\n"
     "<k> Move down tile\n"
     "<l> Move right tile\n"
@@ -363,10 +363,8 @@ int main (int argc, char *argv[])
             break;
         case 1:
             switch (ch) {
-            case KEY_ENTER:
-            case '\n':
-            case '\r':
-            case 'c':
+            case KEY_UP:
+            case 'i':
                 while (testvalidpos (board, cblock, xblock, yblock + 1)) {
                     yblock++;
                 }
@@ -392,9 +390,9 @@ int main (int argc, char *argv[])
                     xblock++;
                 }
                 break;
-            case KEY_UP:
-            case ' ':
-            case 'i':
+            case KEY_ENTER:
+            case '\n':
+            case '\r':
             case 'o':
                 if (!testvalidpos (board, rotateblock (cblock, 1), xblock, yblock)) {
                     rotateblock (cblock, -1);
@@ -404,6 +402,7 @@ int main (int argc, char *argv[])
             case KEY_DELETE:
             case 127:
             case '\b':
+            case ' ':
             case 'u':
                 if (!testvalidpos (board, rotateblock (cblock, -1), xblock, yblock)) {
                     rotateblock (cblock, 1);
@@ -472,18 +471,18 @@ int main (int argc, char *argv[])
 /* test: tetris.exe -w 2>&1 | grep 'no width' */
 /* test: tetris.exe -w 6 2>&1 | grep incorrect */
 /* test: tetris.exe _ 2>&1 | grep invalid */
-/* test: { sleep 1; echo -n s; sleep 1; echo ouuljk; sleep 1; echo q; } | tetris.exe -s 0 */
-/* test: { sleep 1; echo -n s; sleep 1; echo ouuljk; sleep 1; echo q; } | tetris.exe -s 1 */
-/* test: { sleep 1; echo -n s; sleep 1; echo ouuljk; sleep 1; echo q; } | tetris.exe -s 2 */
-/* test: { sleep 1; echo -n s; sleep 1; echo ouuljk; sleep 1; echo q; } | tetris.exe -s 3 */
+/* test: { sleep 1; echo -n s; sleep 1; echo -n ouuljki; sleep 1; echo q; } | tetris.exe -s 0 */
+/* test: { sleep 1; echo -n s; sleep 1; echo -n ouuljki; sleep 1; echo q; } | tetris.exe -s 1 */
+/* test: { sleep 1; echo -n s; sleep 1; echo -n ouuljki; sleep 1; echo q; } | tetris.exe -s 2 */
+/* test: { sleep 1; echo -n s; sleep 1; echo -n ouuljki; sleep 1; echo q; } | tetris.exe -s 3 */
 /* test: { sleep 1; echo -n skkkkkkkkkkkkkkkkkk; sleep 6; echo -n kkkkkkkkkkkkkkkkk; sleep 1; echo q; } | tetris.exe */
-/* test: { sleep 1; echo -n s; sleep 1; echo oup; sleep 1; echo puljk; sleep 1; echo -ne 'sb.ttr\e'; sleep 1; echo -e 'sab\b.ttr'; sleep 1; echo q; } | tetris.exe -w 9 -v 3 */
+/* test: { sleep 1; echo -n s; sleep 1; echo oup; sleep 1; echo -n puljki; sleep 1; echo -ne 'sb.ttr\e'; sleep 1; echo -e 'sab\b.ttr'; sleep 1; echo q; } | tetris.exe -w 9 -v 3 */
 /* test: { sleep 1; echo -n s; sleep 1; echo q; } | tetris.exe -f a.ttr && rm a.ttr && test \! -f b.ttr */
-/* test: { echo -n s; sleep 1; echo ooollllk; sleep 1; echo uuukjjjj; sleep 1; echo ooollllk; sleep 1; echo uuukjjjj; sleep 1; echo ooollllk; sleep 1; echo uuukjjjj; sleep 1; echo ooollllk; sleep 1; echo uuukjjjj; sleep 1; echo cccc; sleep 1; echo q; } | tetris.exe -w 9 */
-/* test: { echo -n s; sleep 1; echo lllololo; sleep 1; echo jjjujuju; sleep 1; echo lllololo; sleep 1; echo jjjujuju; sleep 1; echo q; } | tetris.exe -w 9*/
-/* test: { echo -n s; sleep 1; echo ccccccccccccc; sleep 1; echo q; } | tetris.exe */
-/* test: { echo -n s; sleep 1; echo -n jjuuuc; sleep 1; echo -n jjoc; sleep 1; echo q; } | tetris.exe -f lines.ttr */
-/* test: { echo -n s; sleep 1; echo -n jjuuuc; sleep 1; echo -n jjoc; sleep 1; echo q; } | tetris.exe -c -f lines.ttr */
-/* test: { echo -n sccccccc; sleep 50; echo q; } | tetris.exe -c */
+/* test: { echo -n s; sleep 1; echo -n ooollllki; sleep 1; echo -n uuukjjjji; sleep 1; echo -n ooollllki; sleep 1; echo -n uuukjjjji; sleep 1; echo -n ooollllki; sleep 1; echo -n uuukjjjji; sleep 1; echo -n ooollllki; sleep 1; echo -n uuukjjjji; sleep 1; echo -n iii; sleep 1; echo q; } | tetris.exe -w 9 */
+/* test: { echo -n s; sleep 1; echo -n lllololoi; sleep 1; echo -n jjjujujui; sleep 1; echo -n lllololoi; sleep 1; echo -n jjjujujui; sleep 1; echo q; } | tetris.exe -w 9 */
+/* test: { echo -n s; sleep 1; echo -n iiiiiiiiiiiii; sleep 1; echo q; } | tetris.exe */
+/* test: { echo -n s; sleep 1; echo -n jjuuui; sleep 1; echo -n jjoi; sleep 1; echo q; } | tetris.exe -f lines.ttr */
+/* test: { echo -n s; sleep 1; echo -n jjuuui; sleep 1; echo -n jjoi; sleep 1; echo q; } | tetris.exe -c -f lines.ttr */
+/* test: { echo -n siiiiiii; sleep 50; echo q; } | tetris.exe -c */
 
 /* vim: set ts=4 sw=4 et: */