commit e38f606c3fa496bb4cbab216c2c6d658116c766a
parent a95db6a49706d70fa77127dbd7c5dcdee25b92d5
Author: grouse <bdmfegys@duck.com>
Date: Mon, 27 Nov 2023 18:22:40 -0500
removed patches folder from repository
Diffstat:
2 files changed, 0 insertions(+), 443 deletions(-)
diff --git a/patches/dwm-xrdb-6.4.diff b/patches/dwm-xrdb-6.4.diff
@@ -1,203 +0,0 @@
-From e7c65d2ce902a19a20daa751b42f8ba0209fdb61 Mon Sep 17 00:00:00 2001
-From: NekoCWD <nekodevelopper@gmail.com>
-Date: Sun, 22 Jan 2023 23:42:57 +0300
-Subject: [PATCH] [dwm] xrdb update 6.4
-
----
- config.def.h | 22 ++++++++++---------
- drw.c | 2 +-
- drw.h | 2 +-
- dwm.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 76 insertions(+), 12 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 061ad66..686b947 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -7,15 +7,16 @@ static const int showbar = 1; /* 0 means no bar */
- static const int topbar = 1; /* 0 means bottom bar */
- static const char *fonts[] = { "monospace:size=10" };
- static const char dmenufont[] = "monospace:size=10";
--static const char col_gray1[] = "#222222";
--static const char col_gray2[] = "#444444";
--static const char col_gray3[] = "#bbbbbb";
--static const char col_gray4[] = "#eeeeee";
--static const char col_cyan[] = "#005577";
--static const char *colors[][3] = {
-- /* fg bg border */
-- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
-+static char normbgcolor[] = "#222222";
-+static char normbordercolor[] = "#444444";
-+static char normfgcolor[] = "#bbbbbb";
-+static char selfgcolor[] = "#eeeeee";
-+static char selbordercolor[] = "#005577";
-+static char selbgcolor[] = "#005577";
-+static char *colors[][3] = {
-+ /* fg bg border */
-+ [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
-+ [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
- };
-
- /* tagging */
-@@ -56,7 +57,7 @@ static const Layout layouts[] = {
- #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
- /* commands */
--static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-+static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
- static const char *termcmd[] = { "st", NULL };
-
- static const Key keys[] = {
-@@ -84,6 +85,7 @@ static const Key keys[] = {
- { MODKEY, XK_period, focusmon, {.i = +1 } },
- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
-+ { MODKEY, XK_F5, xrdb, {.v = NULL } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
-diff --git a/drw.c b/drw.c
-index a58a2b4..f8a82f5 100644
---- a/drw.c
-+++ b/drw.c
-@@ -195,7 +195,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
- /* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
- Clr *
--drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-+drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount)
- {
- size_t i;
- Clr *ret;
-diff --git a/drw.h b/drw.h
-index 6471431..bdbf950 100644
---- a/drw.h
-+++ b/drw.h
-@@ -40,7 +40,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
-
- /* Colorscheme abstraction */
- void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
--Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-+Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount);
-
- /* Cursor abstraction */
- Cur *drw_cur_create(Drw *drw, int shape);
-diff --git a/dwm.c b/dwm.c
-index e5efb6a..3fe76be 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -35,6 +35,7 @@
- #include <X11/Xatom.h>
- #include <X11/Xlib.h>
- #include <X11/Xproto.h>
-+#include <X11/Xresource.h>
- #include <X11/Xutil.h>
- #ifdef XINERAMA
- #include <X11/extensions/Xinerama.h>
-@@ -56,6 +57,21 @@
- #define HEIGHT(X) ((X)->h + 2 * (X)->bw)
- #define TAGMASK ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
-+#define XRDB_LOAD_COLOR(R,V) if (XrmGetResource(xrdb, R, NULL, &type, &value) == True) { \
-+ if (value.addr != NULL && strnlen(value.addr, 8) == 7 && value.addr[0] == '#') { \
-+ int i = 1; \
-+ for (; i <= 6; i++) { \
-+ if (value.addr[i] < 48) break; \
-+ if (value.addr[i] > 57 && value.addr[i] < 65) break; \
-+ if (value.addr[i] > 70 && value.addr[i] < 97) break; \
-+ if (value.addr[i] > 102) break; \
-+ } \
-+ if (i == 7) { \
-+ strncpy(V, value.addr, 7); \
-+ V[7] = '\0'; \
-+ } \
-+ } \
-+ }
-
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-@@ -178,6 +194,7 @@ static void grabkeys(void);
- static void incnmaster(const Arg *arg);
- static void keypress(XEvent *e);
- static void killclient(const Arg *arg);
-+static void loadxrdb(void);
- static void manage(Window w, XWindowAttributes *wa);
- static void mappingnotify(XEvent *e);
- static void maprequest(XEvent *e);
-@@ -233,6 +250,7 @@ static Monitor *wintomon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
-+static void xrdb(const Arg *arg);
- static void zoom(const Arg *arg);
-
- /* variables */
-@@ -1019,6 +1037,37 @@ killclient(const Arg *arg)
- }
- }
-
-+void
-+loadxrdb()
-+{
-+ Display *display;
-+ char * resm;
-+ XrmDatabase xrdb;
-+ char *type;
-+ XrmValue value;
-+
-+ display = XOpenDisplay(NULL);
-+
-+ if (display != NULL) {
-+ resm = XResourceManagerString(display);
-+
-+ if (resm != NULL) {
-+ xrdb = XrmGetStringDatabase(resm);
-+
-+ if (xrdb != NULL) {
-+ XRDB_LOAD_COLOR("dwm.normbordercolor", normbordercolor);
-+ XRDB_LOAD_COLOR("dwm.normbgcolor", normbgcolor);
-+ XRDB_LOAD_COLOR("dwm.normfgcolor", normfgcolor);
-+ XRDB_LOAD_COLOR("dwm.selbordercolor", selbordercolor);
-+ XRDB_LOAD_COLOR("dwm.selbgcolor", selbgcolor);
-+ XRDB_LOAD_COLOR("dwm.selfgcolor", selfgcolor);
-+ }
-+ }
-+ }
-+
-+ XCloseDisplay(display);
-+}
-+
- void
- manage(Window w, XWindowAttributes *wa)
- {
-@@ -2110,6 +2159,17 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
- return -1;
- }
-
-+void
-+xrdb(const Arg *arg)
-+{
-+ loadxrdb();
-+ int i;
-+ for (i = 0; i < LENGTH(colors); i++)
-+ scheme[i] = drw_scm_create(drw, colors[i], 3);
-+ focus(NULL);
-+ arrange(NULL);
-+}
-+
- void
- zoom(const Arg *arg)
- {
-@@ -2134,6 +2194,8 @@ main(int argc, char *argv[])
- if (!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display");
- checkotherwm();
-+ XrmInitialize();
-+ loadxrdb();
- setup();
- #ifdef __OpenBSD__
- if (pledge("stdio rpath proc exec", NULL) == -1)
---
-2.38.2
-
diff --git a/patches/dwm-xresources-20210827-138b405.diff b/patches/dwm-xresources-20210827-138b405.diff
@@ -1,240 +0,0 @@
-From f30583c6e2ab5e7de6ef4ebf156076ac0f6e69fc Mon Sep 17 00:00:00 2001
-From: Jack Bird <jack.bird@durham.ac.uk>
-Date: Fri, 27 Aug 2021 00:53:14 +0100
-Subject: [PATCH] xresources updated for 138b405
-
----
- config.def.h | 61 ++++++++++++++++++++++++++++++--------------
- drw.c | 2 +-
- drw.h | 2 +-
- dwm.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 116 insertions(+), 21 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..87ac198 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -1,21 +1,23 @@
- /* See LICENSE file for copyright and license details. */
-
- /* appearance */
--static const unsigned int borderpx = 1; /* border pixel of windows */
--static const unsigned int snap = 32; /* snap pixel */
--static const int showbar = 1; /* 0 means no bar */
--static const int topbar = 1; /* 0 means bottom bar */
--static const char *fonts[] = { "monospace:size=10" };
--static const char dmenufont[] = "monospace:size=10";
--static const char col_gray1[] = "#222222";
--static const char col_gray2[] = "#444444";
--static const char col_gray3[] = "#bbbbbb";
--static const char col_gray4[] = "#eeeeee";
--static const char col_cyan[] = "#005577";
--static const char *colors[][3] = {
-- /* fg bg border */
-- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
-+static unsigned int borderpx = 1; /* border pixel of windows */
-+static unsigned int snap = 32; /* snap pixel */
-+static int showbar = 1; /* 0 means no bar */
-+static int topbar = 1; /* 0 means bottom bar */
-+static char font[] = "monospace:size=10";
-+static char dmenufont[] = "monospace:size=10";
-+static const char *fonts[] = { font };
-+static char normbgcolor[] = "#222222";
-+static char normbordercolor[] = "#444444";
-+static char normfgcolor[] = "#bbbbbb";
-+static char selfgcolor[] = "#eeeeee";
-+static char selbordercolor[] = "#005577";
-+static char selbgcolor[] = "#005577";
-+static char *colors[][3] = {
-+ /* fg bg border */
-+ [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
-+ [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
- };
-
- /* tagging */
-@@ -32,9 +34,9 @@ static const Rule rules[] = {
- };
-
- /* layout(s) */
--static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
--static const int nmaster = 1; /* number of clients in master area */
--static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
-+static float mfact = 0.55; /* factor of master area size [0.05..0.95] */
-+static int nmaster = 1; /* number of clients in master area */
-+static int resizehints = 1; /* 1 means respect size hints in tiled resizals */
- static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
- static const Layout layouts[] = {
-@@ -57,9 +59,30 @@ static const Layout layouts[] = {
-
- /* commands */
- static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
--static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
- static const char *termcmd[] = { "st", NULL };
-
-+/*
-+ * Xresources preferences to load at startup
-+ */
-+ResourcePref resources[] = {
-+ { "font", STRING, &font },
-+ { "dmenufont", STRING, &dmenufont },
-+ { "normbgcolor", STRING, &normbgcolor },
-+ { "normbordercolor", STRING, &normbordercolor },
-+ { "normfgcolor", STRING, &normfgcolor },
-+ { "selbgcolor", STRING, &selbgcolor },
-+ { "selbordercolor", STRING, &selbordercolor },
-+ { "selfgcolor", STRING, &selfgcolor },
-+ { "borderpx", INTEGER, &borderpx },
-+ { "snap", INTEGER, &snap },
-+ { "showbar", INTEGER, &showbar },
-+ { "topbar", INTEGER, &topbar },
-+ { "nmaster", INTEGER, &nmaster },
-+ { "resizehints", INTEGER, &resizehints },
-+ { "mfact", FLOAT, &mfact },
-+};
-+
- static Key keys[] = {
- /* modifier key function argument */
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
-diff --git a/drw.c b/drw.c
-index 4cdbcbe..8f1059e 100644
---- a/drw.c
-+++ b/drw.c
-@@ -208,7 +208,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
- /* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
- Clr *
--drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-+drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount)
- {
- size_t i;
- Clr *ret;
-diff --git a/drw.h b/drw.h
-index 4bcd5ad..42b04ce 100644
---- a/drw.h
-+++ b/drw.h
-@@ -39,7 +39,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
-
- /* Colorscheme abstraction */
- void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
--Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-+Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount);
-
- /* Cursor abstraction */
- Cur *drw_cur_create(Drw *drw, int shape);
-diff --git a/dwm.c b/dwm.c
-index 5e4d494..2214b19 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -36,6 +36,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xproto.h>
- #include <X11/Xutil.h>
-+#include <X11/Xresource.h>
- #ifdef XINERAMA
- #include <X11/extensions/Xinerama.h>
- #endif /* XINERAMA */
-@@ -141,6 +142,19 @@ typedef struct {
- int monitor;
- } Rule;
-
-+/* Xresources preferences */
-+enum resource_type {
-+ STRING = 0,
-+ INTEGER = 1,
-+ FLOAT = 2
-+};
-+
-+typedef struct {
-+ char *name;
-+ enum resource_type type;
-+ void *dst;
-+} ResourcePref;
-+
- /* function declarations */
- static void applyrules(Client *c);
- static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-@@ -234,6 +248,8 @@ static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
- static void zoom(const Arg *arg);
-+static void load_xresources(void);
-+static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
-
- /* variables */
- static const char broken[] = "broken";
-@@ -2127,6 +2143,60 @@ zoom(const Arg *arg)
- pop(c);
- }
-
-+void
-+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
-+{
-+ char *sdst = NULL;
-+ int *idst = NULL;
-+ float *fdst = NULL;
-+
-+ sdst = dst;
-+ idst = dst;
-+ fdst = dst;
-+
-+ char fullname[256];
-+ char *type;
-+ XrmValue ret;
-+
-+ snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name);
-+ fullname[sizeof(fullname) - 1] = '\0';
-+
-+ XrmGetResource(db, fullname, "*", &type, &ret);
-+ if (!(ret.addr == NULL || strncmp("String", type, 64)))
-+ {
-+ switch (rtype) {
-+ case STRING:
-+ strcpy(sdst, ret.addr);
-+ break;
-+ case INTEGER:
-+ *idst = strtoul(ret.addr, NULL, 10);
-+ break;
-+ case FLOAT:
-+ *fdst = strtof(ret.addr, NULL);
-+ break;
-+ }
-+ }
-+}
-+
-+void
-+load_xresources(void)
-+{
-+ Display *display;
-+ char *resm;
-+ XrmDatabase db;
-+ ResourcePref *p;
-+
-+ display = XOpenDisplay(NULL);
-+ resm = XResourceManagerString(display);
-+ if (!resm)
-+ return;
-+
-+ db = XrmGetStringDatabase(resm);
-+ for (p = resources; p < resources + LENGTH(resources); p++)
-+ resource_load(db, p->name, p->type, p->dst);
-+ XCloseDisplay(display);
-+}
-+
- int
- main(int argc, char *argv[])
- {
-@@ -2139,6 +2209,8 @@ main(int argc, char *argv[])
- if (!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display");
- checkotherwm();
-+ XrmInitialize();
-+ load_xresources();
- setup();
- #ifdef __OpenBSD__
- if (pledge("stdio rpath proc exec", NULL) == -1)
---
-2.33.0
-
