if (RECT_INTERSECTS_RECT(*a, self->area))
break;
}
- if (a) a = screen_physical_area_monitor(0);
+ if (!a) a = screen_physical_area_monitor(0);
dx = MIN(0, (a->x + a->width) - (self->area.x + self->area.width));
dy = MIN(0, (a->y + a->height) - (self->area.y + self->area.height));
XMapWindow(ob_display, self->bullet);
} else
XUnmapWindow(ob_display, self->bullet);
+
+ XFlush(ob_display);
}
static void menu_frame_render(ObMenuFrame *self)
h += ob_rr_theme->bwidth * 2;
RECT_SET_SIZE(self->area, w, h);
+
+ XFlush(ob_display);
}
static void menu_frame_update(ObMenuFrame *self)
if (menu_frame_visible == NULL) {
/* no menus shown yet */
- grab_pointer(TRUE, None);
+ grab_pointer(TRUE, OB_CURSOR_NONE);
grab_keyboard(TRUE);
}
if (menu_frame_visible == NULL) {
/* last menu shown */
- grab_pointer(FALSE, None);
+ grab_pointer(FALSE, OB_CURSOR_NONE);
grab_keyboard(FALSE);
}
menu_frame_show(f, self->frame);
}
-void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide)
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
{
if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
self->entry->data.normal.enabled)
ObClient *client = self->frame->client;
/* release grabs before executing the shit */
- if (hide)
+ if (!(state & ControlMask))
menu_frame_hide_all();
if (func)
- func(entry, data);
+ func(entry, state, data);
else {
GSList *it;
for (it = acts; it; it = g_slist_next(it))
- {
- ObAction *act = it->data;
- act->data.any.c = client;
-
- if (act->func == action_moveresize)
- screen_pointer_pos(&act->data.moveresize.x,
- &act->data.moveresize.y);
-
- if (!(act->func == action_cycle_windows ||
- act->func == action_desktop_dir ||
- act->func == action_send_to_desktop_dir ||
- act->func == action_showmenu))
- {
- act->func(&act->data);
- }
- }
+ action_run(it->data, client, state);
}
}
}