mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: add struct menu_parse_context to reduce static vars

Browse source 
The lifetime of the "current_" variables (current_menu, current_item,
current_item_action) is very difficult to understand from reading the
code. It appears that e.g. current_menu could still point to a previous
menu when starting to parse a new one, with unpredictable results.

Let's use a context struct when parsing, and consistently initialize
it when beginning to build a new menu.

Lightly tested with:

- default menus (no menu.xml)
- example static menu from labwc.github.io/getting-started.html
- an added "client-list-combined-menu" sub-menu
- pipe menu generated by `labwc-menu-generator -p`

v2: style fix
This commit is contained in:
John Lindgren 2025-07-18 23:06:20 -04:00 • committed by Hiroaki Yamamoto
parent cb79eccea1
commit d96656ccdc
1 changed files with 136 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

267
src/menu/menu.c
View file

@ -17,7 +17,6 @@
#include "common/font.h" #include "common/font.h"
#include "common/lab-scene-rect.h" #include "common/lab-scene-rect.h"
#include "common/list.h" #include "common/list.h"
#include "common/macros.h"
#include "common/mem.h" #include "common/mem.h"
#include "common/nodename.h" #include "common/nodename.h"
#include "common/scaled-font-buffer.h" #include "common/scaled-font-buffer.h"
@ -38,11 +37,13 @@
#define ICON_SIZE (rc.theme->menu_item_height - 2 * rc.theme->menu_items_padding_y) #define ICON_SIZE (rc.theme->menu_item_height - 2 * rc.theme->menu_items_padding_y)
/* state-machine variables for processing <item></item> */ /* state-machine variables for processing <item></item> */
static bool in_item; struct menu_parse_context {
static struct menuitem *current_item; struct server *server;
static struct action *current_item_action; struct menu *menu;
struct menuitem *item;
static struct menu *current_menu; struct action *action;
bool in_item;
};
static bool waiting_for_pipe_menu; static bool waiting_for_pipe_menu;
static struct menuitem *selected_item; static struct menuitem *selected_item;
@ -72,7 +73,8 @@ is_unique_id(struct server *server, const char *id)
} }
static struct menu * static struct menu *
menu_create(struct server *server, const char *id, const char *label) menu_create(struct server *server, struct menu *parent, const char *id,
const char *label)
{ {
if (!is_unique_id(server, id)) { if (!is_unique_id(server, id)) {
wlr_log(WLR_ERROR, "menu id %s already exists", id); wlr_log(WLR_ERROR, "menu id %s already exists", id);
@ -84,7 +86,7 @@ menu_create(struct server *server, const char *id, const char *label)
wl_list_init(&menu->menuitems); wl_list_init(&menu->menuitems);
menu->id = xstrdup(id); menu->id = xstrdup(id);
menu->label = xstrdup(label ? label : id); menu->label = xstrdup(label ? label : id);
menu->parent = current_menu; menu->parent = parent;
menu->server = server; menu->server = server;
menu->is_pipemenu_child = waiting_for_pipe_menu; menu->is_pipemenu_child = waiting_for_pipe_menu;
return menu; return menu;
@ -467,33 +469,33 @@ menu_create_scene(struct menu *menu)
* </item> * </item>
*/ */
static void static void
fill_item(const char *nodename, const char *content) fill_item(struct menu_parse_context *ctx, const char *nodename,
const char *content)
{ {
/* <item label=""> defines the start of a new item */ /* <item label=""> defines the start of a new item */
if (!strcmp(nodename, "label")) { if (!strcmp(nodename, "label")) {
current_item = item_create(current_menu, content, false); ctx->item = item_create(ctx->menu, content, false);
current_item_action = NULL; ctx->action = NULL;
} else if (!current_item) { } else if (!ctx->item) {
wlr_log(WLR_ERROR, "expect <item label=\"\"> element first. " wlr_log(WLR_ERROR, "expect <item label=\"\"> element first. "
"nodename: '%s' content: '%s'", nodename, content); "nodename: '%s' content: '%s'", nodename, content);
} else if (!strcmp(nodename, "icon")) { } else if (!strcmp(nodename, "icon")) {
#if HAVE_LIBSFDO #if HAVE_LIBSFDO
if (rc.menu_show_icons && !string_null_or_empty(content)) { if (rc.menu_show_icons && !string_null_or_empty(content)) {
xstrdup_replace(current_item->icon_name, content); xstrdup_replace(ctx->item->icon_name, content);
current_menu->has_icons = true; ctx->menu->has_icons = true;
} }
#endif #endif
} else if (!strcmp(nodename, "name.action")) { } else if (!strcmp(nodename, "name.action")) {
current_item_action = action_create(content); ctx->action = action_create(content);
if (current_item_action) { if (ctx->action) {
wl_list_append(&current_item->actions, wl_list_append(&ctx->item->actions, &ctx->action->link);
&current_item_action->link);
} }
} else if (!current_item_action) { } else if (!ctx->action) {
wlr_log(WLR_ERROR, "expect <action name=\"\"> element first. " wlr_log(WLR_ERROR, "expect <action name=\"\"> element first. "
"nodename: '%s' content: '%s'", nodename, content); "nodename: '%s' content: '%s'", nodename, content);
} else { } else {
action_arg_from_xml_node(current_item_action, nodename, content); action_arg_from_xml_node(ctx->action, nodename, content);
} }
} }
@ -546,7 +548,8 @@ nodename_supports_cdata(char *nodename)
} }
static void static void
entry(xmlNode *node, char *nodename, char *content) entry(struct menu_parse_context *ctx, xmlNode *node, char *nodename,
char *content)
{ {
if (!nodename) { if (!nodename) {
return; return;
@ -563,7 +566,7 @@ entry(xmlNode *node, char *nodename, char *content)
if (getenv("LABWC_DEBUG_MENU_NODENAMES")) { if (getenv("LABWC_DEBUG_MENU_NODENAMES")) {
printf("%s: %s\n", nodename, content ? content : (char *)cdata); printf("%s: %s\n", nodename, content ? content : (char *)cdata);
} }
if (in_item) { if (ctx->in_item) {
/* /*
* Nodenames for most menu-items end with '.item.menu' * Nodenames for most menu-items end with '.item.menu'
* but top-level pipemenu items do not have the associated * but top-level pipemenu items do not have the associated
@ -571,13 +574,13 @@ entry(xmlNode *node, char *nodename, char *content)
*/ */
string_truncate_at_pattern(nodename, ".item.menu"); string_truncate_at_pattern(nodename, ".item.menu");
string_truncate_at_pattern(nodename, ".item"); string_truncate_at_pattern(nodename, ".item");
fill_item(nodename, content ? content : (char *)cdata); fill_item(ctx, nodename, content ? content : (char *)cdata);
} }
xmlFree(cdata); xmlFree(cdata);
} }
static void static void
process_node(xmlNode *node) process_node(struct menu_parse_context *ctx, xmlNode *node)
{ {
static char buffer[256]; static char buffer[256];
@ -586,24 +589,24 @@ process_node(xmlNode *node)
return; return;
} }
char *name = nodename(node, buffer, sizeof(buffer)); char *name = nodename(node, buffer, sizeof(buffer));
entry(node, name, content); entry(ctx, node, name, content);
} }
static void xml_tree_walk(xmlNode *node, struct server *server); static void xml_tree_walk(struct menu_parse_context *ctx, xmlNode *node);
static void static void
traverse(xmlNode *n, struct server *server) traverse(struct menu_parse_context *ctx, xmlNode *n)
{ {
xmlAttr *attr; xmlAttr *attr;
process_node(n); process_node(ctx, n);
for (attr = n->properties; attr; attr = attr->next) { for (attr = n->properties; attr; attr = attr->next) {
xml_tree_walk(attr->children, server); xml_tree_walk(ctx, attr->children);
} }
xml_tree_walk(n->children, server); xml_tree_walk(ctx, n->children);
} }
static bool parse_buf(struct server *server, struct buf *buf); static bool parse_buf(struct menu_parse_context *ctx, struct buf *buf);
static int handle_pipemenu_readable(int fd, uint32_t mask, void *_ctx); static int handle_pipemenu_readable(int fd, uint32_t mask, void *_ctx);
static int handle_pipemenu_timeout(void *_ctx); static int handle_pipemenu_timeout(void *_ctx);
@ -614,7 +617,7 @@ static int handle_pipemenu_timeout(void *_ctx);
* * Menuitem of submenu type - has ID only * * Menuitem of submenu type - has ID only
*/ */
static void static void
handle_menu_element(xmlNode *n, struct server *server) handle_menu_element(struct menu_parse_context *ctx, xmlNode *n)
{ {
char *label = (char *)xmlGetProp(n, (const xmlChar *)"label"); char *label = (char *)xmlGetProp(n, (const xmlChar *)"label");
char *icon_name = (char *)xmlGetProp(n, (const xmlChar *)"icon"); char *icon_name = (char *)xmlGetProp(n, (const xmlChar *)"icon");
@ -629,9 +632,10 @@ handle_menu_element(xmlNode *n, struct server *server)
if (execute && label) { if (execute && label) {
wlr_log(WLR_DEBUG, "pipemenu '%s:%s:%s'", id, label, execute); wlr_log(WLR_DEBUG, "pipemenu '%s:%s:%s'", id, label, execute);
struct menu *pipemenu = menu_create(server, id, label); struct menu *pipemenu =
menu_create(ctx->server, ctx->menu, id, label);
pipemenu->execute = xstrdup(execute); pipemenu->execute = xstrdup(execute);
if (!current_menu) { if (!ctx->menu) {
/* /*
* A pipemenu may not have its parent like: * A pipemenu may not have its parent like:
* *
@ -641,18 +645,18 @@ handle_menu_element(xmlNode *n, struct server *server)
* </openbox_menu> * </openbox_menu>
*/ */
} else { } else {
current_item = item_create(current_menu, label, ctx->item = item_create(ctx->menu, label,
/* arrow */ true); /* arrow */ true);
fill_item("icon", icon_name); fill_item(ctx, "icon", icon_name);
current_item_action = NULL; ctx->action = NULL;
current_item->submenu = pipemenu; ctx->item->submenu = pipemenu;
} }
} else if ((label && current_menu) || !current_menu) { } else if ((label && ctx->menu) || !ctx->menu) {
/* /*
* (label && current_menu) refers to <menu id="" label=""> * (label && ctx->menu) refers to <menu id="" label="">
* which is an nested (inline) menu definition. * which is an nested (inline) menu definition.
* *
* (!current_menu) catches: * (!ctx->menu) catches:
* <openbox_menu> * <openbox_menu>
* <menu id=""></menu> * <menu id=""></menu>
* </openbox_menu> * </openbox_menu>
@ -668,22 +672,22 @@ handle_menu_element(xmlNode *n, struct server *server)
* attribute to make it easier for users to define "root-menu" * attribute to make it easier for users to define "root-menu"
* and "client-menu". * and "client-menu".
*/ */
struct menu *parent_menu = current_menu; struct menu *parent_menu = ctx->menu;
current_menu = menu_create(server, id, label); ctx->menu = menu_create(ctx->server, parent_menu, id, label);
if (icon_name) { if (icon_name) {
current_menu->icon_name = xstrdup(icon_name); ctx->menu->icon_name = xstrdup(icon_name);
} }
if (label && parent_menu) { if (label && parent_menu) {
/* /*
* In a nested (inline) menu definition we need to * In a nested (inline) menu definition we need to
* create an item pointing to the new submenu * create an item pointing to the new submenu
*/ */
current_item = item_create(parent_menu, label, true); ctx->item = item_create(parent_menu, label, true);
fill_item("icon", icon_name); fill_item(ctx, "icon", icon_name);
current_item->submenu = current_menu; ctx->item->submenu = ctx->menu;
} }
traverse(n, server); traverse(ctx, n);
current_menu = parent_menu; ctx->menu = parent_menu;
} else { } else {
/* /*
* <menu id=""> (when inside another <menu> element) creates an * <menu id=""> (when inside another <menu> element) creates an
@ -700,13 +704,13 @@ handle_menu_element(xmlNode *n, struct server *server)
goto error; goto error;
} }
struct menu *menu = menu_get_by_id(server, id); struct menu *menu = menu_get_by_id(ctx->server, id);
if (!menu) { if (!menu) {
wlr_log(WLR_ERROR, "no menu with id '%s'", id); wlr_log(WLR_ERROR, "no menu with id '%s'", id);
goto error; goto error;
} }
struct menu *iter = current_menu; struct menu *iter = ctx->menu;
while (iter) { while (iter) {
if (iter == menu) { if (iter == menu) {
wlr_log(WLR_ERROR, "menus with the same id '%s' " wlr_log(WLR_ERROR, "menus with the same id '%s' "
@ -716,9 +720,9 @@ handle_menu_element(xmlNode *n, struct server *server)
iter = iter->parent; iter = iter->parent;
} }
current_item = item_create(current_menu, menu->label, true); ctx->item = item_create(ctx->menu, menu->label, true);
fill_item("icon", menu->icon_name); fill_item(ctx, "icon", menu->icon_name);
current_item->submenu = menu; ctx->item->submenu = menu;
} }
error: error:
free(label); free(label);
@ -729,45 +733,45 @@ error:
/* This can be one of <separator> and <separator label=""> */ /* This can be one of <separator> and <separator label=""> */
static void static void
handle_separator_element(xmlNode *n) handle_separator_element(struct menu_parse_context *ctx, xmlNode *n)
{ {
char *label = (char *)xmlGetProp(n, (const xmlChar *)"label"); char *label = (char *)xmlGetProp(n, (const xmlChar *)"label");
current_item = separator_create(current_menu, label); ctx->item = separator_create(ctx->menu, label);
free(label); free(label);
} }
static void static void
xml_tree_walk(xmlNode *node, struct server *server) xml_tree_walk(struct menu_parse_context *ctx, xmlNode *node)
{ {
for (xmlNode *n = node; n && n->name; n = n->next) { for (xmlNode *n = node; n && n->name; n = n->next) {
if (!strcasecmp((char *)n->name, "comment")) { if (!strcasecmp((char *)n->name, "comment")) {
continue; continue;
} }
if (!strcasecmp((char *)n->name, "menu")) { if (!strcasecmp((char *)n->name, "menu")) {
handle_menu_element(n, server); handle_menu_element(ctx, n);
continue; continue;
} }
if (!strcasecmp((char *)n->name, "separator")) { if (!strcasecmp((char *)n->name, "separator")) {
handle_separator_element(n); handle_separator_element(ctx, n);
continue; continue;
} }
if (!strcasecmp((char *)n->name, "item")) { if (!strcasecmp((char *)n->name, "item")) {
if (!current_menu) { if (!ctx->menu) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
"ignoring <item> without parent <menu>"); "ignoring <item> without parent <menu>");
continue; continue;
} }
in_item = true; ctx->in_item = true;
traverse(n, server); traverse(ctx, n);
in_item = false; ctx->in_item = false;
continue; continue;
} }
traverse(n, server); traverse(ctx, n);
} }
} }
static bool static bool
parse_buf(struct server *server, struct buf *buf) parse_buf(struct menu_parse_context *ctx, struct buf *buf)
{ {
int options = 0; int options = 0;
xmlDoc *d = xmlReadMemory(buf->data, buf->len, NULL, NULL, options); xmlDoc *d = xmlReadMemory(buf->data, buf->len, NULL, NULL, options);
@ -775,7 +779,7 @@ parse_buf(struct server *server, struct buf *buf)
wlr_log(WLR_ERROR, "xmlParseMemory()"); wlr_log(WLR_ERROR, "xmlParseMemory()");
return false; return false;
} }
xml_tree_walk(xmlDocGetRootElement(d), server); xml_tree_walk(ctx, xmlDocGetRootElement(d));
xmlFreeDoc(d); xmlFreeDoc(d);
xmlCleanupParser(); xmlCleanupParser();
return true; return true;
@ -801,7 +805,8 @@ parse_stream(struct server *server, FILE *stream)
buf_add(&b, line); buf_add(&b, line);
} }
free(line); free(line);
parse_buf(server, &b); struct menu_parse_context ctx = {.server = server};
parse_buf(&ctx, &b);
buf_reset(&b); buf_reset(&b);
} }
@ -922,7 +927,7 @@ static void
init_client_send_to_menu(struct server *server) init_client_send_to_menu(struct server *server)
{ {
/* Just create placeholder. Contents will be created when launched */ /* Just create placeholder. Contents will be created when launched */
menu_create(server, "client-send-to-menu", ""); menu_create(server, NULL, "client-send-to-menu", "");
} }
/* /*
@ -941,19 +946,21 @@ update_client_send_to_menu(struct server *server)
reset_menu(menu); reset_menu(menu);
struct menu_parse_context ctx = {.server = server};
struct workspace *workspace; struct workspace *workspace;
wl_list_for_each(workspace, &server->workspaces.all, link) { wl_list_for_each(workspace, &server->workspaces.all, link) {
if (workspace == server->workspaces.current) { if (workspace == server->workspaces.current) {
char *label = strdup_printf(">%s<", workspace->name); char *label = strdup_printf(">%s<", workspace->name);
current_item = item_create(menu, label, ctx.item = item_create(menu, label,
/*show arrow*/ false); /*show arrow*/ false);
free(label); free(label);
} else { } else {
current_item = item_create(menu, workspace->name, /*show arrow*/ false); ctx.item = item_create(menu, workspace->name,
/*show arrow*/ false);
} }
fill_item("name.action", "SendToDesktop"); fill_item(&ctx, "name.action", "SendToDesktop");
fill_item("to.action", workspace->name); fill_item(&ctx, "to.action", workspace->name);
} }
menu_create_scene(menu); menu_create_scene(menu);
@ -963,7 +970,7 @@ static void
init_client_list_combined_menu(struct server *server) init_client_list_combined_menu(struct server *server)
{ {
/* Just create placeholder. Contents will be created when launched */ /* Just create placeholder. Contents will be created when launched */
menu_create(server, "client-list-combined-menu", ""); menu_create(server, NULL, "client-list-combined-menu", "");
} }
/* /*
@ -982,6 +989,7 @@ update_client_list_combined_menu(struct server *server)
reset_menu(menu); reset_menu(menu);
struct menu_parse_context ctx = {.server = server};
struct workspace *workspace; struct workspace *workspace;
struct view *view; struct view *view;
struct buf buffer = BUF_INIT; struct buf buffer = BUF_INIT;
@ -989,7 +997,7 @@ update_client_list_combined_menu(struct server *server)
wl_list_for_each(workspace, &server->workspaces.all, link) { wl_list_for_each(workspace, &server->workspaces.all, link) {
buf_add_fmt(&buffer, workspace == server->workspaces.current ? ">%s<" : "%s", buf_add_fmt(&buffer, workspace == server->workspaces.current ? ">%s<" : "%s",
workspace->name); workspace->name);
current_item = separator_create(menu, buffer.data); ctx.item = separator_create(menu, buffer.data);
buf_clear(&buffer); buf_clear(&buffer);
wl_list_for_each(view, &server->views, link) { wl_list_for_each(view, &server->views, link) {
@ -1004,17 +1012,19 @@ update_client_list_combined_menu(struct server *server)
} }
buf_add(&buffer, title); buf_add(&buffer, title);
current_item = item_create(menu, buffer.data, /*show arrow*/ false); ctx.item = item_create(menu, buffer.data,
current_item->client_list_view = view; /*show arrow*/ false);
fill_item("name.action", "Focus"); ctx.item->client_list_view = view;
fill_item("name.action", "Raise"); fill_item(&ctx, "name.action", "Focus");
fill_item(&ctx, "name.action", "Raise");
buf_clear(&buffer); buf_clear(&buffer);
menu->has_icons = true; menu->has_icons = true;
} }
} }
current_item = item_create(menu, _("Go there..."), /*show arrow*/ false); ctx.item = item_create(menu, _("Go there..."),
fill_item("name.action", "GoToDesktop"); /*show arrow*/ false);
fill_item("to.action", workspace->name); fill_item(&ctx, "name.action", "GoToDesktop");
fill_item(&ctx, "to.action", workspace->name);
} }
buf_reset(&buffer); buf_reset(&buffer);
menu_create_scene(menu); menu_create_scene(menu);
@ -1027,19 +1037,19 @@ init_rootmenu(struct server *server)
/* Default menu if no menu.xml found */ /* Default menu if no menu.xml found */
if (!menu) { if (!menu) {
current_menu = NULL; struct menu_parse_context ctx = {.server = server};
menu = menu_create(server, "root-menu", ""); menu = menu_create(server, NULL, "root-menu", "");
current_item = item_create(menu, _("Terminal"), false); ctx.item = item_create(menu, _("Terminal"), false);
fill_item("name.action", "Execute"); fill_item(&ctx, "name.action", "Execute");
fill_item("command.action", "lab-sensible-terminal"); fill_item(&ctx, "command.action", "lab-sensible-terminal");
current_item = separator_create(menu, NULL); ctx.item = separator_create(menu, NULL);
current_item = item_create(menu, _("Reconfigure"), false); ctx.item = item_create(menu, _("Reconfigure"), false);
fill_item("name.action", "Reconfigure"); fill_item(&ctx, "name.action", "Reconfigure");
current_item = item_create(menu, _("Exit"), false); ctx.item = item_create(menu, _("Exit"), false);
fill_item("name.action", "Exit"); fill_item(&ctx, "name.action", "Exit");
} }
} }
@ -1050,43 +1060,44 @@ init_windowmenu(struct server *server)
/* Default menu if no menu.xml found */ /* Default menu if no menu.xml found */
if (!menu) { if (!menu) {
current_menu = NULL; struct menu_parse_context ctx = {.server = server};
menu = menu_create(server, "client-menu", ""); menu = menu_create(server, NULL, "client-menu", "");
current_item = item_create(menu, _("Minimize"), false); ctx.item = item_create(menu, _("Minimize"), false);
fill_item("name.action", "Iconify"); fill_item(&ctx, "name.action", "Iconify");
current_item = item_create(menu, _("Maximize"), false); ctx.item = item_create(menu, _("Maximize"), false);
fill_item("name.action", "ToggleMaximize"); fill_item(&ctx, "name.action", "ToggleMaximize");
current_item = item_create(menu, _("Fullscreen"), false); ctx.item = item_create(menu, _("Fullscreen"), false);
fill_item("name.action", "ToggleFullscreen"); fill_item(&ctx, "name.action", "ToggleFullscreen");
current_item = item_create(menu, _("Roll Up/Down"), false); ctx.item = item_create(menu, _("Roll Up/Down"), false);
fill_item("name.action", "ToggleShade"); fill_item(&ctx, "name.action", "ToggleShade");
current_item = item_create(menu, _("Decorations"), false); ctx.item = item_create(menu, _("Decorations"), false);
fill_item("name.action", "ToggleDecorations"); fill_item(&ctx, "name.action", "ToggleDecorations");
current_item = item_create(menu, _("Always on Top"), false); ctx.item = item_create(menu, _("Always on Top"), false);
fill_item("name.action", "ToggleAlwaysOnTop"); fill_item(&ctx, "name.action", "ToggleAlwaysOnTop");
/* Workspace sub-menu */ /* Workspace sub-menu */
struct menu *workspace_menu = menu_create(server, "workspaces", ""); struct menu *workspace_menu =
current_item = item_create(workspace_menu, _("Move Left"), false); menu_create(server, NULL, "workspaces", "");
ctx.item = item_create(workspace_menu, _("Move Left"), false);
/* /*
* <action name="SendToDesktop"><follow> is true by default so * <action name="SendToDesktop"><follow> is true by default so
* GoToDesktop will be called as part of the action. * GoToDesktop will be called as part of the action.
*/ */
fill_item("name.action", "SendToDesktop"); fill_item(&ctx, "name.action", "SendToDesktop");
fill_item("to.action", "left"); fill_item(&ctx, "to.action", "left");
current_item = item_create(workspace_menu, _("Move Right"), false); ctx.item = item_create(workspace_menu, _("Move Right"), false);
fill_item("name.action", "SendToDesktop"); fill_item(&ctx, "name.action", "SendToDesktop");
fill_item("to.action", "right"); fill_item(&ctx, "to.action", "right");
current_item = separator_create(workspace_menu, ""); ctx.item = separator_create(workspace_menu, "");
current_item = item_create(workspace_menu, ctx.item = item_create(workspace_menu,
_("Always on Visible Workspace"), false); _("Always on Visible Workspace"), false);
fill_item("name.action", "ToggleOmnipresent"); fill_item(&ctx, "name.action", "ToggleOmnipresent");
current_item = item_create(menu, _("Workspace"), true); ctx.item = item_create(menu, _("Workspace"), true);
current_item->submenu = workspace_menu; ctx.item->submenu = workspace_menu;
current_item = item_create(menu, _("Close"), false); ctx.item = item_create(menu, _("Close"), false);
fill_item("name.action", "Close"); fill_item(&ctx, "name.action", "Close");
} }
if (wl_list_length(&rc.workspace_config.workspaces) == 1) { if (wl_list_length(&rc.workspace_config.workspaces) == 1) {
@ -1173,11 +1184,6 @@ menu_finish(struct server *server)
wl_list_for_each_safe(menu, tmp_menu, &server->menus, link) { wl_list_for_each_safe(menu, tmp_menu, &server->menus, link) {
menu_free(menu); menu_free(menu);
} }
/* Reset state vars for starting fresh when Reload is triggered */
current_item = NULL;
current_item_action = NULL;
current_menu = NULL;
} }
void void
@ -1333,19 +1339,18 @@ static void
create_pipe_menu(struct menu_pipe_context *ctx) create_pipe_menu(struct menu_pipe_context *ctx)
{ {
struct server *server = ctx->pipemenu->server; struct server *server = ctx->pipemenu->server;
struct menu *old_current_menu = current_menu; struct menu_parse_context parse_ctx = {
current_menu = ctx->pipemenu; .server = server,
if (!parse_buf(server, &ctx->buf)) { .menu = ctx->pipemenu,
goto restore_menus; };
if (!parse_buf(&parse_ctx, &ctx->buf)) {
return;
} }
/* TODO: apply validate() only for generated pipemenus */ /* TODO: apply validate() only for generated pipemenus */
validate(server); validate(server);
/* Finally open the new submenu tree */ /* Finally open the new submenu tree */
open_menu(ctx->pipemenu, ctx->anchor_rect); open_menu(ctx->pipemenu, ctx->anchor_rect);
restore_menus:
current_menu = old_current_menu;
} }
static void static void