Updated patches

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