1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
From 06d86c26da60e4196ec3c5228b04c66ac042a1f8 Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Thu, 4 Mar 2021 00:45:50 -0600
Subject: [PATCH] port dwm "push" patch to dwl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
---
Makefile | 2 +-
dwl.c | 2 ++
push.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
push.h | 4 ++++
4 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 push.c
create mode 100644 push.h
diff --git a/Makefile b/Makefile
index 578194f2..f919a61e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ LDLIBS = `$(PKG_CONFIG) --libs $(PKGS)` $(WLR_LIBS) -lm $(LIBS)
all: dwl
dwl: dwl.o util.o
$(CC) dwl.o util.o $(DWLCFLAGS) $(LDFLAGS) $(LDLIBS) -o $@
-dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
+dwl.o: dwl.c client.h config.h config.mk push.h cursor-shape-v1-protocol.h \
pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
util.o: util.c util.h
diff --git a/dwl.c b/dwl.c
index ad21e1ba..69753921 100644
--- a/dwl.c
+++ b/dwl.c
@@ -450,7 +450,9 @@ static struct wlr_xwayland *xwayland;
#endif
/* configuration, allows nested code to access above variables */
+#include "push.h"
#include "config.h"
+#include "push.c"
/* attempt to encapsulate suck into one file */
#include "client.h"
diff --git a/push.c b/push.c
new file mode 100644
index 00000000..323c317e
--- /dev/null
+++ b/push.c
@@ -0,0 +1,63 @@
+static Client *
+nexttiled(Client *sel) {
+ Client *c;
+ wl_list_for_each(c, &sel->link, link) {
+ if (&c->link == &clients)
+ break; /* don't wrap */
+ if (!c->isfloating && VISIBLEON(c, selmon))
+ return c;
+ }
+ return NULL;
+}
+
+static Client *
+prevtiled(Client *sel) {
+ Client *c;
+ wl_list_for_each_reverse(c, &sel->link, link) {
+ if (&c->link == &clients)
+ break; /* don't wrap */
+ if (!c->isfloating && VISIBLEON(c, selmon))
+ return c;
+ }
+ return NULL;
+}
+
+static void
+pushup(const Arg *arg) {
+ Client *sel = focustop(selmon);
+ Client *c;
+
+ if(!sel || sel->isfloating)
+ return;
+ if((c = prevtiled(sel))) {
+ /* attach before c */
+ wl_list_remove(&sel->link);
+ wl_list_insert(c->link.prev, &sel->link);
+ } else {
+ /* move to the end */
+ wl_list_remove(&sel->link);
+ wl_list_insert(clients.prev, &sel->link);
+ }
+ focusclient(sel, 1);
+ arrange(selmon);
+}
+
+static void
+pushdown(const Arg *arg) {
+ Client *sel = focustop(selmon);
+ Client *c;
+
+ if(!sel || sel->isfloating)
+ return;
+ if((c = nexttiled(sel))) {
+ /* attach after c */
+ wl_list_remove(&sel->link);
+ wl_list_insert(&c->link, &sel->link);
+ } else {
+ /* move to the front */
+ wl_list_remove(&sel->link);
+ wl_list_insert(&clients, &sel->link);
+ }
+ focusclient(sel, 1);
+ arrange(selmon);
+}
diff --git a/push.h b/push.h
new file mode 100644
index 00000000..59c0f80e
--- /dev/null
+++ b/push.h
@@ -0,0 +1,4 @@
+static Client *nexttiled(Client *sel);
+static Client *prevtiled(Client *sel);
+static void pushdown(const Arg *arg);
+static void pushup(const Arg *arg);
--
2.48.0
|
