mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: support inline submenus

Browse source 
...for example:

<menu id="root-menu" label="">
  <menu id="submenu" label="submenu">
    <item label="foo"></item>
  </menu>
  <item label="bar"></item>
</menu>
This commit is contained in:
Johan Malm 2021-11-08 17:20:37 +00:00
parent b878db57a7
commit cd31283ba3
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/menu/menu.h
View file

@ -25,6 +25,7 @@ struct menu {
char *id; char *id;
char *label; char *label;
bool visible; bool visible;
struct menu *parent;
struct wlr_box box; struct wlr_box box;
struct wl_list menuitems; struct wl_list menuitems;
struct server *server; struct server *server;

20
src/menu/menu.c
View file

@ -27,6 +27,7 @@
static bool in_item; static bool in_item;
static struct menuitem *current_item; static struct menuitem *current_item;
static int menu_level;
static struct menu *current_menu; static struct menu *current_menu;
/* vector for <menu id="" label=""> elements */ /* vector for <menu id="" label=""> elements */
@ -46,6 +47,7 @@ menu_create(struct server *server, const char *id, const char *label)
wl_list_init(&menu->menuitems); wl_list_init(&menu->menuitems);
menu->id = strdup(id); menu->id = strdup(id);
menu->label = strdup(label); menu->label = strdup(label);
menu->parent = current_menu;
menu->server = server; menu->server = server;
return menu; return menu;
} }
@ -178,8 +180,23 @@ handle_menu_element(xmlNode *n, struct server *server)
if (execute) { if (execute) {
wlr_log(WLR_ERROR, "we do not support pipemenus"); wlr_log(WLR_ERROR, "we do not support pipemenus");
} else if (label && id) { } else if (label && id) {
struct menu **submenu = NULL;
if (menu_level > 0) {
/*
* In a nested (inline) menu definition we need to
* create an item pointing to the new submenu
*/
current_item = item_create(current_menu, label);
submenu = &current_item->submenu;
}
++menu_level;
current_menu = menu_create(server, id, label); current_menu = menu_create(server, id, label);
/* TODO: deal with nested menu definitions */ if (submenu) {
*submenu = current_menu;
}
traverse(n, server);
current_menu = current_menu->parent;
--menu_level;
} else if (id) { } else if (id) {
struct menu *menu = get_menu_by_id(id); struct menu *menu = get_menu_by_id(id);
if (menu) { if (menu) {
@ -203,7 +220,6 @@ xml_tree_walk(xmlNode *node, struct server *server)
} }
if (!strcasecmp((char *)n->name, "menu")) { if (!strcasecmp((char *)n->name, "menu")) {
handle_menu_element(n, server); handle_menu_element(n, server);
traverse(n, server);
continue; continue;
} }
if (!strcasecmp((char *)n->name, "item")) { if (!strcasecmp((char *)n->name, "item")) {