From 5babea731140fc078606dc4c1f70ca3da9dbf36e Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Tue, 2 Dec 2008 23:02:30 +0100
Subject: [PATCH] mouse: Remove resize mwfact with mouse

---
 src/client.c |  1 -
 src/layout.c |  4 ++--
 src/mouse.c  | 60 ++++++----------------------------------------------
 3 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/src/client.c b/src/client.c
index 0495855..5ec54e7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -359,7 +359,6 @@ client_manage(Window w, XWindowAttributes *wa)
      uint duint;
      Window dw;
 
-
      c = emalloc(1, sizeof(Client));
      c->win = w;
      c->screen = screen_get_sel();
diff --git a/src/layout.c b/src/layout.c
index 25b52a0..d883295 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -96,8 +96,8 @@ layoutswitch(Bool b)
 
      for(i = 0; i < conf.nlayout; ++i)
      {
-          if(tags[selscreen][seltag[selscreen]].layout.symbol == conf.layout[i].symbol
-             && tags[selscreen][seltag[selscreen]].layout.func == conf.layout[i].func)
+          if(tags[selscreen][seltag[selscreen]].layout.func == conf.layout[i].func
+             && tags[selscreen][seltag[selscreen]].layout.symbol == conf.layout[i].symbol)
           {
                if(b)
                     tags[selscreen][seltag[selscreen]].layout = conf.layout[(i + 1) % conf.nlayout];
diff --git a/src/mouse.c b/src/mouse.c
index a88c917..02c64d6 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -89,42 +89,17 @@ mouse_resize(Client *c)
 {
      int ocx = c->geo.x;
      int ocy = c->geo.y;
-     double fy, fx, mwf;
      XRectangle geo;
-     XRectangle sg = screen_get_geo(screen_get_sel());
-     int my = sg.y, mx = 0;
      XEvent ev;
 
-    if(c->max || c->lmax)
+    if(c->max || c->lmax || c->tile)
           return;
 
      if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
                      None, cursor[CurResize], CurrentTime) != GrabSuccess)
           return;
 
-     if(!c->tile)
-          XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->geo.width + conf.client.borderheight, c->geo.height);
-
-     /* Warp pointer for mwfact resize {{{ */
-     if(c->tile)
-     {
-          if(tags[selscreen][seltag[selscreen]].layout.func == tile)
-               mx = tags[selscreen][seltag[selscreen]].mwfact * sg.width;
-          else if(tags[selscreen][seltag[selscreen]].layout.func == tile_left)
-               mx = sg.width - (tags[selscreen][seltag[selscreen]].mwfact * sg.width);
-          else if(tags[selscreen][seltag[selscreen]].layout.func == tile_top)
-          {
-               mx = sg.width / 2;
-               my = sg.height - (tags[selscreen][seltag[selscreen]].mwfact * sg.height);
-          }
-          else if(tags[selscreen][seltag[selscreen]].layout.func == tile_bottom)
-          {
-               mx = sg.width / 2;
-               my = tags[selscreen][seltag[selscreen]].mwfact * sg.height;
-          }
-          XWarpPointer(dpy, None, root, 0, 0, 0, 0, sg.x + mx, sg.y + my);
-     }
-     /* }}} */
+     XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->geo.width + conf.client.borderheight, c->geo.height);
 
      for(;;)
      {
@@ -141,34 +116,11 @@ mouse_resize(Client *c)
           {
                XSync(dpy, False);
 
-               if(!c->tile)
-               {
-                    geo.x = c->geo.x; geo.y = c->geo.y;
-                    geo.width = ((ev.xmotion.x - ocx < 1) ? 1 : ev.xmotion.x - ocx);
-                    geo.height = ((ev.xmotion.y - ocy < 1) ? 1 : ev.xmotion.y - ocy);
-               }
-               else
-               {
-                    fy = (round(((ev.xmotion.y * 50) / sg.height))) / 50;
-                    fx = (round(((ev.xmotion.x * 50) / sg.width))) / 50;
+               geo.x = c->geo.x; geo.y = c->geo.y;
+               geo.width = ((ev.xmotion.x - ocx < 1) ? 1 : ev.xmotion.x - ocx);
+               geo.height = ((ev.xmotion.y - ocy < 1) ? 1 : ev.xmotion.y - ocy);
 
-                    if(tags[selscreen][seltag[selscreen]].layout.func == tile)
-                         mwf = sg.x + fx;
-                    else if(tags[selscreen][seltag[selscreen]].layout.func == tile_left)
-                         mwf = 1 - (sg.x + fx);
-                    else if(tags[selscreen][seltag[selscreen]].layout.func == tile_top)
-                         mwf = 1 - fy;
-                    else if(tags[selscreen][seltag[selscreen]].layout.func == tile_bottom)
-                         mwf = fy;
-                    else
-                         mwf = tags[selscreen][seltag[selscreen]].mwfact;
-
-                    tags[selscreen][seltag[selscreen]].mwfact = (mwf < 0.05) ? 0.05 : ((mwf > 0.95) ? 0.95 : mwf);
-                    tags[selscreen][seltag[selscreen]].layout.func();
-               }
-
-               if(!c->tile)
-                    client_moveresize(c, geo, True);
+               client_moveresize(c, geo, True);
           }
           else if(ev.type == Expose)
                expose(&ev.xexpose);