From 138979c506c0b3dd592bc6aa94efdeb8f9a19485 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Tue, 31 Oct 2023 21:08:04 +0000 Subject: [PATCH] menu: s/menu_open/menu_open_root/ ...to be consistent with the 'close' equivalent --- include/menu/menu.h | 4 ++-- src/action.c | 2 +- src/menu/menu.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/menu/menu.h b/include/menu/menu.h index 914fa186..e421a4da 100644 --- a/include/menu/menu.h +++ b/include/menu/menu.h @@ -81,14 +81,14 @@ void menu_finish(struct server *server); struct menu *menu_get_by_id(struct server *server, const char *id); /** - * menu_open - open menu on position (x, y) + * menu_open_root - open menu on position (x, y) * * This function will close server->menu_current, open the * new menu and assign @menu to server->menu_current. * * Additionally, server->input_mode wil be set to LAB_INPUT_STATE_MENU. */ -void menu_open(struct menu *menu, int x, int y); +void menu_open_root(struct menu *menu, int x, int y); /** * menu_process_cursor_motion diff --git a/src/action.c b/src/action.c index 3723e42b..61e28f27 100644 --- a/src/action.c +++ b/src/action.c @@ -605,7 +605,7 @@ show_menu(struct server *server, struct view *view, /* Replaced by next show_menu() or cleaned on view_destroy() */ menu->triggered_by_view = view; - menu_open(menu, x, y); + menu_open_root(menu, x, y); } static struct view * diff --git a/src/menu/menu.c b/src/menu/menu.c index c37ebc3b..722f7d5b 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -842,7 +842,7 @@ menu_close(struct menu *menu) } void -menu_open(struct menu *menu, int x, int y) +menu_open_root(struct menu *menu, int x, int y) { assert(menu); if (menu->server->menu_current) {