jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2026-06-11 10:23:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase to upstream/main

Browse Source
This commit is contained in:
Dhruva Sambrani
2024-09-18 18:56:10 +02:00
parent 2ac40d9676
commit 0ed712244f
13 changed files with 466 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/skipfocus/README.md
+3 -2
View File
@@ -8,8 +8,9 @@ Adds a rule-based ability to skip automatically focusing a window on creation. E
| 2 | skipfocus entirely |
### Download
- [20240714](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus.patch)
- [20240108](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus20240108.patch)
- [2024-09-18](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus.patch)
- [2024-07-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus-20240714.patch)
- [2024-01-08](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus-20240108.patch)
- [git branch](https://codeberg.org/dhruva_sambrani/dwl/src/branch/skipfocus)
### Authors
patches/skipfocus/skipfocus-20240714.patch
+81
View File
@@ -0,0 +1,81 @@
diff --git a/config.def.h b/config.def.h
index 22d2171..9f6599c 100644
--- a/config.def.h
+++ b/config.def.h
@@ -22,10 +22,11 @@ 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[] = {
- /* app_id title tags mask isfloating monitor */
+ /* app_id title tags mask isfloating skipfocus monitor */
/* examples: */
- { "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" */
+ { "Gimp_EXAMPLE", NULL, 0, 1, 0, -1 }, /* Start on currently visible tags floating, not tiled */
+ { "firefox_EXAMPLE", NULL, 1 << 8, 0, 0, -1 }, /* Start on ONLY tag "9" */
+ { "mako_EXAMPLE", NULL, 0, 1, 1, -1 }, /* Start floating and skip focus
};
/* layout(s) */
diff --git a/dwl.c b/dwl.c
index 145fd01..ec9d1af 100644
--- a/dwl.c
+++ b/dwl.c
@@ -138,7 +138,7 @@ typedef struct {
#endif
unsigned int bw;
uint32_t tags;
- int isfloating, isurgent, isfullscreen;
+ int isfloating, isurgent, isfullscreen, skipfocus;
uint32_t resize; /* configure serial of a pending resize */
} Client;
@@ -229,6 +229,7 @@ typedef struct {
const char *title;
uint32_t tags;
int isfloating;
+ int skipfocus;
int monitor;
} Rule;
@@ -465,6 +466,7 @@ applyrules(Client *c)
if ((!r->title || strstr(title, r->title))
&& (!r->id || strstr(appid, r->id))) {
c->isfloating = r->isfloating;
+ c->skipfocus = r->skipfocus;
newtags |= r->tags;
i = 0;
wl_list_for_each(m, &mons, link) {
@@ -1323,6 +1325,13 @@ focusclient(Client *c, int lift)
if (locked)
return;
+ if (c && c->skipfocus != 0){
+ if (c -> skipfocus == 1) {
+ c->skipfocus = 0;
+ }
+ return;
+ }
+
/* Raise client in stacking order if requested */
if (c && lift)
wlr_scene_node_raise_to_top(&c->scene->node);
@@ -1692,11 +1701,13 @@ mapnotify(struct wl_listener *listener, void *data)
printstatus();
unset_fullscreen:
- m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y);
- wl_list_for_each(w, &clients, link) {
- if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags))
- setfullscreen(w, 0);
- }
+ if (!c->skipfocus) {
+ m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y);
+ wl_list_for_each(w, &clients, link) {
+ if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags))
+ setfullscreen(w, 0);
+ }
+ }
}
void
patches/skipfocus/skipfocus.patch
+8 -8
View File
@@ -18,10 +18,10 @@ index 22d2171..9f6599c 100644
/* layout(s) */
diff --git a/dwl.c b/dwl.c
index 145fd01..ec9d1af 100644
index dc0c861..b6a4cbb 100644
--- a/dwl.c
+++ b/dwl.c
@@ -138,7 +138,7 @@ typedef struct {
@@ -141,7 +141,7 @@ typedef struct {
#endif
unsigned int bw;
uint32_t tags;
@@ -30,7 +30,7 @@ index 145fd01..ec9d1af 100644
uint32_t resize; /* configure serial of a pending resize */
} Client;
@@ -229,6 +229,7 @@ typedef struct {
@@ -231,6 +231,7 @@ typedef struct {
const char *title;
uint32_t tags;
int isfloating;
@@ -38,7 +38,7 @@ index 145fd01..ec9d1af 100644
int monitor;
} Rule;
@@ -465,6 +466,7 @@ applyrules(Client *c)
@@ -466,6 +467,7 @@ applyrules(Client *c)
if ((!r->title || strstr(title, r->title))
&& (!r->id || strstr(appid, r->id))) {
c->isfloating = r->isfloating;
@@ -46,7 +46,7 @@ index 145fd01..ec9d1af 100644
newtags |= r->tags;
i = 0;
wl_list_for_each(m, &mons, link) {
@@ -1323,6 +1325,13 @@ focusclient(Client *c, int lift)
@@ -1343,6 +1345,13 @@ focusclient(Client *c, int lift)
if (locked)
return;
@@ -60,19 +60,19 @@ index 145fd01..ec9d1af 100644
/* Raise client in stacking order if requested */
if (c && lift)
wlr_scene_node_raise_to_top(&c->scene->node);
@@ -1692,11 +1701,13 @@ mapnotify(struct wl_listener *listener, void *data)
@@ -1738,11 +1747,13 @@ mapnotify(struct wl_listener *listener, void *data)
printstatus();
unset_fullscreen:
- m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y);
- wl_list_for_each(w, &clients, link) {
- if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags))
- if (w != c && w != p && w->isfullscreen && m == w->mon && (w->tags & c->tags))
- setfullscreen(w, 0);
- }
+ if (!c->skipfocus) {
+ m = c->mon ? c->mon : xytomon(c->geom.x, c->geom.y);
+ wl_list_for_each(w, &clients, link) {
+ if (w != c && w->isfullscreen && m == w->mon && (w->tags & c->tags))
+ if (w != c && w != p && w->isfullscreen && m == w->mon && (w->tags & c->tags))
+ setfullscreen(w, 0);
+ }
+ }