mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-26 07:58:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu: use client-send-to-menu as 'Workspace' submenu

Browse source 
...because that is more flexible and how it is in openbox.

I have had in mind that we should do this since the original
implementation, and #2994 just jogged my memory.
This commit is contained in:
Johan Malm 2025-08-13 20:34:07 +01:00 • committed by Johan Malm
parent d9f7ccf3aa
commit 6fe61f8846
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/menu/menu.c
View file

@ -840,6 +840,10 @@ update_client_send_to_menu(struct server *server)
struct workspace *workspace; struct workspace *workspace;
/*
* <action name="SendToDesktop"><follow> is true by default so
* GoToDesktop will be called as part of the action.
*/
wl_list_for_each(workspace, &server->workspaces.all, link) { wl_list_for_each(workspace, &server->workspaces.all, link) {
struct buf buf = BUF_INIT; struct buf buf = BUF_INIT;
if (workspace == server->workspaces.current) { if (workspace == server->workspaces.current) {
@ -856,6 +860,11 @@ update_client_send_to_menu(struct server *server)
buf_clear(&buf); buf_clear(&buf);
} }
separator_create(menu, "");
struct menuitem *item = item_create(menu,
_("Always on Visible Workspace"), NULL, false);
item_add_action(item, "ToggleOmnipresent");
menu_create_scene(menu); menu_create_scene(menu);
} }
@ -944,7 +953,6 @@ init_windowmenu(struct server *server)
{ {
struct menu *menu = menu_get_by_id(server, "client-menu"); struct menu *menu = menu_get_by_id(server, "client-menu");
struct menuitem *item; struct menuitem *item;
struct action *action;
/* Default menu if no menu.xml found */ /* Default menu if no menu.xml found */
if (!menu) { if (!menu) {
@ -963,25 +971,8 @@ init_windowmenu(struct server *server)
item_add_action(item, "ToggleAlwaysOnTop"); item_add_action(item, "ToggleAlwaysOnTop");
/* Workspace sub-menu */ /* Workspace sub-menu */
struct menu *workspace_menu =
menu_create(server, NULL, "workspaces", "");
item = item_create(workspace_menu, _("Move Left"), NULL, false);
/*
* <action name="SendToDesktop"><follow> is true by default so
* GoToDesktop will be called as part of the action.
*/
action = item_add_action(item, "SendToDesktop");
action_arg_add_str(action, "to", "left");
item = item_create(workspace_menu, _("Move Right"), NULL, false);
action = item_add_action(item, "SendToDesktop");
action_arg_add_str(action, "to", "right");
separator_create(workspace_menu, "");
item = item_create(workspace_menu,
_("Always on Visible Workspace"), NULL, false);
item_add_action(item, "ToggleOmnipresent");
item = item_create(menu, _("Workspace"), NULL, true); item = item_create(menu, _("Workspace"), NULL, true);
item->submenu = workspace_menu; item->submenu = menu_get_by_id(server, "client-send-to-menu");
item = item_create(menu, _("Close"), NULL, false); item = item_create(menu, _("Close"), NULL, false);
item_add_action(item, "Close"); item_add_action(item, "Close");
@ -999,7 +990,7 @@ menu_init(struct server *server)
/* Just create placeholder. Contents will be created when launched */ /* Just create placeholder. Contents will be created when launched */
menu_create(server, NULL, "client-list-combined-menu", _("Windows")); menu_create(server, NULL, "client-list-combined-menu", _("Windows"));
menu_create(server, NULL, "client-send-to-menu", _("Send to desktop")); menu_create(server, NULL, "client-send-to-menu", _("Workspace"));
parse_xml("menu.xml", server); parse_xml("menu.xml", server);
init_rootmenu(server); init_rootmenu(server);