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

Add window menu

Browse source
This commit is contained in:
Consolatis 2022-01-26 00:07:10 +01:00 • committed by Johan Malm
parent 4bc8726abd
commit 759b26b5c1
12 changed files with 108 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/action.c
View file

@ -87,16 +87,37 @@ void action_list_free(struct wl_list *action_list) {
}
static void
show_menu(struct server *server, const char *menu)
show_menu(struct server *server, struct view *view, const char *menu_name)
{
if (!menu) {
struct menu *menu = NULL;
bool force_menu_top_left = false;
if (!menu_name) {
return;
}
if (!strcasecmp(menu, "root-menu")) {
server->input_mode = LAB_INPUT_STATE_MENU;
menu_move(server->rootmenu, server->seat.cursor->x,
server->seat.cursor->y);
if (!strcasecmp(menu_name, "root-menu")) {
menu = server->rootmenu;
server->windowmenu->visible = false;
} else if (!strcasecmp(menu_name, "client-menu") && view) {
menu = server->windowmenu;
server->rootmenu->visible = false;
} else {
return;
}
menu->visible = true;
server->input_mode = LAB_INPUT_STATE_MENU;
int x, y;
if (force_menu_top_left) {
x = view->x;
y = view->y;
} else {
x = server->seat.cursor->x;
y = server->seat.cursor->y;
}
menu_move(menu, x, y);
damage_all_outputs(server);
}
@ -166,7 +187,7 @@ action(struct view *activator, struct server *server, struct wl_list *actions, u
spawn_async_no_shell("killall -SIGHUP labwc");
break;
case ACTION_TYPE_SHOW_MENU:
show_menu(server, action->arg);
show_menu(server, view, action->arg);
break;
case ACTION_TYPE_TOGGLE_MAXIMIZE:
if (view) {

4
src/config/rcxml.c
View file

@ -504,6 +504,7 @@ static struct {
{ "W-Right", "SnapToEdge", "right" },
{ "W-Up", "SnapToEdge", "up" },
{ "W-Down", "SnapToEdge", "down" },
{ "A-Space", "ShowMenu", "client-menu"},
{ "XF86_AudioLowerVolume", "Execute", "amixer sset Master 5%-" },
{ "XF86_AudioRaiseVolume", "Execute", "amixer sset Master 5%+" },
{ "XF86_AudioMute", "Execute", "amixer sset Master toggle" },
@ -553,6 +554,9 @@ static struct {
{ "Titlebar", "Left", "Press", "Raise", NULL},
{ "TitleBar", "Left", "Drag", "Move", NULL },
{ "TitleBar", "Left", "DoubleClick", "ToggleMaximize", NULL },
{ "TitleBar", "Right", "Click", "Focus", NULL},
{ "TitleBar", "Right", "Click", "Raise", NULL},
{ "TitleBar", "Right", "Click", "ShowMenu", "client-menu"},
{ "Close", "Left", "Click", "Close", NULL },
{ "Iconify", "Left", "Click", "Iconify", NULL},
{ "Maximize", "Left", "Click", "ToggleMaximize", NULL},

16
src/cursor.c
View file

@ -183,7 +183,15 @@ process_cursor_motion(struct server *server, uint32_t time)
process_cursor_resize(server, time);
return;
} else if (server->input_mode == LAB_INPUT_STATE_MENU) {
menu_set_selected(server->rootmenu,
struct menu *menu = NULL;
if (server->rootmenu->visible) {
menu = server->rootmenu;
} else if (server->windowmenu->visible) {
menu = server->windowmenu;
} else {
return;
}
menu_set_selected(menu,
server->seat.cursor->x, server->seat.cursor->y);
damage_all_outputs(server);
return;
@ -615,7 +623,11 @@ cursor_button(struct wl_listener *listener, void *data)
}
if (server->input_mode == LAB_INPUT_STATE_MENU) {
menu_action_selected(server, server->rootmenu);
if (server->rootmenu->visible) {
menu_action_selected(server, server->rootmenu);
} else if (server->windowmenu->visible) {
menu_action_selected(server, server->windowmenu);
}
server->input_mode = LAB_INPUT_STATE_PASSTHROUGH;
cursor_rebase(&server->seat, event->time_msec);
return;

1
src/main.c
View file

@ -72,6 +72,7 @@ main(int argc, char *argv[])
server.theme = &theme;
menu_init_rootmenu(&server);
menu_init_windowmenu(&server);
session_autostart_init();
if (startup_cmd) {

29
src/menu/menu.c
View file

@ -313,6 +313,7 @@ menu_init_rootmenu(struct server *server)
/* Default menu if no menu.xml found */
if (!server->rootmenu) {
current_menu = NULL;
server->rootmenu = menu_create(server, "root-menu", "");
}
if (wl_list_empty(&server->rootmenu->menuitems)) {
@ -326,6 +327,33 @@ menu_init_rootmenu(struct server *server)
menu_configure(server->rootmenu, 100, 100);
}
void
menu_init_windowmenu(struct server *server)
{
server->windowmenu = get_menu_by_id("client-menu");
/* Default menu if no menu.xml found */
if (!server->windowmenu) {
current_menu = NULL;
server->windowmenu = menu_create(server, "client-menu", "");
}
if (wl_list_empty(&server->windowmenu->menuitems)) {
current_item = item_create(server->windowmenu, "Minimize");
fill_item("name.action", "Iconify");
current_item = item_create(server->windowmenu, "Maximize");
fill_item("name.action", "ToggleMaximize");
current_item = item_create(server->windowmenu, "Fullscreen");
fill_item("name.action", "ToggleFullscreen");
current_item = item_create(server->windowmenu, "Decorations");
fill_item("name.action", "ToggleDecorations");
current_item = item_create(server->windowmenu, "Close");
fill_item("name.action", "Close");
}
server->windowmenu->visible = true;
menu_configure(server->windowmenu, 100, 100);
}
void
menu_finish(void)
{
@ -437,4 +465,5 @@ menu_reconfigure(struct server *server, struct menu *menu)
{
menu_finish();
menu_init_rootmenu(server);
menu_init_windowmenu(server);
}

1
src/output.c
View file

@ -832,6 +832,7 @@ output_render(struct output *output, pixman_region32_t *damage)
if (output->server->input_mode == LAB_INPUT_STATE_MENU) {
render_menu(output, damage, server->rootmenu);
render_menu(output, damage, server->windowmenu);
}
renderer_end: