#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"
CLIENT_ICONIFY,
CLIENT_RESTORE,
CLIENT_MAXIMIZE,
- CLIENT_ROLL_UP,
- CLIENT_ROLL_DOWN,
+ CLIENT_SHADE,
CLIENT_DECORATE,
CLIENT_MOVE,
CLIENT_RESIZE,
*en = ((c->functions & OB_CLIENT_FUNC_MAXIMIZE) &&
(!c->max_horz || !c->max_vert));
break;
- case CLIENT_ROLL_UP:
- *en = c->functions & OB_CLIENT_FUNC_SHADE && !c->shaded;
- break;
- case CLIENT_ROLL_DOWN:
- *en = c->functions & OB_CLIENT_FUNC_SHADE && c->shaded;
+ case CLIENT_SHADE:
+ *en = c->functions & OB_CLIENT_FUNC_SHADE;
break;
case CLIENT_MOVE:
*en = c->functions & OB_CLIENT_FUNC_MOVE;
*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;
Time time)
{
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 */
case CLIENT_MAXIMIZE:
client_maximize(c, TRUE, 0);
break;
- case CLIENT_ROLL_UP:
- client_shade(c, TRUE);
- break;
- case CLIENT_ROLL_DOWN:
- client_shade(c, FALSE);
+ case CLIENT_SHADE:
+ client_shade(c, !c->shaded);
break;
case CLIENT_DECORATE:
client_set_undecorated(c, !c->undecorated);
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);
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;
ObClient *c, guint state, gpointer data,
Time time)
{
+ 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);
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);
{
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();
e->data.normal.mask_disabled_selected_color =
ob_rr_theme->menu_disabled_selected_color;
- menu_add_normal(menu, CLIENT_ROLL_UP, _("Roll &up"), NULL, TRUE);
-
- menu_add_normal(menu, CLIENT_ROLL_DOWN, _("Roll do&wn"), NULL, TRUE);
+ menu_add_normal(menu, CLIENT_SHADE, _("&Roll up/down"), NULL, TRUE);
menu_add_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), NULL, TRUE);