[skipfocus] do not unset-fullscreen

patches/skipfocus/README.md

@@ -8,9 +8,10 @@ Adds a rule-based ability to skip automatically focusing a window on creation. E
 | 2                 | skipfocus entirely |
 
 ### Download
-- [20240108](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/skipfocus/skipfocus.patch)
+- [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)
 - [git branch](https://codeberg.org/dhruva_sambrani/dwl/src/branch/skipfocus)
 
 ### Authors
-- [dhruva_sambrani](https://codeberg.org/dhruva_sambrani)
+- [Dhruva Sambrani](https://codeberg.org/dhruva_sambrani)
 

patches/skipfocus/skipfocus.patch

@@ -1,10 +1,10 @@
 diff --git a/config.def.h b/config.def.h
-index a784eb4..5d3a4f9 100644
+index 22d2171..9f6599c 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -21,10 +21,11 @@ static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You ca
+@@ -22,10 +22,11 @@ static int log_level = WLR_ERROR;
- 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 */
@@ -18,10 +18,10 @@ index a784eb4..5d3a4f9 100644
  
  /* layout(s) */
 diff --git a/dwl.c b/dwl.c
-index 6f041a0..90ac57b 100644
+index 145fd01..ec9d1af 100644
 --- a/dwl.c
 +++ b/dwl.c
-@@ -137,7 +137,7 @@ typedef struct {
+@@ -138,7 +138,7 @@ typedef struct {
  #endif
  	unsigned int bw;
  	uint32_t tags;
@@ -30,7 +30,7 @@ index 6f041a0..90ac57b 100644
  	uint32_t resize; /* configure serial of a pending resize */
  } Client;
  
-@@ -228,6 +228,7 @@ typedef struct {
+@@ -229,6 +229,7 @@ typedef struct {
  	const char *title;
  	uint32_t tags;
  	int isfloating;
@@ -38,7 +38,7 @@ index 6f041a0..90ac57b 100644
  	int monitor;
  } Rule;
  
-@@ -464,6 +465,7 @@ applyrules(Client *c)
+@@ -465,6 +466,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 6f041a0..90ac57b 100644
  			newtags |= r->tags;
  			i = 0;
  			wl_list_for_each(m, &mons, link) {
-@@ -1307,6 +1309,13 @@ focusclient(Client *c, int lift)
+@@ -1323,6 +1325,13 @@ focusclient(Client *c, int lift)
  	if (locked)
  		return;
  
@@ -60,3 +60,22 @@ index 6f041a0..90ac57b 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)
+ 	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/skipfocus20240108.patch

@@ -0,0 +1,62 @@
+diff --git a/config.def.h b/config.def.h
+index a784eb4..5d3a4f9 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -21,10 +21,11 @@ static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You ca
+ static int log_level = WLR_ERROR;
+ 
+ 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 6f041a0..90ac57b 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -137,7 +137,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;
+ 
+@@ -228,6 +228,7 @@ typedef struct {
+ 	const char *title;
+ 	uint32_t tags;
+ 	int isfloating;
++	int skipfocus;
+ 	int monitor;
+ } Rule;
+ 
+@@ -464,6 +465,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) {
+@@ -1307,6 +1309,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);