mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-06-11 10:23:19 +00:00
rebase to upstream/main
This commit is contained in:
@@ -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);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
Reference in New Issue
Block a user