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

3 files changed, 6 insertions, 4 deletions

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index 67c17acd..acb33cd5 100644
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -56,6 +56,7 @@ void client_send_to_update(Menu *self)
     }
 }
 
+#if 0
 void client_menu_show(Menu *self, int x, int y, Client *client)
 {
     int newy;
@@ -82,6 +83,7 @@ void client_menu_show(Menu *self, int x, int y, Client *client)
 	menu_hide(self->open_submenu);
     }
 }
+#endif
 
 void plugin_setup_config() { }
 
diff --git a/plugins/placement/placement.c b/plugins/placement/placement.c
index 5f962e47..589e0a30 100644
--- a/plugins/placement/placement.c
+++ b/plugins/placement/placement.c
@@ -32,8 +32,8 @@ static void place_random(Client *c)
 
     if (ob_state == State_Starting) return;
 
-    area = screen_area_xinerama(c->desktop,
-                                g_random_int_range(0, screen_num_xin_areas));
+    area = screen_area_monitor(c->desktop,
+                               g_random_int_range(0, screen_num_monitors));
 
     l = area->x;
     t = area->y;
diff --git a/plugins/resistance/resistance.c b/plugins/resistance/resistance.c
index aa60b2b1..31844752 100644
--- a/plugins/resistance/resistance.c
+++ b/plugins/resistance/resistance.c
@@ -108,8 +108,8 @@ static void resist_move(Client *c, int *x, int *y)
         }
 
     /* get the screen boundaries */
-    for (i = 0; i < screen_num_xin_areas; ++i) {
-        area = screen_area_xinerama(c->desktop, i);
+    for (i = 0; i < screen_num_monitors; ++i) {
+        area = screen_area_monitor(c->desktop, i);
 
         if (!RECT_INTERSECTS_RECT(*area, c->frame->area))
             continue;