mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-09-08 20:24:51 +00:00
212 lines
7.2 KiB
Diff
212 lines
7.2 KiB
Diff
From a8d29e03f565b54a68c6c2cb2da103366c627825 Mon Sep 17 00:00:00 2001
|
|
From: julmajustus <julmajustus@tutanota.com>
|
|
Date: Sat, 4 Jan 2025 13:22:12 +0200
|
|
Subject: [PATCH] add simple_scratchpad
|
|
|
|
---
|
|
config.def.h | 3 ++
|
|
dwl.c | 34 +++++++++++++++++++++--
|
|
simple_scratchpad.c | 67 +++++++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 102 insertions(+), 2 deletions(-)
|
|
create mode 100644 simple_scratchpad.c
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 22d2171..83f19b3 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -136,6 +136,9 @@ static const Key keys[] = {
|
|
{ MODKEY, XKB_KEY_Return, zoom, {0} },
|
|
{ MODKEY, XKB_KEY_Tab, view, {0} },
|
|
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} },
|
|
+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Z, addscratchpad, {0} },
|
|
+ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_z, togglescratchpad, {0} },
|
|
+ { MODKEY, XKB_KEY_z, removescratchpad, {0} },
|
|
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} },
|
|
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} },
|
|
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} },
|
|
diff --git a/dwl.c b/dwl.c
|
|
index a2711f6..85f4a51 100644
|
|
--- a/dwl.c
|
|
+++ b/dwl.c
|
|
@@ -141,6 +141,7 @@ typedef struct {
|
|
uint32_t tags;
|
|
int isfloating, isurgent, isfullscreen;
|
|
uint32_t resize; /* configure serial of a pending resize */
|
|
+ struct wl_list link_temp;
|
|
} Client;
|
|
|
|
typedef struct {
|
|
@@ -243,6 +244,7 @@ typedef struct {
|
|
} SessionLock;
|
|
|
|
/* function declarations */
|
|
+static void addscratchpad(const Arg *arg);
|
|
static void applybounds(Client *c, struct wlr_box *bbox);
|
|
static void applyrules(Client *c);
|
|
static void arrange(Monitor *m);
|
|
@@ -317,6 +319,7 @@ static void printstatus(void);
|
|
static void powermgrsetmode(struct wl_listener *listener, void *data);
|
|
static void quit(const Arg *arg);
|
|
static void rendermon(struct wl_listener *listener, void *data);
|
|
+static void removescratchpad(const Arg *arg);
|
|
static void requestdecorationmode(struct wl_listener *listener, void *data);
|
|
static void requeststartdrag(struct wl_listener *listener, void *data);
|
|
static void requestmonstate(struct wl_listener *listener, void *data);
|
|
@@ -340,6 +343,7 @@ static void tagmon(const Arg *arg);
|
|
static void tile(Monitor *m);
|
|
static void togglefloating(const Arg *arg);
|
|
static void togglefullscreen(const Arg *arg);
|
|
+static void togglescratchpad(const Arg *arg);
|
|
static void toggletag(const Arg *arg);
|
|
static void toggleview(const Arg *arg);
|
|
static void unlocksession(struct wl_listener *listener, void *data);
|
|
@@ -413,6 +417,9 @@ static struct wlr_box sgeom;
|
|
static struct wl_list mons;
|
|
static Monitor *selmon;
|
|
|
|
+static struct wl_list scratchpad_clients;
|
|
+static int scratchpad_visible = 1;
|
|
+
|
|
#ifdef XWAYLAND
|
|
static void activatex11(struct wl_listener *listener, void *data);
|
|
static void associatex11(struct wl_listener *listener, void *data);
|
|
@@ -432,6 +439,8 @@ static xcb_atom_t netatom[NetLast];
|
|
/* attempt to encapsulate suck into one file */
|
|
#include "client.h"
|
|
|
|
+#include "simple_scratchpad.c"
|
|
+
|
|
/* function implementations */
|
|
void
|
|
applybounds(Client *c, struct wlr_box *bbox)
|
|
@@ -1259,10 +1268,20 @@ void
|
|
destroynotify(struct wl_listener *listener, void *data)
|
|
{
|
|
/* Called when the xdg_toplevel is destroyed. */
|
|
- Client *c = wl_container_of(listener, c, destroy);
|
|
+ Client *sc, *c = wl_container_of(listener, c, destroy);
|
|
wl_list_remove(&c->destroy.link);
|
|
wl_list_remove(&c->set_title.link);
|
|
wl_list_remove(&c->fullscreen.link);
|
|
+ /* Check if destroyed client was part of scratchpad_clients
|
|
+ * and clean it from the list if so. */
|
|
+ if (c && wl_list_length(&scratchpad_clients) > 0) {
|
|
+ wl_list_for_each(sc, &scratchpad_clients, link_temp) {
|
|
+ if (sc == c) {
|
|
+ wl_list_remove(&c->link_temp);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
#ifdef XWAYLAND
|
|
if (c->type != XDGShell) {
|
|
wl_list_remove(&c->activate.link);
|
|
@@ -2306,11 +2325,21 @@ setcursorshape(struct wl_listener *listener, void *data)
|
|
void
|
|
setfloating(Client *c, int floating)
|
|
{
|
|
- Client *p = client_get_parent(c);
|
|
+ Client *sc, *p = client_get_parent(c);
|
|
c->isfloating = floating;
|
|
/* If in floating layout do not change the client's layer */
|
|
if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange)
|
|
return;
|
|
+ /* Check if unfloated client was part of scratchpad_clients
|
|
+ * and remove it from scratchpad_clients list if so */
|
|
+ if (!floating && wl_list_length(&scratchpad_clients) > 0) {
|
|
+ wl_list_for_each(sc, &scratchpad_clients, link_temp) {
|
|
+ if (sc == c) {
|
|
+ wl_list_remove(&c->link_temp);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ||
|
|
(p && p->isfullscreen) ? LyrFS
|
|
: c->isfloating ? LyrFloat : LyrTile]);
|
|
@@ -2534,6 +2563,7 @@ setup(void)
|
|
*/
|
|
wl_list_init(&clients);
|
|
wl_list_init(&fstack);
|
|
+ wl_list_init(&scratchpad_clients);
|
|
|
|
xdg_shell = wlr_xdg_shell_create(dpy, 6);
|
|
LISTEN_STATIC(&xdg_shell->events.new_toplevel, createnotify);
|
|
diff --git a/simple_scratchpad.c b/simple_scratchpad.c
|
|
new file mode 100644
|
|
index 0000000..381f4b5
|
|
--- /dev/null
|
|
+++ b/simple_scratchpad.c
|
|
@@ -0,0 +1,68 @@
|
|
+/* ************************************************************************** */
|
|
+/* */
|
|
+/* ::: :::::::: */
|
|
+/* simple_scratchpad.c :+: :+: :+: */
|
|
+/* +:+ +:+ +:+ */
|
|
+/* By: jmakkone <jmakkone@student.hive.fi> +#+ +:+ +#+ */
|
|
+/* +#+#+#+#+#+ +#+ */
|
|
+/* Created: 2024/12/19 19:35:02 by jmakkone #+# #+# */
|
|
+/* Updated: 2025/01/04 13:35:50 by jmakkone ### ########.fr */
|
|
+/* */
|
|
+/* ************************************************************************** */
|
|
+
|
|
+void
|
|
+addscratchpad(const Arg *arg)
|
|
+{
|
|
+ Client *cc, *c = focustop(selmon);
|
|
+
|
|
+ if (!c)
|
|
+ return;
|
|
+ /* Check if the added client is already a scratchpad client */
|
|
+ wl_list_for_each(cc, &scratchpad_clients, link_temp) {
|
|
+ if (cc == c)
|
|
+ return;
|
|
+ }
|
|
+ if (!c->isfloating) {
|
|
+ setfloating(c, 1);
|
|
+ }
|
|
+ wl_list_insert(&scratchpad_clients, &c->link_temp);
|
|
+}
|
|
+
|
|
+void
|
|
+togglescratchpad(const Arg *arg)
|
|
+{
|
|
+ Client *c;
|
|
+ Monitor *m = selmon;
|
|
+
|
|
+ scratchpad_visible = !scratchpad_visible;
|
|
+ if (scratchpad_visible) {
|
|
+ wl_list_for_each(c, &scratchpad_clients, link_temp) {
|
|
+ c->mon = m;
|
|
+ c->tags = m->tagset[m->seltags];
|
|
+ arrange(m);
|
|
+ focusclient(c, 1);
|
|
+ }
|
|
+ } else {
|
|
+ wl_list_for_each(c, &scratchpad_clients, link_temp) {
|
|
+ c->tags = 0;
|
|
+ focusclient(focustop(m), 1);
|
|
+ arrange(m);
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+void
|
|
+removescratchpad(const Arg *arg)
|
|
+{
|
|
+ Client *sc, *c = focustop(selmon);
|
|
+
|
|
+ if (c && wl_list_length(&scratchpad_clients) > 0) {
|
|
+ /* Check if c is in scratchpad_clients */
|
|
+ wl_list_for_each(sc, &scratchpad_clients, link_temp) {
|
|
+ if (sc == c) {
|
|
+ wl_list_remove(&c->link_temp);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|
|
--
|
|
2.45.2
|
|
|