mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-03-22 00:41:30 +00:00
Compare commits
4 Commits
c916b773fd
...
e1fa126693
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1fa126693 | ||
|
|
3e627686a3 | ||
|
|
47d7e4d5ac | ||
|
|
32701fc108 |
@ -5,7 +5,8 @@ Note: Commands from array are executed using execvp(). So if you need to execute
|
|||||||
|
|
||||||
### Download
|
### Download
|
||||||
- [git branch](https://codeberg.org/sevz/dwl/src/branch/autostart)
|
- [git branch](https://codeberg.org/sevz/dwl/src/branch/autostart)
|
||||||
- [2025-01-20](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart.patch)
|
- [wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart-wlroots-next-f4249db.patch)
|
||||||
|
- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart-0.8.patch)
|
||||||
- [0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart-0.7.patch)
|
- [0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/autostart/autostart-0.7.patch)
|
||||||
|
|
||||||
### Authors
|
### Authors
|
||||||
|
|||||||
@ -1,148 +0,0 @@
|
|||||||
From 3b0b0249d900121a90528616f4d11f733c7a5ca2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
|
|
||||||
<leohdz172@proton.me>
|
|
||||||
Date: Sat, 8 Jul 2023 17:11:36 -0600
|
|
||||||
Subject: [PATCH] port autostart patch from dwm
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
https://dwm.suckless.org/patches/cool_autostart/
|
|
||||||
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
|
|
||||||
---
|
|
||||||
config.def.h | 7 +++++++
|
|
||||||
dwl.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
|
||||||
2 files changed, 62 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 22d2171d..8dc6502c 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -20,6 +20,13 @@ static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You ca
|
|
||||||
/* logging */
|
|
||||||
static int log_level = WLR_ERROR;
|
|
||||||
|
|
||||||
+/* Autostart */
|
|
||||||
+static const char *const autostart[] = {
|
|
||||||
+ "wbg", "/path/to/your/image", NULL,
|
|
||||||
+ NULL /* terminate */
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
|
|
||||||
static const Rule rules[] = {
|
|
||||||
/* app_id title tags mask isfloating monitor */
|
|
||||||
diff --git a/dwl.c b/dwl.c
|
|
||||||
index ad21e1ba..3118e07f 100644
|
|
||||||
--- a/dwl.c
|
|
||||||
+++ b/dwl.c
|
|
||||||
@@ -246,6 +246,7 @@ static void arrange(Monitor *m);
|
|
||||||
static void arrangelayer(Monitor *m, struct wl_list *list,
|
|
||||||
struct wlr_box *usable_area, int exclusive);
|
|
||||||
static void arrangelayers(Monitor *m);
|
|
||||||
+static void autostartexec(void);
|
|
||||||
static void axisnotify(struct wl_listener *listener, void *data);
|
|
||||||
static void buttonpress(struct wl_listener *listener, void *data);
|
|
||||||
static void chvt(const Arg *arg);
|
|
||||||
@@ -455,6 +456,9 @@ static struct wlr_xwayland *xwayland;
|
|
||||||
/* attempt to encapsulate suck into one file */
|
|
||||||
#include "client.h"
|
|
||||||
|
|
||||||
+static pid_t *autostart_pids;
|
|
||||||
+static size_t autostart_len;
|
|
||||||
+
|
|
||||||
/* function implementations */
|
|
||||||
void
|
|
||||||
applybounds(Client *c, struct wlr_box *bbox)
|
|
||||||
@@ -599,6 +603,27 @@ arrangelayers(Monitor *m)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+autostartexec(void) {
|
|
||||||
+ const char *const *p;
|
|
||||||
+ size_t i = 0;
|
|
||||||
+
|
|
||||||
+ /* count entries */
|
|
||||||
+ for (p = autostart; *p; autostart_len++, p++)
|
|
||||||
+ while (*++p);
|
|
||||||
+
|
|
||||||
+ autostart_pids = calloc(autostart_len, sizeof(pid_t));
|
|
||||||
+ for (p = autostart; *p; i++, p++) {
|
|
||||||
+ if ((autostart_pids[i] = fork()) == 0) {
|
|
||||||
+ setsid();
|
|
||||||
+ execvp(*p, (char *const *)p);
|
|
||||||
+ die("dwl: execvp %s:", *p);
|
|
||||||
+ }
|
|
||||||
+ /* skip arguments */
|
|
||||||
+ while (*++p);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
axisnotify(struct wl_listener *listener, void *data)
|
|
||||||
{
|
|
||||||
@@ -695,12 +720,23 @@ checkidleinhibitor(struct wlr_surface *exclude)
|
|
||||||
void
|
|
||||||
cleanup(void)
|
|
||||||
{
|
|
||||||
+ size_t i;
|
|
||||||
+
|
|
||||||
cleanuplisteners();
|
|
||||||
#ifdef XWAYLAND
|
|
||||||
wlr_xwayland_destroy(xwayland);
|
|
||||||
xwayland = NULL;
|
|
||||||
#endif
|
|
||||||
wl_display_destroy_clients(dpy);
|
|
||||||
+
|
|
||||||
+ /* kill child processes */
|
|
||||||
+ for (i = 0; i < autostart_len; i++) {
|
|
||||||
+ if (0 < autostart_pids[i]) {
|
|
||||||
+ kill(autostart_pids[i], SIGTERM);
|
|
||||||
+ waitpid(autostart_pids[i], NULL, 0);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (child_pid > 0) {
|
|
||||||
kill(-child_pid, SIGTERM);
|
|
||||||
waitpid(child_pid, NULL, 0);
|
|
||||||
@@ -1551,10 +1587,25 @@ gpureset(struct wl_listener *listener, void *data)
|
|
||||||
void
|
|
||||||
handlesig(int signo)
|
|
||||||
{
|
|
||||||
- if (signo == SIGCHLD)
|
|
||||||
- while (waitpid(-1, NULL, WNOHANG) > 0);
|
|
||||||
- else if (signo == SIGINT || signo == SIGTERM)
|
|
||||||
+ if (signo == SIGCHLD) {
|
|
||||||
+ pid_t pid, *p, *lim;
|
|
||||||
+ while ((pid = waitpid(-1, NULL, WNOHANG)) > 0) {
|
|
||||||
+ if (pid == child_pid)
|
|
||||||
+ child_pid = -1;
|
|
||||||
+ if (!(p = autostart_pids))
|
|
||||||
+ continue;
|
|
||||||
+ lim = &p[autostart_len];
|
|
||||||
+
|
|
||||||
+ for (; p < lim; p++) {
|
|
||||||
+ if (*p == pid) {
|
|
||||||
+ *p = -1;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ } else if (signo == SIGINT || signo == SIGTERM) {
|
|
||||||
quit(NULL);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -2241,6 +2292,7 @@ run(char *startup_cmd)
|
|
||||||
die("startup: backend_start");
|
|
||||||
|
|
||||||
/* Now that the socket exists and the backend is started, run the startup command */
|
|
||||||
+ autostartexec();
|
|
||||||
if (startup_cmd) {
|
|
||||||
int piperw[2];
|
|
||||||
if (pipe(piperw) < 0)
|
|
||||||
--
|
|
||||||
2.48.0
|
|
||||||
|
|
||||||
@ -15,10 +15,8 @@ The "Monitor area" refers to the space enclosed by the green rectangle, while th
|
|||||||
|
|
||||||
### Download
|
### Download
|
||||||
- [git branch](https://codeberg.org/wochap/dwl/src/branch/v0.5/customfloat)
|
- [git branch](https://codeberg.org/wochap/dwl/src/branch/v0.5/customfloat)
|
||||||
- [2025-08-16](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat.patch)
|
- [wlroots-next-f4249db](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat-wlroots-next-f4249db.patch)
|
||||||
- [2024-07-09](https://codeberg.org/dwl/dwl-patches/raw/commit/13d96b51b54500dd24544cf3a73c61b7a1414bc6/patches/customfloat/customfloat.patch)
|
- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/customfloat/customfloat-0.8.patch)
|
||||||
- [2024-04-11](https://codeberg.org/dwl/dwl-patches/raw/commit/98cba933c9f4099202e54f39acbf17e05bde828a/customfloat/customfloat.patch)
|
|
||||||
- [v0.5](https://codeberg.org/dwl/dwl-patches/raw/commit/bf098459219e7a473d8edb4c0435aeb6a4b82e38/customfloat/customfloat.patch)
|
|
||||||
|
|
||||||
### Authors
|
### Authors
|
||||||
- [fauxmight](https://codeberg.org/fauxmight)
|
- [fauxmight](https://codeberg.org/fauxmight)
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
From 83ce30cdfeebcc7569fbb30014db8d1758df79bd Mon Sep 17 00:00:00 2001
|
From 96125a70b7525740a42803f1faa666ca37b9433f Mon Sep 17 00:00:00 2001
|
||||||
From: A Frederick Christensen <dwl@ivories.org>
|
From: A Frederick Christensen <dwl@ivories.org>
|
||||||
Date: Thu, 25 Dec 2025 18:44:07 -0600
|
Date: Mon, 23 Feb 2026 09:06:33 -0600
|
||||||
Subject: [PATCH] Add: customfloat patch
|
Subject: [PATCH] Apply customfloat patch
|
||||||
|
|
||||||
---
|
---
|
||||||
config.def.h | 7 ++++---
|
config.def.h | 7 ++++---
|
||||||
@ -9,7 +9,7 @@ Subject: [PATCH] Add: customfloat patch
|
|||||||
2 files changed, 30 insertions(+), 3 deletions(-)
|
2 files changed, 30 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
diff --git a/config.def.h b/config.def.h
|
||||||
index 95c2afa..67b27ed 100644
|
index 8a6eda0..16afbb3 100644
|
||||||
--- a/config.def.h
|
--- a/config.def.h
|
||||||
+++ b/config.def.h
|
+++ b/config.def.h
|
||||||
@@ -13,6 +13,7 @@ static const float focuscolor[] = COLOR(0x005577ff);
|
@@ -13,6 +13,7 @@ static const float focuscolor[] = COLOR(0x005577ff);
|
||||||
@ -20,22 +20,21 @@ index 95c2afa..67b27ed 100644
|
|||||||
|
|
||||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||||
#define TAGCOUNT (9)
|
#define TAGCOUNT (9)
|
||||||
@@ -22,10 +23,10 @@ static int log_level = WLR_ERROR;
|
@@ -21,9 +22,9 @@ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
|
||||||
|
static int log_level = WLR_ERROR;
|
||||||
|
|
||||||
/* NOTE: ALWAYS keep a rule declared even if you don't use rules (e.g leave at least one example) */
|
|
||||||
static const Rule rules[] = {
|
static const Rule rules[] = {
|
||||||
- /* app_id title tags mask isfloating monitor */
|
- /* app_id title tags mask isfloating monitor */
|
||||||
+ /* app_id title tags mask isfloating monitor x y width height */
|
|
||||||
/* examples: */
|
|
||||||
- { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
|
- { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
|
||||||
- { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
|
- { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
|
||||||
|
+ /* app_id title tags mask isfloating monitor x y width height */
|
||||||
+ { "Gimp_EXAMPLE", NULL, 0, 1, -1, -1, -1, 1000, 0.75 }, /* Start on currently visible tags floating, not tiled */
|
+ { "Gimp_EXAMPLE", NULL, 0, 1, -1, -1, -1, 1000, 0.75 }, /* Start on currently visible tags floating, not tiled */
|
||||||
+ { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1, -1, -1, -1, -1 }, /* Start on ONLY tag "9" */
|
+ { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1, -1, -1, -1, -1 }, /* Start on ONLY tag "9" */
|
||||||
|
/* default/example rule: can be changed but cannot be eliminated; at least one rule must exist */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* layout(s) */
|
|
||||||
diff --git a/dwl.c b/dwl.c
|
diff --git a/dwl.c b/dwl.c
|
||||||
index 12f441e..e364621 100644
|
index 44f3ad9..801696a 100644
|
||||||
--- a/dwl.c
|
--- a/dwl.c
|
||||||
+++ b/dwl.c
|
+++ b/dwl.c
|
||||||
@@ -228,6 +228,10 @@ typedef struct {
|
@@ -228,6 +228,10 @@ typedef struct {
|
||||||
@ -92,5 +91,5 @@ index 12f441e..e364621 100644
|
|||||||
|
|
||||||
void
|
void
|
||||||
--
|
--
|
||||||
2.51.2
|
2.52.0
|
||||||
|
|
||||||
95
patches/customfloat/customfloat-wlroots-next-f4249db.patch
Normal file
95
patches/customfloat/customfloat-wlroots-next-f4249db.patch
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
From d8a861b30bf93554633ff0517d5bbdcb9b9614f0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: A Frederick Christensen <dwl@ivories.org>
|
||||||
|
Date: Mon, 23 Feb 2026 09:18:07 -0600
|
||||||
|
Subject: [PATCH] Apply customfloat patch
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 7 ++++---
|
||||||
|
dwl.c | 26 ++++++++++++++++++++++++++
|
||||||
|
2 files changed, 30 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 8a6eda0..16afbb3 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -13,6 +13,7 @@ static const float focuscolor[] = COLOR(0x005577ff);
|
||||||
|
static const float urgentcolor[] = COLOR(0xff0000ff);
|
||||||
|
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
|
||||||
|
static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
|
||||||
|
+static const int respect_monitor_reserved_area = 0; /* 1 to monitor center while respecting the monitor's reserved area, 0 to monitor center */
|
||||||
|
|
||||||
|
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||||
|
#define TAGCOUNT (9)
|
||||||
|
@@ -21,9 +22,9 @@ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
|
||||||
|
static int log_level = WLR_ERROR;
|
||||||
|
|
||||||
|
static const Rule rules[] = {
|
||||||
|
- /* app_id title tags mask isfloating monitor */
|
||||||
|
- { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
|
||||||
|
- { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
|
||||||
|
+ /* app_id title tags mask isfloating monitor x y width height */
|
||||||
|
+ { "Gimp_EXAMPLE", NULL, 0, 1, -1, -1, -1, 1000, 0.75 }, /* Start on currently visible tags floating, not tiled */
|
||||||
|
+ { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1, -1, -1, -1, -1 }, /* Start on ONLY tag "9" */
|
||||||
|
/* default/example rule: can be changed but cannot be eliminated; at least one rule must exist */
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/dwl.c b/dwl.c
|
||||||
|
index 8a9715d..7de0655 100644
|
||||||
|
--- a/dwl.c
|
||||||
|
+++ b/dwl.c
|
||||||
|
@@ -230,6 +230,10 @@ typedef struct {
|
||||||
|
uint32_t tags;
|
||||||
|
int isfloating;
|
||||||
|
int monitor;
|
||||||
|
+ int x;
|
||||||
|
+ int y;
|
||||||
|
+ float w;
|
||||||
|
+ float h;
|
||||||
|
} Rule;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
@@ -484,6 +488,11 @@ applyrules(Client *c)
|
||||||
|
int i;
|
||||||
|
const Rule *r;
|
||||||
|
Monitor *mon = selmon, *m;
|
||||||
|
+ int newwidth;
|
||||||
|
+ int newheight;
|
||||||
|
+ int newx;
|
||||||
|
+ int newy;
|
||||||
|
+ int apply_resize = 0;
|
||||||
|
|
||||||
|
appid = client_get_appid(c);
|
||||||
|
title = client_get_title(c);
|
||||||
|
@@ -497,12 +506,29 @@ applyrules(Client *c)
|
||||||
|
wl_list_for_each(m, &mons, link) {
|
||||||
|
if (r->monitor == i++)
|
||||||
|
mon = m;
|
||||||
|
+ if (c->isfloating || !mon->lt[mon->sellt]->arrange) {
|
||||||
|
+ /* client is floating or in floating layout */
|
||||||
|
+ struct wlr_box b = respect_monitor_reserved_area ? mon->w : mon->m;
|
||||||
|
+ newwidth = (int)round((r->w >= 0) ? (r->w <= 1 ? b.width * r->w : r->w) : c->geom.width);
|
||||||
|
+ newheight = (int)round((r->h >= 0) ? (r->h <= 1 ? b.height * r->h : r->h) : c->geom.height);
|
||||||
|
+ newx = (int)round((r->x >= 0) ? (r->x <= 1 ? b.width * r->x + b.x : r->x + b.x) : c->geom.x);
|
||||||
|
+ newy = (int)round((r->y >= 0) ? (r->y <= 1 ? b.height * r->y + b.y : r->y + b.y) : c->geom.y);
|
||||||
|
+ apply_resize = 1;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c->isfloating |= client_is_float_type(c);
|
||||||
|
setmon(c, mon, newtags);
|
||||||
|
+ if (apply_resize) {
|
||||||
|
+ resize(c, (struct wlr_box){
|
||||||
|
+ .x = newx,
|
||||||
|
+ .y = newy,
|
||||||
|
+ .width = newwidth,
|
||||||
|
+ .height = newheight,
|
||||||
|
+ }, 1);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
--
|
||||||
|
2.52.0
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user