Changeset 4027 for neercs/trunkTweet

Timestamp:

Nov 23, 2009, 5:39:33 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Python mini-command input box (no evaluation yet)

Location:

neercs/trunk/src

Files:

• input.c (modified) (1 diff)
• neercs.h (modified) (3 diffs)
• python.c (modified) (2 diffs)
• screen_list.c (modified) (2 diffs)

neercs/trunk/src/input.c

@@ -182 +182 @@
     case 'e':
         screen_list->python_command = 1;
+        screen_list->command_props.x = 0;
+        screen_list->command_props.y = 0;
         break;
 #endif

neercs/trunk/src/neercs.h

@@ -144 +144 @@
 };
 
+struct command_props
+{
+        int x, y;
+    int size;
+    char *command;
+};
+
 struct screen_list
 {
@@ -185 +192 @@
     struct cube_props cube;      /* Cube */
     long long unsigned int last_switch; /* Cube */
+    struct command_props command_props;
 
     /* ScreenSaver stuff */
@@ -309 +317 @@
 int help_handle_key(struct screen_list *screen_list, unsigned int c);
 #ifdef USE_PYTHON
-int python_command_handle_key(struct screen_list *screen_list, unsigned int c);
+int  python_command_handle_key(struct screen_list *screen_list, unsigned int c);
 void draw_python_command(struct screen_list *screen_list);
 #endif

neercs/trunk/src/python.c

@@ -31 +31 @@
 #include "neercs.h"
 
+void add_char(struct screen_list *sl, unsigned int c);
+void del_char(struct screen_list *sl);
+void python_execute(struct screen_list *sl);
+
+void add_char(struct screen_list *sl, unsigned int c)
+{
+    /* FIXME handle return values */
+    if (!sl->command_props.command)
+    {
+        sl->command_props.size = 1;
+        sl->command_props.x = 0;
+        sl->command_props.command = (char *)malloc(2);
+        sl->command_props.command[0] = 0;
+    }
+    else
+    {
+        sl->command_props.command =
+            (char *)realloc(sl->command_props.command,
+                            sl->command_props.size + 1);
+    }
+    memmove(&sl->command_props.command[sl->command_props.x + 1],
+           &sl->command_props.command[sl->command_props.x],
+           (sl->command_props.size - sl->command_props.x));
+
+    sl->command_props.command[sl->command_props.x] = c;
+    sl->command_props.x++;
+    sl->command_props.size++;
+}
+
+void del_char(struct screen_list *sl)
+{
+    if(sl->command_props.x<1) return;
+    if (sl->command_props.size > 1)
+        sl->command_props.size--;
+    else
+        return;
+
+    memcpy(&sl->command_props.command[sl->command_props.x - 1],
+           &sl->command_props.command[sl->command_props.x],
+           sl->command_props.size - sl->command_props.x);
+    
+    sl->command_props.command =
+        (char *)realloc(sl->command_props.command, sl->command_props.size);
+    
+    if (sl->command_props.x)
+        sl->command_props.x--;
+    sl->command_props.command[sl->command_props.size-1] = 0;
+}
+
 int python_command_handle_key(struct screen_list *screen_list, unsigned int c)
 {
@@ -39 +88 @@
         return 1;
     }
+    else if(c == CACA_KEY_LEFT)
+    {
+        if(screen_list->command_props.x)
+            screen_list->command_props.x--; 
+    } 
+    else if(c == CACA_KEY_RIGHT)
+    {
+        if(screen_list->command_props.x < screen_list->command_props.size-1)
+            screen_list->command_props.x++; 
+    }
+    else if(c == CACA_KEY_RETURN)
+    {
+        python_execute(screen_list); 
+    }    
     else
     {
+        if (c >= ' ' && c < 127)
+            add_char(screen_list, c);
+        else if (c == 8)
+        {
+            del_char(screen_list);
+        }
+        screen_list->changed = 1;
         return 0;
     }
+    return 0;
 }
 
 void draw_python_command(struct screen_list *screen_list)
 {
+    int w = 65, h = 5;
+    int x = (caca_get_canvas_width(screen_list->cv) - w) / 2;
+    int y = (caca_get_canvas_height(screen_list->cv) - h) / 2;
 
+    caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
+    caca_fill_box(screen_list->cv, x, y, w, h, '#');
+    caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
+    caca_draw_cp437_box(screen_list->cv, x, y, w, h);
+    caca_printf(screen_list->cv, x, y, "Execute command");
+
+    caca_printf(screen_list->cv, x + 2, y + 2,
+                "[___________________________________________________________]");
+    if (screen_list->command_props.command)
+    {
+        caca_printf(screen_list->cv, x + 3, y + 2,
+                    "%s", screen_list->command_props.command);
+        caca_gotoxy(screen_list->cv,
+                    x + 3 + screen_list->command_props.x, y + 2);
+    }
 }
+
+
+void python_execute(struct screen_list *sl)
+{
+    debug("Executing '%s'\n", sl->command_props.command);
+    
+    if(sl->command_props.command);
+    free(sl->command_props.command);
+    sl->command_props.command = NULL;
+    sl->command_props.size = 0;
+    sl->command_props.x = 0;
+    sl->python_command = 0;
+    sl->changed = 1;
+}
+
+
+
 #endif

neercs/trunk/src/screen_list.c

@@ -58 +58 @@
     screen_list->mini = 1;
     screen_list->help = 0;
-    screen_list->python_command = 0;
     screen_list->status = 1;
     screen_list->eyecandy = 1;
@@ -98 +97 @@
     screen_list->cube.duration = 1000000;
     
+    screen_list->python_command = 0;
+    screen_list->command_props.x = 0;
+    screen_list->command_props.y = 0;
+    screen_list->command_props.command = NULL;
+    screen_list->command_props.size = 0;
     
     screen_list->recurrent_list = NULL;