update dhruva_sambrani patches

This commit is contained in:
Dhruva Sambrani 2024-01-08 15:18:22 +01:00
parent ab65f23d4b
commit 425132696f
3 changed files with 66 additions and 75 deletions

View File

@ -1,8 +1,19 @@
From 83e3bc56d59ac38ce50df1563fcaa1025c1f688a Mon Sep 17 00:00:00 2001
From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:00:21 +0100
Subject: [PATCH] first dim-unfocused commit
---
client.h | 6 ++++++
config.def.h | 7 ++++---
dwl.c | 19 +++++++++++++++----
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/client.h b/client.h diff --git a/client.h b/client.h
index 71c7d76..749be99 100644 index 1dae434..7e4619c 100644
--- a/client.h --- a/client.h
+++ b/client.h +++ b/client.h
@@ -316,6 +316,12 @@ client_set_border_color(Client *c, const float color[static 4]) @@ -317,6 +317,12 @@ client_set_border_color(Client *c, const float color[static 4])
wlr_scene_rect_set_color(c->border[i], color); wlr_scene_rect_set_color(c->border[i], color);
} }
@ -16,18 +27,18 @@ index 71c7d76..749be99 100644
client_set_fullscreen(Client *c, int fullscreen) client_set_fullscreen(Client *c, int fullscreen)
{ {
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index db0babc..da75950 100644 index a8ed61d..f53d4a1 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -9,6 +9,7 @@ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will @@ -10,6 +10,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int borderpx = 1; /* border pixel of windows */ static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x444444ff); static const float bordercolor[] = COLOR(0x444444ff);
static const float focuscolor[] = COLOR(0x005577ff); static const float focuscolor[] = COLOR(0x005577ff);
+static const float unfocuseddim[] = COLOR(0x00000088); +static const float unfocuseddim[] = COLOR(0x00000088);
static const float urgentcolor[] = COLOR(0xff0000ff); static const float urgentcolor[] = COLOR(0xff0000ff);
/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */ /* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can also use glsl colors */ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can also use glsl colors */
@@ -20,11 +21,11 @@ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can al @@ -21,11 +22,11 @@ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can al
static int log_level = WLR_ERROR; static int log_level = WLR_ERROR;
static const Rule rules[] = { static const Rule rules[] = {
@ -43,10 +54,10 @@ index db0babc..da75950 100644
/* layout(s) */ /* layout(s) */
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 69da91d..8e163be 100644 index 632dabf..5569d82 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -103,6 +103,7 @@ typedef struct { @@ -104,6 +104,7 @@ typedef struct {
Monitor *mon; Monitor *mon;
struct wlr_scene_tree *scene; struct wlr_scene_tree *scene;
struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ struct wlr_scene_rect *border[4]; /* top, bottom, left, right */
@ -54,7 +65,7 @@ index 69da91d..8e163be 100644
struct wlr_scene_tree *scene_surface; struct wlr_scene_tree *scene_surface;
struct wl_list link; struct wl_list link;
struct wl_list flink; struct wl_list flink;
@@ -128,7 +129,7 @@ typedef struct { @@ -132,7 +133,7 @@ typedef struct {
#endif #endif
unsigned int bw; unsigned int bw;
uint32_t tags; uint32_t tags;
@ -63,7 +74,7 @@ index 69da91d..8e163be 100644
uint32_t resize; /* configure serial of a pending resize */ uint32_t resize; /* configure serial of a pending resize */
} Client; } Client;
@@ -214,6 +215,7 @@ typedef struct { @@ -217,6 +218,7 @@ typedef struct {
const char *title; const char *title;
uint32_t tags; uint32_t tags;
int isfloating; int isfloating;
@ -71,15 +82,15 @@ index 69da91d..8e163be 100644
int monitor; int monitor;
} Rule; } Rule;
@@ -433,6 +435,7 @@ applyrules(Client *c) @@ -440,6 +442,7 @@ applyrules(Client *c)
if ((!r->title || strstr(title, r->title)) if ((!r->title || strstr(title, r->title))
&& (!r->id || strstr(appid, r->id))) { && (!r->id || strstr(appid, r->id))) {
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
+ c->neverdim = r-> neverdim; + c->neverdim = r-> neverdim;
newtags |= r->tags; newtags |= r->tags;
i = 0; i = 0;
wl_list_for_each(m, &mons, link) wl_list_for_each(m, &mons, link) {
@@ -1191,8 +1194,10 @@ focusclient(Client *c, int lift) @@ -1190,8 +1193,10 @@ focusclient(Client *c, int lift)
/* Don't change border color if there is an exclusive focus or we are /* Don't change border color if there is an exclusive focus or we are
* handling a drag operation */ * handling a drag operation */
@ -91,7 +102,7 @@ index 69da91d..8e163be 100644
} }
/* Deactivate old client if focus is changing */ /* Deactivate old client if focus is changing */
@@ -1210,7 +1215,7 @@ focusclient(Client *c, int lift) @@ -1209,7 +1214,7 @@ focusclient(Client *c, int lift)
* and probably other clients */ * and probably other clients */
} else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) {
client_set_border_color(old_c, bordercolor); client_set_border_color(old_c, bordercolor);
@ -100,7 +111,7 @@ index 69da91d..8e163be 100644
client_activate_surface(old, 0); client_activate_surface(old, 0);
} }
} }
@@ -1524,6 +1529,10 @@ mapnotify(struct wl_listener *listener, void *data) @@ -1522,6 +1527,10 @@ mapnotify(struct wl_listener *listener, void *data)
c->border[i]->node.data = c; c->border[i]->node.data = c;
} }
@ -110,8 +121,8 @@ index 69da91d..8e163be 100644
+ +
/* Initialize client geometry with room for border */ /* Initialize client geometry with room for border */
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT); client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
client_get_geometry(c, &c->geom); c->geom.width += 2 * c->bw;
@@ -1927,7 +1936,7 @@ resize(Client *c, struct wlr_box geo, int interact) @@ -1932,7 +1941,7 @@ resize(Client *c, struct wlr_box geo, int interact)
c->geom = geo; c->geom = geo;
applybounds(c, bbox); applybounds(c, bbox);
@ -120,14 +131,15 @@ index 69da91d..8e163be 100644
wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y);
wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw); wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw);
wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw); wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw);
@@ -1937,7 +1946,9 @@ resize(Client *c, struct wlr_box geo, int interact) @@ -1942,6 +1951,8 @@ resize(Client *c, struct wlr_box geo, int interact)
wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw); wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw);
wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw); wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw);
wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw); wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw);
-
+ wlr_scene_rect_set_size(c->dimmer, c->geom.width, c-> geom.height); + wlr_scene_rect_set_size(c->dimmer, c->geom.width, c-> geom.height);
+ wlr_scene_node_set_position(&c->dimmer->node, 0, 0); + wlr_scene_node_set_position(&c->dimmer->node, 0, 0);
+
/* this is a no-op if size hasn't changed */ /* this is a no-op if size hasn't changed */
c->resize = client_set_size(c, c->geom.width - 2 * c->bw, c->resize = client_set_size(c, c->geom.width - 2 * c->bw,
c->geom.height - 2 * c->bw); --
2.43.0

View File

@ -1,3 +1,13 @@
From 2825a2e8b0dae5d7146ba9bb66e2a3b7265617d5 Mon Sep 17 00:00:00 2001
From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com>
Date: Mon, 8 Jan 2024 14:54:39 +0100
Subject: [PATCH] first skipfocus commit
---
config.def.h | 6 +++---
dwl.c | 9 ++++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index a8ed61d..fc105de 100644 index a8ed61d..fc105de 100644
--- a/config.def.h --- a/config.def.h
@ -18,7 +28,7 @@ index a8ed61d..fc105de 100644
/* layout(s) */ /* layout(s) */
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 4d19357..3826f65 100644 index 632dabf..a8c87e5 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -132,7 +132,7 @@ typedef struct { @@ -132,7 +132,7 @@ typedef struct {
@ -58,3 +68,6 @@ index 4d19357..3826f65 100644
/* Raise client in stacking order if requested */ /* Raise client in stacking order if requested */
if (c && lift) if (c && lift)
wlr_scene_node_raise_to_top(&c->scene->node); wlr_scene_node_raise_to_top(&c->scene->node);
--
2.43.0

View File

@ -1,55 +1,18 @@
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md From 7a2b65af8c7a56c8d78875530685422702be993e Mon Sep 17 00:00:00 2001
index e6278d8..cd9bd8d 100644 From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com>
--- a/.github/ISSUE_TEMPLATE/bug_report.md Date: Mon, 8 Jan 2024 15:04:09 +0100
+++ b/.github/ISSUE_TEMPLATE/bug_report.md Subject: [PATCH] first winview commit
@@ -7,7 +7,11 @@ assignees: ''
--- ---
config.def.h | 1 +
-### ⚠️ Migrated to Codeberg dwl.c | 12 ++++++++++++
- 2 files changed, 13 insertions(+)
-This project has [migrated to Codeberg](https://codeberg.org/dwl/dwl).
-
+## Info
+dwl version:
+wlroots version:
+## Description
+<!--
+Only report bugs that can be reproduced on the main line
+Report patch issues to their respective authors
+-->
diff --git a/.github/ISSUE_TEMPLATE/enhancement-idea.md b/.github/ISSUE_TEMPLATE/enhancement-idea.md
index cbfd90f..0ac096d 100644
--- a/.github/ISSUE_TEMPLATE/enhancement-idea.md
+++ b/.github/ISSUE_TEMPLATE/enhancement-idea.md
@@ -7,7 +7,4 @@ assignees: ''
---
-### ⚠️ Migrated to Codeberg
-
-This project has [migrated to Codeberg](https://codeberg.org/dwl/dwl).
diff --git a/README.md b/README.md
index e02c9c4..62ae872 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,5 @@
# dwl - dwm for Wayland
-> ### ⚠️ Migrated to Codeberg
->
-> This project has [migrated to Codeberg](https://codeberg.org/dwl/dwl).
-
-
Join us on our IRC channel: [#dwl on Libera Chat]
Or on our [Discord server].
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index db0babc..149313c 100644 index a8ed61d..af9d866 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -136,6 +136,7 @@ static const Key keys[] = { @@ -138,6 +138,7 @@ static const Key keys[] = {
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} },
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} },
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} },
@ -58,10 +21,10 @@ index db0babc..149313c 100644
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} },
{ MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} },
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index ef27a1d..5f287b5 100644 index 632dabf..5f3a596 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -323,6 +323,7 @@ static void updatetitle(struct wl_listener *listener, void *data); @@ -327,6 +327,7 @@ static void updatetitle(struct wl_listener *listener, void *data);
static void urgent(struct wl_listener *listener, void *data); static void urgent(struct wl_listener *listener, void *data);
static void view(const Arg *arg); static void view(const Arg *arg);
static void virtualkeyboard(struct wl_listener *listener, void *data); static void virtualkeyboard(struct wl_listener *listener, void *data);
@ -69,8 +32,8 @@ index ef27a1d..5f287b5 100644
static Monitor *xytomon(double x, double y); static Monitor *xytomon(double x, double y);
static void xytonode(double x, double y, struct wlr_surface **psurface, static void xytonode(double x, double y, struct wlr_surface **psurface,
Client **pc, LayerSurface **pl, double *nx, double *ny); Client **pc, LayerSurface **pl, double *nx, double *ny);
@@ -2676,6 +2677,17 @@ virtualkeyboard(struct wl_listener *listener, void *data) @@ -2726,6 +2727,17 @@ virtualkeyboard(struct wl_listener *listener, void *data)
createkeyboard(&keyboard->keyboard); wlr_keyboard_group_add_keyboard(vkb_group.wlr_group, &keyboard->keyboard);
} }
+void +void
@ -87,3 +50,6 @@ index ef27a1d..5f287b5 100644
Monitor * Monitor *
xytomon(double x, double y) xytomon(double x, double y)
{ {
--
2.43.0