Changeset 2363

Timestamp:

06/12/08 15:50:39 (5 years ago)

Author:

jylam

Message:

• Added Cards window manager
• Thumbnails are now black instead of white at neercs start

Location:

neercs/trunk/src

Files:

• main.c (modified) (5 diffs)
• wm.c (modified) (2 diffs)

neercs/trunk/src/main.c

@@ -82 +82 @@
     screen_list->screen = (struct screen**) malloc(sizeof(sizeof(struct screen*)));
     screen_list->count = 0;
-    screen_list->wm_type = WM_VSPLIT;
     screen_list->width  = cucul_get_canvas_width(cv);
     screen_list->height = cucul_get_canvas_height(cv) - (mini*6);
-
+    screen_list->wm_type = WM_CARD;
 
     for(i = 0; i < nt; i++)
@@ -289 +288 @@
             cucul_set_color_ansi(cv, CUCUL_LIGHTRED, CUCUL_BLACK);
 
-            for(i = 0; i < screen_list->count; i++)
+            for(i = screen_list->count - 1; i >=0; i--)
             {
 
@@ -298 +297 @@
                                screen_list->screen[i]->y,
                                screen_list->screen[i]->cv, NULL);
+                    cucul_draw_cp437_box(cv,
+                                         screen_list->screen[i]->x - 1,
+                                         screen_list->screen[i]->y - 1,
+                                         screen_list->screen[i]->w + 2,
+                                         screen_list->screen[i]->h + 2);
+
                 }
-                cucul_draw_cp437_box(cv,
-                                     screen_list->screen[i]->x - 1,
-                                     screen_list->screen[i]->y - 1,
-                                     screen_list->screen[i]->w + 2,
-                                     screen_list->screen[i]->h + 2);
 
             }
@@ -312 +312 @@
                        screen_list->screen[pty]->y,
                    screen_list->screen[pty]->cv, NULL);
+            cucul_draw_cp437_box(cv,
+                                 screen_list->screen[pty]->x - 1,
+                                 screen_list->screen[pty]->y - 1,
+                                 screen_list->screen[pty]->w + 2,
+                                 screen_list->screen[pty]->h + 2);
+
             cucul_gotoxy(cv,
                          screen_list->screen[pty]->x + cucul_get_cursor_x(screen_list->screen[pty]->cv),
@@ -400 +406 @@
 
     s->cv = cucul_create_canvas(w, h);
+    cucul_set_color_ansi(s->cv, CUCUL_BLACK, CUCUL_BLACK);
+    cucul_clear_canvas(s->cv);
     s->init = 0;
 

neercs/trunk/src/wm.c

@@ -101 +101 @@
     int h = screen_list->height - 2;
 
-
     for(i = 0; i < screen_list->count; i++)
     {
@@ -115 +114 @@
 void update_windows_props_cards(cucul_canvas_t *cv, struct screen_list *screen_list, int pty)
 {
-#if 0
     int i;
-    int xtab, ytab;
-
-    xtab = cucul_get_canvas_width(cv) screen_list->count
-
-
-    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_DEFAULT);
-    cucul_clear_canvas(cv);
-    cucul_set_color_ansi(cv, CUCUL_LIGHTRED, CUCUL_BLACK);
+    int w = (screen_list->width  - screen_list->count) - 3;
+    int h = (screen_list->height - screen_list->count) - 4;
+    int x = (screen_list->width  - w) - (3*screen_list->count) + 4;
+    int y = 2 + (1*screen_list->count);
 
     for(i = 0; i < screen_list->count; i++)
     {
-        int n = screen_list->count;
-        if(screen_list->screen[i]->fd < 0)
-            continue;
-        int j = (pty + n - 1 - i) % n;
-        cucul_blit(cv, (n - 1 - j) * XTAB + 1,
-                   j * YTAB + 1, screen_list->screen[j]->cv, NULL);
-        cucul_draw_cp437_box(cv, (n - 1 - j) * XTAB, j * YTAB,
-                             screen_list->screen[j]->w+1,
-                             screen_list->screen[j]->h+1);
-        /* Set cursor to the correct position */
-        if(i == n - 1)
-            cucul_gotoxy(cv, (n - 1 - j) * XTAB + 1
-                         + cucul_get_cursor_x(screen_list->screen[j]->cv),
-                         j * YTAB + 1
-                         + cucul_get_cursor_y(screen_list->screen[j]->cv));
+        screen_list->screen[i]->x = x;
+        screen_list->screen[i]->y = y;
+
+        resize_screen(screen_list->screen[i],
+                      w, h);
+        x += 3;
+        y--;
+
     }
-
-#endif
 }