remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 29e6677d55988804ee20ec6ba4cc92bbd06a750d..aef0356d4bc603e3b447b5ff3dcf19f32580ba20 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,13 +1,14 @@
 #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)
@@ -61,7 +62,7 @@ parse_menu_fail:
     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)
 {
@@ -211,7 +212,7 @@ Menu *menu_new_full(char *label, char *name, Menu *parent,
 
     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);
@@ -288,7 +289,7 @@ void menu_add_entry(Menu *menu, MenuEntry *entry)
     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;
   
@@ -302,7 +303,7 @@ void menu_show(char *name, int x, int y, Client *client)
     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);
        
@@ -310,6 +311,14 @@ void menu_show_full(Menu *self, int x, int y, Client *client)
     
     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 {
@@ -326,6 +335,11 @@ void menu_hide(Menu *self) {
        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);
     }
 }
 
@@ -353,6 +367,18 @@ MenuEntry *menu_find_entry(Menu *menu, Window win)
     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;
@@ -372,15 +398,24 @@ void menu_entry_fire(MenuEntry *self)
    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);
@@ -393,6 +428,8 @@ void menu_control_show(Menu *self, int x, int y, Client *client) {
 
 void menu_control_mouseover(MenuEntry *self, gboolean enter) {
     int x;
+    Rect *a;
+
     self->hilite = enter;
   
     if (enter) {
@@ -400,7 +437,7 @@ void menu_control_mouseover(MenuEntry *self, gboolean 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 */
@@ -408,14 +445,16 @@ void menu_control_mouseover(MenuEntry *self, gboolean enter) {
            /* TODO: I don't understand why these bevels should be here.
               Something must be wrong in the width calculation */
            x = self->parent->location.x + self->parent->size.width + 
-               ob_rr_theme->bevel;
+               ob_rr_theme->bwidth;
 
            /* 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,