Changeset 2641 for neercs/trunkTweet

Timestamp:

Aug 2, 2008, 12:53:55 PM (12 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added window list and window selection by name using ctrl-a-"

Location:

neercs/trunk/src

Files:

• effects.c (modified) (1 diff)
• input.c (modified) (2 diffs)
• main.c (modified) (1 diff)
• neercs.h (modified) (2 diffs)
• screens.c (modified) (1 diff)
• server.c (modified) (1 diff)

neercs/trunk/src/effects.c

@@ -213 +213 @@
 }
 
-
+int update_window_list(int c, struct screen_list *screen_list)
+{
+    debug("Got %x\n", c);
+
+    switch(c)
+    {
+    case 0x111:
+        if(screen_list->cur_in_list>0)
+            screen_list->cur_in_list--;
+        break;
+    case 0x112:
+        if(screen_list->cur_in_list<screen_list->count-1)
+            screen_list->cur_in_list++;
+        break;
+    case 0xd:
+        screen_list->window_list = 0;
+        screen_list->prevpty = screen_list->pty;
+        screen_list->pty     = screen_list->cur_in_list;
+        break;
+    case 0x22:
+        screen_list->window_list = 0;
+        break;
+    default:
+        break;
+    }
+
+    return 1;
+}
+
+void draw_list(struct screen_list *screen_list)
+{
+    int i;
+    int w = (cucul_get_canvas_width(screen_list->cv));
+    int h = (cucul_get_canvas_height(screen_list->cv));
+
+    debug("Drawing list\n");
+    cucul_set_color_ansi(screen_list->cv, CUCUL_BLACK, CUCUL_BLACK);
+    cucul_fill_box(screen_list->cv,
+                   0, 0,
+                   w, h, '#');
+    cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_DEFAULT);
+    cucul_draw_cp437_box(screen_list->cv,
+                         0, 0,
+                         w, h);
+
+    cucul_printf(screen_list->cv, 2, 1, "Num \tName");
+    for(i = 0; i < screen_list->count; i++)
+    {
+        char line[1024];
+        if(screen_list->cur_in_list == i)
+            cucul_set_color_ansi(screen_list->cv, CUCUL_BLACK, CUCUL_WHITE);
+        else
+            cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_DEFAULT);
+        sprintf(line, "%d \t%s", i+1, screen_list->screen[i]->title);
+
+        cucul_printf(screen_list->cv, 2, i+3, line);
+    }
+}
 
 /* Close a window by animating it collapsing */

neercs/trunk/src/input.c

@@ -74 +74 @@
     int refresh = 0;
 
+    debug("Key %x\n", c);
+
     if(c >= '0' && c<='9')
     {
@@ -148 +150 @@
         refresh = 1;
         break;
+    case '"':
+    case 0x34: //CTRL+"
+        screen_list->cur_in_list = screen_list->pty;
+        screen_list->window_list = !screen_list->window_list;
+        refresh = 1;
+        break;
     case 'd':
     case 0x04: //CACA_KEY_CTRL_D:

neercs/trunk/src/main.c

@@ -478 +478 @@
     screen_list->help = 0;
     screen_list->status = 1;
+    screen_list->window_list = 0;
     screen_list->wm_type = WM_VSPLIT;
     screen_list->in_bell = 0;

neercs/trunk/src/neercs.h

@@ -168 +168 @@
     int mini;                    /* Thumbnails */
     int status;                  /* Status bar */
-    int help;                    /* help */
+    int help;                    /* Help */
+    int window_list;             /* Window list */
+    int cur_in_list;             /* Window list */
 
     /* ScreenSaver stuff */
@@ -250 +252 @@
 void draw_status(struct screen_list *screen_list);
 void draw_help(struct screen_list *screen_list);
+int update_window_list(int c, struct screen_list *screen_list);
+void draw_list(struct screen_list *screen_list);
 void draw_lock(struct screen_list *screen_list);
 int update_lock(int c, struct screen_list *screen_list);

neercs/trunk/src/screens.c

@@ -267 +267 @@
         draw_help(screen_list);
     }
+    if(screen_list->window_list)
+    {
+        draw_list(screen_list);
+    }
 }
 

neercs/trunk/src/server.c

@@ -234 +234 @@
                     /* Handle lock window */
                     if(screen_list->locked)
+                    {
                         refresh |= update_lock(c, screen_list);
+                    }
+                    else if(screen_list->window_list) {
+                        refresh |= update_window_list(c, screen_list);
+                    }
                     else
                     {