make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / openbox / menuframe.c

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 4e8236908ecb0e85e627f35ac44c82cbd7f9ebcc..ecd2b59045340d6eabb83c06a41b0439fd9068ea 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -169,6 +169,7 @@ void menu_frame_move_on_screen(ObMenuFrame *self)
     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);
@@ -177,10 +178,23 @@ void menu_frame_move_on_screen(ObMenuFrame *self)
     }
     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;
@@ -361,6 +375,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         XMapWindow(ob_display, self->bullet);
     } else
         XUnmapWindow(ob_display, self->bullet);
+
+    XFlush(ob_display);
 }
 
 static void menu_frame_render(ObMenuFrame *self)
@@ -383,8 +399,6 @@ 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);
 
@@ -581,9 +595,10 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
             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);