sowm

commit 13f874ead76523d76267d653fe3ab12190ec16ea
parent 09a514cd5edf98c9fc6ac0e1a46d2f3b32b9093a
Author: dylan <dylan.araps@gmail.com>
Date:   Wed, 18 Dec 2019 12:05:47 +0000

Merge pull request #38 from AnusReaper/fix-patches

Updated patches to conform with new changes
Diffstat:
M
patches/sowm-almost-tags-0.3.diff
 | 
14
+++++++-------
M
patches/sowm-almost-tags-1.0.diff
 | 
2
+-
M
patches/sowm-primitive-multimonitor.patch
 | 
6
+++---
M
patches/sowm-rounded-corners.patch
 | 
4
++--

4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/patches/sowm-almost-tags-0.3.diff b/patches/sowm-almost-tags-0.3.diff
@@ -36,7 +36,7 @@ Only in b/: sowm-almost-tags-0.3.diff
 diff -up a/sowm.c b/sowm.c
 --- a/sowm.c	2019-10-17 19:48:23.000000000 +0300
 +++ b/sowm.c	2019-10-18 19:02:41.959290919 +0300
-@@ -43,11 +43,14 @@ static void win_kill();
+@@ -43,11 +43,14 @@ static void win_prev();
  static void win_next();
  static void win_to_ws(const Arg arg);
  static void ws_go(const Arg arg);
@@ -44,13 +44,13 @@ diff -up a/sowm.c b/sowm.c
 +static void ws_toggle_all(const Arg arg);
  static int  xerror() { return 0;}
  
- static client       *list = {0}, *ws_list[10] = {0};
- static int          ws = 1, sw, sh, wx, wy;
+ static client       *list = {0}, *ws_list[10] = {0}, *cur;
+ static int          ws = 1, sw, sh, wx, wy, numlock;
  static unsigned int ww, wh;
 +static int			is_ws_enabled[10] = {0}; /* +1 the amount of ws */
  
  static Display      *d;
- static Window       root, cur;
+ static XButtonEvent mouse;
 @@ -235,24 +238,68 @@ void win_next() {
  }
  
@@ -64,11 +64,11 @@ diff -up a/sowm.c b/sowm.c
      ws_save(ws);
 -    ws_sel(arg.i);
  
--    if (list) for win XMapWindow(d, c->w);
+-    for win XMapWindow(d, c->w);
 -
 -    ws_sel(tmp);
 -
--    if (list) for win XUnmapWindow(d, c->w);
+-    for win XUnmapWindow(d, c->w);
 +	for (i = 1; i <= 9; i++) {
 +		if (i != arg.i) {
 +			ws_sel(i);
@@ -80,7 +80,7 @@ diff -up a/sowm.c b/sowm.c
      ws_sel(arg.i);
  
 +    if (list) for win XMapWindow(d, c->w);
-     if (list) win_focus(list->w);
+     if (list) win_focus(list); else cur = 0;
  }
  
 +void
diff --git a/patches/sowm-almost-tags-1.0.diff b/patches/sowm-almost-tags-1.0.diff
@@ -46,7 +46,7 @@ diff -up a/sowm.c b/sowm.c
  static int  xerror() { return 0;}
  
  static client       *list = {0}, *ws_list[10] = {0}, *cur;
- static int          ws = 1, sw, sh, wx, wy;
+ static int          ws = 1, sw, sh, wx, wy, numlock;
  static unsigned int ww, wh;
 +static int			is_ws_enabled[10] = {0}; /* +1 the amount of ws */
  
diff --git a/patches/sowm-primitive-multimonitor.patch b/patches/sowm-primitive-multimonitor.patch
@@ -3,7 +3,7 @@ index 8573837..72e9542 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,5 @@
- CFLAGS+= -std=c99 -Wall -Wextra -pedantic
+ CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -pedantic
 -LDADD+= -lX11
 +LDADD+= -lX11 -lXinerama
  LDFLAGS=
@@ -25,8 +25,8 @@ index 0cc1293..6f858a9 100644
  static int  xerror() { return 0;}
  
  static client       *list = {0}, *ws_list[10] = {0}, *cur;
--static int          ws = 1, sw, sh, wx, wy;
-+static int          ws = 1, sw, sh, wx, wy, monitors;
+-static int          ws = 1, sw, sh, wx, wy, numlock;
++static int          ws = 1, sw, sh, wx, wy, numlock, monitors;
  static unsigned int ww, wh;
  
  static Display      *d;
diff --git a/patches/sowm-rounded-corners.patch b/patches/sowm-rounded-corners.patch
@@ -3,7 +3,7 @@ index 8573837..738af94 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,5 +1,5 @@
- CFLAGS+= -std=c99 -Wall -Wextra -pedantic
+ CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -pedantic
 -LDADD+= -lX11
 +LDADD+= -lX11 -lXext
  LDFLAGS=
@@ -34,8 +34,8 @@ index d1b4c2a..56bf509 100644
  #include <signal.h>
  #include <unistd.h>
 @@ -43,6 +44,7 @@ static void win_del(Window w);
- static void win_fs();
  static void win_kill();
+ static void win_prev();
  static void win_next();
 +static void win_round_corners(Window w, int rad);
  static void win_to_ws(const Arg arg);