Changeset 2359 for neercs/trunk/src/main.cTweet

Timestamp:

Jun 11, 2008, 6:00:26 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• moved thumbnail code to its own function, and added a box around current one
• Cosmetic changes

File:

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

neercs/trunk/src/main.c

@@ -297 +297 @@
             if(mini)
             {
+                draw_thumbnails(cv, screen_list, pty);
+            }
+
+            caca_refresh_display(dp);
+        }
+
+        eof = 1;
+        for(i = 0; i < screen_list->count; i++)
+            if(screen_list->screen[i]->fd >= 0)
+                eof = 0;
+        if(eof)
+            break;
+    }
+
+    /* Clean up */
+    caca_free_display(dp);
+    cucul_free_canvas(cv);
+    for(i = 0; i < screen_list->count; i++)
+    {
+        destroy_screen(screen_list->screen[i]);
+    }
+    free(screen_list->screen);
+    free(screen_list);
+
+
+    return 0;
+}
+
+static int create_pty(char *cmd, unsigned int w, unsigned int h)
+{
+    char **argv;
+    int fd;
+    pid_t pid;
+
+    pid = forkpty(&fd, NULL, NULL, NULL);
+    if(pid < 0)
+    {
+        fprintf(stderr, "forkpty() error\n");
+        return -1;
+    }
+    else if(pid == 0)
+    {
+        set_tty_size(0, w, h);
+        putenv("CACA_DRIVER=slang");
+        putenv("TERM=xterm");
+        argv = malloc(2 * sizeof(char *));
+        argv[0] = cmd;
+        argv[1] = NULL;
+        execvp(cmd, argv);
+        fprintf(stderr, "execvp() error\n");
+        return -1;
+    }
+
+    fcntl(fd, F_SETFL, O_NDELAY);
+    return fd;
+#if 0
+    fprintf(stderr, "forkpty() not available\n");
+    return -1;
+#endif
+}
+
+static int set_tty_size(int fd, unsigned int w, unsigned int h)
+{
+    struct winsize ws;
+
+    memset(&ws, 0, sizeof(ws));
+    ws.ws_row = h;
+    ws.ws_col = w;
+    ioctl(fd, TIOCSWINSZ, (char *)&ws);
+
+    return 0;
+}
+
+
+
+
+struct screen* create_screen(int w, int h, char *command)
+{
+    struct screen *s = (struct screen*) malloc(sizeof(struct screen));
+
+    s->cv = cucul_create_canvas(w, h);
+    s->init = 0;
+
+
+    s->buf = NULL;
+    s->total = 0;
+    s->fd = create_pty(command, w, h);
+    if(s->fd < 0)
+    {
+        cucul_free_canvas(s->cv);
+        free(s);
+        return NULL;
+    }
+    return s;
+}
+
+
+int add_screen(struct screen_list *list, struct screen *s)
+{
+    if(list == NULL || s == NULL) return -1;
+
+    else
+    {
+        list->screen = (struct screen**) realloc(list->screen,
+                                                 sizeof(sizeof(struct screen*))
+                                                 * (list->count+1));
+        list->screen[list->count] = s;
+        list->count++;
+    }
+
+    return list->count-1;
+}
+
+
+int remove_screen(struct screen_list *list, int n)
+{
+    if(n>list->count) return -1;
+
+    memmove(&list->screen[n],
+            &list->screen[n+1],
+            sizeof(struct screen*)*(list->count-(n+1)));
+
+    list->screen = (struct screen**) realloc(list->screen,
+                                             sizeof(sizeof(struct screen*))
+                                             * (list->count));
+
+    list->count--;
+    return 1;
+}
+
+int destroy_screen(struct screen *s)
+{
+    free(s->buf);
+    cucul_free_canvas(s->cv);
+    free(s);
+    return 1;
+}
+
+
+
+void draw_thumbnails(cucul_canvas_t *cv, struct screen_list *screen_list, int pty)
+{
                 char const * const *fonts;
                 cucul_dither_t *d;
                 cucul_font_t *f;
                 uint8_t *buf;
+                int i;
                 int miniw, minih;
 
@@ -334 +477 @@
                                             cucul_get_canvas_height(cv) - 6, 19, 6, d, buf);
                         cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
