Rect *a;
guint i;
gint dx = 0, dy = 0;
+ gint pos, half;
for (i = 0; i < screen_num_monitors; ++i) {
a = screen_physical_area_monitor(i);
}
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));
- if (!dx) dx = MAX(0, a->x - self->area.x);
- if (!dy) dy = MAX(0, a->y - self->area.y);
+ half = g_list_length(self->entries) / 2;
+ pos = g_list_index(self->entries, self->selected);
+
+ /* if in the bottom half then check this shit first, will keep the bottom
+ edge of the menu visible */
+ if (pos > half) {
+ dx = MAX(dx, a->x - self->area.x);
+ dy = MAX(dy, a->y - self->area.y);
+ }
+ dx = MIN(dx, (a->x + a->width) - (self->area.x + self->area.width));
+ dy = MIN(dy, (a->y + a->height) - (self->area.y + self->area.height));
+ /* if in the top half then check this shit last, will keep the top
+ edge of the menu visible */
+ if (pos <= half) {
+ dx = MAX(dx, a->x - self->area.x);
+ dy = MAX(dy, a->y - self->area.y);
+ }
if (dx || dy) {
ObMenuFrame *f;
XMapWindow(ob_display, self->bullet);
} else
XUnmapWindow(ob_display, self->bullet);
+
+ XFlush(ob_display);
}
static void menu_frame_render(ObMenuFrame *self)
self->a_title->texture[0].data.text.string = self->menu->title;
RrMinsize(self->a_title, &tw, &th);
tw = MIN(tw, MAX_MENU_WIDTH);
- tw += 2*PADDING;
- th += 2*PADDING;
w = MAX(w, tw);
h += (self->title_h = th + ob_rr_theme->bwidth);
h += ob_rr_theme->bwidth * 2;
RECT_SET_SIZE(self->area, w, h);
+
+ XFlush(ob_display);
}
static void menu_frame_update(ObMenuFrame *self)
self->menu->update_func(self, self->menu->data);
}
- menu_frame_visible = g_list_prepend(menu_frame_visible, self);
menu_frame_update(self);
+ menu_frame_visible = g_list_prepend(menu_frame_visible, self);
+
menu_frame_move_on_screen(self);
XMapWindow(ob_display, self->window);
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);
}
}
}