From 8eec996d1bf36804386bd7484d8d77f5918ed720 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Mon, 1 Dec 2008 20:14:45 +0100
Subject: [PATCH] screen/client: Add y in the if of screen_get_sel and
 client_moveresize for find the screen verticaly

---
 src/client.c |  5 ++++-
 src/config.c |  1 -
 src/event.c  |  2 +-
 src/init.c   |  1 -
 src/layout.c |  1 -
 src/screen.c | 15 +++------------
 src/wmfs.h   |  1 -
 7 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/client.c b/src/client.c
index 1332a5a..16838e7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -458,7 +458,10 @@ client_moveresize(Client *c, XRectangle geo, bool r)
           /* Set the client screen */
           for(i = 0; i < screen_count(); ++i)
                if(geo.x >= screen_get_geo(i).x
-                  && geo.x < screen_get_geo(i).x + screen_get_geo(i).width)
+                  && geo.x < screen_get_geo(i).x + screen_get_geo(i).width
+                  && geo.y >= screen_get_geo(i).y - INFOBARH - TBARH
+                  && geo.y < screen_get_geo(i).y - INFOBARH - TBARH + screen_get_geo(i).height + INFOBARH)
+
                     c->screen = i;
 
           frame_moveresize(c, geo);
diff --git a/src/config.c b/src/config.c
index badf05b..12180a7 100644
--- a/src/config.c
+++ b/src/config.c
@@ -478,7 +478,6 @@ init_conf(void)
           tags[j][conf.ntag[j]].resizehint = cfg_getbool(cfgtmp, "resizehint");
           tags[j][conf.ntag[j]].layout     = layout_name_to_struct(conf.layout, cfg_getstr(cfgtmp, "layout"), conf.nlayout);
      }
-
      for(i = 0; i < screen_count(); ++i)
           if(!conf.ntag[i] || conf.ntag[i] > MAXTAG)
           {
diff --git a/src/event.c b/src/event.c
index f2e5de0..55087d8 100644
--- a/src/event.c
+++ b/src/event.c
@@ -65,7 +65,7 @@ buttonpress(XButtonEvent *ev)
      /* Root */
      if(ev->window == root)
           for(i = 0; i < conf.root.nmouse; ++i)
-               if(conf.root.mouse[i].tag == seltag[selscreen]
+               if(conf.root.mouse[i].tag == seltag[screen_get_sel()]
                   || conf.root.mouse[i].tag < 0)
                     if(ev->button == conf.root.mouse[i].button)
                          if(conf.root.mouse[i].func)
diff --git a/src/init.c b/src/init.c
index b852682..a57b2c9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -46,7 +46,6 @@ init(void)
      init_root();
      init_atom();
      infobar_init();
-     screen_init();
      grabkeys();
 
      /* Warning about font */
diff --git a/src/layout.c b/src/layout.c
index 9a3058e..25b52a0 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -531,7 +531,6 @@ uicb_togglemax(uicb_t cmd)
           client_moveresize(sel, geo, False);
           sel->max = False;
      }
-     arrange();
 
      return;
 }
diff --git a/src/screen.c b/src/screen.c
index ab37b07..bb1e419 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -98,8 +98,9 @@ screen_get_sel(void)
           XQueryPointer(dpy, root, &w, &w, &x, &y, &d, &d, &du);
 
           for(i = 0; i < screen_count(); ++i)
-               if(x >= screen_get_geo(i).x
-                  && x < screen_get_geo(i).x + screen_get_geo(i).width)
+               if((x >= screen_get_geo(i).x && x < screen_get_geo(i).x + screen_get_geo(i).width)
+                  && (y >= screen_get_geo(i).y - INFOBARH - TBARH
+                      && y < screen_get_geo(i).y - INFOBARH - TBARH + screen_get_geo(i).height + INFOBARH))
                     selscreen = i;
 
           return selscreen;
@@ -107,13 +108,3 @@ screen_get_sel(void)
      else
           return 0;
 }
-
-/** Init screen geometry
-*/
-void
-screen_init(void)
-{
-     screen_get_sel();
-
-     return;
-}
diff --git a/src/wmfs.h b/src/wmfs.h
index fb228a7..c969dda 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -184,7 +184,6 @@ void uicb_tagtransfert(uicb_t);
 int screen_count(void);
 XRectangle screen_get_geo(int s);
 int screen_get_sel(void);
-void screen_init(void);
 
 /* layout.c */
 void arrange(void);