Changeset 2358Tweet

Timestamp:

06/11/08 17:45:02 (5 years ago)

Author:

jylam

Message:

• Added a default shell roolback if no arguments are givent
• ctrl-a-c adds a new screen

File:

• neercs/trunk/src/main.c (modified) (4 diffs)

neercs/trunk/src/main.c

@@ -44 +44 @@
     static caca_display_t *dp;
     struct screen_list *screen_list = NULL;
-    int pty = 0, prevpty = 0, i, w, h, nt;
+    char *default_shell = NULL;
+    int pty = 0, prevpty = 0, i, w, h, nt, args = 0;
     int eof = 0, refresh = 1, command = 0, mini = 1;
 
-    if(argc < 2)
-    {
-        fprintf(stderr, "usage: %s <cmd1> [<cmd2> [<cmd3> ...]]\n", argv[0]);
-        fprintf(stderr, "eg. \"%s zsh bash\"\n", argv[0]);
-        return 1;
-    }
-
     nt = argc - 1;
+    args = nt;
+
+    if(nt == 0)
+    {
+        nt = 1;
+    }
+    default_shell = getenv("SHELL");
+
 
     /* Create main canvas and associated caca window */
@@ -78 +80 @@
     for(i = 0; i < nt; i++)
     {
-        struct screen *tmp = create_screen(w, h, argv[i + 1]);
+        struct screen *tmp;
+        if(args) tmp = create_screen(w, h, argv[i + 1]);
+        else     tmp = create_screen(w, h, default_shell);
+
         if(tmp)
         {
@@ -215 +220 @@
                     prevpty = pty;
                     pty = (pty + screen_list->count - 1) % screen_list->count;
+                    refresh = 1;
+                    break;
+                case 0x03: //CACA_KEY_CTRL_C:
+                    prevpty = pty;
+                    pty = add_screen(screen_list, create_screen(w, h, default_shell));
                     refresh = 1;
                     break;
@@ -276 +286 @@
                            j * YTAB + 1, screen_list->screen[j]->cv, NULL);
                 cucul_draw_cp437_box(cv, (n - 1 - j) * XTAB, j * YTAB,
-                                     w + (n - 1 - j) * XTAB + 1, h + j * YTAB + 1);
+                                     w + (n - 1 - j) * XTAB + 1, h + j * YTAB + 2);
                 /* Set cursor to the correct position */
                 if(i == n - 1)