mirror of
https://github.com/tiyn/dwm.git
synced 2025-10-15 20:31:18 +02:00
Compare commits
85 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
cdd41ed4aa | ||
|
e82ea595c8 | ||
27c10d4bd7 | |||
c357419eaf | |||
a4257742ce | |||
c7ff6b6a42 | |||
04ba42ca7f | |||
a12c7638d0 | |||
ca94ba21a6 | |||
4c8265265f | |||
d286e168ef | |||
b9c7e4b9a1 | |||
380d63f8fd | |||
008c92268a | |||
8fcd0666ff | |||
1dd7519235 | |||
0035d03900 | |||
1a7568c158 | |||
32e01b8179 | |||
18bc15180f | |||
c4f7ace2f4 | |||
633070875e | |||
c556f40832 | |||
b88f60d2e7 | |||
4ff8663e88 | |||
ca7a863c1a | |||
722caafce3 | |||
3d72376cef | |||
15ac6f9754 | |||
fc7eb3f7c2 | |||
1fada364c0 | |||
|
c376355cfe | ||
|
767d7e124e | ||
|
9addd105de | ||
|
1e28cca03d | ||
|
5a92ec4807 | ||
|
116548d4a1 | ||
|
fbd7aa1468 | ||
|
2ab6d4df92 | ||
|
9228d0d79f | ||
|
0da1eba5da | ||
|
8c87d02376 | ||
|
b5bb901fea | ||
|
ce8e36d874 | ||
|
8fc905a914 | ||
|
e173a53c7f | ||
|
0edb06f677 | ||
|
0e09a836d3 | ||
|
9170e1e2f2 | ||
|
a3cbe17ccf | ||
|
e94c3b8bcd | ||
|
2af267744c | ||
|
483b197eb5 | ||
|
da3b3a372c | ||
|
f0d878b8a2 | ||
|
92abb3b304 | ||
|
3807c7106d | ||
|
37fa8a2f71 | ||
|
9ea35a00a9 | ||
|
8c92c1941d | ||
|
685c69599e | ||
|
2314f013d8 | ||
|
b1d4290a00 | ||
|
90d5ce64d7 | ||
|
eb0271878b | ||
|
c98f008b1e | ||
|
c40dc12e8c | ||
|
fb9efccff1 | ||
|
08c631234c | ||
|
4c2c587c0a | ||
|
1eb5dafe1d | ||
|
643db6de4c | ||
|
d4c979c649 | ||
|
d1fb53de7d | ||
|
9e0818634f | ||
|
ed5afc2a28 | ||
|
71a8ed6bb0 | ||
|
66c73c08ab | ||
|
b7c7db8d3d | ||
|
fd23800043 | ||
|
5e34669153 | ||
|
a862f85599 | ||
|
eb34580110 | ||
|
41598088e8 | ||
|
bd524f38f4 |
76
README.md
Normal file
76
README.md
Normal file
@@ -0,0 +1,76 @@
|
||||
# dwm
|
||||
|
||||
This is my patched version of dwm. The base version is directly from
|
||||
suckless.org.
|
||||
This belongs to my larbs installation script and depends heavily on its scripts
|
||||
and programs.
|
||||
It is supposed to work in the environment after the larbs-base-installation.
|
||||
This is my patched version of dwm. The base version is directly from suckless.org.
|
||||
This repository is set up according to the
|
||||
[suckless entry of my wiki](https://github.com/tiyn/wiki/blob/master/wiki/linux/suckless.md).
|
||||
|
||||
## Patches
|
||||
|
||||
The list below shows the currently applied patches to the master branch.
|
||||
|
||||
- dwm-activetagindicatorbar-6.2.diff (show bar as window indicator)
|
||||
- dwm-actualfullscreen-20191112-cb3f58a.diff (enables true fullscreen)
|
||||
- dwm-alpha-20180613-b69c870.diff (adds transparency)
|
||||
- dwm-bottomstack-20160719-56a31dc.diff (adds bottomstack and bottomstackhorizontal layout)
|
||||
- dwm-center-6.1.diff (adds ability to center floating windows at launch)
|
||||
- dwm-cyclelayouts-20180524-6.2.diff (adds ability to cycle through layouts)
|
||||
- dwm-deck-6.0.diff (adds deck layout)
|
||||
- dwm-noborder-6.2.diff (removes border if there is only one window)
|
||||
- dwm-notitle-6.2.diff (removes window title in the middle of the bar)
|
||||
- dwm-pertag-20170513-ceac8c9.diff (allows having a layout/mwfact/barpos/nmaster per tag)
|
||||
- dwm-quitprompt-20220718-6613d9f.diff (adds a confirmation prompt before exiting dwm)
|
||||
- dwm-status2d-6.2.diff (adds colors and ability to draw rectangles)
|
||||
- dwm-statusallmons-6.2.diff (display statusbar on every monitors)
|
||||
- dwm-statuscmd-6.2.diff (enables dwmblocks compatibility)
|
||||
- dwm-systray-6.2.diff (adds a systray to statusbar)
|
||||
- dwm-zeroastag-22032023-0aea805.diff (adds a tenth tag on 0)
|
||||
|
||||
## Hotkeys
|
||||
|
||||
There are various shortcuts and hotkeys used in this version. Included in my
|
||||
build are the following.
|
||||
|
||||
| ModKey | Shift | Key | Function |
|
||||
| ------ | ----- | --- | -------- |
|
||||
| Super | | h | (Tiling/Deck) Focus window higher in stack than current |
|
||||
| Super | | j | (Tiling/Deck) Focus window lower in stack than current |
|
||||
| Super | | k | (Tiling/Deck) Focus window higher in stack than current |
|
||||
| Super | | l | (Tiling/Deck) Focus window lower in stack than current |
|
||||
| Super | | 1/2/.../9/0 | Show tag 1/2/.../9/0 |
|
||||
| Super | | . | Show monitor lower in stack |
|
||||
| Super | | , | Show monitor higher in stack |
|
||||
| Super | Shift | Escape | Quit dwm with call for confirmation |
|
||||
| Super | Shift | b | Toggle dwmbar |
|
||||
| Super | Shift | c | Enable deck(/card) layout |
|
||||
| Super | Shift | d | Toggle floating/tiled for selected window |
|
||||
| Super | Shift | f | Toggle fullscreen |
|
||||
| Super | Shift | h | (Tiling/Deck) Make current window the master window |
|
||||
| Super | Shift | j | (Tiling/Deck) Make current window the master window |
|
||||
| Super | Shift | k | (Tiling/Deck) Make current window the master window |
|
||||
| Super | Shift | m | Enable monocle layout |
|
||||
| Super | Shift | o | (Tiling/Deck) Increase master window size |
|
||||
| Super | Shift | q | Close current window |
|
||||
| Super | Shift | t | Enable tiling layout |
|
||||
| Super | Shift | u | Enable bottomstack layout |
|
||||
| Super | Shift | v | Enable bottomstackhorizontal layout |
|
||||
| Super | Shift | z | (Tiling/Deck) Decrease master window size |
|
||||
| Super | Shift | 1/2/.../9/0 | Add current window to tag 1/2/.../9/0 |
|
||||
| Super | Shift | . | Add to monitor lower in stack |
|
||||
| Super | Shift | , | Add to monitor higher in stack |
|
||||
| Alt | | Tab | (Tiling/Deck) Focus window lower in stack than current |
|
||||
|
||||
## Installation
|
||||
|
||||
The following programs are required to be installed for full functionality.
|
||||
|
||||
- [dmenu](https://github.com/tiyn/dmenu)
|
||||
|
||||
The most basic way is to clone the repository and then invoke make.
|
||||
|
||||
- `git clone https://github.com/tiyn/dwm`
|
||||
- `make clean install`
|
196
config.def.h
196
config.def.h
@@ -1,117 +1,151 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
/* for media keys */
|
||||
#include <X11/XF86keysym.h>
|
||||
|
||||
/* 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 unsigned int borderpx = 1; /* border pixel of windows */
|
||||
static const unsigned int snap = 32; /* snap pixel */
|
||||
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
||||
static const unsigned int systrayspacing = 2; /* systray spacing */
|
||||
static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
||||
static const int showsystray = 1; /* 0 means no systray */
|
||||
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 normbgcolor[] = "#0e0f14";
|
||||
static const char normbordercolor[] = "#363b47";
|
||||
static const char normfgcolor[] = "#dfdfdf";
|
||||
static const char selfgcolor[] = "#eeeeee";
|
||||
static const char selbordercolor[] = "#555a63";
|
||||
static const char selbgcolor[] = "#282828";
|
||||
static const unsigned int baralpha = 0xff;
|
||||
static const unsigned int borderalpha = OPAQUE;
|
||||
|
||||
static const char *colors[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
||||
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
||||
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
|
||||
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
|
||||
};
|
||||
|
||||
static const unsigned int alphas[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
||||
[SchemeSel] = { OPAQUE, baralpha, borderalpha },
|
||||
};
|
||||
|
||||
/* tagging */
|
||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||
static const char *tags[] = { "", "", "", "", "", "", "", "", "", "" };
|
||||
|
||||
static const Rule rules[] = {
|
||||
/* xprop(1):
|
||||
* WM_CLASS(STRING) = instance, class
|
||||
* WM_NAME(STRING) = title
|
||||
*/
|
||||
/* class instance title tags mask isfloating monitor */
|
||||
{ "Gimp", NULL, NULL, 0, 1, -1 },
|
||||
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
|
||||
/* class instance title tags center float mon */
|
||||
{ "firefox", 0, 0, 1 << 1, 0, 0, -1 },
|
||||
{ "zen", 0, 0, 1 << 1, 0, 0, -1 },
|
||||
{ "Lutris", 0, 0, 1 << 2, 0, 0, 0 },
|
||||
{ "zenity", 0, 0, 0, 0, 1, -1 },
|
||||
{ "steam", 0, 0, 1 << 2, 0, 0, 0 },
|
||||
{ "discord", 0, 0, 1 << 2, 0, 0, 1 },
|
||||
{ "TeamSpeak", 0, 0, 1 << 2, 0, 0, 1 },
|
||||
{ "Element", 0, 0, 1 << 2, 0, 0, 1 },
|
||||
{ "Signal", 0, 0, 1 << 4, 0, 0, 1 },
|
||||
{ "TelegramDesktop", 0, 0, 1 << 4, 0, 0, 1 },
|
||||
{ "threema-web", 0, 0, 1 << 4, 0, 0, 1 },
|
||||
{ "thunderbird", 0, 0, 1 << 4, 0, 0, 1 },
|
||||
{ "Sonixd", 0, 0, 1 << 8, 0, 0, 1 },
|
||||
{ "KeePassXC", 0, "Unlock Database - KeePassXC", 1 << 1, 0, 0, 0 },
|
||||
{ "KeePassXC", 0, 0, 1 << 9, 0, 0, 0 },
|
||||
{ "easyeffects", 0, 0, 1 << 9, 0, 0, 1 },
|
||||
{ "pavucontrol", 0, 0, 1 << 9, 0, 0, 1 },
|
||||
{ "Onboard", 0, 0, 0, 0, 1, 0 },
|
||||
};
|
||||
|
||||
/* layout(s) */
|
||||
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||
static const float mfact = 0.5; /* 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 const Layout layouts[] = {
|
||||
/* symbol arrange function */
|
||||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
{ "M", monocle },
|
||||
{ "T", tile }, /* first entry is default */
|
||||
{ "D", deck },
|
||||
{ "B", bstack },
|
||||
{ "B", bstackhoriz },
|
||||
{ "F", NULL }, /* no layout function means floating behavior */
|
||||
{ NULL, NULL },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
#define MODKEY Mod1Mask
|
||||
#define MODKEY Mod4Mask
|
||||
#define TAGKEYS(KEY,TAG) \
|
||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
||||
|
||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||
|
||||
/* 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 *termcmd[] = { "st", NULL };
|
||||
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY, XK_b, togglebar, {0} },
|
||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
||||
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
||||
{ MODKEY, XK_Return, zoom, {0} },
|
||||
{ MODKEY, XK_Tab, view, {0} },
|
||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY, XK_space, setlayout, {0} },
|
||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
||||
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
TAGKEYS( XK_4, 3)
|
||||
TAGKEYS( XK_5, 4)
|
||||
TAGKEYS( XK_6, 5)
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||
/* modifier key function argument */
|
||||
{ MODKEY|ShiftMask, XK_Escape, quitprompt, {0} },
|
||||
{ MODKEY|ShiftMask, XK_b, togglebar, {0} },
|
||||
{ MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[2]} },
|
||||
{ MODKEY|ShiftMask, XK_d, togglefloating, {0} },
|
||||
{ MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
|
||||
{ MODKEY, XK_h, focusstack, {.i = -1} },
|
||||
{ MODKEY|ShiftMask, XK_h, zoom, {0} },
|
||||
{ MODKEY, XK_j, focusstack, {.i = +1} },
|
||||
{ MODKEY|ShiftMask, XK_j, zoom, {0} },
|
||||
{ MODKEY, XK_k, focusstack, {.i = -1} },
|
||||
{ MODKEY|ShiftMask, XK_k, zoom, {0} },
|
||||
{ MODKEY, XK_l, focusstack, {.i = +1} },
|
||||
{ MODKEY|ShiftMask, XK_m, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY|ShiftMask, XK_o, setmfact, {.f = +0.05} },
|
||||
{ MODKEY|ShiftMask, XK_q, killclient, {0} },
|
||||
{ MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[3]} },
|
||||
{ MODKEY|ShiftMask, XK_v, setlayout, {.v = &layouts[4]} },
|
||||
{ MODKEY|ShiftMask, XK_z, setmfact, {.f = -0.05} },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0} },
|
||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0} },
|
||||
{ MODKEY, XK_comma, focusmon, {.i = -1} },
|
||||
{ MODKEY, XK_period, focusmon, {.i = +1} },
|
||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1} },
|
||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1} },
|
||||
{ Mod1Mask, XK_Tab, focusstack, {.i = +1} },
|
||||
|
||||
TAGKEYS(XK_1, 0)
|
||||
TAGKEYS(XK_2, 1)
|
||||
TAGKEYS(XK_3, 2)
|
||||
TAGKEYS(XK_4, 3)
|
||||
TAGKEYS(XK_5, 4)
|
||||
TAGKEYS(XK_6, 5)
|
||||
TAGKEYS(XK_7, 6)
|
||||
TAGKEYS(XK_8, 7)
|
||||
TAGKEYS(XK_9, 8)
|
||||
TAGKEYS(XK_0, 9)
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin, or ClkRootWin */
|
||||
static Button buttons[] = {
|
||||
/* click event mask button function argument */
|
||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||
{ ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} },
|
||||
{ ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} },
|
||||
{ ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} },
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
{ ClkTagBar, 0, Button1, view, {0} },
|
||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||
/* click event mask button function argument */
|
||||
{ ClkLtSymbol, 0, Button1, cyclelayout, {.i = +1} },
|
||||
{ ClkLtSymbol, 0, Button2, focusstack, {.i = +1} },
|
||||
{ ClkLtSymbol, 0, Button3, cyclelayout, {.i = -1} },
|
||||
{ ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} },
|
||||
{ ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} },
|
||||
{ ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} },
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
{ ClkTagBar, 0, Button1, view, {0} },
|
||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||
};
|
||||
|
||||
|
4
drw.c
4
drw.c
@@ -139,11 +139,11 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
||||
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
|
||||
* and lots more all over the internet.
|
||||
*/
|
||||
FcBool iscol;
|
||||
/*FcBool iscol;
|
||||
if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
|
||||
XftFontClose(drw->dpy, xfont);
|
||||
return NULL;
|
||||
}
|
||||
}*/
|
||||
|
||||
font = ecalloc(1, sizeof(Fnt));
|
||||
font->xfont = xfont;
|
||||
|
@@ -1,157 +0,0 @@
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 1c0b587..b67825e 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -103,7 +103,9 @@ static Button buttons[] = {
|
||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||
- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||
+ { ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1} },
|
||||
+ { ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2} },
|
||||
+ { ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3} },
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
diff --git a/dwm.c b/dwm.c
|
||||
index 4465af1..c600131 100644
|
||||
--- a/dwm.c
|
||||
+++ b/dwm.c
|
||||
@@ -156,6 +156,7 @@ static void clientmessage(XEvent *e);
|
||||
static void configure(Client *c);
|
||||
static void configurenotify(XEvent *e);
|
||||
static void configurerequest(XEvent *e);
|
||||
+static void copyvalidchars(char *text, char *rawtext);
|
||||
static Monitor *createmon(void);
|
||||
static void destroynotify(XEvent *e);
|
||||
static void detach(Client *c);
|
||||
@@ -169,6 +170,7 @@ static void focus(Client *c);
|
||||
static void focusin(XEvent *e);
|
||||
static void focusmon(const Arg *arg);
|
||||
static void focusstack(const Arg *arg);
|
||||
+static int getdwmblockspid();
|
||||
static int getrootptr(int *x, int *y);
|
||||
static long getstate(Window w);
|
||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||
@@ -205,6 +207,7 @@ static void setup(void);
|
||||
static void seturgent(Client *c, int urg);
|
||||
static void showhide(Client *c);
|
||||
static void sigchld(int unused);
|
||||
+static void sigdwmblocks(const Arg *arg);
|
||||
static void spawn(const Arg *arg);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
@@ -237,6 +240,9 @@ static void zoom(const Arg *arg);
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
static char stext[256];
|
||||
+static char rawstext[256];
|
||||
+static int dwmblockssig;
|
||||
+pid_t dwmblockspid = 0;
|
||||
static int screen;
|
||||
static int sw, sh; /* X display screen geometry width, height */
|
||||
static int bh, blw = 0; /* bar geometry */
|
||||
@@ -439,9 +445,26 @@ buttonpress(XEvent *e)
|
||||
arg.ui = 1 << i;
|
||||
} else if (ev->x < x + blw)
|
||||
click = ClkLtSymbol;
|
||||
- else if (ev->x > selmon->ww - TEXTW(stext))
|
||||
+ else if (ev->x > (x = selmon->ww - TEXTW(stext) + lrpad)) {
|
||||
click = ClkStatusText;
|
||||
- else
|
||||
+
|
||||
+ char *text = rawstext;
|
||||
+ int i = -1;
|
||||
+ char ch;
|
||||
+ dwmblockssig = 0;
|
||||
+ while (text[++i]) {
|
||||
+ if ((unsigned char)text[i] < ' ') {
|
||||
+ ch = text[i];
|
||||
+ text[i] = '\0';
|
||||
+ x += TEXTW(text) - lrpad;
|
||||
+ text[i] = ch;
|
||||
+ text += i+1;
|
||||
+ i = -1;
|
||||
+ if (x >= ev->x) break;
|
||||
+ dwmblockssig = ch;
|
||||
+ }
|
||||
+ }
|
||||
+ } else
|
||||
click = ClkWinTitle;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
focus(c);
|
||||
@@ -627,6 +650,19 @@ configurerequest(XEvent *e)
|
||||
XSync(dpy, False);
|
||||
}
|
||||
|
||||
+void
|
||||
+copyvalidchars(char *text, char *rawtext)
|
||||
+{
|
||||
+ int i = -1, j = 0;
|
||||
+
|
||||
+ while(rawtext[++i]) {
|
||||
+ if ((unsigned char)rawtext[i] >= ' ') {
|
||||
+ text[j++] = rawtext[i];
|
||||
+ }
|
||||
+ }
|
||||
+ text[j] = '\0';
|
||||
+}
|
||||
+
|
||||
Monitor *
|
||||
createmon(void)
|
||||
{
|
||||
@@ -871,6 +907,18 @@ getatomprop(Client *c, Atom prop)
|
||||
return atom;
|
||||
}
|
||||
|
||||
+int
|
||||
+getdwmblockspid()
|
||||
+{
|
||||
+ char buf[16];
|
||||
+ FILE *fp = popen("pidof -s dwmblocks", "r");
|
||||
+ fgets(buf, sizeof(buf), fp);
|
||||
+ pid_t pid = strtoul(buf, NULL, 10);
|
||||
+ pclose(fp);
|
||||
+ dwmblockspid = pid;
|
||||
+ return pid != 0 ? 0 : -1;
|
||||
+}
|
||||
+
|
||||
int
|
||||
getrootptr(int *x, int *y)
|
||||
{
|
||||
@@ -1636,6 +1684,23 @@ sigchld(int unused)
|
||||
while (0 < waitpid(-1, NULL, WNOHANG));
|
||||
}
|
||||
|
||||
+void
|
||||
+sigdwmblocks(const Arg *arg)
|
||||
+{
|
||||
+ union sigval sv;
|
||||
+ sv.sival_int = (dwmblockssig << 8) | arg->i;
|
||||
+ if (!dwmblockspid)
|
||||
+ if (getdwmblockspid() == -1)
|
||||
+ return;
|
||||
+
|
||||
+ if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) {
|
||||
+ if (errno == ESRCH) {
|
||||
+ if (!getdwmblockspid())
|
||||
+ sigqueue(dwmblockspid, SIGUSR1, sv);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void
|
||||
spawn(const Arg *arg)
|
||||
{
|
||||
@@ -1987,8 +2052,10 @@ updatesizehints(Client *c)
|
||||
void
|
||||
updatestatus(void)
|
||||
{
|
||||
- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||
+ if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
|
||||
strcpy(stext, "dwm-"VERSION);
|
||||
+ else
|
||||
+ copyvalidchars(stext, rawstext);
|
||||
drawbar(selmon);
|
||||
}
|
||||
|
73
dwm.c
73
dwm.c
@@ -156,7 +156,6 @@ static void clientmessage(XEvent *e);
|
||||
static void configure(Client *c);
|
||||
static void configurenotify(XEvent *e);
|
||||
static void configurerequest(XEvent *e);
|
||||
static void copyvalidchars(char *text, char *rawtext);
|
||||
static Monitor *createmon(void);
|
||||
static void destroynotify(XEvent *e);
|
||||
static void detach(Client *c);
|
||||
@@ -170,7 +169,6 @@ static void focus(Client *c);
|
||||
static void focusin(XEvent *e);
|
||||
static void focusmon(const Arg *arg);
|
||||
static void focusstack(const Arg *arg);
|
||||
static int getdwmblockspid();
|
||||
static int getrootptr(int *x, int *y);
|
||||
static long getstate(Window w);
|
||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||
@@ -207,7 +205,6 @@ static void setup(void);
|
||||
static void seturgent(Client *c, int urg);
|
||||
static void showhide(Client *c);
|
||||
static void sigchld(int unused);
|
||||
static void sigdwmblocks(const Arg *arg);
|
||||
static void spawn(const Arg *arg);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
@@ -240,9 +237,6 @@ static void zoom(const Arg *arg);
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
static char stext[256];
|
||||
static char rawstext[256];
|
||||
static int dwmblockssig;
|
||||
pid_t dwmblockspid = 0;
|
||||
static int screen;
|
||||
static int sw, sh; /* X display screen geometry width, height */
|
||||
static int bh, blw = 0; /* bar geometry */
|
||||
@@ -445,26 +439,9 @@ buttonpress(XEvent *e)
|
||||
arg.ui = 1 << i;
|
||||
} else if (ev->x < x + blw)
|
||||
click = ClkLtSymbol;
|
||||
else if (ev->x > (x = selmon->ww - TEXTW(stext) + lrpad)) {
|
||||
else if (ev->x > selmon->ww - TEXTW(stext))
|
||||
click = ClkStatusText;
|
||||
|
||||
char *text = rawstext;
|
||||
int i = -1;
|
||||
char ch;
|
||||
dwmblockssig = 0;
|
||||
while (text[++i]) {
|
||||
if ((unsigned char)text[i] < ' ') {
|
||||
ch = text[i];
|
||||
text[i] = '\0';
|
||||
x += TEXTW(text) - lrpad;
|
||||
text[i] = ch;
|
||||
text += i+1;
|
||||
i = -1;
|
||||
if (x >= ev->x) break;
|
||||
dwmblockssig = ch;
|
||||
}
|
||||
}
|
||||
} else
|
||||
else
|
||||
click = ClkWinTitle;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
focus(c);
|
||||
@@ -650,19 +627,6 @@ configurerequest(XEvent *e)
|
||||
XSync(dpy, False);
|
||||
}
|
||||
|
||||
void
|
||||
copyvalidchars(char *text, char *rawtext)
|
||||
{
|
||||
int i = -1, j = 0;
|
||||
|
||||
while(rawtext[++i]) {
|
||||
if ((unsigned char)rawtext[i] >= ' ') {
|
||||
text[j++] = rawtext[i];
|
||||
}
|
||||
}
|
||||
text[j] = '\0';
|
||||
}
|
||||
|
||||
Monitor *
|
||||
createmon(void)
|
||||
{
|
||||
@@ -907,18 +871,6 @@ getatomprop(Client *c, Atom prop)
|
||||
return atom;
|
||||
}
|
||||
|
||||
int
|
||||
getdwmblockspid()
|
||||
{
|
||||
char buf[16];
|
||||
FILE *fp = popen("pidof -s dwmblocks", "r");
|
||||
fgets(buf, sizeof(buf), fp);
|
||||
pid_t pid = strtoul(buf, NULL, 10);
|
||||
pclose(fp);
|
||||
dwmblockspid = pid;
|
||||
return pid != 0 ? 0 : -1;
|
||||
}
|
||||
|
||||
int
|
||||
getrootptr(int *x, int *y)
|
||||
{
|
||||
@@ -1684,23 +1636,6 @@ sigchld(int unused)
|
||||
while (0 < waitpid(-1, NULL, WNOHANG));
|
||||
}
|
||||
|
||||
void
|
||||
sigdwmblocks(const Arg *arg)
|
||||
{
|
||||
union sigval sv;
|
||||
sv.sival_int = (dwmblockssig << 8) | arg->i;
|
||||
if (!dwmblockspid)
|
||||
if (getdwmblockspid() == -1)
|
||||
return;
|
||||
|
||||
if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) {
|
||||
if (errno == ESRCH) {
|
||||
if (!getdwmblockspid())
|
||||
sigqueue(dwmblockspid, SIGUSR1, sv);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
spawn(const Arg *arg)
|
||||
{
|
||||
@@ -2052,10 +1987,8 @@ updatesizehints(Client *c)
|
||||
void
|
||||
updatestatus(void)
|
||||
{
|
||||
if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
|
||||
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||
strcpy(stext, "dwm-"VERSION);
|
||||
else
|
||||
copyvalidchars(stext, rawstext);
|
||||
drawbar(selmon);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user