rename 'xinerama' stuff to 'monitors' to be more generic and descriptive.

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index f7eef7fb08c3e4bcad316bf9fe88a89a79f190d1..23bb11289398aa830362b61547466c9d8c4a127a 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -403,8 +403,8 @@ void menu_control_show(Menu *self, int x, int y, Client *client) {
 
     g_assert(!self->invalid);
     
-    for (i = 0; i < screen_num_xin_areas; ++i) {
-        a = screen_physical_area_xinerama(i);
+    for (i = 0; i < screen_num_monitors; ++i) {
+        a = screen_physical_area_monitor(i);
         if (RECT_CONTAINS(*a, x, y))
             break;
     }
@@ -449,7 +449,7 @@ void menu_control_mouseover(MenuEntry *self, gboolean enter) {
            /* need to get the width. is this bad?*/
            menu_render(self->submenu);
 
-            a = screen_physical_area_xinerama(self->parent->xin_area);
+            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 -