From 328e5d0d4e0074b5fed9979401bbcaea3048e3da Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Mon, 25 Feb 2008 13:01:54 +0100
Subject: [PATCH] rename screen to phys_screen to avoid confusion

---
 common/draw.c |  4 ++--
 screen.c      |  6 +++---
 window.c      | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/draw.c b/common/draw.c
index a29209f9..f1b23be5 100644
--- a/common/draw.c
+++ b/common/draw.c
@@ -491,14 +491,14 @@ draw_get_image_size(const char *filename)
 }
 
 Drawable
-draw_rotate(DrawCtx *ctx, int screen, double angle, int tx, int ty)
+draw_rotate(DrawCtx *ctx, int phys_screen, double angle, int tx, int ty)
 {
     cairo_surface_t *surface, *source;
     cairo_t *cr;
     Drawable newdrawable;
 
     newdrawable = XCreatePixmap(ctx->display,
-                                RootWindow(ctx->display, screen),
+                                RootWindow(ctx->display, phys_screen),
                                 ctx->height, ctx->width,
                                 ctx->depth);
     surface = cairo_xlib_surface_create(ctx->display, newdrawable, ctx->visual, ctx->height, ctx->width);
diff --git a/screen.c b/screen.c
index fc141ab8..645b09fb 100644
--- a/screen.c
+++ b/screen.c
@@ -313,11 +313,11 @@ move_client_to_screen(Client *c, int new_screen, Bool doresize)
  * \param screen screen number
  */
 static void
-move_mouse_pointer_to_screen(int screen)
+move_mouse_pointer_to_screen(int phys_screen)
 {
     if(XineramaIsActive(globalconf.display))
     {
-        Area area = screen_get_area(screen, NULL, NULL);
+        Area area = screen_get_area(phys_screen, NULL, NULL);
         XWarpPointer(globalconf.display,
                      None,
                      DefaultRootWindow(globalconf.display),
@@ -326,7 +326,7 @@ move_mouse_pointer_to_screen(int screen)
     else
         XWarpPointer(globalconf.display,
                      None,
-                     RootWindow(globalconf.display, screen),
+                     RootWindow(globalconf.display, phys_screen),
                      0, 0, 0, 0, 0, 0);
 }
 
diff --git a/window.c b/window.c
index 7c909f49..35b30219 100644
--- a/window.c
+++ b/window.c
@@ -91,7 +91,7 @@ window_configure(Window win, Area geometry, int border)
  * \param win The window
  */
 void
-window_grabbuttons(int screen, Window win)
+window_grabbuttons(int phys_screen, Window win)
 {
     Button *b;
 
@@ -116,27 +116,27 @@ window_grabbuttons(int screen, Window win)
                     win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
     }
 
-    XUngrabButton(globalconf.display, AnyButton, AnyModifier, RootWindow(globalconf.display, screen));
+    XUngrabButton(globalconf.display, AnyButton, AnyModifier, RootWindow(globalconf.display, phys_screen));
 }
 
 void
-window_root_grabbuttons(int screen)
+window_root_grabbuttons(int phys_screen)
 {
     Button *b;
 
     for(b = globalconf.buttons.root; b; b = b->next)
     {
         XGrabButton(globalconf.display, b->button, b->mod,
-                    RootWindow(globalconf.display, screen), False, BUTTONMASK,
+                    RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
                     GrabModeAsync, GrabModeSync, None, None);
         XGrabButton(globalconf.display, b->button, b->mod | LockMask,
-                    RootWindow(globalconf.display, screen), False, BUTTONMASK,
+                    RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
                     GrabModeAsync, GrabModeSync, None, None);
         XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask,
-                    RootWindow(globalconf.display, screen), False, BUTTONMASK,
+                    RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
                     GrabModeAsync, GrabModeSync, None, None);
         XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask | LockMask,
-                    RootWindow(globalconf.display, screen), False, BUTTONMASK,
+                    RootWindow(globalconf.display, phys_screen), False, BUTTONMASK,
                     GrabModeAsync, GrabModeSync, None, None);
     }
 }