#include "menu.h"
#include "openbox.h"
#include "stacking.h"
+#include "client.h"
#include "grab.h"
-#include "render/theme.h"
#include "screen.h"
#include "geom.h"
#include "plugin.h"
GHashTable *menu_hash = NULL;
+GSList *menu_visible = NULL;
#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \
LeaveWindowMask)
g_free(title);
}
-void menu_control_show(Menu *self, int x, int y, Client *client);
+void menu_control_show(Menu *self, int x, int y, ObClient *client);
void menu_destroy_hash_key(Menu *menu)
{
attrib.override_redirect = TRUE;
attrib.event_mask = FRAME_EVENTMASK;
- self->frame = createWindow(ob_root,
+ self->frame = createWindow(RootWindow(ob_display, ob_screen),
CWOverrideRedirect|CWEventMask, &attrib);
attrib.event_mask = TITLE_EVENTMASK;
self->title = createWindow(self->frame, CWEventMask, &attrib);
g_hash_table_insert(window_map, &entry->item, menu);
}
-void menu_show(char *name, int x, int y, Client *client)
+void menu_show(char *name, int x, int y, ObClient *client)
{
Menu *self;
menu_show_full(self, x, y, client);
}
-void menu_show_full(Menu *self, int x, int y, Client *client)
+void menu_show_full(Menu *self, int x, int y, ObClient *client)
{
g_assert(self != NULL);
self->client = client;
+ if (!self->shown) {
+ if (!self->parent) {
+ grab_pointer(TRUE, None);
+ grab_keyboard(TRUE);
+ }
+ menu_visible = g_slist_append(menu_visible, self);
+ }
+
if (self->show) {
self->show(self, x, y, client);
} else {
if (self->parent && self->parent->open_submenu == self)
self->parent->open_submenu = NULL;
+ if (!self->parent) {
+ grab_keyboard(FALSE);
+ grab_pointer(FALSE, None);
+ }
+ menu_visible = g_slist_remove(menu_visible, self);
}
}
return NULL;
}
+MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y)
+{
+ if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height)
+ return NULL;
+
+ y -= menu->title_h + ob_rr_theme->bwidth;
+ if (y < 0) return NULL;
+
+ g_message ("%d %p", y/menu->item_h, g_list_nth_data(menu->entries, y / menu->item_h));
+ return g_list_nth_data(menu->entries, y / menu->item_h);
+}
+
void menu_entry_fire(MenuEntry *self)
{
Menu *m;
Default menu controller action for showing.
*/
-void menu_control_show(Menu *self, int x, int y, Client *client) {
+void menu_control_show(Menu *self, int x, int y, ObClient *client) {
+ guint i;
+ Rect *a = NULL;
+
g_assert(!self->invalid);
- XMoveWindow(ob_display, self->frame,
- MIN(x, screen_physical_size.width - self->size.width),
- MIN(y, screen_physical_size.height - self->size.height));
- POINT_SET(self->location,
- MIN(x, screen_physical_size.width - self->size.width),
- MIN(y, screen_physical_size.height - self->size.height));
+ for (i = 0; i < screen_num_monitors; ++i) {
+ a = screen_physical_area_monitor(i);
+ if (RECT_CONTAINS(*a, x, y))
+ break;
+ }
+ g_assert(a != NULL);
+ self->xin_area = i;
+
+ POINT_SET(self->location,
+ MIN(x, a->x + a->width - 1 - self->size.width),
+ MIN(y, a->y + a->height - 1 - self->size.height));
+ XMoveWindow(ob_display, self->frame, self->location.x, self->location.y);
if (!self->shown) {
XMapWindow(ob_display, self->frame);
void menu_control_mouseover(MenuEntry *self, gboolean enter) {
int x;
+ Rect *a;
+
self->hilite = enter;
if (enter) {
!= self->parent->open_submenu)
menu_hide(self->parent->open_submenu);
- if (self->submenu) {
+ if (self->submenu && self->parent->open_submenu != self->submenu) {
self->parent->open_submenu = self->submenu;
/* shouldn't be invalid since it must be displayed */
/* need to get the width. is this bad?*/
menu_render(self->submenu);
- if (self->submenu->size.width + x > screen_physical_size.width)
+ a = screen_physical_area_monitor(self->parent->xin_area);
+
+ if (self->submenu->size.width + x >= a->x + a->width)
x = self->parent->location.x - self->submenu->size.width -
- ob_rr_theme->bevel;
+ ob_rr_theme->bwidth;
menu_show_full(self->submenu, x,
self->parent->location.y + self->y,