X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_menu.c;h=cf556744a35d0fca46910cab7623d5d28cca6b78;hb=3ae58f457bcdfa90b26dad4c9d192f045874ddae;hp=74fa847770eb6ebbd950999941c3eea7788523f4;hpb=ecfd93b1868975f0b881622e5a2e55d4e1834cd9;p=chaz%2Fopenbox diff --git a/openbox/client_menu.c b/openbox/client_menu.c index 74fa8477..cf556744 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -19,11 +19,13 @@ #include "debug.h" #include "menu.h" #include "menuframe.h" +#include "config.h" #include "screen.h" #include "client.h" #include "openbox.h" #include "frame.h" #include "moveresize.h" +#include "event.h" #include "prop.h" #include "gettext.h" @@ -90,7 +92,7 @@ static gboolean client_menu_update(ObMenuFrame *frame, gpointer data) *en = c->functions & OB_CLIENT_FUNC_CLOSE; break; case CLIENT_DECORATE: - *en = client_normal(c); + *en = c->functions & OB_CLIENT_FUNC_UNDECORATE; break; default: *en = TRUE; @@ -101,13 +103,16 @@ static gboolean client_menu_update(ObMenuFrame *frame, gpointer data) } static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f, - ObClient *c, guint state, gpointer data, - Time time) + ObClient *c, guint state, gpointer data) { gint x, y; + gulong ignore_start; g_assert(c); + if (!config_focus_under_mouse) + ignore_start = event_start_ignore_all_enters(); + switch (e->id) { case CLIENT_ICONIFY: /* the client won't be on screen anymore so hide the menu */ @@ -153,6 +158,9 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f, g_assert_not_reached(); } + if (!config_focus_under_mouse) + event_end_ignore_all_enters(ignore_start); + /* update the menu cuz stuff can have changed */ if (f) { client_menu_update(f, NULL); @@ -176,13 +184,13 @@ static gboolean layer_menu_update(ObMenuFrame *frame, gpointer data) if (e->type == OB_MENU_ENTRY_TYPE_NORMAL) { switch (e->id) { case LAYER_TOP: - *en = !c->above; + *en = !c->above && (c->functions & OB_CLIENT_FUNC_ABOVE); break; case LAYER_NORMAL: *en = c->above || c->below; break; case LAYER_BOTTOM: - *en = !c->below; + *en = !c->below && (c->functions & OB_CLIENT_FUNC_BELOW); break; default: *en = TRUE; @@ -193,11 +201,15 @@ static gboolean layer_menu_update(ObMenuFrame *frame, gpointer data) } static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f, - ObClient *c, guint state, gpointer data, - Time time) + ObClient *c, guint state, gpointer data) { + gulong ignore_start; + g_assert(c); + if (!config_focus_under_mouse) + ignore_start = event_start_ignore_all_enters(); + switch (e->id) { case LAYER_TOP: client_set_layer(c, 1); @@ -212,6 +224,9 @@ static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f, g_assert_not_reached(); } + if (!config_focus_under_mouse) + event_end_ignore_all_enters(ignore_start); + /* update the menu cuz stuff can have changed */ if (f) { layer_menu_update(f, NULL); @@ -264,23 +279,22 @@ static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data) } static void send_to_menu_execute(ObMenuEntry *e, ObMenuFrame *f, - ObClient *c, guint state, gpointer data, - Time time) + ObClient *c, guint state, gpointer data) { g_assert(c); - client_set_desktop(c, e->id, FALSE); + client_set_desktop(c, e->id, FALSE, FALSE); /* the client won't even be on the screen anymore, so hide the menu */ if (f) menu_frame_hide_all(); } static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y, - gint button, gpointer data) + gboolean mouse, gpointer data) { gint dx, dy; - if (button == 0 && frame->client) { + if (!mouse && frame->client) { *x = frame->client->frame->area.x; /* try below the titlebar */ @@ -338,22 +352,22 @@ static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y, } } -void client_menu_startup() +void client_menu_startup(void) { ObMenu *menu; ObMenuEntry *e; - menu = menu_new(LAYER_MENU_NAME, _("&Layer"), TRUE, NULL); + menu = menu_new(LAYER_MENU_NAME, _("_Layer"), TRUE, NULL); menu_show_all_shortcuts(menu, TRUE); menu_set_update_func(menu, layer_menu_update); menu_set_execute_func(menu, layer_menu_execute); - menu_add_normal(menu, LAYER_TOP, _("Always on &top"), NULL, TRUE); - menu_add_normal(menu, LAYER_NORMAL, _("&Normal"), NULL, TRUE); - menu_add_normal(menu, LAYER_BOTTOM, _("Always on &bottom"),NULL, TRUE); + menu_add_normal(menu, LAYER_TOP, _("Always on _top"), NULL, TRUE); + menu_add_normal(menu, LAYER_NORMAL, _("_Normal"), NULL, TRUE); + menu_add_normal(menu, LAYER_BOTTOM, _("Always on _bottom"),NULL, TRUE); - menu = menu_new(SEND_TO_MENU_NAME, _("&Send to desktop"), TRUE, NULL); + menu = menu_new(SEND_TO_MENU_NAME, _("_Send to desktop"), TRUE, NULL); menu_set_update_func(menu, send_to_menu_update); menu_set_execute_func(menu, send_to_menu_execute); @@ -363,19 +377,23 @@ void client_menu_startup() menu_set_place_func(menu, client_menu_place); menu_set_execute_func(menu, client_menu_execute); - e = menu_add_normal(menu, CLIENT_RESTORE, _("R&estore"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->max_toggled_mask; + menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME); + + menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); + + e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, 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_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_normal(menu, CLIENT_MOVE, _("&Move"), NULL, TRUE); + menu_add_normal(menu, CLIENT_MOVE, _("_Move"), NULL, TRUE); - menu_add_normal(menu, CLIENT_RESIZE, _("Resi&ze"), NULL, TRUE); + menu_add_normal(menu, CLIENT_RESIZE, _("Resi_ze"), NULL, TRUE); - e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico&nify"), NULL, TRUE); + e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico_nify"), NULL, 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_selected_color = ob_rr_theme->menu_selected_color; @@ -383,33 +401,21 @@ void client_menu_startup() e->data.normal.mask_disabled_selected_color = ob_rr_theme->menu_disabled_selected_color; - e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma&ximize"), NULL, 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_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_normal(menu, CLIENT_SHADE, _("&Roll up/down"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->shade_mask; + e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma_ximize"), NULL, 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_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_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), NULL, TRUE); + menu_add_normal(menu, CLIENT_SHADE, _("_Roll up/down"), NULL, TRUE); - menu_add_separator(menu, -1, NULL); - - menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME); - - menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); + menu_add_normal(menu, CLIENT_DECORATE, _("Un/_Decorate"), NULL, TRUE); menu_add_separator(menu, -1, NULL); - e = menu_add_normal(menu, CLIENT_CLOSE, _("&Close"), NULL, TRUE); + e = menu_add_normal(menu, CLIENT_CLOSE, _("_Close"), NULL, 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_selected_color = ob_rr_theme->menu_selected_color;