diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 0000000..1903c72
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,44 @@
+_pkgname=dwm
+pkgname=$_pkgname-larbs-git
+pkgver=6.2.r1888.0ac09e0
+pkgrel=1
+pkgdesc="Luke's build of dwm"
+url=https://github.com/LukeSmithxyz/dwm
+arch=(i686 x86_64)
+license=(MIT)
+makedepends=(git)
+depends=(freetype2 libx11 libxft)
+optdepends=(
+ 'dmenu: program launcher'
+ 'st: terminal emulator')
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=(git+https://github.com/LukeSmithxyz/dwm)
+sha256sums=('SKIP')
+
+pkgver() {
+ cd "$_pkgname"
+ echo "$(awk '/^VERSION =/ {print $3}' config.mk)".r"$(git rev-list --count HEAD)"."$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+ cd "$_pkgname"
+ echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
+ echo "CFLAGS+=${CFLAGS}" >> config.mk
+ echo "LDFLAGS+=${LDFLAGS}" >> config.mk
+ # to use a custom config.h, place it in the package directory
+ if [[ -f ${SRCDEST}/config.h ]]; then
+ cp "${SRCDEST}/config.h" .
+ fi
+}
+
+build() {
+ cd "$_pkgname"
+ make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+}
+
+package() {
+ cd "$_pkgname"
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/README.md b/README.md
index 0ef557b..be40502 100644
--- a/README.md
+++ b/README.md
@@ -7,30 +7,28 @@
This is suckless, mmmbud, the source code is the documentation! Check out [config.h](config.h).
Okay, okay, actually I keep a readme in `larbs.mom` for my whole system, including the binds here.
-Press `super+F1` to view it in dwm (zathura is required for that binding).
+Press <kbd>super+F1</kbd> to view it in dwm (zathura is required for that binding).
I haven't kept `man dwm`/`dwm.1` updated though. PRs welcome on that, lol.
## Patches and features
- [Clickable statusbar](https://dwm.suckless.org/patches/statuscmd/) with my build of [dwmblocks](https://git.kusoneko.moe/Kusoneko/dwmblocks).
- Reads [xresources](https://dwm.suckless.org/patches/xresources/) colors/variables (i.e. works with `pywal`, etc.).
-- scratchpad: Accessible with mod+shift+enter.
-- New layouts: bstack, fibonacci, deck, centered master and more. All bound to keys `super+(shift+)t/y/u/i`.
-- True fullscreen (`super+f`) and prevents focus shifting.
-- Windows can be made sticky (`super+s`).
-- [stacker](https://dwm.suckless.org/patches/stacker/): Move windows up the stack manually (`super-K/J`).
-- [shiftview](https://dwm.suckless.org/patches/nextprev/): Cycle through tags (`super+g/;`).
+- scratchpad: Accessible with <kbd>mod+shift+enter</kbd>.
+- New layouts: bstack, fibonacci, deck, centered master and more. All bound to keys <kbd>super+(shift+)t/y/u/i</kbd>.
+- True fullscreen (<kbd>super+f</kbd>) and prevents focus shifting.
+- Windows can be made sticky (<kbd>super+s</kbd>).
+- [hide vacant tags](https://dwm.suckless.org/patches/hide_vacant_tags/) hides tags with no windows.
+- [stacker](https://dwm.suckless.org/patches/stacker/): Move windows up the stack manually (<kbd>super-K/J</kbd>).
+- [shiftview](https://dwm.suckless.org/patches/nextprev/): Cycle through tags (<kbd>super+g/;</kbd>).
- [vanitygaps](https://dwm.suckless.org/patches/vanitygaps/): Gaps allowed across all layouts.
- [swallow patch](https://dwm.suckless.org/patches/swallow/): if a program run from a terminal would make it inoperable, it temporarily takes its place to save space.
+
## Installation for newbs
-```
+```bash
git clone https://git.kusoneko.moe/Kusoneko/dwm
cd dwm
sudo make install
```
-
-## Please install `libxft-bgra`!
-
-This build of dwm does not block color emoji in the status/info bar, so you must add the bgra patch to libxft, which fixes a libxft color emoji rendering problem, otherwise dwm will crash upon trying to render one. Hopefully this fix will be in all libxft soon enough.
diff --git a/config.h b/config.h
index 690ff83..0a6244b 100644
--- a/config.h
+++ b/config.h
@@ -3,6 +3,7 @@
/* Constants */
#define TERMINAL "st"
#define TERMCLASS "St"
+#define BROWSER "librewolf"
/* appearance */
static unsigned int borderpx = 3; /* border pixel of windows */
@@ -136,7 +137,7 @@ static Key keys[] = {
STACKKEYS(MODKEY, focus)
STACKKEYS(MODKEY|ShiftMask, push)
/* { MODKEY|ShiftMask, XK_Escape, spawn, SHCMD("") }, */
- { MODKEY, XK_grave, spawn, SHCMD("dmenuunicode") },
+ { MODKEY, XK_grave, spawn, {.v = (const char*[]){ "dmenuunicode", NULL } } },
/* { MODKEY|ShiftMask, XK_grave, togglescratch, SHCMD("") }, */
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
@@ -153,19 +154,19 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_minus, spawn, SHCMD("pamixer --allow-boost -d 15; kill -44 $(pidof dwmblocks)") },
{ MODKEY, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 5; kill -44 $(pidof dwmblocks)") },
{ MODKEY|ShiftMask, XK_equal, spawn, SHCMD("pamixer --allow-boost -i 15; kill -44 $(pidof dwmblocks)") },
- { MODKEY, XK_BackSpace, spawn, SHCMD("sysact") },
- { MODKEY|ShiftMask, XK_BackSpace, spawn, SHCMD("sysact") },
+ { MODKEY, XK_BackSpace, spawn, {.v = (const char*[]){ "sysact", NULL } } },
+ { MODKEY|ShiftMask, XK_BackSpace, spawn, {.v = (const char*[]){ "sysact", NULL } } },
{ MODKEY, XK_Tab, view, {0} },
/* { MODKEY|ShiftMask, XK_Tab, spawn, SHCMD("") }, */
{ MODKEY, XK_q, killclient, {0} },
- { MODKEY|ShiftMask, XK_q, spawn, SHCMD("sysact") },
- { MODKEY, XK_w, spawn, SHCMD("$BROWSER") },
- { MODKEY|ShiftMask, XK_w, spawn, SHCMD(TERMINAL " -e sudo nmtui") },
+ { MODKEY|ShiftMask, XK_q, spawn, {.v = (const char*[]){ "sysact", NULL } } },
+ { MODKEY, XK_w, spawn, {.v = (const char*[]){ BROWSER, NULL } } },
+ { MODKEY|ShiftMask, XK_w, spawn, {.v = (const char*[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
{ MODKEY, XK_e, spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook") },
{ MODKEY|ShiftMask, XK_e, spawn, SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile ~/.config/abook/addressbook") },
- { MODKEY, XK_r, spawn, SHCMD(TERMINAL " -e lfub") },
- { MODKEY|ShiftMask, XK_r, spawn, SHCMD(TERMINAL " -e htop") },
+ { MODKEY, XK_r, spawn, {.v = (const char*[]){ TERMINAL, "-e", "lfub", NULL } } },
+ { MODKEY|ShiftMask, XK_r, spawn, {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } },
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, /* tile */
{ MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */
{ MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */
@@ -176,12 +177,12 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */
{ MODKEY, XK_o, incnmaster, {.i = +1 } },
{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } },
- { MODKEY, XK_p, spawn, SHCMD("mpc toggle") },
- { MODKEY|ShiftMask, XK_p, spawn, SHCMD("mpc pause ; pauseallmpv") },
- { MODKEY, XK_bracketleft, spawn, SHCMD("mpc seek -10") },
- { MODKEY|ShiftMask, XK_bracketleft, spawn, SHCMD("mpc seek -60") },
- { MODKEY, XK_bracketright, spawn, SHCMD("mpc seek +10") },
- { MODKEY|ShiftMask, XK_bracketright, spawn, SHCMD("mpc seek +60") },
+ { MODKEY, XK_p, spawn, {.v = (const char*[]){ "mpc", "toggle", NULL } } },
+ { MODKEY|ShiftMask, XK_p, spawn, SHCMD("mpc pause; pauseallmpv") },
+ { MODKEY, XK_bracketleft, spawn, {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } },
+ { MODKEY|ShiftMask, XK_bracketleft, spawn, {.v = (const char*[]){ "mpc", "seek", "-60", NULL } } },
+ { MODKEY, XK_bracketright, spawn, {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } },
+ { MODKEY|ShiftMask, XK_bracketright, spawn, {.v = (const char*[]){ "mpc", "seek", "+60", NULL } } },
{ MODKEY, XK_backslash, view, {0} },
/* { MODKEY|ShiftMask, XK_backslash, spawn, SHCMD("") }, */
@@ -189,8 +190,8 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_a, defaultgaps, {0} },
{ MODKEY, XK_s, togglesticky, {0} },
/* { MODKEY|ShiftMask, XK_s, spawn, SHCMD("") }, */
- { MODKEY, XK_d, spawn, SHCMD("dmenu_run") },
- { MODKEY|ShiftMask, XK_d, spawn, SHCMD("passmenu") },
+ { MODKEY, XK_d, spawn, {.v = (const char*[]){ "dmenu_run", NULL } } },
+ { MODKEY|ShiftMask, XK_d, spawn, {.v = (const char*[]){ "passmenu", NULL } } },
{ MODKEY, XK_f, togglefullscr, {0} },
{ MODKEY|ShiftMask, XK_f, setlayout, {.v = &layouts[8]} },
{ MODKEY, XK_g, shiftview, { .i = -1 } },
@@ -210,19 +211,19 @@ static Key keys[] = {
/* { MODKEY|ShiftMask, XK_z, spawn, SHCMD("") }, */
{ MODKEY, XK_x, incrgaps, {.i = -3 } },
/* { MODKEY|ShiftMask, XK_x, spawn, SHCMD("") }, */
- /* { MODKEY, XK_c, spawn, SHCMD("") }, */
+ { MODKEY, XK_c, spawn, {.v = (const char*[]){ TERMINAL, "-e", "profanity", NULL } } },
/* { MODKEY|ShiftMask, XK_c, spawn, SHCMD("") }, */
/* V is automatically bound above in STACKKEYS */
{ MODKEY, XK_b, togglebar, {0} },
/* { MODKEY|ShiftMask, XK_b, spawn, SHCMD("") }, */
- { MODKEY, XK_n, spawn, SHCMD(TERMINAL " -e nvim -c VimwikiIndex") },
- { MODKEY|ShiftMask, XK_n, spawn, SHCMD(TERMINAL " -e newsboat; pkill -RTMIN+6 dwmblocks") },
- { MODKEY, XK_m, spawn, SHCMD(TERMINAL " -e ncmpcpp") },
+ { MODKEY, XK_n, spawn, {.v = (const char*[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", NULL } } },
+ { MODKEY|ShiftMask, XK_n, spawn, SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+ { MODKEY, XK_m, spawn, {.v = (const char*[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
{ MODKEY|ShiftMask, XK_m, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
- { MODKEY, XK_comma, spawn, SHCMD("mpc prev") },
- { MODKEY|ShiftMask, XK_comma, spawn, SHCMD("mpc seek 0%") },
- { MODKEY, XK_period, spawn, SHCMD("mpc next") },
- { MODKEY|ShiftMask, XK_period, spawn, SHCMD("mpc repeat") },
+ { MODKEY, XK_comma, spawn, {.v = (const char*[]){ "mpc", "prev", NULL } } },
+ { MODKEY|ShiftMask, XK_comma, spawn, {.v = (const char*[]){ "mpc", "seek", "0%", NULL } } },
+ { MODKEY, XK_period, spawn, {.v = (const char*[]){ "mpc", "next", NULL } } },
+ { MODKEY|ShiftMask, XK_period, spawn, {.v = (const char*[]){ "mpc", "repeat", NULL } } },
{ MODKEY, XK_Left, focusmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_Left, tagmon, {.i = -1 } },
@@ -236,55 +237,55 @@ static Key keys[] = {
{ MODKEY, XK_Insert, spawn, SHCMD("xdotool type $(grep -v '^#' ~/.local/share/larbs/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
{ MODKEY, XK_F1, spawn, SHCMD("groff -mom /usr/local/share/dwm/larbs.mom -Tpdf | zathura -") },
- { MODKEY, XK_F2, spawn, SHCMD("tutorialvids") },
- { MODKEY, XK_F3, spawn, SHCMD("displayselect") },
+ { MODKEY, XK_F2, spawn, {.v = (const char*[]){ "tutorialvids", NULL } } },
+ { MODKEY, XK_F3, spawn, {.v = (const char*[]){ "displayselect", NULL } } },
{ MODKEY, XK_F4, spawn, SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
- /* { MODKEY, XK_F5, xrdb, {.v = NULL } }, */
- { MODKEY, XK_F6, spawn, SHCMD("torwrap") },
- { MODKEY, XK_F7, spawn, SHCMD("td-toggle") },
- { MODKEY, XK_F8, spawn, SHCMD("mw -Y") },
- { MODKEY, XK_F9, spawn, SHCMD("dmenumount") },
- { MODKEY, XK_F10, spawn, SHCMD("dmenuumount") },
+ { MODKEY, XK_F5, xrdb, {.v = NULL } },
+ { MODKEY, XK_F6, spawn, {.v = (const char*[]){ "torwrap", NULL } } },
+ { MODKEY, XK_F7, spawn, {.v = (const char*[]){ "td-toggle", NULL } } },
+ { MODKEY, XK_F8, spawn, {.v = (const char*[]){ "mw", "-Y", NULL } } },
+ { MODKEY, XK_F9, spawn, {.v = (const char*[]){ "dmenumount", NULL } } },
+ { MODKEY, XK_F10, spawn, {.v = (const char*[]){ "dmenuumount", NULL } } },
{ MODKEY, XK_F11, spawn, SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls /dev/video[0,2,4,6,8] | tail -n 1)") },
- { MODKEY, XK_F12, spawn, SHCMD("remaps & notify-send \\\"⌨️ Keyboard remapping...\\\" \\\"Re-running keyboard defaults for any newly plugged-in keyboards.\\\"") },
+ { MODKEY, XK_F12, spawn, SHCMD("remaps") },
{ MODKEY, XK_space, zoom, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ 0, XK_Print, spawn, SHCMD("maim pic-full-$(date '+%y%m%d-%H%M-%S').png") },
- { ShiftMask, XK_Print, spawn, SHCMD("maimpick") },
- { MODKEY, XK_Print, spawn, SHCMD("dmenurecord") },
- { MODKEY|ShiftMask, XK_Print, spawn, SHCMD("dmenurecord kill") },
- { MODKEY, XK_Delete, spawn, SHCMD("dmenurecord kill") },
+ { ShiftMask, XK_Print, spawn, {.v = (const char*[]){ "maimpick", NULL } } },
+ { MODKEY, XK_Print, spawn, {.v = (const char*[]){ "dmenurecord", NULL } } },
+ { MODKEY|ShiftMask, XK_Print, spawn, {.v = (const char*[]){ "dmenurecord", "kill", NULL } } },
+ { MODKEY, XK_Delete, spawn, {.v = (const char*[]){ "dmenurecord", "kill", NULL } } },
{ MODKEY, XK_Scroll_Lock, spawn, SHCMD("killall screenkey || screenkey &") },
{ 0, XF86XK_AudioMute, spawn, SHCMD("pamixer -t; kill -44 $(pidof dwmblocks)") },
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 3; kill -44 $(pidof dwmblocks)") },
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 3; kill -44 $(pidof dwmblocks)") },
- { 0, XF86XK_AudioPrev, spawn, SHCMD("mpc prev") },
- { 0, XF86XK_AudioNext, spawn, SHCMD("mpc next") },
- { 0, XF86XK_AudioPause, spawn, SHCMD("mpc pause") },
- { 0, XF86XK_AudioPlay, spawn, SHCMD("mpc play") },
- { 0, XF86XK_AudioStop, spawn, SHCMD("mpc stop") },
- { 0, XF86XK_AudioRewind, spawn, SHCMD("mpc seek -10") },
- { 0, XF86XK_AudioForward, spawn, SHCMD("mpc seek +10") },
- { 0, XF86XK_AudioMedia, spawn, SHCMD(TERMINAL " -e ncmpcpp") },
+ { 0, XF86XK_AudioPrev, spawn, {.v = (const char*[]){ "mpc", "prev", NULL } } },
+ { 0, XF86XK_AudioNext, spawn, {.v = (const char*[]){ "mpc", "next", NULL } } },
+ { 0, XF86XK_AudioPause, spawn, {.v = (const char*[]){ "mpc", "pause", NULL } } },
+ { 0, XF86XK_AudioPlay, spawn, {.v = (const char*[]){ "mpc", "play", NULL } } },
+ { 0, XF86XK_AudioStop, spawn, {.v = (const char*[]){ "mpc", "stop", NULL } } },
+ { 0, XF86XK_AudioRewind, spawn, {.v = (const char*[]){ "mpc", "seek", "-10", NULL } } },
+ { 0, XF86XK_AudioForward, spawn, {.v = (const char*[]){ "mpc", "seek", "+10", NULL } } },
+ { 0, XF86XK_AudioMedia, spawn, {.v = (const char*[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
{ 0, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
- { 0, XF86XK_PowerOff, spawn, SHCMD("sysact") },
- { 0, XF86XK_Calculator, spawn, SHCMD(TERMINAL " -e bc -l") },
- { 0, XF86XK_Sleep, spawn, SHCMD("sudo -A zzz") },
- { 0, XF86XK_WWW, spawn, SHCMD("$BROWSER") },
- { 0, XF86XK_DOS, spawn, SHCMD(TERMINAL) },
+ /* { 0, XF86XK_PowerOff, spawn, {.v = (const char*[]){ "sysact", NULL } } }, */
+ { 0, XF86XK_Calculator, spawn, {.v = (const char*[]){ TERMINAL, "-e", "bc", "-l", NULL } } },
+ { 0, XF86XK_Sleep, spawn, {.v = (const char*[]){ "sudo", "-A", "zzz", NULL } } },
+ { 0, XF86XK_WWW, spawn, {.v = (const char*[]){ BROWSER, NULL } } },
+ { 0, XF86XK_DOS, spawn, {.v = termcmd } },
{ 0, XF86XK_ScreenSaver, spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
- { 0, XF86XK_TaskPane, spawn, SHCMD(TERMINAL " -e htop") },
+ { 0, XF86XK_TaskPane, spawn, {.v = (const char*[]){ TERMINAL, "-e", "htop", NULL } } },
{ 0, XF86XK_Mail, spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
- { 0, XF86XK_MyComputer, spawn, SHCMD(TERMINAL " -e lfub /") },
+ { 0, XF86XK_MyComputer, spawn, {.v = (const char*[]){ TERMINAL, "-e", "lfub", "/", NULL } } },
/* { 0, XF86XK_Battery, spawn, SHCMD("") }, */
- { 0, XF86XK_Launch1, spawn, SHCMD("xset dpms force off") },
+ { 0, XF86XK_Launch1, spawn, {.v = (const char*[]){ "xset", "dpms", "force", "off", NULL } } },
{ 0, XF86XK_TouchpadToggle, spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
- { 0, XF86XK_TouchpadOff, spawn, SHCMD("synclient TouchpadOff=1") },
- { 0, XF86XK_TouchpadOn, spawn, SHCMD("synclient TouchpadOff=0") },
- { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("xbacklight -inc 15") },
- { 0, XF86XK_MonBrightnessDown, spawn, SHCMD("xbacklight -dec 15") },
+ { 0, XF86XK_TouchpadOff, spawn, {.v = (const char*[]){ "synclient", "TouchpadOff=1", NULL } } },
+ { 0, XF86XK_TouchpadOn, spawn, {.v = (const char*[]){ "synclient", "TouchpadOff=0", NULL } } },
+ { 0, XF86XK_MonBrightnessUp, spawn, {.v = (const char*[]){ "xbacklight", "-inc", "15", NULL } } },
+ { 0, XF86XK_MonBrightnessDown, spawn, {.v = (const char*[]){ "xbacklight", "-dec", "15", NULL } } },
/* { MODKEY|Mod4Mask, XK_h, incrgaps, {.i = +1 } }, */
/* { MODKEY|Mod4Mask, XK_l, incrgaps, {.i = -1 } }, */
diff --git a/dwm.1 b/dwm.1
index 94dbd94..b8649d9 100644
--- a/dwm.1
+++ b/dwm.1
@@ -25,15 +25,6 @@ top left corner. The tags which are applied to one or more windows are
indicated with an empty square in the top left corner.
.P
dwm draws a small border around windows to indicate the focus state.
-.P
-.I
-libxft-bgra
-should be installed for this build of dwm. Arch users may install it via the
-AUR. Color characters and emoji are enabled, but these will cause crashes
-without the fix
-.I
-libxft-bgra
-offers.
.SH OPTIONS
.TP
.B \-v
@@ -69,6 +60,14 @@ Spawn
.BR dmenu(1)
for launching other programs.
.TP
+.B Super\-grave
+Spawn
+.BR dmenuunicode(1)
+for selecting emoji.
+.TP
+.B Super\-minus/plus, Super\-Shift\-minus/plus
+Decrease/increase volume by 5 and 15 respectively.
+.TP
.B Super\-b
Toggles bar on and off.
.TP
diff --git a/dwm.c b/dwm.c
index f9eb887..7b87339 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>
#include <X11/Xresource.h>
#ifdef XINERAMA
@@ -67,6 +68,21 @@
#define SPTAG(i) ((1 << LENGTH(tags)) << (i))
#define SPTAGMASK (((1 << LENGTH(scratchpads))-1) << LENGTH(tags))
#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'; \
+ } \
+ } \
+ }
#define TRUNC(X,A,B) (MAX((A), MIN((X), (B))))
/* enums */
@@ -212,6 +228,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);
@@ -278,6 +295,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);
static void load_xresources(void);
static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
@@ -1191,6 +1209,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.color0", normbordercolor);
+ XRDB_LOAD_COLOR("dwm.color0", normbgcolor);
+ XRDB_LOAD_COLOR("dwm.color4", normfgcolor);
+ XRDB_LOAD_COLOR("dwm.color8", selbordercolor);
+ XRDB_LOAD_COLOR("dwm.color4", selbgcolor);
+ XRDB_LOAD_COLOR("dwm.color0", selfgcolor);
+ }
+ }
+ }
+
+ XCloseDisplay(display);
+}
+
+void
manage(Window w, XWindowAttributes *wa)
{
Client *c, *t = NULL, *term = NULL;
@@ -2534,6 +2583,17 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
}
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)
{
Client *c = selmon->sel;
diff --git a/larbs.mom b/larbs.mom
index a1fa49e..5015ecd 100644
--- a/larbs.mom
+++ b/larbs.mom
@@ -15,6 +15,7 @@ Pressing \f(CWs\fP will fit it to window width (\f(CWa\fP to revert).
\f(CWK\fP and \f(CWJ\fP zoom in and out.
\f(CWSuper+f\fP to toggle fullscreen.
\f(CWq\fP to quit.
+\f(CW/\fP to search for text.
(These are general binds set for \fBzathura\fP, the pdf reader.)
.LI
.ITEM
@@ -76,6 +77,9 @@ You can also right click on the module to see what it does.
.PP
The program dwmblocks is what is run to generate the statusbar from those scripts.
You can edit its config/source code in \f(CW~/.local/src/dwmblocks/\fP to tell it what scripts/commands you want it to display.
+.HEADING 3 "HiDPI and 4K Displays"
+.PP
+If you have a screen with a very high dots-per-inch, the interface, particularly the status bar at the top may be very small. To change this, you can run \f(CWxrandr --dpi 96\fP, replacing 96 with a higher number, then you can refresh the window manager in the menu at \f(CWsuper+backspace\fP. To make this change persistent after reboot, edit \f(CW~/.xprofile\fP and you will see that same command which you can change to have the dots-per-inch value you want.
.HEADING 2 "Deeper Tutorials"
.PP
Press \f(CWmod+F2\fP at any time to get a menu of programs to watch videos about streaming directly from YouTube.
@@ -130,7 +134,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
.ITEM
\f(CWMod+F\fP \(en Floating (AKA normie) mode
.ITEM
-\f(CWMod+y\fP \(en Fibbonacci spiral mode
+\f(CWMod+y\fP \(en Fibonacci spiral mode
.ITEM
\f(CWMod+Y\fP \(en Dwindle mode (similar to Fibonacci)
.ITEM
@@ -157,7 +161,7 @@ To type capital letters, hold down the \f(CWShift\fP key\(emthat might sound lik
.ITEM
\f(CWMod+m\fP \(en ncmpcpp (music player)
.ITEM
-\f(CWMod+w\fP \(en Web browser (Brave by default)
+\f(CWMod+w\fP \(en Web browser (LibreWolf by default)
.ITEM
\f(CWMod+W\fP \(en nmtui (for connecting to wireless internet)
.ITEM
@@ -217,7 +221,7 @@ There are nine tags, active tags are highlighted in the top left.
.ITEM
\f(CWMod+F11\fP \(en View webcam
.ITEM
-\f(CWMod+F12\fP \(en Rerun kayboard mapping scripts if new keyboard is attached
+\f(CWMod+F12\fP \(en Rerun keyboard mapping scripts if new keyboard is attached
.ITEM
\f(CWMod+`\fP \(en Select an emoji to copy to clipboard
.ITEM
@@ -306,7 +310,7 @@ In the Linux terminal, those binds have other more important purposes, so you ca
Additionally, I've set vim to use the clipboard as the default buffer, which means when you yank or delete something in vim, it will be in your system clipboard as well, so you can \f(CWctrl-v\fP it into your browser instance, etc. You can also paste material copied from other programs into vim with the typical vim bindings.
.HEADING 2 "How do I change the background/wallpaper?"
.PP
-The system will always read the file \f(CW~/.config/wall.png\fP as the wallpaper.
+The system will always read the file \f(CW~/.local/share/bg\fP as the wallpaper.
The script \f(CWsetbg\fP, if run on an image will set it as the persistent background.
When using the file manager, you can simply hover over an image name and type \f(CWb\fP and this will run \f(CWsetbg\fP.
.HEADING 2 "How I change the colorscheme?"
@@ -323,7 +327,7 @@ See \f(CWman mw\fP for all the information you need about mutt-wizard.
Once you have successfully added your email address(es), you can open your mail with \f(CWneomutt\fP which is also bound to \f(CWMod+e\fP.
You can sync your mail by pressing \f(CWMod+F8\fP and you can set a cronjob to sync mail every 10 minutes by running \f(CWmw -t 10\fP.
.PP
-You may also want to install \f(CWpam-gnupg-git\fP, which can be set up to automatically unlock your GPG key on login, which will allow you avoid having put in a password to sync and send, all while keeping your password safe and encypted on your machine.
+You may also want to install \f(CWpam-gnupg-git\fP, which can be set up to automatically unlock your GPG key on login, which will allow you avoid having put in a password to sync and send, all while keeping your password safe and encrypted on your machine.
.HEADING 2 "How do I set up my music?"
.PP
By default, mpd, the music daemon assumes that \f(CW~/Music\fP is your music directory.
diff --git a/shiftview.c b/shiftview.c
index 3d2706b..bb43969 100644
--- a/shiftview.c
+++ b/shiftview.c
@@ -46,7 +46,7 @@ shifttag(const Arg *arg)
nextseltags = (curseltags << i) | (curseltags >> (LENGTH(tags) - i));
else // right circular shift
- nextseltags = curseltags >> (- i) | (curseltags << (LENGTH(tags) + i));
+ nextseltags = (curseltags >> - i) | (curseltags << (LENGTH(tags) + i));
// Check if tag is visible
for (c = selmon->clients; c && !visible; c = c->next)
@@ -62,3 +62,4 @@ shifttag(const Arg *arg)
tag(&a);
}
}
+
|
