CLIENT_ICONIFY,
CLIENT_RESTORE,
CLIENT_MAXIMIZE,
- CLIENT_SHADE,
+ CLIENT_ROLL_UP,
+ CLIENT_ROLL_DOWN,
CLIENT_DECORATE,
CLIENT_MOVE,
CLIENT_RESIZE,
*en = ((c->functions & OB_CLIENT_FUNC_MAXIMIZE) &&
(!c->max_horz || !c->max_vert));
break;
- case CLIENT_SHADE:
- *en = c->functions & OB_CLIENT_FUNC_SHADE;
+ 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;
break;
case CLIENT_MOVE:
*en = c->functions & OB_CLIENT_FUNC_MOVE;
menu_frame_hide_all();
f = NULL; /* and don't update */
- client_iconify(c, TRUE, FALSE);
+ client_iconify(c, TRUE, FALSE, FALSE);
break;
case CLIENT_RESTORE:
client_maximize(c, FALSE, 0);
case CLIENT_MAXIMIZE:
client_maximize(c, TRUE, 0);
break;
- case CLIENT_SHADE:
- client_shade(c, !c->shaded);
+ case CLIENT_ROLL_UP:
+ client_shade(c, TRUE);
+ break;
+ case CLIENT_ROLL_DOWN:
+ client_shade(c, FALSE);
break;
case CLIENT_DECORATE:
client_set_undecorated(c, !c->undecorated);
menu_frame_hide_all();
f = NULL; /* and don't update */
- if (screen_pointer_pos(&x, &y))
- moveresize_start(c, x, y, 0,
- prop_atoms.net_wm_moveresize_move_keyboard);
+ screen_pointer_pos(&x, &y);
+ moveresize_start(c, x, y, 0,
+ prop_atoms.net_wm_moveresize_move_keyboard);
break;
case CLIENT_RESIZE:
/* this needs to grab the keyboard so hide the menu */
menu_frame_hide_all();
f = NULL; /* and don't update */
- if (screen_pointer_pos(&x, &y))
- moveresize_start(c, x, y, 0,
- prop_atoms.net_wm_moveresize_size_keyboard);
+ 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);
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_ROLL_UP, _("Roll &up"), NULL, TRUE);
+
+ menu_add_normal(menu, CLIENT_ROLL_DOWN, _("Roll do&wn"), NULL, TRUE);
menu_add_normal(menu, CLIENT_DECORATE, _("Un/&Decorate"), NULL, TRUE);