/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
client_menu.c for the Openbox window manager
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
CLIENT_SEND_TO,
CLIENT_LAYER,
CLIENT_ICONIFY,
+ CLIENT_RESTORE,
CLIENT_MAXIMIZE,
- CLIENT_RAISE,
- CLIENT_LOWER,
CLIENT_SHADE,
CLIENT_DECORATE,
CLIENT_MOVE,
CLIENT_CLOSE
};
-static void client_update(ObMenuFrame *frame, gpointer data)
+static gboolean client_update(ObMenuFrame *frame, gpointer data)
{
ObMenu *menu = frame->menu;
ObMenuEntry *e;
GList *it;
- frame->show_title = FALSE;
+ if (frame->client == NULL || !client_normal(frame->client))
+ return FALSE; /* don't show the menu */
for (it = menu->entries; it; it = g_list_next(it)) {
e = it->data;
if (e->type == OB_MENU_ENTRY_TYPE_NORMAL)
- e->data.normal.enabled = !!frame->client;
+ e->data.normal.enabled = TRUE;
}
- if (!frame->client)
- return;
-
e = menu_find_entry_id(menu, CLIENT_ICONIFY);
e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_ICONIFY;
+ e = menu_find_entry_id(menu, CLIENT_RESTORE);
+ e->data.normal.enabled =frame->client->max_horz || frame->client->max_vert;
+
e = menu_find_entry_id(menu, CLIENT_MAXIMIZE);
- g_free(e->data.normal.label);
- e->data.normal.label =
- g_strdup(frame->client->max_vert || frame->client->max_horz ?
- _("Restore") : _("Maximize"));
- e->data.normal.enabled =frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE;
+ e->data.normal.enabled =
+ (frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE) &&
+ !frame->client->max_horz && !frame->client->max_vert;
e = menu_find_entry_id(menu, CLIENT_SHADE);
- g_free(e->data.normal.label);
- e->data.normal.label = g_strdup(frame->client->shaded ?
- _("Roll down") : _("Roll up"));
e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_SHADE;
e = menu_find_entry_id(menu, CLIENT_MOVE);
e = menu_find_entry_id(menu, CLIENT_DECORATE);
e->data.normal.enabled = client_normal(frame->client);
+ return TRUE; /* show the menu */
}
-static void layer_update(ObMenuFrame *frame, gpointer data)
+static gboolean layer_update(ObMenuFrame *frame, gpointer data)
{
ObMenu *menu = frame->menu;
ObMenuEntry *e;
GList *it;
+ if (frame->client == NULL || !client_normal(frame->client))
+ return FALSE; /* don't show the menu */
+
for (it = menu->entries; it; it = g_list_next(it)) {
e = it->data;
if (e->type == OB_MENU_ENTRY_TYPE_NORMAL)
- e->data.normal.enabled = !!frame->client;
+ e->data.normal.enabled = TRUE;
}
- if (!frame->client)
- return;
-
e = menu_find_entry_id(menu, LAYER_TOP);
e->data.normal.enabled = !frame->client->above;
e = menu_find_entry_id(menu, LAYER_BOTTOM);
e->data.normal.enabled = !frame->client->below;
+ return TRUE; /* show the menu */
}
-static void send_to_update(ObMenuFrame *frame, gpointer data)
+static gboolean send_to_update(ObMenuFrame *frame, gpointer data)
{
ObMenu *menu = frame->menu;
guint i;
GSList *acts;
ObAction *act;
+ ObMenuEntry *e;;
menu_clear_entries(menu);
- if (!frame->client)
- return;
+ if (frame->client == NULL || !client_normal(frame->client))
+ return FALSE; /* don't show the menu */
for (i = 0; i <= screen_num_desktops; ++i) {
- gchar *name;
+ const gchar *name;
guint desk;
if (i >= screen_num_desktops) {
- menu_add_separator(menu, -1);
+ menu_add_separator(menu, -1, NULL);
desk = DESKTOP_ALL;
name = _("All desktops");
act->data.sendto.desk = desk;
act->data.sendto.follow = FALSE;
acts = g_slist_prepend(NULL, act);
- menu_add_normal(menu, desk, name, acts);
+ e = menu_add_normal(menu, desk, name, acts, FALSE);
+ if (desk == DESKTOP_ALL) {
+ e->data.normal.mask = ob_rr_theme->desk_mask;
+ e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
+ e->data.normal.mask_selected_color =
+ ob_rr_theme->menu_selected_color;
+ e->data.normal.mask_disabled_color =
+ ob_rr_theme->menu_disabled_color;
+ e->data.normal.mask_disabled_selected_color =
+ ob_rr_theme->menu_disabled_selected_color;
+ }
- if (frame->client->desktop == desk) {
- ObMenuEntry *e = menu_find_entry_id(menu, desk);
- g_assert(e);
+ if (frame->client->desktop == desk)
e->data.normal.enabled = FALSE;
+ }
+ return TRUE; /* show the menu */
+}
+
+static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y,
+ gint button, gpointer data)
+{
+ gint dx, dy;
+
+ if (button == 0 && frame->client) {
+ *x = frame->client->frame->area.x;
+
+ /* try below the titlebar */
+ *y = frame->client->frame->area.y + frame->client->frame->size.top -
+ frame->client->frame->bwidth;
+ menu_frame_move_on_screen(frame, *x, *y, &dx, &dy);
+ if (dy != 0) {
+ /* try above the titlebar */
+ *y = frame->client->frame->area.y + frame->client->frame->bwidth -
+ frame->area.height;
+ menu_frame_move_on_screen(frame, *x, *y, &dx, &dy);
+ }
+ if (dy != 0) {
+ /* didnt fit either way, use move on screen's values */
+ *y = frame->client->frame->area.y + frame->client->frame->size.top;
+ menu_frame_move_on_screen(frame, *x, *y, &dx, &dy);
+ }
+
+ *x += dx;
+ *y += dy;
+ } else {
+ gint myx, myy;
+
+ myx = *x;
+ myy = *y;
+
+ /* try to the bottom right of the cursor */
+ menu_frame_move_on_screen(frame, myx, myy, &dx, &dy);
+ if (dx != 0 || dy != 0) {
+ /* try to the bottom left of the cursor */
+ myx = *x - frame->area.width;
+ myy = *y;
+ menu_frame_move_on_screen(frame, myx, myy, &dx, &dy);
+ }
+ if (dx != 0 || dy != 0) {
+ /* try to the top right of the cursor */
+ myx = *x;
+ myy = *y - frame->area.height;
+ menu_frame_move_on_screen(frame, myx, myy, &dx, &dy);
+ }
+ if (dx != 0 || dy != 0) {
+ /* try to the top left of the cursor */
+ myx = *x - frame->area.width;
+ myy = *y - frame->area.height;
+ menu_frame_move_on_screen(frame, myx, myy, &dx, &dy);
}
+ if (dx != 0 || dy != 0) {
+ /* if didnt fit on either side so just use what it says */
+ myx = *x;
+ myy = *y;
+ menu_frame_move_on_screen(frame, myx, myy, &dx, &dy);
+ }
+ *x = myx + dx;
+ *y = myy + dy;
}
}
ObMenu *menu;
ObMenuEntry *e;
- menu = menu_new(LAYER_MENU_NAME, _("Layer"), NULL);
+ menu = menu_new(LAYER_MENU_NAME, _("&Layer"), TRUE, NULL);
+ menu_show_all_shortcuts(menu, TRUE);
menu_set_update_func(menu, layer_update);
acts = g_slist_prepend(NULL, action_from_string
("SendToTopLayer", OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, LAYER_TOP, _("Always on top"), acts);
+ menu_add_normal(menu, LAYER_TOP, _("Always on &top"), acts, TRUE);
acts = g_slist_prepend(NULL, action_from_string
("SendToNormalLayer",
OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, LAYER_NORMAL, _("Normal"), acts);
+ menu_add_normal(menu, LAYER_NORMAL, _("&Normal"), acts, TRUE);
acts = g_slist_prepend(NULL, action_from_string
("SendToBottomLayer",
OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, LAYER_BOTTOM, _("Always on bottom"),acts);
+ menu_add_normal(menu, LAYER_BOTTOM, _("Always on &bottom"),acts, TRUE);
- menu = menu_new(SEND_TO_MENU_NAME, _("Send to desktop"), NULL);
+ menu = menu_new(SEND_TO_MENU_NAME, _("&Send to desktop"), TRUE, NULL);
menu_set_update_func(menu, send_to_update);
- menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL);
+ menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), TRUE, NULL);
+ menu_show_all_shortcuts(menu, TRUE);
menu_set_update_func(menu, client_update);
+ menu_set_place_func(menu, client_menu_place);
- e = menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
- e->data.normal.mask = ob_rr_theme->desk_mask;
+ acts = g_slist_prepend(NULL, action_from_string
+ ("ToggleMaximizeFull",
+ OB_USER_ACTION_MENU_SELECTION));
+ e = menu_add_normal(menu, CLIENT_RESTORE, _("R&estore"), acts, TRUE);
+ e->data.normal.mask = ob_rr_theme->max_toggled_mask;
e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
+ e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+ e->data.normal.mask_disabled_selected_color =
+ ob_rr_theme->menu_disabled_selected_color;
- menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Move", OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_MOVE, _("&Move"), acts, TRUE);
+
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Resize", OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_RESIZE, _("Resi&ze"), acts, TRUE);
acts = g_slist_prepend(NULL, action_from_string
("Iconify", OB_USER_ACTION_MENU_SELECTION));
- e = menu_add_normal(menu, CLIENT_ICONIFY, _("Iconify"), acts);
+ e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico&nify"), acts, TRUE);
e->data.normal.mask = ob_rr_theme->iconify_mask;
e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
+ e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+ e->data.normal.mask_disabled_selected_color =
+ ob_rr_theme->menu_disabled_selected_color;
acts = g_slist_prepend(NULL, action_from_string
("ToggleMaximizeFull",
OB_USER_ACTION_MENU_SELECTION));
- e = menu_add_normal(menu, CLIENT_MAXIMIZE, "MAXIMIZE", acts);
+ e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma&ximize"), acts, TRUE);
e->data.normal.mask = ob_rr_theme->max_mask;
e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
-
- acts = g_slist_prepend(NULL, action_from_string
- ("Raise", OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, CLIENT_RAISE, _("Raise to top"), acts);
-
- acts = g_slist_prepend(NULL, action_from_string
- ("Lower", OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, CLIENT_LOWER, _("Lower to bottom"),acts);
+ e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+ e->data.normal.mask_disabled_selected_color =
+ ob_rr_theme->menu_disabled_selected_color;
acts = g_slist_prepend(NULL, action_from_string
("ToggleShade", OB_USER_ACTION_MENU_SELECTION));
- e = menu_add_normal(menu, CLIENT_SHADE, "SHADE", acts);
+ e = menu_add_normal(menu, CLIENT_SHADE, _("&Roll up/down"), acts, TRUE);
e->data.normal.mask = ob_rr_theme->shade_mask;
e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
+ e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+ e->data.normal.mask_disabled_selected_color =
+ ob_rr_theme->menu_disabled_selected_color;
acts = g_slist_prepend(NULL, action_from_string
("ToggleDecorations",
OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts);
+ menu_add_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), acts, TRUE);
- menu_add_separator(menu, -1);
+ menu_add_separator(menu, -1, NULL);
- acts = g_slist_prepend(NULL, action_from_string
- ("Move", OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, CLIENT_MOVE, _("Move"), acts);
+ menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
- acts = g_slist_prepend(NULL, action_from_string
- ("Resize", OB_USER_ACTION_MENU_SELECTION));
- menu_add_normal(menu, CLIENT_RESIZE, _("Resize"), acts);
+ menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
- menu_add_separator(menu, -1);
+ menu_add_separator(menu, -1, NULL);
acts = g_slist_prepend(NULL, action_from_string
("Close", OB_USER_ACTION_MENU_SELECTION));
- e = menu_add_normal(menu, CLIENT_CLOSE, _("Close"), acts);
+ e = menu_add_normal(menu, CLIENT_CLOSE, _("&Close"), acts, TRUE);
e->data.normal.mask = ob_rr_theme->close_mask;
e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
- e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
+ e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+ e->data.normal.mask_disabled_selected_color =
+ ob_rr_theme->menu_disabled_selected_color;
}
projects / chaz / openbox / blobdiff