X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Ftimed_menu.c;h=788f7180e2867d55df1ced3c099c8726d6862302;hb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;hp=34d71e73c3ff19a192a4b20e53c7d6a29058f080;hpb=03d42b5d8253ad2de94df20b12b9fb22ce51eb3d;p=chaz%2Fopenbox

diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index 34d71e73..788f7180 100644
--- a/plugins/menu/timed_menu.c
+++ b/plugins/menu/timed_menu.c
@@ -1,9 +1,14 @@
 #include <glib.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
 
 #include "kernel/menu.h"
 #include "kernel/timer.h"
 #include "timed_menu.h"
 #include "kernel/action.h"
+#include "kernel/event.h"
 
 #define TIMED_MENU(m) ((Menu *)m)
 #define TIMED_MENU_DATA(m) ((Timed_Menu_Data *)((Menu *)m)->plugin_data)
@@ -22,6 +27,9 @@ typedef struct {
     Timed_Menu_Type type;
     Timer *timer; /* timer code handles free */
     char *command; /* for the PIPE */
+    char *buf;
+    unsigned long buflen;
+    int fd;
 } Timed_Menu_Data;
 
 
@@ -30,54 +38,116 @@ void plugin_startup()
 { }
 void plugin_shutdown() { }
 
-void timed_menu_timeout_handler(void *data)
+void timed_menu_clean_up(Menu *m) {
+    if (TIMED_MENU_DATA(m)->buf != NULL) {
+        fprintf(stderr, "%s", TIMED_MENU_DATA(m)->buf);
+        g_free(TIMED_MENU_DATA(m)->buf);
+        TIMED_MENU_DATA(m)->buf = NULL;
+    }
+
+    TIMED_MENU_DATA(m)->buflen = 0;
+
+    if (TIMED_MENU_DATA(m)->fd != -1) {
+        event_remove_fd(TIMED_MENU_DATA(m)->fd);
+        close(TIMED_MENU_DATA(m)->fd);
+        TIMED_MENU_DATA(m)->fd = -1;
+    }
+
+    /* child is reaped by glib ? */
+}
+
+void timed_menu_read_pipe(int fd, Menu *menu)
+{
+    char *tmpbuf = NULL;
+    unsigned long num_read;
+#ifdef DEBUG
+    Timed_Menu_Data *d = TIMED_MENU_DATA(menu);
+#endif
+
+    unsigned long num_realloc;
+    /* if we have less than a quarter BUFSIZ left, allocate more */
+    num_realloc = (BUFSIZ - (TIMED_MENU_DATA(menu)->buflen % BUFSIZ) <
+                   BUFSIZ >> 2) ?
+                  0 : BUFSIZ;
+    
+    tmpbuf = g_try_realloc(TIMED_MENU_DATA(menu)->buf,             
+                           TIMED_MENU_DATA(menu)->buflen + num_realloc);
+
+    if (tmpbuf == NULL) {
+        g_warning("Unable to allocate memory for read()");
+        return;
+    }
+    
+    TIMED_MENU_DATA(menu)->buf = tmpbuf;
+    
+    num_read = read(fd,
+                    TIMED_MENU_DATA(menu)->buf + TIMED_MENU_DATA(menu)->buflen,
+                    num_realloc);
+    if (num_read == 0) {
+        unsigned long count = 0;
+        char *found = NULL;
+        menu->invalid = TRUE;
+        menu_clear(menu);
+
+        /* TEMP: list them */
+        while (NULL !=
+               (found = strchr(&TIMED_MENU_DATA(menu)->buf[count], '\n'))) {
+            TIMED_MENU_DATA(menu)->buf
+                [found - TIMED_MENU_DATA(menu)->buf] = '\0';
+            menu_add_entry(menu,
+                menu_entry_new_separator
+                (&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);
+    } else if (num_read > 0) {
+        TIMED_MENU_DATA(menu)->buflen += num_read;
+        TIMED_MENU_DATA(menu)->buf[TIMED_MENU_DATA(menu)->buflen] = '\0';
+    } else { /* num_read < 1 */
+        g_warning("Error on read %s", strerror(errno));
+        timed_menu_clean_up(menu);
+    }
+}
+
+void timed_menu_timeout_handler(Menu *data)
 {
     Action *a;
-    ((Menu *)data)->invalid = TRUE;
 
-    if (!TIMED_MENU(data)->shown) {
+    if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) {
         switch (TIMED_MENU_DATA(data)->type) {
             case (TIMED_MENU_PIPE):
             {
                 /* if the menu is not shown, run a process and use its output
                    as menu */
-                char *args[] = {"/bin/sh", "-c", "ls", NULL};
-                GIOChannel *io;
-                char *line;
-                gint child, c_stdout, line_len, terminator_pos;
-                GIOStatus status;
-                /* this blocks for now, until the event stuff can handle it */
-                if (!g_spawn_async_with_pipes(NULL,
+
+                /* I hate you glib in all your hideous forms */
+                char *args[] = {"/bin/sh", "-c", TIMED_MENU_DATA(data)->command,
+                                NULL};
+                int child_stdout;
+                if (g_spawn_async_with_pipes(
+                        NULL,
                         args,
                         NULL,
-                        G_SPAWN_DO_NOT_REAP_CHILD,
-                        NULL, NULL,
-                        &child, NULL, &c_stdout, NULL,
+                        G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                        NULL,
+                        NULL,
+                        NULL,
+                        NULL,
+                        &child_stdout,
+                        NULL,
                         NULL)) {
-                    g_warning("%s: Unable to run timed_menu program",
-                        __FUNCTION__);
-                    break;
-                }
-                
-                io = g_io_channel_unix_new(c_stdout);
-                if (io == NULL) {
-                    g_error("%s: Unable to get IO channel", __FUNCTION__);
-                    break;
-                }
-
-                menu_clear(TIMED_MENU(data));
-                
-                while ( G_IO_STATUS_NORMAL == (status =
-                            g_io_channel_read_line
-                            (io, &line, &line_len, &terminator_pos, NULL))
-                    ) {
-                    /* the \n looks ugly */
-                    line[terminator_pos] = '\0';
-                    menu_add_entry(TIMED_MENU(data),
-                        menu_entry_new_separator(line));
-                    g_message("%s", line);
-                    g_free(line);
+                    event_fd_handler *h = g_new(event_fd_handler, 1);
+                    TIMED_MENU_DATA(data)->fd = h->fd = child_stdout;
+                    h->handler = timed_menu_read_pipe;
+                    h->data = data;
+                    event_add_fd_handler(h);
+                } else {
+                    g_warning("unable to spawn child");
                 }
+                    
                 break;
             }
         }
@@ -92,10 +162,15 @@ void *plugin_create()
     m->plugin = PLUGIN_NAME;
 
     d->type = TIMED_MENU_PIPE;
-    d->timer = timer_start(1000000, &timed_menu_timeout_handler, m);
+    d->timer = timer_start(60000000, &timed_menu_timeout_handler, m);
+    d->command = "find /media -name *.m3u";
+    d->buf = NULL;
+    d->buflen = 0;
+    d->fd = -1;
     
     m->plugin_data = (void *)d;
-  
+
+    timed_menu_timeout_handler(m);
     return (void *)m;
 }