X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Ftimed_menu.c;h=83ae5aa87f7aa720de6ddc5a7d655f64800f329c;hb=a9567a816385f8f66ed0f827bb4af78cdb10cd6d;hp=d304b7b0840b7f4837b13f5ec8ab8c70c3b9bbf1;hpb=c912b634abe65ea4a07c69f8c051b0c766614128;p=chaz%2Fopenbox
diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index d304b7b0..83ae5aa8 100644
--- a/plugins/menu/timed_menu.c
+++ b/plugins/menu/timed_menu.c
@@ -1,3 +1,35 @@
+/*
+ * $Header$
+ *
+ * Timed menu plugin
+ * Provides a menu from either a periodically executing process or by
+ * periodically checking the timestamp of a file and loading if it has changed.
+ *
+ * Examples:
+ * Piped timed menu:
+ * rc3:
+ *
+ * timeout is in seconds
+ *
+ * Output of command:
+ *
+ * -
+ *
+ *
+ * bsetbg "/home/woodblock/.openbox/backgrounds/GLOVE.png"
+ *
+ *
+ *
+ *
+ *
+ * stat() menu:
+ *
+ * stat_menu contents: same as timed menu
+ *
+ */
+
#include
#include
#include
@@ -15,8 +47,8 @@
#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)
+#define TIMED_MENU(m) ((ObMenu *)m)
+#define TIMED_MENU_DATA(m) ((Timed_Menu_Data *)((ObMenu *)m)->plugin_data)
static char *PLUGIN_NAME = "timed_menu";
typedef enum {
@@ -26,8 +58,8 @@ typedef enum {
typedef struct {
Timed_Menu_Type type;
- Timer *timer;
- char *command; /* for the PIPE */
+ ObTimer *timer;
+ char *command; /* command to run or file to stat() */
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 */
@@ -41,9 +73,8 @@ void plugin_startup()
{ }
void plugin_shutdown() { }
-void timed_menu_clean_up(Menu *m) {
+void timed_menu_clean_up(ObMenu *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;
}
@@ -60,17 +91,18 @@ void timed_menu_clean_up(Menu *m) {
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)
{
+ ObMenu *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;
@@ -93,23 +125,24 @@ void timed_menu_read_pipe(int fd, Menu *menu)
TIMED_MENU_DATA(menu)->buf + TIMED_MENU_DATA(menu)->buflen,
num_realloc);
if (num_read == 0) {
- unsigned long count = 0;
- char *found = NULL;
+ ObParseInst *i;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+
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';
+
+ i = parse_startup();
+
+ if (parse_load_mem(TIMED_MENU_DATA(menu)->buf,
+ TIMED_MENU_DATA(menu)->buflen,
+ "timed_menu", &doc, &node))
+ parse_menu_full(i, doc, node, menu, FALSE);
+
+ parse_shutdown(i);
+
timed_menu_clean_up(menu);
} else if (num_read > 0) {
TIMED_MENU_DATA(menu)->buflen += num_read;
@@ -120,10 +153,9 @@ void timed_menu_read_pipe(int fd, Menu *menu)
}
}
-void timed_menu_timeout_handler(Menu *data)
+void timed_menu_timeout_handler(ObTimer *t, void *d)
{
- Action *a;
-
+ ObMenu *data = d;
if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) {
switch (TIMED_MENU_DATA(data)->type) {
case (TIMED_MENU_PIPE): {
@@ -131,10 +163,13 @@ void timed_menu_timeout_handler(Menu *data)
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,
@@ -170,25 +205,80 @@ void timed_menu_timeout_handler(Menu *data)
}
if (stat_buf.st_mtime > TIMED_MENU_DATA(data)->mtime) {
+ ObParseInst *i;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+
g_warning("file changed");
TIMED_MENU_DATA(data)->mtime = stat_buf.st_mtime;
- /* TODO: parse */
+
+ data->invalid = TRUE;
+ menu_clear(data);
+
+ i = parse_startup();
+
+ if (parse_load(TIMED_MENU_DATA(data)->command,
+ "timed_menu", &doc, &node))
+ parse_menu_full(i, doc, node, data, FALSE);
+
+ parse_shutdown(i);
+
+ timed_menu_clean_up(data);
}
}
}
}
}
-void *plugin_create()
+void *plugin_create(PluginMenuCreateData *data)
{
- Timed_Menu_Data *d = g_new(Timed_Menu_Data, 1);
- Menu *m = menu_new("", PLUGIN_NAME, NULL);
+ char *id;
+ char *label;
+ char *timeout;
+ char *type;
+ Timed_Menu_Data *d;
+ ObMenu *m;
+
+ parse_attr_string("id", data->node, &id);
+ parse_attr_string("label", data->node, &label);
+
+ d = g_new(Timed_Menu_Data, 1);
+
+ m = menu_new( (label != NULL ? label : ""),
+ (id != NULL ? id : PLUGIN_NAME),
+ data->parent);
+
m->plugin = PLUGIN_NAME;
- d->type = TIMED_MENU_STAT;
- d->timer = timer_start(6000000, &timed_menu_timeout_handler, m);
- d->command = "/home/woodblock/timed_menu_stat";
+ if (data->parent)
+ menu_add_entry(data->parent, menu_entry_new_submenu(
+ (label != NULL ? label : ""),
+ m));
+
+ d->type = TIMED_MENU_PIPE;
+
+ if (parse_attr_string("type", data->node, &type) &&
+ !g_strcasecmp(type, "stat")) {
+ d->type = TIMED_MENU_STAT;
+
+ if (!parse_attr_string("file", data->node, &d->command)) {
+ d->command = g_strdup("");
+ }
+ } else
+ if (!parse_attr_string("command", data->node, &d->command)) {
+ d->command = g_strdup("");
+ }
+
+ if (parse_attr_string("timeout", data->node, &timeout)) {
+ char *endptr;
+ gdouble timeout_val = g_strtod(timeout, &endptr);
+ g_free(timeout);
+ d->timer = timer_start(timeout_val * 1000000,
+ &timed_menu_timeout_handler, m);
+ } else
+ d->timer = timer_start(600 * 1000000, &timed_menu_timeout_handler, m);
+
d->buf = NULL;
d->buflen = 0;
d->fd = -1;
@@ -197,12 +287,13 @@ void *plugin_create()
m->plugin_data = (void *)d;
- timed_menu_timeout_handler(m);
+ timed_menu_timeout_handler(NULL, m);
return (void *)m;
}
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);