Changeset 4026 for neercs/trunkTweet

Timestamp:

Nov 23, 2009, 2:57:43 PM (13 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added src/python.c and ctrl-a-e to open (non-existing yet) single-command executer. Do not document this yet (hint hint)

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• input.c (modified) (1 diff)
• neercs.h (modified) (2 diffs)
• python.c (added)
• screen_list.c (modified) (1 diff)
• screens.c (modified) (1 diff)
• server.c (modified) (1 diff)

neercs/trunk/src/Makefile.am

@@ -5 +5 @@
                  term.c grab.c effects.c wm.c screensaver.c attach.c \
                  configuration.c mytrace.c mytrace.h input.c lock.c server.c \
-                 client.c screen_list.c help.c              
-neercs_CFLAGS = @CACA_CFLAGS@
-neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
+                 client.c screen_list.c help.c python.c             
+neercs_CFLAGS = @CACA_CFLAGS@ @PYTHON3_CFLAGS@
+neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@ @PYTHON3_LIBS@

neercs/trunk/src/input.c

@@ -179 +179 @@
         detach(screen_list);
         break;
+#ifdef USE_PYTHON
+    case 'e':
+        screen_list->python_command = 1;
+        break;
+#endif
     }
     return refresh;

neercs/trunk/src/neercs.h

@@ -178 +178 @@
     int status;                  /* Status bar */
     int help;                    /* Help */
+    int python_command;          /* Python command */
     int border_size;             /* Borders */
     int window_list;             /* Window list */
@@ -307 +308 @@
 void draw_help(struct screen_list *screen_list);
 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);
+void draw_python_command(struct screen_list *screen_list);
+#endif
 int update_window_list(int c, struct screen_list *screen_list);
 void draw_list(struct screen_list *screen_list);

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;

neercs/trunk/src/screens.c

@@ -231 +231 @@
         draw_list(screen_list);
     }
+#ifdef USE_PYTHON
+    if(screen_list->python_command)
+    {
+        draw_python_command(screen_list);   
+    }
+#endif
     screen_list->changed = 0;
     for (i = screen_list->count - 1; i >= 0; i--)

neercs/trunk/src/server.c

@@ -455 +455 @@
         return help_handle_key(screen_list, c);  
     }
-
+#ifdef USE_PYTHON
+        if(screen_list->python_command)
+    {
+        return python_command_handle_key(screen_list, c);   
+    }
+#endif
+    
     /* CTRL-A has been pressed before, handle this as a command, except that
      CTRL-A a sends literal CTRL-A */