mirror of
https://github.com/tiyn/dwm.git
synced 2025-10-19 14:21:19 +02:00
Compare commits
33 Commits
f8d402ce8d
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
f58d147e39 | ||
|
35271b171c | ||
2d72ffe932 | |||
7458dff00f | |||
76e7f12b7d | |||
2b6678b993 | |||
3b66ee89b0 | |||
00aaef36c5 | |||
06edec0e26 | |||
d7971a2924 | |||
22b482d2c9 | |||
5fb1ba1806 | |||
09cd0a6931 | |||
58c2988f12 | |||
6255476d24 | |||
dd78bfd8a9 | |||
a46043c632 | |||
81d1901820 | |||
cdacc63d2c | |||
e38f510fc7 | |||
914f84af4d | |||
299cb5e508 | |||
002df98ae2 | |||
19a055a06e | |||
9026191666 | |||
47c3b32cab | |||
227f42d6ca | |||
95c85e8ae6 | |||
b5e01d916b | |||
004afb329b | |||
cd9ac60b08 | |||
d4829e7085 | |||
6901b39847 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
||||
*.o
|
||||
dwm
|
||||
config.h
|
||||
|
24
README.md
24
README.md
@@ -18,13 +18,17 @@ The list below shows the currently applied patches to the master branch.
|
||||
- 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
|
||||
|
||||
@@ -37,11 +41,10 @@ build are the following.
|
||||
| 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 | | 0 | Show all tags |
|
||||
| Super | | 1/2/.../9 | Show tag 1/2/.../9 |
|
||||
| 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 |
|
||||
| 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 |
|
||||
@@ -56,7 +59,18 @@ build are the following.
|
||||
| Super | Shift | u | Enable bottomstack layout |
|
||||
| Super | Shift | v | Enable bottomstackhorizontal layout |
|
||||
| Super | Shift | z | (Tiling/Deck) Decrease master window size |
|
||||
| Super | Shift | 0 | Add current window to all tag |
|
||||
| Super | Shift | 1/2/.../9 | Add current window to tag 1/2/.../9 |
|
||||
| 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`
|
||||
|
174
config.def.h
174
config.def.h
@@ -4,29 +4,30 @@
|
||||
#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 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 dmenufont[] = "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 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] = { normfgcolor, normbgcolor, normbordercolor },
|
||||
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
|
||||
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
|
||||
};
|
||||
|
||||
static const unsigned int alphas[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
||||
@@ -34,15 +35,32 @@ static const unsigned int alphas[][3] = {
|
||||
};
|
||||
|
||||
/* tagging */
|
||||
static const char *tags[] = { "", "", "", "", "", "", "", "", "" };
|
||||
static const char *tags[] = { "", "", "", "", "", "", "", "", "", "" };
|
||||
|
||||
static const Rule rules[] = {
|
||||
/* xprop(1):
|
||||
* WM_CLASS(STRING) = instance, class
|
||||
* WM_NAME(STRING) = title
|
||||
*/
|
||||
/* class instance title tags mask iscentered isfloating monitor */
|
||||
{ NULL, "origin.exe", NULL, 0, 0, 1, -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) */
|
||||
@@ -58,78 +76,76 @@ static const Layout layouts[] = {
|
||||
{ "B", bstack },
|
||||
{ "B", bstackhoriz },
|
||||
{ "F", NULL }, /* no layout function means floating behavior */
|
||||
{ NULL, NULL },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
#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", "-c", "-l", "20", NULL };
|
||||
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY|ShiftMask, XK_Escape, quit, {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 } },
|
||||
//{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = +1 } },
|
||||
//{ MODKEY|ShiftMask, XK_z, incnmaster, {.i = -1 } },
|
||||
//{ MODKEY, XK_space, setlayout, {0} },
|
||||
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)
|
||||
/* 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, {.v = 0 } },
|
||||
{ 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} },
|
||||
};
|
||||
|
135
config.h
135
config.h
@@ -1,135 +0,0 @@
|
||||
/* 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 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 dmenufont[] = "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] = { 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[] = { "", "", "", "", "", "", "", "", "" };
|
||||
|
||||
static const Rule rules[] = {
|
||||
/* xprop(1):
|
||||
* WM_CLASS(STRING) = instance, class
|
||||
* WM_NAME(STRING) = title
|
||||
*/
|
||||
/* class instance title tags mask iscentered isfloating monitor */
|
||||
{ NULL, "origin.exe", NULL, 0, 0, 1, -1 },
|
||||
};
|
||||
|
||||
/* layout(s) */
|
||||
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 */
|
||||
{ "M", monocle },
|
||||
{ "T", tile }, /* first entry is default */
|
||||
{ "D", deck },
|
||||
{ "B", bstack },
|
||||
{ "B", bstackhoriz },
|
||||
{ "F", NULL }, /* no layout function means floating behavior */
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
#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} },
|
||||
|
||||
/* 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", "-c", "-l", "20", NULL };
|
||||
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY|ShiftMask, XK_Escape, quit, {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 } },
|
||||
//{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = +1 } },
|
||||
//{ MODKEY|ShiftMask, XK_z, incnmaster, {.i = -1 } },
|
||||
//{ MODKEY, XK_space, setlayout, {0} },
|
||||
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)
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||
static Button buttons[] = {
|
||||
/* click event mask button function argument */
|
||||
{ ClkLtSymbol, 0, Button1, setlayout, {.v = 0 } },
|
||||
{ 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} },
|
||||
};
|
93
dwm-cyclelayouts-20180524-6.2.diff
Normal file
93
dwm-cyclelayouts-20180524-6.2.diff
Normal file
@@ -0,0 +1,93 @@
|
||||
From a09e766a4342f580582082a92b2de65f33208eb4 Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Drelich <cd@cdrakka.com>
|
||||
Date: Thu, 24 May 2018 00:56:56 -0400
|
||||
Subject: [PATCH] Function to cycle through available layouts.
|
||||
|
||||
MOD-CTRL-, and MOD-CTRL-.
|
||||
cycle backwards and forwards through available layouts.
|
||||
Probably only useful if you have a lot of additional layouts.
|
||||
The NULL, NULL layout should always be the last layout in your list,
|
||||
in order to guarantee consistent behavior.
|
||||
---
|
||||
config.def.h | 3 +++
|
||||
dwm.1 | 6 ++++++
|
||||
dwm.c | 18 ++++++++++++++++++
|
||||
3 files changed, 27 insertions(+)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index a9ac303..153b880 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -41,6 +41,7 @@ static const Layout layouts[] = {
|
||||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
+ { NULL, NULL },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
@@ -76,6 +77,8 @@ static Key keys[] = {
|
||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||
+ { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } },
|
||||
+ { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } },
|
||||
{ MODKEY, XK_space, setlayout, {0} },
|
||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
diff --git a/dwm.1 b/dwm.1
|
||||
index 13b3729..165891b 100644
|
||||
--- a/dwm.1
|
||||
+++ b/dwm.1
|
||||
@@ -92,6 +92,12 @@ Sets monocle layout.
|
||||
.B Mod1\-space
|
||||
Toggles between current and previous layout.
|
||||
.TP
|
||||
+.B Mod1\-Control\-,
|
||||
+Cycles backwards in layout list.
|
||||
+.TP
|
||||
+.B Mod1\-Control\-.
|
||||
+Cycles forwards in layout list.
|
||||
+.TP
|
||||
.B Mod1\-j
|
||||
Focus next window.
|
||||
.TP
|
||||
diff --git a/dwm.c b/dwm.c
|
||||
index bb95e26..db73000 100644
|
||||
--- a/dwm.c
|
||||
+++ b/dwm.c
|
||||
@@ -157,6 +157,7 @@ static void configure(Client *c);
|
||||
static void configurenotify(XEvent *e);
|
||||
static void configurerequest(XEvent *e);
|
||||
static Monitor *createmon(void);
|
||||
+static void cyclelayout(const Arg *arg);
|
||||
static void destroynotify(XEvent *e);
|
||||
static void detach(Client *c);
|
||||
static void detachstack(Client *c);
|
||||
@@ -645,6 +646,23 @@ createmon(void)
|
||||
}
|
||||
|
||||
void
|
||||
+cyclelayout(const Arg *arg) {
|
||||
+ Layout *l;
|
||||
+ for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++);
|
||||
+ if(arg->i > 0) {
|
||||
+ if(l->symbol && (l + 1)->symbol)
|
||||
+ setlayout(&((Arg) { .v = (l + 1) }));
|
||||
+ else
|
||||
+ setlayout(&((Arg) { .v = layouts }));
|
||||
+ } else {
|
||||
+ if(l != layouts && (l - 1)->symbol)
|
||||
+ setlayout(&((Arg) { .v = (l - 1) }));
|
||||
+ else
|
||||
+ setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] }));
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
destroynotify(XEvent *e)
|
||||
{
|
||||
Client *c;
|
||||
--
|
||||
2.7.4
|
||||
|
81
dwm-notitle-6.2.diff
Normal file
81
dwm-notitle-6.2.diff
Normal file
@@ -0,0 +1,81 @@
|
||||
From 969dbbc548f16da5d94630e3d54e9c96c5296520 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan Kes <alrayyes@gmail.com>
|
||||
Date: Thu, 28 Mar 2019 14:36:07 +0100
|
||||
Subject: [PATCH] dwm-notitle-6.2
|
||||
|
||||
---
|
||||
config.def.h | 1 -
|
||||
dwm.c | 20 ++++----------------
|
||||
2 files changed, 4 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 1c0b587..19330cd 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -102,7 +102,6 @@ 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, Button2, spawn, {.v = termcmd } },
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
diff --git a/dwm.c b/dwm.c
|
||||
index 4465af1..bcf5cb1 100644
|
||||
--- a/dwm.c
|
||||
+++ b/dwm.c
|
||||
@@ -64,8 +64,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||
- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin,
|
||||
+ ClkRootWin, ClkLast }; /* clicks */
|
||||
|
||||
typedef union {
|
||||
int i;
|
||||
@@ -439,10 +439,8 @@ buttonpress(XEvent *e)
|
||||
arg.ui = 1 << i;
|
||||
} else if (ev->x < x + blw)
|
||||
click = ClkLtSymbol;
|
||||
- else if (ev->x > selmon->ww - TEXTW(stext))
|
||||
- click = ClkStatusText;
|
||||
else
|
||||
- click = ClkWinTitle;
|
||||
+ click = ClkStatusText;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
focus(c);
|
||||
restack(selmon);
|
||||
@@ -729,15 +727,8 @@ drawbar(Monitor *m)
|
||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||
|
||||
if ((w = m->ww - sw - x) > bh) {
|
||||
- if (m->sel) {
|
||||
- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||
- if (m->sel->isfloating)
|
||||
- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
||||
- } else {
|
||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||
- }
|
||||
}
|
||||
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||
}
|
||||
@@ -1235,11 +1226,8 @@ propertynotify(XEvent *e)
|
||||
drawbars();
|
||||
break;
|
||||
}
|
||||
- if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
|
||||
+ if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
|
||||
updatetitle(c);
|
||||
- if (c == c->mon->sel)
|
||||
- drawbar(c->mon);
|
||||
- }
|
||||
if (ev->atom == netatom[NetWMWindowType])
|
||||
updatewindowtype(c);
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
92
dwm-quitprompt-20220718-6613d9f.diff
Normal file
92
dwm-quitprompt-20220718-6613d9f.diff
Normal file
@@ -0,0 +1,92 @@
|
||||
From eb558048819ed916b272765e64e1ea795a85740e Mon Sep 17 00:00:00 2001
|
||||
From: Lerrrtaste <lerrrtaste@protonmail.com>
|
||||
Date: Mon, 18 Jul 2022 12:22:39 +0200
|
||||
Subject: [PATCH] This Patch replaces the default quit behavior with an dmenu
|
||||
prompt. Possible selections are (Quit DWM?) "yes", "no" and "restart". The
|
||||
additional confirmation can save your work from accidentally hitting the quit
|
||||
key by requiring two additional keystrokes (y/yes and RET). Additionally it
|
||||
allows for restarting / reloading dwm without ending the xsession and closing
|
||||
all open x windows. To abort press ESC or n/no and RET.
|
||||
|
||||
---
|
||||
config.def.h | 2 +-
|
||||
dwm.c | 30 ++++++++++++++++++++++++++++++
|
||||
2 files changed, 31 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index a2ac963..9e3b394 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -94,7 +94,7 @@ static Key keys[] = {
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
- { MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||
+ { MODKEY|ShiftMask, XK_q, quitprompt, {0} },
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
diff --git a/dwm.c b/dwm.c
|
||||
index 7c0f978..3761ba4 100644
|
||||
--- a/dwm.c
|
||||
+++ b/dwm.c
|
||||
@@ -188,6 +188,7 @@ static Client *nexttiled(Client *c);
|
||||
static void pop(Client *c);
|
||||
static void propertynotify(XEvent *e);
|
||||
static void quit(const Arg *arg);
|
||||
+static void quitprompt(const Arg *arg);
|
||||
static Monitor *recttomon(int x, int y, int w, int h);
|
||||
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||
static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||
@@ -262,6 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
||||
};
|
||||
static Atom wmatom[WMLast], netatom[NetLast];
|
||||
static int running = 1;
|
||||
+static int restart = 1;
|
||||
static Cur *cursor[CurLast];
|
||||
static Clr **scheme;
|
||||
static Display *dpy;
|
||||
@@ -1258,6 +1260,31 @@ quit(const Arg *arg)
|
||||
running = 0;
|
||||
}
|
||||
|
||||
+void
|
||||
+quitprompt(const Arg *arg)
|
||||
+{
|
||||
+ FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
|
||||
+ if(pp != NULL) {
|
||||
+ char buf[1024];
|
||||
+ if (fgets(buf, sizeof(buf), pp) == NULL) {
|
||||
+ fprintf(stderr, "Quitprompt: Error reading pipe!\n");
|
||||
+ return;
|
||||
+ }
|
||||
+ if (strcmp(buf, "yes\n") == 0) {
|
||||
+ pclose(pp);
|
||||
+ restart = 0;
|
||||
+ quit(NULL);
|
||||
+ } else if (strcmp(buf, "restart\n") == 0) {
|
||||
+ pclose(pp);
|
||||
+ restart = 1;
|
||||
+ quit(NULL);
|
||||
+ } else if (strcmp(buf, "no\n") == 0) {
|
||||
+ pclose(pp);
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
Monitor *
|
||||
recttomon(int x, int y, int w, int h)
|
||||
{
|
||||
@@ -2155,5 +2182,8 @@ main(int argc, char *argv[])
|
||||
run();
|
||||
cleanup();
|
||||
XCloseDisplay(dpy);
|
||||
+ if (restart == 1) {
|
||||
+ execlp("dwm", "dwm", NULL);
|
||||
+ }
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
--
|
||||
2.36.0
|
||||
|
44
dwm-zeroastag-22032023-0aea805.diff
Normal file
44
dwm-zeroastag-22032023-0aea805.diff
Normal file
@@ -0,0 +1,44 @@
|
||||
From 0aea8051b1ae85c568dc69d4cf9865de9ad6acce Mon Sep 17 00:00:00 2001
|
||||
From: Michal Orman <michal.orman@gmail.com>
|
||||
Date: Wed, 22 Mar 2023 16:02:45 +0100
|
||||
Subject: [PATCH] Make XK_0 a regular tag.
|
||||
|
||||
Change the default behavior of XK_0 from selecting all tags to be
|
||||
a regular 10th tag.
|
||||
---
|
||||
config.def.h | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 9efa774..15d02d7 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -19,7 +19,7 @@ static const char *colors[][3] = {
|
||||
};
|
||||
|
||||
/* tagging */
|
||||
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" };
|
||||
|
||||
static const Rule rules[] = {
|
||||
/* xprop(1):
|
||||
@@ -79,8 +79,6 @@ static const Key keys[] = {
|
||||
{ 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 } },
|
||||
@@ -94,6 +92,7 @@ static const Key keys[] = {
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
+ TAGKEYS( XK_0, 9)
|
||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||
};
|
||||
|
||||
--
|
||||
2.40.0
|
||||
|
6
dwm.1
6
dwm.1
@@ -92,6 +92,12 @@ Sets monocle layout.
|
||||
.B Mod1\-space
|
||||
Toggles between current and previous layout.
|
||||
.TP
|
||||
.B Mod1\-Control\-,
|
||||
Cycles backwards in layout list.
|
||||
.TP
|
||||
.B Mod1\-Control\-.
|
||||
Cycles forwards in layout list.
|
||||
.TP
|
||||
.B Mod1\-j
|
||||
Focus next window.
|
||||
.TP
|
||||
|
72
dwm.c
72
dwm.c
@@ -83,8 +83,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||
enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin,
|
||||
ClkRootWin, ClkLast }; /* clicks */
|
||||
|
||||
typedef union {
|
||||
int i;
|
||||
@@ -187,6 +187,7 @@ static void configurerequest(XEvent *e);
|
||||
static void copyvalidchars(char *text, char *rawtext);
|
||||
static Monitor *createmon(void);
|
||||
static void deck(Monitor *m);
|
||||
static void cyclelayout(const Arg *arg);
|
||||
static void destroynotify(XEvent *e);
|
||||
static void detach(Client *c);
|
||||
static void detachstack(Client *c);
|
||||
@@ -221,6 +222,7 @@ static Client *nexttiled(Client *c);
|
||||
static void pop(Client *);
|
||||
static void propertynotify(XEvent *e);
|
||||
static void quit(const Arg *arg);
|
||||
static void quitprompt(const Arg *arg);
|
||||
static Monitor *recttomon(int x, int y, int w, int h);
|
||||
static void removesystrayicon(Client *i);
|
||||
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||
@@ -313,6 +315,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
||||
};
|
||||
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
||||
static int running = 1;
|
||||
static int restart = 1;
|
||||
static Cur *cursor[CurLast];
|
||||
static Clr **scheme;
|
||||
static Display *dpy;
|
||||
@@ -526,7 +529,7 @@ buttonpress(XEvent *e)
|
||||
}
|
||||
}
|
||||
} else
|
||||
click = ClkWinTitle;
|
||||
click = ClkStatusText;
|
||||
} else if ((c = wintoclient(ev->window))) {
|
||||
focus(c);
|
||||
restack(selmon);
|
||||
@@ -809,6 +812,23 @@ createmon(void)
|
||||
return m;
|
||||
}
|
||||
|
||||
void
|
||||
cyclelayout(const Arg *arg) {
|
||||
Layout *l;
|
||||
for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++);
|
||||
if(arg->i > 0) {
|
||||
if(l->symbol && (l + 1)->symbol)
|
||||
setlayout(&((Arg) { .v = (l + 1) }));
|
||||
else
|
||||
setlayout(&((Arg) { .v = layouts }));
|
||||
} else {
|
||||
if(l != layouts && (l - 1)->symbol)
|
||||
setlayout(&((Arg) { .v = (l - 1) }));
|
||||
else
|
||||
setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] }));
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
destroynotify(XEvent *e)
|
||||
{
|
||||
@@ -1040,15 +1060,8 @@ drawbar(Monitor *m)
|
||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||
|
||||
if ((w = m->ww - sw - stw - x) > bh) {
|
||||
if (m->sel) {
|
||||
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||
if (m->sel->isfloating)
|
||||
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
||||
} else {
|
||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||
}
|
||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||
}
|
||||
drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
|
||||
}
|
||||
@@ -1599,11 +1612,8 @@ propertynotify(XEvent *e)
|
||||
drawbars();
|
||||
break;
|
||||
}
|
||||
if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
|
||||
if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
|
||||
updatetitle(c);
|
||||
if (c == c->mon->sel)
|
||||
drawbar(c->mon);
|
||||
}
|
||||
if (ev->atom == netatom[NetWMWindowType])
|
||||
updatewindowtype(c);
|
||||
}
|
||||
@@ -1615,6 +1625,31 @@ quit(const Arg *arg)
|
||||
running = 0;
|
||||
}
|
||||
|
||||
void
|
||||
quitprompt(const Arg *arg)
|
||||
{
|
||||
FILE *pp = popen("echo \"no\nrestart\nyes\" | dmenu -i -p \"Quit DWM?\"", "r");
|
||||
if(pp != NULL) {
|
||||
char buf[1024];
|
||||
if (fgets(buf, sizeof(buf), pp) == NULL) {
|
||||
fprintf(stderr, "Quitprompt: Error reading pipe!\n");
|
||||
return;
|
||||
}
|
||||
if (strcmp(buf, "yes\n") == 0) {
|
||||
pclose(pp);
|
||||
restart = 0;
|
||||
quit(NULL);
|
||||
} else if (strcmp(buf, "restart\n") == 0) {
|
||||
pclose(pp);
|
||||
restart = 1;
|
||||
quit(NULL);
|
||||
} else if (strcmp(buf, "no\n") == 0) {
|
||||
pclose(pp);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Monitor *
|
||||
recttomon(int x, int y, int w, int h)
|
||||
{
|
||||
@@ -2083,8 +2118,6 @@ sigdwmblocks(const Arg *arg)
|
||||
void
|
||||
spawn(const Arg *arg)
|
||||
{
|
||||
if (arg->v == dmenucmd)
|
||||
dmenumon[0] = '0' + selmon->num;
|
||||
if (fork() == 0) {
|
||||
if (dpy)
|
||||
close(ConnectionNumber(dpy));
|
||||
@@ -2853,6 +2886,9 @@ main(int argc, char *argv[])
|
||||
run();
|
||||
cleanup();
|
||||
XCloseDisplay(dpy);
|
||||
if (restart == 1) {
|
||||
execlp("dwm", "dwm", NULL);
|
||||
}
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user