Changeset 4033

Timestamp:

11/25/09 12:47:40 (4 years ago)

Author:

jylam

Message:

• Added basic and non-working python interpreter

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• input.c (modified) (1 diff)
• interpreter.c (added)
• neercs.h (modified) (5 diffs)
• python.c (deleted)
• screen_list.c (modified) (1 diff)
• server.c (modified) (7 diffs)

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 python.c             
+                 client.c screen_list.c help.c interpreter.c             
 neercs_CFLAGS = @CACA_CFLAGS@ @PYTHON3_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@ @PYTHON3_LIBS@

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;
+        screen_list->interpreter_props.x = 0;
+        screen_list->interpreter_props.y = 0;
         break;
 #endif

neercs/trunk/src/neercs.h

@@ -144 +144 @@
 };
 
-struct command_props
-{
+struct interpreter_props
+{
+    /* Input box */
         int x, y;
     int size;
     char *command;
+    char *output;
 };
 
 struct screen_list
 {
+    int outfd;                   /* Debug */
     int wm_type;                 /* Window manager type */
     int in_bell;                 /* Bell occuring in a window  */
@@ -192 +195 @@
     struct cube_props cube;      /* Cube */
     long long unsigned int last_switch; /* Cube */
-    struct command_props command_props;
+    struct interpreter_props interpreter_props;
 
     /* ScreenSaver stuff */
@@ -272 +275 @@
 void refresh_screens(struct screen_list *screen_list);
 int update_screens_contents(struct screen_list* screen_list);
+int install_fds(struct screen_list *screen_list);
 long long get_us(void);
 
@@ -316 +320 @@
 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);
@@ -360 +360 @@
 int get_key_value(char *line, struct option *option);
 int fill_config(struct screen_list *screen_list);
+
+
+/* Python interpreter */
+#ifdef USE_PYTHON
+int python_init(struct screen_list *sl);
+int python_close(struct screen_list *sl);
+int  python_command_handle_key(struct screen_list *screen_list, unsigned int c);
+void draw_python_command(struct screen_list *screen_list);
+#endif
 
 #if defined DEBUG

neercs/trunk/src/screen_list.c

@@ -98 +98 @@
     
     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->interpreter_props.x = 0;
+    screen_list->interpreter_props.y = 0;
+    screen_list->interpreter_props.command = NULL;
+    screen_list->interpreter_props.size = 0;
     
     screen_list->recurrent_list = NULL;

neercs/trunk/src/server.c

@@ -212 +212 @@
 
 
-    
+
     screen_list->last_key_time = 0;
     screen_list->attached = 0;
@@ -220 +220 @@
 
     server_init(screen_list);
+#ifdef USE_PYTHON
+    python_init(screen_list);
+#endif
 
     for (;;)
@@ -300 +303 @@
     free_screen_list(screen_list);
 
+#ifdef USE_PYTHON
+    python_close(screen_list);
+#endif
+    
     exit(0);
 }
@@ -453 +460 @@
     if (screen_list->help)
     {
-        return help_handle_key(screen_list, c);  
+        return help_handle_key(screen_list, c);
     }
 #ifdef USE_PYTHON
-        if(screen_list->python_command)
-    {
-        return python_command_handle_key(screen_list, c);   
-    }
-#endif
-    
+    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 */
+       CTRL-A a sends literal CTRL-A */
     if (screen_list->command && (c != 'a'))
     {
@@ -527 +534 @@
 }
 
+
+int install_fds(struct screen_list *screen_list)
+{
+    int fd;
+    close(0);
+    close(1);
+    close(2);
+    fd = open("/dev/null", O_RDWR, 0);
+    if (fd < 0)
+    {
+        perror("Failed to open /dev/null");
+        return -2;
+    }
+    dup2(fd, 0);
+#ifndef DEBUG
+    dup2(fd, 1);
+    dup2(fd, 2);
+    if (fd > 2)
+        close(fd);
+#else
+    if (fd != 0)
+        close(fd);
+    screen_list->outfd =
+        open("/tmp/neercs-debug.txt", O_TRUNC | O_RDWR | O_CREAT,
+             S_IRUSR | S_IWUSR);
+    dup2(screen_list->outfd, 1);
+    dup2(screen_list->outfd, 2);
+    if (screen_list->outfd > 2)
+        close(screen_list->outfd);
+#endif
+        return 0;
+}
+
 int start_server(struct screen_list *screen_list)
 {
@@ -539 +579 @@
     if (pid == 0)
     {
-        int fd;
-        close(0);
-        close(1);
-        close(2);
-        fd = open("/dev/null", O_RDWR, 0);
-        if (fd < 0)
-        {
-            perror("Failed to open /dev/null");
-            return -2;
-        }
-        dup2(fd, 0);
-#ifndef DEBUG
-        dup2(fd, 1);
-        dup2(fd, 2);
-        if (fd > 2)
-            close(fd);
-#else
-        if (fd != 0)
-            close(fd);
-        fd = open("/tmp/neercs-debug.txt", O_TRUNC | O_RDWR | O_CREAT,
-                  S_IRUSR | S_IWUSR);
-        dup2(fd, 1);
-        dup2(fd, 2);
-        if (fd > 2)
-            close(fd);
-#endif
+        int r = install_fds(screen_list);
+        if(r) return r;
         setsid();
 
@@ -570 +586 @@
         /* Never returns */
     }
-    
+
     return 0;
 }