X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fmenu%2Ftimed_menu.c;h=83ae5aa87f7aa720de6ddc5a7d655f64800f329c;hb=888c3d1f6ae80c3e2d8ab37ebead8a96a8d0a565;hp=a6e2e8dd7beffe1cb82ad7bb93f7f6ddbfe5c86e;hpb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;p=chaz%2Fopenbox
diff --git a/plugins/menu/timed_menu.c b/plugins/menu/timed_menu.c
index a6e2e8dd..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,23 +125,24 @@ 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) {
- 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;
@@ -123,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) {
@@ -175,25 +205,80 @@ 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);
}
}
}
}
}
-void *plugin_create()
+void *plugin_create(PluginMenuCreateData *data)
{
- Timed_Menu_Data *d = g_new(Timed_Menu_Data, 1);
- ObMenu *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;
@@ -202,7 +287,7 @@ void *plugin_create()
m->plugin_data = (void *)d;
- timed_menu_timeout_handler(m);
+ timed_menu_timeout_handler(NULL, m);
return (void *)m;
}