mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-09 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

menu: Add generic menu_init() entry point

Browse source
This commit is contained in:
Consolatis 2022-12-06 11:54:55 +01:00 • committed by Johan Malm
parent aa4ef94af0
commit ccf68c5950
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/menu/menu.h
View file

@ -61,8 +61,7 @@ struct menu {
struct view *triggered_by_view; /* may be NULL */ struct view *triggered_by_view; /* may be NULL */
}; };
void menu_init_rootmenu(struct server *server); void menu_init(struct server *server);
void menu_init_windowmenu(struct server *server);
void menu_finish(void); void menu_finish(void);
/** /**

3
src/main.c
View file

@ -169,8 +169,7 @@ main(int argc, char *argv[])
rc.theme = &theme; rc.theme = &theme;
server.theme = &theme; server.theme = &theme;
menu_init_rootmenu(&server); menu_init(&server);
menu_init_windowmenu(&server);
session_autostart_init(rc.config_dir); session_autostart_init(rc.config_dir);
if (startup_cmd) { if (startup_cmd) {

18
src/menu/menu.c
View file

@ -575,8 +575,8 @@ menu_hide_submenu(const char *id)
} }
} }
void static void
menu_init_rootmenu(struct server *server) init_rootmenu(struct server *server)
{ {
parse_xml("menu.xml", server); parse_xml("menu.xml", server);
struct menu *menu = menu_get_by_id("root-menu"); struct menu *menu = menu_get_by_id("root-menu");
@ -594,8 +594,8 @@ menu_init_rootmenu(struct server *server)
} }
} }
void static void
menu_init_windowmenu(struct server *server) init_windowmenu(struct server *server)
{ {
struct menu *menu = menu_get_by_id("client-menu"); struct menu *menu = menu_get_by_id("client-menu");
@ -640,6 +640,13 @@ menu_init_windowmenu(struct server *server)
} }
} }
void
menu_init(struct server *server)
{
init_rootmenu(server);
init_windowmenu(server);
}
void void
menu_finish(void) menu_finish(void)
{ {
@ -799,6 +806,5 @@ menu_reconfigure(struct server *server)
{ {
menu_finish(); menu_finish();
server->menu_current = NULL; server->menu_current = NULL;
menu_init_rootmenu(server); menu_init(server);
menu_init_windowmenu(server);
} }