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

* Change xml parsing to pass the parent node, rather than the first

Browse source 
child.
* Add x,y co-ordinates on showmenu action so we can place menus on keypress.
This commit is contained in:
Scott Moynes 2003-07-23 01:45:44 +00:00
parent 845833226b
commit 0e69ae2b96
7 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbox/config.c
View file

@ -28,6 +28,8 @@ static void parse_focus(xmlDocPtr doc, xmlNodePtr node, void *d)
{
xmlNodePtr n;
node = node->xmlChildrenNode;
if ((n = parse_find_node("focusNew", node)))
config_focus_new = parse_bool(doc, n);
if ((n = parse_find_node("followMouse", node)))
@ -44,6 +46,8 @@ static void parse_theme(xmlDocPtr doc, xmlNodePtr node, void *d)
{
xmlNodePtr n;
node = node->xmlChildrenNode;
if ((n = parse_find_node("theme", node))) {
g_free(config_theme);
config_theme = parse_string(doc, n);
@ -54,6 +58,8 @@ static void parse_desktops(xmlDocPtr doc, xmlNodePtr node, void *d)
{
xmlNodePtr n;
node = node->xmlChildrenNode;
if ((n = parse_find_node("number", node)))
config_desktops_num = parse_int(doc, n);
if ((n = parse_find_node("names", node))) {
@ -78,6 +84,8 @@ static void parse_moveresize(xmlDocPtr doc, xmlNodePtr node, void *d)
{
xmlNodePtr n;
node = node->xmlChildrenNode;
if ((n = parse_find_node("opaqueMove", node)))
config_opaque_move = parse_bool(doc, n);
if ((n = parse_find_node("opaqueResize", node)))
@ -88,6 +96,8 @@ static void parse_dock(xmlDocPtr doc, xmlNodePtr node, void *d)
{
xmlNodePtr n;
node = node->xmlChildrenNode;
if ((n = parse_find_node("position", node))) {
if (parse_contains("TopLeft", doc, n))
config_dock_floating = FALSE,

22
openbox/menu.c
View file

@ -33,20 +33,30 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
ObMenu *menu = NULL, *parent;
if (newmenu == TRUE) {
if (!parse_attr_string("id", node->parent, &id))
if (!parse_attr_string("id", node, &id))
goto parse_menu_fail;
if (!parse_attr_string("label", node->parent, &title))
if (!parse_attr_string("label", node, &title))
goto parse_menu_fail;
g_message("menu label %s", title);
menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
if (parse_attr_string("plugin", node, &plugin)) {
PluginMenuCreateData data = {
.doc = doc,
.node = node,
.parent = menu
};
parent = plugin_create(plugin, &data);
g_free(plugin);
} else
menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
if (data)
*((ObMenu**)data) = menu;
} else {
menu = (ObMenu *)data;
}
node = node->xmlChildrenNode;
while (node) {
if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) {
@ -59,7 +69,7 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
g_free(plugin);
} else {
parent = menu;
parse_menu(doc, node->xmlChildrenNode, &parent);
parse_menu(doc, node, &parent);
menu_add_entry(menu, menu_entry_new_submenu(parent->label,
parent));
}

2
parser/parse.c
View file

@ -100,7 +100,7 @@ void parse_tree(xmlDocPtr doc, xmlNodePtr node, void *nothing)
struct Callback *c = g_hash_table_lookup(callbacks, node->name);
if (c)
c->func(doc, node->xmlChildrenNode, c->data);
c->func(doc, node, c->data);
node = node->next;
}

7
plugins/keyboard/keyboard.c
View file

@ -69,7 +69,7 @@ static void parse_key(xmlDocPtr doc, xmlNodePtr node, GList *keylist)
static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
{
parse_key(doc, node, NULL);
parse_key(doc, node->xmlChildrenNode, NULL);
}
void plugin_setup_config()
@ -249,6 +249,11 @@ static void event(ObEvent *e, void *foo)
grabbed_key = p;
}
if (act->func == action_showmenu) {
act->data.showmenu.x = e->data.x.e->xkey.x_root;
act->data.showmenu.y = e->data.x.e->xkey.y_root;
}
act->data.any.c = focus_client;
act->func(&act->data);
}

13
plugins/menu/fifo_menu.c
View file

@ -133,6 +133,11 @@ void plugin_destroy (ObMenu *m)
FIFO_MENU_DATA(m)->fifo = NULL;
}
if (FIFO_MENU_DATA(m)->buf != NULL) {
g_free(FIFO_MENU_DATA(m)->buf);
FIFO_MENU_DATA(m)->buf = NULL;
}
g_free(m->plugin_data);
menu_free(m->name);
@ -162,9 +167,11 @@ void *plugin_create(PluginMenuCreateData *data)
m = menu_new( (label != NULL ? label : ""),
(id != NULL ? id : PLUGIN_NAME),
data->parent);
menu_add_entry(data->parent, menu_entry_new_submenu(
(label != NULL ? label : ""),
m));
if (data->parent)
menu_add_entry(data->parent, menu_entry_new_submenu(
(label != NULL ? label : ""),
m));
g_free(label);
g_free(id);

2
plugins/mouse/mouse.c
View file

@ -31,6 +31,8 @@ static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
MouseAction mact;
Action *action;
node = node->xmlChildrenNode;
if ((n = parse_find_node("dragThreshold", node)))
threshold = parse_int(doc, n);
if ((n = parse_find_node("doubleClickTime", node)))

4
plugins/placement/history.c
View file

@ -181,7 +181,7 @@ static void save_history()
xmlIndentTreeOutput = 1;
xmlSaveFormatFile(history_path, doc, 1);
xmlFree(doc);
xmlFreeDoc(doc);
}
static void load_history()
@ -236,7 +236,7 @@ static void load_history()
g_free(name); g_free(class); g_free(role);
node = parse_find_node("entry", node->next);
}
xmlFree(doc);
xmlFreeDoc(doc);
}
void history_startup()