nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

If there is a pid="true" attribute in the <menu plugin="fifo_menu">

Browse source 
tag, append .pid to the fifo files. This allows for more than one
openbox to be run by the same user and use fifo menus.
This commit is contained in:
Scott Moynes 2003-07-19 19:09:38 +00:00
parent 22ff8c587d
commit fd19711e6a
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
plugins/menu/fifo_menu.c
View file

@ -12,11 +12,12 @@
static char *PLUGIN_NAME = "fifo_menu"; static char *PLUGIN_NAME = "fifo_menu";
typedef struct Fifo_Menu_Data{ typedef struct Fifo_Menu_Data {
char *fifo; char *fifo;
char *buf; /* buffer to hold partially read menu */ char *buf; /* buffer to hold partially read menu */
unsigned long buflen; /* how many bytes are in the buffer */ unsigned long buflen; /* how many bytes are in the buffer */
int fd; /* file descriptor to read menu from */ int fd; /* file descriptor to read menu from */
gboolean use_pid;
event_fd_handler *handler; event_fd_handler *handler;
} Fifo_Menu_Data; } Fifo_Menu_Data;
@ -78,9 +79,6 @@ void fifo_menu_handler(int fd, void *d) {
num_realloc); num_realloc);
if (num_read == 0) { /* eof */ if (num_read == 0) { /* eof */
unsigned long count = 0;
char *found = NULL;
menu->invalid = TRUE; menu->invalid = TRUE;
menu_clear(menu); menu_clear(menu);
@ -91,7 +89,8 @@ void fifo_menu_handler(int fd, void *d) {
xmlNodePtr node = xmlDocGetRootElement(doc); xmlNodePtr node = xmlDocGetRootElement(doc);
if (!xmlStrcasecmp(node->name, (const xmlChar*) "fifo")) { if (node &&
!xmlStrcasecmp(node->name, (const xmlChar*) "fifo_menu")) {
if ((node = parse_find_node("item", node->xmlChildrenNode))) if ((node = parse_find_node("item", node->xmlChildrenNode)))
parse_menu_full(doc, node, menu, FALSE); parse_menu_full(doc, node, menu, FALSE);
} }
@ -137,8 +136,6 @@ void plugin_destroy (ObMenu *m)
} }
void *plugin_create(PluginMenuCreateData *data) void *plugin_create(PluginMenuCreateData *data)
{ {
char *fifo; char *fifo;
char *dir; char *dir;
@ -146,12 +143,19 @@ void *plugin_create(PluginMenuCreateData *data)
Fifo_Menu_Data *d; Fifo_Menu_Data *d;
ObMenu *m; ObMenu *m;
char *label = NULL, *id = NULL; char *label = NULL, *id = NULL;
char *attr_pid = NULL;
d = g_new(Fifo_Menu_Data, 1); d = g_new(Fifo_Menu_Data, 1);
parse_attr_string("id", data->node, &id); parse_attr_string("id", data->node, &id);
parse_attr_string("label", data->node, &label); parse_attr_string("label", data->node, &label);
if (parse_attr_string("pid", data->node, &attr_pid) &&
g_strcasecmp(attr_pid, "true") == 0) {
d->use_pid = TRUE;
} else
d->use_pid = FALSE;
m = menu_new( (label != NULL ? label : ""), m = menu_new( (label != NULL ? label : ""),
(id != NULL ? id : PLUGIN_NAME), (id != NULL ? id : PLUGIN_NAME),
data->parent); data->parent);
@ -172,6 +176,7 @@ void *plugin_create(PluginMenuCreateData *data)
m->plugin_data = (void *)d; m->plugin_data = (void *)d;
dir = g_build_filename(g_get_home_dir(), ".openbox", dir = g_build_filename(g_get_home_dir(), ".openbox",
PLUGIN_NAME, NULL); PLUGIN_NAME, NULL);
@ -185,9 +190,19 @@ void *plugin_create(PluginMenuCreateData *data)
return NULL; return NULL;
} }
if (d->use_pid)
{
char *pid = g_strdup_printf("%s.%d", m->name, getpid());
fifo = g_build_filename(g_get_home_dir(), ".openbox",
PLUGIN_NAME,
pid, NULL);
g_free(pid);
} else {
fifo = g_build_filename(g_get_home_dir(), ".openbox", fifo = g_build_filename(g_get_home_dir(), ".openbox",
PLUGIN_NAME, PLUGIN_NAME,
m->name, NULL); m->name, NULL);
}
if (mkfifo(fifo, S_IRUSR | S_IWUSR | if (mkfifo(fifo, S_IRUSR | S_IWUSR |
S_IRGRP | S_IWGRP | /* let umask do its thing */ S_IRGRP | S_IWGRP | /* let umask do its thing */
S_IROTH | S_IWOTH) == -1 && errno != EEXIST) { S_IROTH | S_IWOTH) == -1 && errno != EEXIST) {