X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Ftimed_menu.c;h=83ae5aa87f7aa720de6ddc5a7d655f64800f329c;hb=1045079482453424f8320de99639390e3020eb72;hp=3bf820a7ce6da5793e37558ffa2c44536c4f4c7d;hpb=03186a7bab2c903fdf60c98134551c727808bd0b;p=chaz%2Fopenbox
diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index 3bf820a7..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
@@ -27,7 +59,7 @@ typedef enum {
typedef struct {
Timed_Menu_Type type;
ObTimer *timer;
- char *command; /* for the PIPE */
+ 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 */
@@ -43,7 +75,6 @@ void plugin_shutdown() { }
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,8 +91,6 @@ void timed_menu_clean_up(ObMenu *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, void *d)
@@ -96,6 +125,7 @@ void timed_menu_read_pipe(int fd, void *d)
TIMED_MENU_DATA(menu)->buf + TIMED_MENU_DATA(menu)->buflen,
num_realloc);
if (num_read == 0) {
+ ObParseInst *i;
xmlDocPtr doc;
xmlNodePtr node;
@@ -104,15 +134,14 @@ void timed_menu_read_pipe(int fd, void *d)
TIMED_MENU_DATA(menu)->buf[TIMED_MENU_DATA(menu)->buflen] = '\0';
- doc = xmlParseMemory(TIMED_MENU_DATA(menu)->buf,
- TIMED_MENU_DATA(menu)->buflen);
+ i = parse_startup();
- node = xmlDocGetRootElement(doc);
+ 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);
- if (!xmlStrcasecmp(node->name, (const xmlChar*) "timed_menu")) {
- if ((node = parse_find_node("item", node->xmlChildrenNode)))
- parse_menu_full(doc, node, menu, FALSE);
- }
+ parse_shutdown(i);
timed_menu_clean_up(menu);
} else if (num_read > 0) {
@@ -124,7 +153,7 @@ void timed_menu_read_pipe(int fd, void *d)
}
}
-void timed_menu_timeout_handler(void *d)
+void timed_menu_timeout_handler(ObTimer *t, void *d)
{
ObMenu *data = d;
if (!data->shown && TIMED_MENU_DATA(data)->fd == -1) {
@@ -176,9 +205,25 @@ void timed_menu_timeout_handler(void *d)
}
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);
}
}
}
@@ -190,6 +235,8 @@ void *plugin_create(PluginMenuCreateData *data)
char *id;
char *label;
char *timeout;
+ char *type;
+
Timed_Menu_Data *d;
ObMenu *m;
@@ -209,9 +256,19 @@ void *plugin_create(PluginMenuCreateData *data)
(label != NULL ? label : ""),
m));
- if (!parse_attr_string("command", data->node, &d->command)) {
- d->command = g_strdup("");
- }
+ 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;
@@ -222,7 +279,6 @@ void *plugin_create(PluginMenuCreateData *data)
} else
d->timer = timer_start(600 * 1000000, &timed_menu_timeout_handler, m);
- d->type = TIMED_MENU_PIPE;
d->buf = NULL;
d->buflen = 0;
d->fd = -1;
@@ -231,7 +287,7 @@ void *plugin_create(PluginMenuCreateData *data)
m->plugin_data = (void *)d;
- timed_menu_timeout_handler(m);
+ timed_menu_timeout_handler(NULL, m);
return (void *)m;
}