+
+                        if(pty == i)
+                            cucul_draw_cp437_box(cv,20 * i,
+                                                 cucul_get_canvas_height(cv) - 6, 19, 6);
                         cucul_printf(cv, 20 * i,
                                      cucul_get_canvas_height(cv) - 6, "(%i)", i);
@@ -343 +490 @@
                     free(buf);
                 }
-            }
-
-            caca_refresh_display(dp);
-        }
-
-        eof = 1;
-        for(i = 0; i < screen_list->count; i++)
-            if(screen_list->screen[i]->fd >= 0)
-                eof = 0;
-        if(eof)
-            break;
-    }
-
-    /* Clean up */
-    caca_free_display(dp);
-    cucul_free_canvas(cv);
-    for(i = 0; i < screen_list->count; i++)
-    {
-        destroy_screen(screen_list->screen[i]);
-    }
-    free(screen_list->screen);
-    free(screen_list);
-
-
-    return 0;
-}
-
-static int create_pty(char *cmd, unsigned int w, unsigned int h)
-{
-    char **argv;
-    int fd;
-    pid_t pid;
-
-    pid = forkpty(&fd, NULL, NULL, NULL);
-    if(pid < 0)
-    {
-        fprintf(stderr, "forkpty() error\n");
-        return -1;
-    }
-    else if(pid == 0)
-    {
-        set_tty_size(0, w, h);
-        putenv("CACA_DRIVER=slang");
-        putenv("TERM=xterm");
-        argv = malloc(2 * sizeof(char *));
-        argv[0] = cmd;
-        argv[1] = NULL;
-        execvp(cmd, argv);
-        fprintf(stderr, "execvp() error\n");
-        return -1;
-    }
-
-    fcntl(fd, F_SETFL, O_NDELAY);
-    return fd;
-#if 0
-    fprintf(stderr, "forkpty() not available\n");
-    return -1;
-#endif
-}
-
-static int set_tty_size(int fd, unsigned int w, unsigned int h)
-{
-    struct winsize ws;
-
-    memset(&ws, 0, sizeof(ws));
-    ws.ws_row = h;
-    ws.ws_col = w;
-    ioctl(fd, TIOCSWINSZ, (char *)&ws);
-
-    return 0;
-}
-
-
-
-
-struct screen* create_screen(int w, int h, char *command)
-{
-    struct screen *s = (struct screen*) malloc(sizeof(struct screen));
-
-    s->cv = cucul_create_canvas(w, h);
-    s->init = 0;
-
-    s->buf = NULL;
-    s->total = 0;
-    s->fd = create_pty(command, w, h);
-    if(s->fd < 0)
-    {
-        cucul_free_canvas(s->cv);
-        free(s);
-        return NULL;
-    }
-    return s;
-}
-
-
-int add_screen(struct screen_list *list, struct screen *s)
-{
-    if(list == NULL || s == NULL)
-    {
-        return -1;
-    }
-    else
-    {
-        list->screen = (struct screen**) realloc(list->screen,
-                                                 sizeof(sizeof(struct screen*))
-                                                 * (list->count+1));
-        list->screen[list->count] = s;
-        list->count++;
-    }
-
-    return list->count-1;
-}
-
-
-int remove_screen(struct screen_list *list, int n)
-{
-    if(n>list->count) return -1;
-
-    memmove(&list->screen[n],
-            &list->screen[n+1],
-            sizeof(struct screen*)*(list->count-(n+1)));
-
-    list->screen = (struct screen**) realloc(list->screen,
-                                             sizeof(sizeof(struct screen*))
-                                             * (list->count));
-
-    list->count--;
-    return 1;
-}
-
-int destroy_screen(struct screen *s)
-{
-    free(s->buf);
-    cucul_free_canvas(s->cv);
-    free(s);
-    return 1;
-}
+
+}