ayham
/
dwm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update dwm 2021-03-08

This commit is contained in:
altffour 2021-03-08 10:41:35 +03:00
parent 664334c378
commit cf13c510a2
No known key found for this signature in database
GPG Key ID: 976939521A14589F
5 changed files with 260 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
config.def.h
View File

@ -5,29 +5,36 @@
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 = 0; /* 0 means bottom bar */
static const unsigned int gappih = 20; /* horiz inner gap between windows */
static int topbar = 1; /* 0 means bottom bar */
static const unsigned int gappih = 10; /* horiz inner gap between windows */
static const unsigned int gappiv = 10; /* vert inner gap between windows */
static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */
static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
static int smartgaps = 0; /* 1 means no outer gap when there is only one window */
static const char *fonts[] = { "terminus:size=10" };
static const char dmenufont[] = "terminus:size=10";
//static const char *fonts[] = { "iosevka:size=9" };
//static const char dmenufont[] = "iosevka:size=9";
static const char *fonts[] = { "ProFontIIx Nerd Font:size=9" };
static const char dmenufont[] = "ProFontIIx Nerd Font:size=9";
#include "/home/dizzy/.cache/wal/colors-wal-dwm.h"
//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 col_urgborder[] = "#ff0000";
//static char *colors[][3] = {
// /* fg bg border */
// [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
// [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
// [SchemeUrg] = { selfgcolor, selbgcolor, col_urgborder },
//};
//#include "/home/dizzy/.cache/wal/colors-wal-dwm.h"
static char normbgcolor[] = "#000000";
static char normbordercolor[] = "#505050";
static char normfgcolor[] = "#FFFFFF";
static char selfgcolor[] = "#FFFFFF";
static char selbordercolor[] = "#FFFFFF";
static char selbgcolor[] = "#505050";
static char col_urgborder[] = "#ff0000";
static char col_urgfg[] = "#ff0000";
static char col_urgbg[] = "#ff0000";
static char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
[SchemeUrg] = { col_urgfg, col_urgbg, col_urgborder },
};
/* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
@ -39,12 +46,14 @@ static const Rule rules[] = {
*/
/* class instance title tags mask isfloating monitor scratch keys float x,y,w,h floatborderpx*/
{ "Gimp", NULL, NULL, 0, 1, -1, 0, 50,50,500,500, 5 },
{ "feh", NULL, NULL, 0, 1, -1, 0, 50,50,500,500, 5 },
{ "mpv", NULL, NULL, 0, 1, -1, 0, 50,50,500,500, 5 },
{ "firefox", NULL, NULL, 0, 0, -1, 0, 50,50,500,500, 5 },
{ NULL, NULL, "scratchpad", 0, 1, -1, 's', 450,450,600,500, 5 },
{ NULL, NULL, "scratchpad", 0, 1, -1, 's', 50,50,700,500, 4 },
};
/* layout(s) */
static float mfact = 0.55; /* factor of master area size [0.05..0.95] */
static float mfact = 0.50; /* 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 */
@ -92,14 +101,17 @@ static const char *termcmd[] = { "alacritty", NULL };
* Xresources preferences to load at startup
*/
ResourcePref resources[] = {
//{ "normbgcolor", STRING, &normbgcolor },
//{ "normbordercolor", STRING, &normbordercolor },
//{ "normfgcolor", STRING, &normfgcolor },
//{ "selbgcolor", STRING, &selbgcolor },
//{ "selbordercolor", STRING, &selbordercolor },
//{ "selfgcolor", STRING, &selfgcolor },
{ "borderpx", INTEGER, &borderpx },
//{ "snap", INTEGER, &snap },
{ "color0", STRING, &normbgcolor },
{ "color8", STRING, &normbordercolor },
{ "color15", STRING, &normfgcolor },
{ "color2", STRING, &selbgcolor },
{ "color15", STRING, &selbordercolor },
{ "color15", STRING, &selfgcolor },
{ "color1", STRING, &col_urgborder },
{ "color15", STRING, &col_urgfg },
{ "color1", STRING, &col_urgbg },
//{ "borderpx", INTEGER, &borderpx },
//{ "snap", INTEGER, &snap },
//{ "showbar", INTEGER, &showbar },
//{ "topbar", INTEGER, &topbar },
//{ "nmaster", INTEGER, &nmaster },
@ -117,13 +129,23 @@ static const char *scratchpadcmd[] = {"s", "alacritty", "-t", "scratchpad", NULL
static Key keys[] = {
/* modifier key function argument */
{ MODKEY, XK_u, spawn, {.v = dmenucmd } },
{ MODKEY, XK_p, spawn, SHCMD("passmenu") },
{ MODKEY, XK_p, spawn, SHCMD("dpass") },
{ MODKEY|ShiftMask, XK_d, spawn, SHCMD("flameshot gui") },
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("slock -m \"$(cowsay \"$(fortune)\")\"") },
{ MODKEY, XK_w, spawn, SHCMD("firefox") },
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("xscreensaver-command -lock") },
{ MODKEY, XK_y, spawn, SHCMD("yt -r") },
{ MODKEY, XK_n, spawn, SHCMD("dmenufm") },
{ MODKEY, XK_e, spawn, SHCMD("emojenu") },
{ MODKEY, XK_w, spawn, SHCMD("librewolf") },
{ MODKEY, XK_s, spawn, SHCMD("dmenu_tsearch") },
{ MODKEY, XK_q, spawn, SHCMD("dpower") },
{ MODKEY, XK_g, spawn, SHCMD("dman") },
{ MODKEY, XK_b, spawn, SHCMD("dbuku") },
{ MODKEY|ShiftMask, XK_u, spawn, SHCMD("upload_file") },
{ MODKEY|ControlMask, XK_w, spawn, SHCMD("change_wallpaper") },
{ MODKEY|ControlMask, XK_a, spawn, SHCMD("add_wallpaper") },
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_grave, togglescratch, {.v = scratchpadcmd } },
{ MODKEY, XK_b, togglebar, {0} },
//{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
@ -149,10 +171,10 @@ static Key keys[] = {
{ MODKEY|Mod1Mask|ShiftMask, XK_0, defaultgaps, {0} },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_t, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_f, setlayout, {.v = &layouts[13]} },
{ MODKEY, XK_m, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_n, setlayout, {.v = &layouts[3]} },
{ MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_x, setlayout, {.v = &layouts[4]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
@ -162,6 +184,8 @@ static Key keys[] = {
{ MODKEY, XK_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
{ MODKEY, XK_F4, spawn, { .v = (const char*[]){ "refresh_wallpaper", NULL } } },
{ MODKEY, XK_F5, xresources, {.v = NULL}},
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2)

2
drw.c
View File

@ -207,7 +207,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, char *clrnames[], size_t clrcount)
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
{
size_t i;
Clr *ret;

2
drw.h
View File

@ -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, char *clrnames[], size_t clrcount);
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
/* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape);

12
dwm.c
View File

@ -266,6 +266,7 @@ 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 xresources(const Arg *arg);
static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
/* variables */
@ -2412,6 +2413,13 @@ resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
}
}
static void xresources(const Arg *arg) {
load_xresources();
int i;
for (i = 0; i < LENGTH(colors); i++)
scheme[i] = drw_scm_create(drw, colors[i], 3);
}
void
load_xresources(void)
{
@ -2443,8 +2451,8 @@ main(int argc, char *argv[])
if (!(dpy = XOpenDisplay(NULL)))
die("dwm: cannot open display");
checkotherwm();
//XrmInitialize();
//load_xresources();
XrmInitialize();
load_xresources();
setup();
#ifdef __OpenBSD__
if (pledge("stdio rpath proc exec", NULL) == -1)

188
patches/011-xrdb.diff Normal file
View File

@ -0,0 +1,188 @@
diff --git a/config.def.h b/config.def.h
index 1c0b587..5db7d05 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[] = {
/* 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 };
static Key keys[] = {
@@ -84,6 +85,7 @@ static 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 8fd1ca4..e4968a0 100644
--- a/drw.c
+++ b/drw.c
@@ -207,7 +207,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 4465af1..7fa45c5 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 */
@@ -177,6 +193,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);
@@ -232,6 +249,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 */
@@ -1014,6 +1032,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)
{
@@ -2136,6 +2196,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)