Changeset 4063Tweet

Timestamp:

11/29/09 13:48:53 (3 years ago)

Author:

jylam

Message:

• Moved modal windows flags to struct modal

Location:

neercs/trunk/src

Files:

• client.c (modified) (2 diffs)
• configuration.c (modified) (4 diffs)
• effects.c (modified) (3 diffs)
• help.c (modified) (1 diff)
• input.c (modified) (3 diffs)
• neercs.h (modified) (5 diffs)
• python/interpreter.c (modified) (4 diffs)
• screen_list.c (modified) (2 diffs)
• screens.c (modified) (2 diffs)
• server.c (modified) (3 diffs)
• term.c (modified) (1 diff)

neercs/trunk/src/client.c

@@ -242 +242 @@
 
         if (ret)
+        {
+            debug("ret1\n");
             break;
-
+        }
         ret = caca_get_event(screen_list->dp,
                              CACA_EVENT_KEY_PRESS
@@ -255 +257 @@
 
         if (ret)
+        {
+            debug("ret2\n");
             break;
+        }
     }
 

neercs/trunk/src/configuration.c

@@ -404 +404 @@
 {
     if (IS_OPTION_TRUE)
-        screen_list->mini = 1;
-    else
-        screen_list->mini = 0;
+        screen_list->modals.mini = 1;
+    else
+        screen_list->modals.mini = 0;
     return 0;
 
@@ -414 +414 @@
 {
     if (IS_OPTION_TRUE)
-        screen_list->status = 1;
-    else
-        screen_list->status = 0;
+        screen_list->modals.status = 1;
+    else
+        screen_list->modals.status = 0;
     return 0;
 }
@@ -510 +510 @@
 char *get_thumbnails(struct screen_list *screen_list)
 {
-    if (screen_list->mini)
+    if (screen_list->modals.mini)
         return "true";
     return "false";
@@ -517 +517 @@
 char *get_status_bar(struct screen_list *screen_list)
 {
-    if (screen_list->status)
+    if (screen_list->modals.status)
         return "true";
     return "false";

neercs/trunk/src/effects.c

@@ -34 +34 @@
     uint8_t *buf;
     int i, y =
-        caca_get_canvas_height(screen_list->cv) - 6 - screen_list->status;
+        caca_get_canvas_height(screen_list->cv) - 6 - screen_list->modals.status;
     int miniw, minih;
 
@@ -187 +187 @@
     {
     case 0x111:
-        if (screen_list->cur_in_list > 0)
-            screen_list->cur_in_list--;
+        if (screen_list->modals.cur_in_list > 0)
+            screen_list->modals.cur_in_list--;
         break;
     case 0x112:
-        if (screen_list->cur_in_list < screen_list->count - 1)
-            screen_list->cur_in_list++;
+        if (screen_list->modals.cur_in_list < screen_list->count - 1)
+            screen_list->modals.cur_in_list++;
         break;
     case 0xd:
-        screen_list->window_list = 0;
+        screen_list->modals.window_list = 0;
         screen_list->prevpty = screen_list->pty;
-        screen_list->pty = screen_list->cur_in_list;
+        screen_list->pty = screen_list->modals.cur_in_list;
         break;
     case 0x22:
-        screen_list->window_list = 0;
+        screen_list->modals.window_list = 0;
         break;
     default:
@@ -225 +225 @@
     {
         char line[1024];
-        if (screen_list->cur_in_list == i)
+        if (screen_list->modals.cur_in_list == i)
             caca_set_color_ansi(screen_list->cv, CACA_BLACK, CACA_WHITE);
         else

neercs/trunk/src/help.c

@@ -31 +31 @@
     if (c == CACA_KEY_ESCAPE || c == 'h')
     {
-        screen_list->help = 0;
+        screen_list->modals.help = 0;
         screen_list->changed = 1;
         return 1;

neercs/trunk/src/input.c

@@ -103 +103 @@
     case 'm':
     case 0x0d:                 // CACA_KEY_CTRL_M:
-        screen_list->mini = !screen_list->mini;
+        screen_list->modals.mini = !screen_list->modals.mini;
         refresh = 1;
         break;
@@ -166 +166 @@
     case '?':
     case 0x08:                 // CACA_KEY_CTRL_H:
-        screen_list->help = !screen_list->help;
+        screen_list->modals.help = !screen_list->modals.help;
         refresh = 1;
         break;
     case '"':
     case 0x34:                 // CTRL+"
-        screen_list->cur_in_list = screen_list->pty;
-        screen_list->window_list = !screen_list->window_list;
+        screen_list->modals.cur_in_list = screen_list->pty;
+        screen_list->modals.window_list = !screen_list->modals.window_list;
         refresh = 1;
         break;
@@ -182 +182 @@
     case 'e':
     case 0x05:
-        screen_list->python_command = 1;
+        debug("py : command is %d, setting to 1 (at %p)\n", screen_list->modals.python_command, &screen_list->modals.python_command);
+        screen_list->modals.python_command = 1;
         break;
 #endif

neercs/trunk/src/neercs.h

@@ -185 +185 @@
 };
 
+struct modals
+{
+    /* Add-ons*/
+    int mini;                    /* Thumbnails */
+    int status;                  /* Status bar */
+    int help;                    /* Help */
+    int python_command;          /* Python command */
+    int window_list;             /* Window list */
+    int cur_in_list;             /* Window list */  
+};
+
 struct screen_list
 {
     int outfd;                   /* Debug */
-    int wm_type;                 /* Window manager type */
     int in_bell;                 /* Bell occuring in a window  */
     int was_in_bell;
@@ -197 +207 @@
     int need_refresh;            /* If we skipped a refresh, do it next time */
     int command;
+    int eyecandy;                /* Eye Candy */
+    
     long long unsigned int last_key_time;
     long long unsigned int last_refresh_time;
@@ -206 +218 @@
         struct lock lock;
 
-    /* Add-ons*/
-    int eyecandy;                /* Eye Candy */
-    int mini;                    /* Thumbnails */
-    int status;                  /* Status bar */
-    int help;                    /* Help */
-    int python_command;          /* Python command */
-    int border_size;             /* Borders */
-    int window_list;             /* Window list */
-    int cur_in_list;             /* Window list */
-    char *title;                 /* Window title */
-    struct cube_props cube;      /* Cube */
-    long long unsigned int last_switch; /* Cube */
+    /* Modal windows */
+        struct modals modals;
+    
+    /* Python interpreter */
     struct interpreter_props interpreter_props;
 
@@ -226 +230 @@
     int count;                   /* Window count */
     int width, height;           /* caca window size */
+    int wm_type;                 /* Window manager type */
+    struct cube_props cube;      /* Cube */
+    long long unsigned int last_switch; /* Cube */
+    int border_size;             /* Borders */
+    
     struct screen **screen;      /* Windows */
 
@@ -240 +249 @@
     struct recurrent_list *recurrent_list;
     
+    char *title;                 /* Window title */
     caca_canvas_t *cv;
     caca_display_t *dp;

neercs/trunk/src/python/interpreter.c

@@ -46 +46 @@
 int python_command_handle_key(struct screen_list *screen_list, unsigned int c)
 {
-
     int ret = widget_ibox_handle_key(screen_list->interpreter_props.box, c);
 
@@ -53 +52 @@
         widget_ibox_destroy(screen_list->interpreter_props.box);
         screen_list->interpreter_props.box = NULL;
-        screen_list->python_command = 0;
+        screen_list->modals.python_command = 0;
     }
     else if (ret == INPUT_BOX_RET)
@@ -67 +66 @@
 {
     if (!screen_list->interpreter_props.box)
+    {
         screen_list->interpreter_props.box =
             widget_ibox_init(screen_list->cv, 65, 6);
-
+        debug("py Init %p\n", screen_list->interpreter_props.box);
+    }
+    debug("py Drawing !\n");
     widget_ibox_draw(screen_list->interpreter_props.box);
 }
@@ -156 +158 @@
     {
         widget_ibox_destroy(sl->interpreter_props.box);
-        sl->python_command = 0;
+        sl->interpreter_props.box = NULL;
+        sl->modals.python_command = 0;
     }
     sl->changed = 1;

neercs/trunk/src/screen_list.c

@@ -56 +56 @@
     
     screen_list->count = 0;
-    screen_list->mini = 1;
-    screen_list->help = 0;
-    screen_list->status = 1;
+    screen_list->modals.mini = 1;
+    screen_list->modals.help = 0;
+    screen_list->modals.status = 1;
+    screen_list->modals.window_list = 0;
+    screen_list->modals.python_command = 0;
     screen_list->eyecandy = 1;
     screen_list->border_size = 1;
     screen_list->title = NULL;
-    screen_list->window_list = 0;
     screen_list->wm_type = WM_VSPLIT;
     screen_list->in_bell = 0;
@@ -98 +99 @@
     screen_list->cube.duration = 1000000;
     
-    screen_list->python_command = 0;
     screen_list->interpreter_props.box = NULL;
     

neercs/trunk/src/screens.c

@@ -189 +189 @@
 
 
-    debug("Current pty is %d\n", screen_list->pty);
-
     screen_list->width = caca_get_canvas_width(screen_list->cv);
     screen_list->height =
-        caca_get_canvas_height(screen_list->cv) - (screen_list->mini * 6) -
-        screen_list->status;
+        caca_get_canvas_height(screen_list->cv) - (screen_list->modals.mini * 6) -
+        screen_list->modals.status;
 
     if (!screen_list->dont_update_coords)
@@ -216 +214 @@
 
 
-    if (screen_list->mini)
+    if (screen_list->modals.mini)
     {
         draw_thumbnails(screen_list);
     }
-    if (screen_list->status)
+    if (screen_list->modals.status)
     {
         draw_status(screen_list);
     }
-    if (screen_list->help)
+    if (screen_list->modals.help)
     {
         draw_help(screen_list);
     }
-    if (screen_list->window_list)
+    if (screen_list->modals.window_list)
     {
         draw_list(screen_list);
     }
 #ifdef USE_PYTHON
-    if(screen_list->python_command)
+    debug("py : command is %d (at %p)\n", screen_list->modals.python_command, &screen_list->modals.python_command);
+    if(screen_list->modals.python_command)
     {
         draw_python_command(screen_list);   

neercs/trunk/src/server.c

@@ -415 +415 @@
     screen_list->cv = caca_create_canvas(screen_list->width,
                                          screen_list->height
-                                         + screen_list->mini * 6
-                                         + screen_list->status);
+                                         + screen_list->modals.mini * 6
+                                         + screen_list->modals.status);
 
     if (!screen_list->to_grab && !screen_list->to_start)
@@ -477 +477 @@
     int size = 0;
 
-    if (screen_list->help)
+    if (screen_list->modals.help)
     {
         return help_handle_key(screen_list, c);
     }
 #ifdef USE_PYTHON
-    if (screen_list->python_command)
+    if (screen_list->modals.python_command)
     {
         return python_command_handle_key(screen_list, c);
@@ -516 +516 @@
             screen_list->changed = 1;
         }
-        else if (screen_list->window_list)
+        else if (screen_list->modals.window_list)
         {
             refresh |= update_window_list(c, screen_list);

neercs/trunk/src/term.c

@@ -1212 +1212 @@
                         screen_list->screen[i]->buf + bytes,
                         screen_list->screen[i]->total);
-                if (screen_list->screen[i]->visible || screen_list->mini)
+                if (screen_list->screen[i]->visible || screen_list->modals.mini)
                     refresh = 1;
             }