ObClient *c, guint state, gpointer data,
Time time)
{
- GList *it;
+ gint x, y;
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();
f = NULL; /* and don't update */
+
+ client_iconify(c, TRUE, FALSE, FALSE);
break;
case CLIENT_RESTORE:
client_maximize(c, FALSE, 0);
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);
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;
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);