mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2026-06-11 10:23:19 +00:00
sync wochap patches with latest dwl
This commit is contained in:
@@ -1,51 +1,46 @@
|
||||
From 55c22683c88c9816ceba6351a716fbe005555abd Mon Sep 17 00:00:00 2001
|
||||
From f08376a2a04929a3907612e6c1f980ad3cdf939f Mon Sep 17 00:00:00 2001
|
||||
From: wochap <gean.marroquin@gmail.com>
|
||||
Date: Thu, 11 Apr 2024 12:43:29 -0500
|
||||
Subject: [PATCH] add ability to change cursor's theme and size
|
||||
Date: Fri, 5 Jul 2024 11:10:39 -0500
|
||||
Subject: [PATCH] implement cursortheme
|
||||
|
||||
---
|
||||
config.def.h | 2 ++
|
||||
dwl.c | 6 ++++--
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
dwl.c | 8 ++++++--
|
||||
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 8847e58..3189d48 100644
|
||||
index 22d2171..1f9ff56 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -13,6 +13,8 @@ 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.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
|
||||
+static const char cursortheme[] = ""; /* theme from /usr/share/cursors/xorg-x11 */
|
||||
+static const unsigned int cursorsize = 24;
|
||||
+static const char *cursor_theme = NULL;
|
||||
+static const char cursor_size[] = "24"; /* Make sure it's a valid integer, otherwise things will break */
|
||||
|
||||
/* tagging - TAGCOUNT must be no greater than 31 */
|
||||
#define TAGCOUNT (9)
|
||||
diff --git a/dwl.c b/dwl.c
|
||||
index bf763df..961e2f1 100644
|
||||
index dc0437e..a91d42b 100644
|
||||
--- a/dwl.c
|
||||
+++ b/dwl.c
|
||||
@@ -2274,7 +2274,9 @@ setup(void)
|
||||
|
||||
int i, sig[] = {SIGCHLD, SIGINT, SIGTERM, SIGPIPE};
|
||||
struct sigaction sa = {.sa_flags = SA_RESTART, .sa_handler = handlesig};
|
||||
+ char cursorsize_str[3];
|
||||
sigemptyset(&sa.sa_mask);
|
||||
+ sprintf(cursorsize_str, "%d", cursorsize);
|
||||
|
||||
for (i = 0; i < (int)LENGTH(sig); i++)
|
||||
sigaction(sig[i], &sa, NULL);
|
||||
@@ -2412,8 +2414,8 @@ setup(void)
|
||||
@@ -2522,8 +2522,12 @@ setup(void)
|
||||
* Xcursor themes to source cursor images from and makes sure that cursor
|
||||
* images are available at all scale factors on the screen (necessary for
|
||||
* HiDPI support). Scaled cursors will be loaded with each output. */
|
||||
- cursor_mgr = wlr_xcursor_manager_create(NULL, 24);
|
||||
- setenv("XCURSOR_SIZE", "24", 1);
|
||||
+ cursor_mgr = wlr_xcursor_manager_create(cursortheme, cursorsize);
|
||||
+ setenv("XCURSOR_SIZE", cursorsize_str, 1);
|
||||
+ cursor_mgr = wlr_xcursor_manager_create(cursor_theme, atoi(cursor_size));
|
||||
+ setenv("XCURSOR_SIZE", cursor_size, 1);
|
||||
+ if (cursor_theme)
|
||||
+ setenv("XCURSOR_THEME", cursor_theme, 1);
|
||||
+ else
|
||||
+ unsetenv("XCURSOR_THEME");
|
||||
|
||||
/*
|
||||
* wlr_cursor *only* displays an image on screen. It does not move around
|
||||
--
|
||||
2.43.2
|
||||
2.45.1
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user