X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_menu.c;h=f538eafd7f36ae263a81e2feecd8bba0f932073a;hb=0f677834e253dfd18a246c8811bf4a4e364d5e0e;hp=0d4aa57f1418216e432b5aac46fa08470a25afde;hpb=1361a87bdff4a04c4c5e273bafa7a90c16368b67;p=chaz%2Fopenbox diff --git a/openbox/client_menu.c b/openbox/client_menu.c index 0d4aa57f..f538eafd 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -24,6 +24,7 @@ #include "openbox.h" #include "frame.h" #include "moveresize.h" +#include "event.h" #include "prop.h" #include "gettext.h" @@ -90,7 +91,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; @@ -100,30 +101,22 @@ static gboolean client_menu_update(ObMenuFrame *frame, gpointer data) return TRUE; /* show the menu */ } -static void client_menu_execute(ObMenuEntry *e, guint state, gpointer data, +static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f, + ObClient *c, guint state, gpointer data, Time time) { - GList *it; - ObMenuFrame *f; - ObClient *c; - - /* find our frame */ - for (it = menu_frame_visible; it; it = g_list_next(it)) { - f = it->data; - /* yay this is our menu frame */ - if (f->menu == e->menu) - break; - } - g_assert(it); + gint x, y; - c = f->client; + g_assert(c); switch (e->id) { case CLIENT_ICONIFY: - client_iconify(c, TRUE, FALSE); /* the client won't be on screen anymore so hide the menu */ menu_frame_hide_all(); - return; /* and don't update */ + f = NULL; /* and don't update */ + + client_iconify(c, TRUE, FALSE, FALSE); + break; case CLIENT_RESTORE: client_maximize(c, FALSE, 0); break; @@ -137,10 +130,22 @@ static void client_menu_execute(ObMenuEntry *e, guint state, gpointer data, client_set_undecorated(c, !c->undecorated); break; case CLIENT_MOVE: - moveresize_start(c,0,0,0, prop_atoms.net_wm_moveresize_move_keyboard); + /* this needs to grab the keyboard so hide the menu */ + menu_frame_hide_all(); + f = NULL; /* and don't update */ + + screen_pointer_pos(&x, &y); + moveresize_start(c, x, y, 0, + prop_atoms.net_wm_moveresize_move_keyboard); break; case CLIENT_RESIZE: - moveresize_start(c,0,0,0,prop_atoms.net_wm_moveresize_size_keyboard); + /* this needs to grab the keyboard so hide the menu */ + menu_frame_hide_all(); + f = NULL; /* and don't update */ + + screen_pointer_pos(&x, &y); + moveresize_start(c, x, y, 0, + prop_atoms.net_wm_moveresize_size_keyboard); break; case CLIENT_CLOSE: client_close(c); @@ -149,9 +154,13 @@ static void client_menu_execute(ObMenuEntry *e, guint state, gpointer data, g_assert_not_reached(); } + event_ignore_all_queued_enters(); + /* update the menu cuz stuff can have changed */ - client_menu_update(f, NULL); - menu_frame_render(f); + if (f) { + client_menu_update(f, NULL); + menu_frame_render(f); + } } static gboolean layer_menu_update(ObMenuFrame *frame, gpointer data) @@ -170,13 +179,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; @@ -186,38 +195,33 @@ static gboolean layer_menu_update(ObMenuFrame *frame, gpointer data) return TRUE; /* show the menu */ } -static void layer_menu_execute(ObMenuEntry *e, guint state, gpointer data, +static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f, + ObClient *c, guint state, gpointer data, Time time) { - GList *it; - ObMenuFrame *f; - - /* find our frame */ - for (it = menu_frame_visible; it; it = g_list_next(it)) { - f = it->data; - /* yay this is our menu frame */ - if (f->menu == e->menu) - break; - } - g_assert(it); + g_assert(c); switch (e->id) { case LAYER_TOP: - client_set_layer(f->client, 1); + client_set_layer(c, 1); break; case LAYER_NORMAL: - client_set_layer(f->client, 0); + client_set_layer(c, 0); break; case LAYER_BOTTOM: - client_set_layer(f->client, -1); + client_set_layer(c, -1); break; default: g_assert_not_reached(); } + event_ignore_all_queued_enters(); + /* update the menu cuz stuff can have changed */ - layer_menu_update(f, NULL); - menu_frame_render(f); + if (f) { + layer_menu_update(f, NULL); + menu_frame_render(f); + } } static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data) @@ -264,24 +268,16 @@ static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data) return TRUE; /* show the menu */ } -static void send_to_menu_execute(ObMenuEntry *e, guint state, gpointer data, +static void send_to_menu_execute(ObMenuEntry *e, ObMenuFrame *f, + ObClient *c, guint state, gpointer data, Time time) { - GList *it; - ObMenuFrame *f; - - /* find our frame */ - for (it = menu_frame_visible; it; it = g_list_next(it)) { - f = it->data; - /* yay this is our menu frame */ - if (f->menu == e->menu) - break; - } - g_assert(it); + g_assert(c); - client_set_desktop(f->client, e->id, FALSE); + client_set_desktop(c, e->id, FALSE); /* the client won't even be on the screen anymore, so hide the menu */ - menu_frame_hide_all(); + if (f) + menu_frame_hide_all(); } static void client_menu_place(ObMenuFrame *frame, gint *x, gint *y, @@ -400,13 +396,7 @@ void client_menu_startup() e->data.normal.mask_disabled_selected_color = ob_rr_theme->menu_disabled_selected_color; - e = menu_add_normal(menu, CLIENT_SHADE, _("&Roll up/down"), NULL, 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_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); menu_add_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), NULL, TRUE);