X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fmenu%2Ftimed_menu.c;h=e7665b5642049e49fea033090936472504c241bf;hb=85112c4d0831067251de1295fbb6974db94af2ba;hp=788f7180e2867d55df1ced3c099c8726d6862302;hpb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;p=chaz%2Fopenbox

diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index 788f7180..e7665b56 100644
--- a/plugins/menu/timed_menu.c
+++ b/plugins/menu/timed_menu.c
@@ -3,6 +3,11 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 #include "kernel/menu.h"
 #include "kernel/timer.h"
@@ -15,21 +20,19 @@
 static char *PLUGIN_NAME = "timed_menu";
 
 typedef enum {
-    TIMED_MENU_PIPE
+    TIMED_MENU_PIPE, /* read entries from a child process' output */
+    TIMED_MENU_STAT  /* reread entries from file when timestamp changes */
 } Timed_Menu_Type;
 
-/* we can use various GIO channels to support reading menus (can we add them to
-   the event loop? )
-   stat() based update
-   exec() based read
-*/
 typedef struct {
     Timed_Menu_Type type;
-    Timer *timer; /* timer code handles free */
+    ObTimer *timer;
     char *command; /* for the PIPE */
-    char *buf;
-    unsigned long buflen;
-    int fd;
+    char *buf; /* buffer to hold partially read menu */
+    unsigned long buflen; /* how many bytes are in the buffer */
+    int fd; /* file descriptor to read menu from */
+    pid_t pid; /* pid of child process in PIPE */
+    time_t mtime; /* time of last modification */
 } Timed_Menu_Data;
 
 
@@ -53,15 +56,24 @@ void timed_menu_clean_up(Menu *m) {
         TIMED_MENU_DATA(m)->fd = -1;
     }
 
-    /* child is reaped by glib ? */
+    if (TIMED_MENU_DATA(m)->pid != -1) {
+        waitpid(TIMED_MENU_DATA(m)->pid, NULL, 0);
+        TIMED_MENU_DATA(m)->pid = -1;
+    }
+
+    TIMED_MENU_DATA(m)->mtime = 0;
 }
 
-void timed_menu_read_pipe(int fd, Menu *menu)
+void timed_menu_read_pipe(int fd, void *d)
 {
+    Menu *menu = d;
     char *tmpbuf = NULL;
     unsigned long num_read;
 #ifdef DEBUG
+    /* because gdb is dumb */
+#if 0
     Timed_Menu_Data *d = TIMED_MENU_DATA(menu);
+#endif
 #endif
 
     unsigned long num_realloc;
@@ -99,7 +111,6 @@ void timed_menu_read_pipe(int fd, Menu *menu)
                 (&TIMED_MENU_DATA(menu)->buf[count]));
             count = found - TIMED_MENU_DATA(menu)->buf + 1;
         }
-            
 
         TIMED_MENU_DATA(menu)->buf[TIMED_MENU_DATA(menu)->buflen] = '\0';
         timed_menu_clean_up(menu);
@@ -112,21 +123,23 @@ void timed_menu_read_pipe(int fd, Menu *menu)
     }
 }
 
-void timed_menu_timeout_handler(Menu *data)
+void timed_menu_timeout_handler(void *d)
 {
-    Action *a;
-
+    Menu *data = d;
     if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) {
         switch (TIMED_MENU_DATA(data)->type) {
-            case (TIMED_MENU_PIPE):
-            {
+            case (TIMED_MENU_PIPE): {
                 /* if the menu is not shown, run a process and use its output
                    as menu */
 
                 /* I hate you glib in all your hideous forms */
-                char *args[] = {"/bin/sh", "-c", TIMED_MENU_DATA(data)->command,
-                                NULL};
+                char *args[4];
                 int child_stdout;
+                int child_pid;
+                args[0] = "/bin/sh";
+                args[1] = "-c";
+                args[2] = TIMED_MENU_DATA(data)->command;
+                args[3] = NULL;
                 if (g_spawn_async_with_pipes(
                         NULL,
                         args,
@@ -134,22 +147,39 @@ void timed_menu_timeout_handler(Menu *data)
                         G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                         NULL,
                         NULL,
-                        NULL,
+                        &child_pid,
                         NULL,
                         &child_stdout,
                         NULL,
                         NULL)) {
                     event_fd_handler *h = g_new(event_fd_handler, 1);
                     TIMED_MENU_DATA(data)->fd = h->fd = child_stdout;
+                    TIMED_MENU_DATA(data)->pid = child_pid;
                     h->handler = timed_menu_read_pipe;
                     h->data = data;
                     event_add_fd_handler(h);
                 } else {
                     g_warning("unable to spawn child");
                 }
-                    
                 break;
             }
+
+            case (TIMED_MENU_STAT): {
+                struct stat stat_buf;
+
+                if (stat(TIMED_MENU_DATA(data)->command, &stat_buf) == -1) {
+                    g_warning("Unable to stat %s: %s",
+                              TIMED_MENU_DATA(data)->command,
+                              strerror(errno));
+                    break;
+                }
+
+                if (stat_buf.st_mtime > TIMED_MENU_DATA(data)->mtime) {
+                    g_warning("file changed");
+                    TIMED_MENU_DATA(data)->mtime = stat_buf.st_mtime;
+                    /* TODO: parse */
+                }
+            }
         }
     }
 }
@@ -161,12 +191,14 @@ void *plugin_create()
     
     m->plugin = PLUGIN_NAME;
 
-    d->type = TIMED_MENU_PIPE;
-    d->timer = timer_start(60000000, &timed_menu_timeout_handler, m);
-    d->command = "find /media -name *.m3u";
+    d->type = TIMED_MENU_STAT;
+    d->timer = timer_start(6000000, &timed_menu_timeout_handler, m);
+    d->command = "/home/woodblock/timed_menu_stat";
     d->buf = NULL;
     d->buflen = 0;
     d->fd = -1;
+    d->pid = -1;
+    d->mtime = 0;
     
     m->plugin_data = (void *)d;
 
@@ -176,6 +208,7 @@ void *plugin_create()
 
 void plugin_destroy (void *m)
 {
+    timed_menu_clean_up(m);
     /* this will be freed by timer_* */
     timer_stop( ((Timed_Menu_Data *)TIMED_MENU(m)->plugin_data)->timer);