sowm

commit 087e2767361e60a143b3f00cbe7a7486b032af4a
parent 4aa7d1a4d6e92bc10cd0a5a3ca5a2c9d4812c027
Author: dylan <dylan.araps@gmail.com>
Date:   Wed, 22 Jan 2020 10:57:24 +0200

Merge pull request #49 from SeungheonOh/master

Patch: Wheel resize update
Diffstat:
A
patches/.sowm-wheelresize.patch.swp
 | 
0

M
patches/sowm-wheelresize.patch
 | 
42
++++++++++++++++++++----------------------

2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/patches/.sowm-wheelresize.patch.swp b/patches/.sowm-wheelresize.patch.swp
Binary files differ.
diff --git a/patches/sowm-wheelresize.patch b/patches/sowm-wheelresize.patch
@@ -1,43 +1,41 @@
 diff --git a/config.def.h b/config.def.h
-index aaaf38d..5a95d71 100644
+index cae2009..a7a9fa7 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -2,6 +2,7 @@
+@@ -1,6 +1,7 @@
+ #ifndef CONFIG_H
  #define CONFIG_H
  
++#define WHELLSTEP 5
  #define MOD Mod4Mask
-+#define WheelResizeStep 5
  
  const char* menu[]    = {"dmenu_run",      0};
- const char* term[]    = {"st",             0};
 diff --git a/sowm.c b/sowm.c
-index bc14c4e..3b95c28 100644
+index 90ae3bc..cbb56b5 100644
 --- a/sowm.c
 +++ b/sowm.c
-@@ -120,6 +120,17 @@ void button_press(XEvent *e) {
+@@ -126,6 +126,15 @@ void button_press(XEvent *e) {
  
      win_size(e->xbutton.subwindow, &wx, &wy, &ww, &wh);
      XRaiseWindow(d, e->xbutton.subwindow);
 +
-+    int sd = 0;
-+    if(e->xbutton.button == Button4) sd = WheelResizeStep;
-+    else if(e->xbutton.button == Button5) sd = -WheelResizeStep;
++		int sd = 0;
++		if(e->xbutton.button == Button4) sd = WHELLSTEP;
++		else if(e->xbutton.button == Button5) sd = -WHELLSTEP;
 +
-+    XMoveResizeWindow(d, e->xbutton.subwindow,
-+        wx - sd,
-+        wy - sd,
-+        ww + sd*2,
-+        wh + sd*2);
++		XMoveResizeWindow(d, e->xbutton.subwindow,
++				wx - sd, wy - sd,
++				ww + sd*2, wh + sd*2);
 +
      mouse = e->xbutton;
  }
  
-@@ -285,7 +296,7 @@ int main(void) {
-         XGrabKey(d, XKeysymToKeycode(d, keys[i].keysym), keys[i].mod,
-                  root, True, GrabModeAsync, GrabModeAsync);
+@@ -295,7 +304,7 @@ void input_grab(Window root) {
+                 XGrabKey(d, code, keys[i].mod | modifiers[j], root,
+                         True, GrabModeAsync, GrabModeAsync);
  
--    for (int i=1; i<4; i+=2)
-+    for (int i=1; i<6; i++)
-         XGrabButton(d, i, MOD, root, True,
-             ButtonPressMask|ButtonReleaseMask|PointerMotionMask,
-             GrabModeAsync, GrabModeAsync, 0, 0);
+-    for (i = 1; i < 4; i += 2)
++    for (i = 1; i < 6; i++)
+         for (j = 0; j < sizeof(modifiers)/sizeof(*modifiers); j++)
+             XGrabButton(d, i, MOD | modifiers[j], root, True,
+                 ButtonPressMask|ButtonReleaseMask|PointerMotionMask,