archy-linux/archy-dwm
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 4 Packages Wiki Activity

Fix freez issue #8

Merged
anas-elgarhy merged 18 commits from fix-freez-issue into master 2022-08-01 16:56:42 +00:00
Conversation 0 Commits 18 Files changed 13 +388 -288
6 changed files with 388 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b726853f33 - Show all commits

106
.idea/workspace.xml Normal file
View file

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="903d15d6-153e-4c7a-9891-04c7da85fbd2" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/src/config.def.h.rej" beforeDir="false" afterPath="$PROJECT_DIR$/src/config.def.h.rej" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/dwm.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/dwm.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/dwm.c.orig" beforeDir="false" afterPath="$PROJECT_DIR$/src/dwm.c.orig" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/keys/keys.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/keys/keys.c" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GitToolBoxStore">
<option name="recentBranches">
<RecentBranches>
<option name="branchesForRepo">
<list>
<RecentBranchesForRepo>
<option name="branches">
<list>
<RecentBranch>
<option name="branchName" value="applay-keychain-patch" />
<option name="lastUsedInstant" value="1658993931" />
</RecentBranch>
<RecentBranch>
<option name="branchName" value="fix-freez-issue" />
<option name="lastUsedInstant" value="1658993930" />
</RecentBranch>
</list>
</option>
<option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
</RecentBranchesForRepo>
</list>
</option>
</RecentBranches>
</option>
</component>
<component name="GithubProjectSettings">
<option name="branchProtectionPatterns">
<list>
<option value="master" />
</list>
</option>
</component>
<component name="MacroExpansionManager">
<option name="directoryName" value="c9gfyueg" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2CYxIWMIxibS82pzVDkyNF4nXbQ" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
<option name="showMembers" value="true" />
<option name="showVisibilityIcons" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "/home/anas/suckless_utils/dwm-anas",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"ruby.rails.projectView.checked": "true"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="903d15d6-153e-4c7a-9891-04c7da85fbd2" name="Changes" comment="" />
<created>1658993240000</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1658993240000</updated>
<workItem from="1658993241700" duration="1312000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
</project>

14
README.md
View file

@ -11,7 +11,6 @@
- [cool autostart](https://dwm.suckless.org/patches/cool_autostart) - [cool autostart](https://dwm.suckless.org/patches/cool_autostart)
- [fullscreen](https://dwm.suckless.org/patches/fullscreen) - [fullscreen](https://dwm.suckless.org/patches/fullscreen)
- [gridmode](https://dwm.suckless.org/patches/gridmode) - [gridmode](https://dwm.suckless.org/patches/gridmode)
- [keychord](https://dwm.suckless.org/patches/keychord)
- [movestack](https://dwm.suckless.org/patches/movestack) - [movestack](https://dwm.suckless.org/patches/movestack)
- [pertag](https://dwm.suckless.org/patches/pertag) - [pertag](https://dwm.suckless.org/patches/pertag)
- [systray](https://dwm.suckless.org/patches/systray) - [systray](https://dwm.suckless.org/patches/systray)
@ -19,6 +18,7 @@
- [noborder](https://dwm.suckless.org/patches/noborder) - [noborder](https://dwm.suckless.org/patches/noborder)
- [fibonacci layouts](https://dwm.suckless.org/patches/fibonacci) - [fibonacci layouts](https://dwm.suckless.org/patches/fibonacci)
- [centeredmaster](https://dwm.suckless.org/patches/centeredmaster) - [centeredmaster](https://dwm.suckless.org/patches/centeredmaster)
- [keychain](https://dwm.suckless.org/patches/keychain)
### Keys ### Keys
| Keys | Function | | Keys | Function |
@ -27,9 +27,9 @@
| modkey + shift + ctrl + d | Open rofi launcher (small size) | | modkey + shift + ctrl + d | Open rofi launcher (small size) |
| modkey + enter | Launche the main terminal (alacritty by default) | | modkey + enter | Launche the main terminal (alacritty by default) |
| modkey + t -> a | Launche the alacritty terminal | | modkey + t -> a | Launche the alacritty terminal |
| modkey + t -> shift + a | Launche the alacritty terminal with tmux | <!-- | modkey + t -> shift + a | Launche the alacritty terminal with tmux | -->
| modkey + t -> k | Launche the kitty terminal | | modkey + t -> k | Launche the kitty terminal |
| modkey + t -> shift + k | Launche the kitty terminal with tmux | <!-- | modkey + t -> shift + k | Launche the kitty terminal with tmux | -->
| modkey + shift + f -> g | Launche the GUI file manger (pcmanfm by default) | | modkey + shift + f -> g | Launche the GUI file manger (pcmanfm by default) |
| modkey + shift + f -> f | Launche rofi file file browser (small size) | | modkey + shift + f -> f | Launche rofi file file browser (small size) |
| modkey + shift + f -> t | Launche the terminal file manger (ranger) in the main terminal | | modkey + shift + f -> t | Launche the terminal file manger (ranger) in the main terminal |
@ -61,15 +61,15 @@
| modkey + s -> m | Use the monocle layout | | modkey + s -> m | Use the monocle layout |
| modkey + s -> g | Use the grid layout | | modkey + s -> g | Use the grid layout |
| modkey + s -> r | Use the spial layout (part from fibonacci layouts) | | modkey + s -> r | Use the spial layout (part from fibonacci layouts) |
| modkey + s -> shift + r | Use the dwindle layout (part from fibonacci layouts) | | modkey + s -> d | Use the dwindle layout (part from fibonacci layouts) |
| modkey + s -> c | Use the centerd master layout | | modkey + s -> c | Use the centerd master layout |
| modkey + s -> shift + s | Use the centerd floating master layout | | modkey + s -> x | Use the centerd floating master layout |
| modkey + s -> space | Toggle between current layout and tile layout | | modkey + s -> s | Toggle between current layout and tile layout |
| modkey + shift + s | Toggle sticky mode | | modkey + shift + s | Toggle sticky mode |
| modkey + alt + f | Toggle floating window | | modkey + alt + f | Toggle floating window |
| modkey + m -> c | Launche the cmus player | | modkey + m -> c | Launche the cmus player |
| modkey + m -> v | Launche vlc video player | | modkey + m -> v | Launche vlc video player |
| modkey + m -> shift + v | Lanuche nvlc in the main terminal | <!-- | modkey + m -> shift + v | Lanuche nvlc in the main terminal | -->
| modkey + 0 | View all tags | | modkey + 0 | View all tags |
| modkey + shift + 0 | Mirror the current tag in all tags | | modkey + shift + 0 | Mirror the current tag in all tags |
| modkey + comma (,) | - | | modkey + comma (,) | - |

158
src/config.def.h.rej
View file

@ -1,92 +1,96 @@
--- config.def.h --- config.def.h
+++ config.def.h +++ config.def.h
@@ -46,12 +46,11 @@ static const Layout layouts[] = { @@ -45,11 +45,11 @@ static const Layout layouts[] = {
/* key definitions */ /* key definitions */
#define MODKEY Mod1Mask #define MODKEY Mod1Mask
-
-#define TAGKEYS(KEY,TAG) \ -#define TAGKEYS(KEY,TAG) \
- {1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }, \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- {1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- {1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- {1, {{MODKEY|ControlMask|ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG} }, - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
+#define TAGKEYS(KEY,TAG) \ +#define TAGKEYS(CHAIN,KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG} }, \
+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, + { MODKEY|ControlMask|ShiftMask, CHAIN, KEY, toggletag, {.ui = 1 << TAG} },
/* helper for spawning shell commands in the pre dwm-5.0 fashion */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
@@ -60,34 +59,32 @@ static const Layout layouts[] = { @@ -60,40 +60,42 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont,
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 const char *termcmd[] = { "st", NULL };
-static const char *emacs[] = { "emacs", NULL };
-static Keychord keychords[] = { static Key keys[] = {
- /* Keys function argument */ - /* modifier key function argument */
- {1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }, - { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- {1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }, - { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- {2, {{MODKEY, XK_e}, {MODKEY, XK_e}}, spawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} },
- {1, {{MODKEY, XK_b}}, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } },
- {1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } },
- {1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }, - { MODKEY, XK_i, incnmaster, {.i = +1 } },
- {1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }, - { MODKEY, XK_d, incnmaster, {.i = -1 } },
- {1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.05} },
- {1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }, - { MODKEY, XK_l, setmfact, {.f = +0.05} },
- {1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }, - { MODKEY, XK_Return, zoom, {0} },
- {1, {{MODKEY, XK_Return}}, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} },
- {1, {{MODKEY, XK_Tab}}, view, {0} }, - { MODKEY|ShiftMask, XK_c, killclient, {0} },
- {1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
- {1, {{MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
- {1, {{MODKEY, XK_f}}, setlayout, {.v = &layouts[1]} }, - { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
- {1, {{MODKEY, XK_m}}, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_space, setlayout, {0} },
- {1, {{MODKEY, XK_space}}, setlayout, {0} }, - { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- {1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }, - { MODKEY, XK_0, view, {.ui = ~0 } },
- {1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- {1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }, - { MODKEY, XK_comma, focusmon, {.i = -1 } },
- {1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }, - { MODKEY, XK_period, focusmon, {.i = +1 } },
- {1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- {1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
- {1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }, - TAGKEYS( XK_1, 0)
+static Key keys[] = { - TAGKEYS( XK_2, 1)
+ /* modifier key function argument */ - TAGKEYS( XK_3, 2)
+ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, - TAGKEYS( XK_4, 3)
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, - TAGKEYS( XK_5, 4)
+ { MODKEY, XK_b, togglebar, {0} }, - TAGKEYS( XK_6, 5)
+ { MODKEY, XK_j, focusstack, {.i = +1 } }, - TAGKEYS( XK_7, 6)
+ { 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)
@@ -95,9 +92,9 @@ static Key keys[] = {
TAGKEYS( XK_5, 4)
TAGKEYS( XK_6, 5)
TAGKEYS( XK_7, 6)
- TAGKEYS( XK_8, 7) - TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8)
TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} },
- {1, {{MODKEY|ShiftMask, XK_q}}, quit, {0} }, + /* modifier chain key key function argument */
+ { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY, -1, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, -1, XK_Return, spawn, {.v = termcmd } },
+ { MODKEY, -1, XK_b, togglebar, {0} },
+ { MODKEY, -1, XK_j, focusstack, {.i = +1 } },
+ { MODKEY, -1, XK_k, focusstack, {.i = -1 } },
+ { MODKEY, -1, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, -1, XK_d, incnmaster, {.i = -1 } },
+ { MODKEY, -1, XK_h, setmfact, {.f = -0.05} },
+ { MODKEY, -1, XK_l, setmfact, {.f = +0.05} },
+ { MODKEY, -1, XK_Return, zoom, {0} },
+ { MODKEY, -1, XK_Tab, view, {0} },
+ { MODKEY|ShiftMask, -1, XK_c, killclient, {0} },
+ { MODKEY, -1, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, -1, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, -1, XK_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY, -1, XK_space, setlayout, {0} },
+ { MODKEY|ShiftMask, -1, XK_space, togglefloating, {0} },
+ { MODKEY, -1, XK_0, view, {.ui = ~0 } },
+ { MODKEY|ShiftMask, -1, XK_0, tag, {.ui = ~0 } },
+ { MODKEY, -1, XK_comma, focusmon, {.i = -1 } },
+ { MODKEY, -1, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, -1, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, -1, XK_period, tagmon, {.i = +1 } },
+ TAGKEYS( -1, XK_1, 0)
+ TAGKEYS( -1, XK_2, 1)
+ TAGKEYS( -1, XK_3, 2)
+ TAGKEYS( -1, XK_4, 3)
+ TAGKEYS( -1, XK_5, 4)
+ TAGKEYS( -1, XK_6, 5)
+ TAGKEYS( -1, XK_7, 6)
+ TAGKEYS( -1, XK_8, 7)
+ TAGKEYS( -1, XK_9, 8)
+ { MODKEY|ShiftMask, -1, XK_q, quit, {0} },
+ { MODKEY, XK_a, XK_d, spawn, {.v = dmenucmd } },
+ { MODKEY, XK_a, XK_t, spawn, {.v = termcmd } },
}; };
/* button definitions */ /* button definitions */

35
src/dwm.c
View file

@ -116,6 +116,7 @@ struct Client {
typedef struct { typedef struct {
unsigned int mod; unsigned int mod;
KeySym chain;
KeySym keysym; KeySym keysym;
void (*func)(const Arg *); void (*func)(const Arg *);
const Arg arg; const Arg arg;
@ -305,6 +306,7 @@ static Display *dpy;
static Drw *drw; static Drw *drw;
static Monitor *mons, *selmon; static Monitor *mons, *selmon;
static Window root, wmcheckwin; static Window root, wmcheckwin;
static KeySym keychain = -1;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
@ -1135,14 +1137,19 @@ grabkeys(void)
unsigned int i, j; unsigned int i, j;
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
KeyCode code; KeyCode code;
KeyCode chain;
XUngrabKey(dpy, AnyKey, AnyModifier, root); XUngrabKey(dpy, AnyKey, AnyModifier, root);
for (i = 0; i < LENGTH(keys); i++) for (i = 0; i < LENGTH(keys); i++)
if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) {
if (keys[i].chain != -1 &&
((chain = XKeysymToKeycode(dpy, keys[i].chain))))
code = chain;
for (j = 0; j < LENGTH(modifiers); j++) for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
True, GrabModeAsync, GrabModeAsync); True, GrabModeAsync, GrabModeAsync);
} }
}
} }
void void
@ -1167,17 +1174,37 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
void void
keypress(XEvent *e) keypress(XEvent *e)
{ {
unsigned int i; unsigned int i, j;
KeySym keysym; KeySym keysym;
XKeyEvent *ev; XKeyEvent *ev;
int current = 0;
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
ev = &e->xkey; ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for (i = 0; i < LENGTH(keys); i++) for (i = 0; i < LENGTH(keys); i++) {
if (keysym == keys[i].keysym if (keysym == keys[i].keysym && keys[i].chain == -1
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func) && keys[i].func)
keys[i].func(&(keys[i].arg)); keys[i].func(&(keys[i].arg));
else if (keysym == keys[i].chain && keychain == -1
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func) {
current = 1;
keychain = keysym;
for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(dpy, AnyKey, 0 | modifiers[j], root,
True, GrabModeAsync, GrabModeAsync);
} else if (!current && keysym == keys[i].keysym
&& keychain != -1
&& keys[i].chain == keychain
&& keys[i].func)
keys[i].func(&(keys[i].arg));
}
if (!current) {
keychain = -1;
grabkeys();
}
} }
void void

63
src/dwm.c.orig
View file

@ -117,14 +117,9 @@ struct Client {
typedef struct { typedef struct {
unsigned int mod; unsigned int mod;
KeySym keysym; KeySym keysym;
} Key;
typedef struct {
unsigned int n;
const Key keys[5];
void (*func)(const Arg *); void (*func)(const Arg *);
const Arg arg; const Arg arg;
} Keychord; } Key;
typedef struct { typedef struct {
const char *symbol; const char *symbol;
@ -310,7 +305,6 @@ static Display *dpy;
static Drw *drw; static Drw *drw;
static Monitor *mons, *selmon; static Monitor *mons, *selmon;
static Window root, wmcheckwin; static Window root, wmcheckwin;
unsigned int currentkey = 0;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
@ -1138,15 +1132,15 @@ grabkeys(void)
{ {
updatenumlockmask(); updatenumlockmask();
{ {
unsigned int i, k; unsigned int i, j;
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
KeyCode code; KeyCode code;
XUngrabKey(dpy, AnyKey, AnyModifier, root); XUngrabKey(dpy, AnyKey, AnyModifier, root);
for (i = 0; i < LENGTH(keychords); i++) for (i = 0; i < LENGTH(keys); i++)
if ((code = XKeysymToKeycode(dpy, keychords[i].keys[currentkey].keysym))) if ((code = XKeysymToKeycode(dpy, keys[i].keysym)))
for (k = 0; k < LENGTH(modifiers); k++) for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(dpy, code, keychords[i].keys[currentkey].mod | modifiers[k], root, XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
True, GrabModeAsync, GrabModeAsync); True, GrabModeAsync, GrabModeAsync);
} }
} }
@ -1173,48 +1167,17 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
void void
keypress(XEvent *e) keypress(XEvent *e)
{ {
XEvent event = *e; unsigned int i;
Keychord *keychord;
unsigned int ran = 0;
KeySym keysym; KeySym keysym;
XKeyEvent *ev; XKeyEvent *ev;
Keychord *newoptions;
Keychord *oldoptions = (Keychord *)malloc(sizeof(keychords));
memcpy(oldoptions, keychords, sizeof(keychords)); ev = &e->xkey;
size_t numoption = 0;
while(!ran){
ev = &event.xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
newoptions = (Keychord *)malloc(0); for (i = 0; i < LENGTH(keys); i++)
numoption = 0; if (keysym == keys[i].keysym
for (keychord = oldoptions; keychord->n != 0 && currentkey < 5; keychord = (Keychord *)((char *)keychord + sizeof(Keychord))){ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
if(keysym == keychord->keys[currentkey].keysym && keys[i].func)
&& CLEANMASK(keychord->keys[currentkey].mod) == CLEANMASK(ev->state) keys[i].func(&(keys[i].arg));
&& keychord->func){
if(keychord->n == currentkey +1){
keychord->func(&(keychord->arg));
ran = 1;
}else{
numoption++;
newoptions = (Keychord *)realloc(newoptions, numoption * sizeof(Keychord));
memcpy((char *)newoptions + (numoption -1) * sizeof(Keychord),keychord, sizeof(Keychord));
}
}
}
currentkey++;
if(numoption == 0)
break;
grabkeys();
while (running && !XNextEvent(dpy, &event) && !ran)
if(event.type == KeyPress)
break;
free(oldoptions);
oldoptions = newoptions;
}
free(newoptions);
currentkey = 0;
grabkeys();
} }
void void

286
src/keys/keys.c
View file

@ -10,161 +10,161 @@ static const char *termcmd[] = { TERMINAL, NULL };
/* key definitions */ /* key definitions */
#define MODKEY Mod4Mask // win/super key #define MODKEY Mod4Mask // win/super key
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(CHAIN,KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, { MODKEY|ControlMask|ShiftMask, CHAIN, KEY, toggletag, {.ui = 1 << TAG} },
// X11 keysym definitions // X11 keysym definitions
#include <X11/XF86keysym.h> // req (libxinerama1 and libxinerama-dev) #include <X11/XF86keysym.h> // req (libxinerama1 and libxinerama-dev)
static Key keys[] = { static Key keys[] = {
/* modifier key function argument */ /* modifier chain key key function argument */
/* ---------------------------------- Apps Keys ---------------------------------- */ /* ---------------------------------- Apps Keys ---------------------------------- */
// Dmenu (launcher) // Dmenu (launcher)
{ MODKEY|ShiftMask, XK_d, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, -1, XK_d, spawn, {.v = dmenucmd } },
// Rofi launcher (small) // Rofi launcher (small)
{ MODKEY|ShiftMask|ControlMask, XK_d, spawn, SHCMD("rofi -show drun") }, { MODKEY|ShiftMask|ControlMask, -1, XK_d, spawn, SHCMD("rofi -show drun") },
// Start the main terminal // Start the main terminal
{ MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, -1, XK_Return, spawn, {.v = termcmd } },
// Start the alacritty terminal // Start the alacritty terminal
// {2, {{MODKEY, XK_t}, {0, XK_a}}, spawn, SHCMD("alacritty") }, { MODKEY, XK_t, XK_a, spawn, SHCMD("alacritty") },
// // Start the alacritty terminal with tmux // Start the alacritty terminal with tmux
// {2, {{MODKEY, XK_t}, {ShiftMask, XK_a}}, spawn, SHCMD("alacritty -e tmux") }, // { MODKEY, XK_t, XK_a|ShiftMask, spawn, SHCMD("alacritty -e tmux") },
// // kitty // kitty
// {2, {{MODKEY, XK_t}, {0, XK_k}}, spawn, SHCMD("kitty") }, { MODKEY, XK_t, XK_k, spawn, SHCMD("kitty") },
// // kitty with tmux // kitty with tmux
// {2, {{MODKEY, XK_t}, {ShiftMask, XK_k}}, spawn, SHCMD("kitty -e tmux") }, // { MODKEY, XK_t, ShiftMask|XK_k, spawn, SHCMD("kitty -e tmux") },
// /************************************* File browsers *************************************/ /************************************* File browsers *************************************/
// // GUI filebrowser (pcmanfm) // GUI filebrowser (pcmanfm)
// {2, {{MODKEY|ShiftMask, XK_f}, {0, XK_g}}, spawn, SHCMD(GUI_FILEMANAGER) }, { MODKEY|ShiftMask, XK_f, XK_g, spawn, SHCMD(GUI_FILEMANAGER) },
// // Rofi file browser (small) // Rofi file browser (small)
// {2, {{MODKEY|ShiftMask, XK_f}, {0, XK_f}}, spawn, SHCMD("rofi -show filebrowser") }, { MODKEY|ShiftMask, XK_f, XK_f, spawn, SHCMD("rofi -show filebrowser") },
// // Terminal file manager (ranger) // Terminal file manager (ranger)
// {2, {{MODKEY|ShiftMask, XK_f}, {0, XK_t}}, spawn, SHCMD(TERMINAL " -e ranger") }, { MODKEY|ShiftMask, XK_f, XK_t, spawn, SHCMD(TERMINAL " -e ranger") },
// /************************************* Start the web browers *************************************/ /************************************* Start the web browers *************************************/
// // Google chrome stable // Google chrome stable
// {2, {{MODKEY, XK_w}, {0, XK_g}}, spawn, SHCMD(WEBBROWSER) }, { MODKEY, XK_w, XK_g, spawn, SHCMD(WEBBROWSER) },
// // Tor brower // Tor brower
// {2, {{MODKEY, XK_w}, {0, XK_t}}, spawn, SHCMD("tor-browser") }, { MODKEY, XK_w, XK_t, spawn, SHCMD("tor-browser") },
// /************************************* Start the caht/email/\* apps *************************************/ /************************************* Start the caht/email/\* apps *************************************/
// // Discord // Discord
// {2, {{MODKEY, XK_c}, {0, XK_d}}, spawn, SHCMD("discord") }, { MODKEY, XK_c, XK_d, spawn, SHCMD("discord") },
// // Obsidian // Obsidian
// {2, {{MODKEY, XK_c}, {0, XK_o}}, spawn, SHCMD("obsidian") }, { MODKEY, XK_c, XK_o, spawn, SHCMD("obsidian") },
// /************************************* Start the dev apps *************************************/ /************************************* Start the dev apps *************************************/
// // Jetbrains toolbox // Jetbrains toolbox
// {2, {{MODKEY, XK_a}, {0, XK_j}}, spawn, SHCMD("jetbrains-toolbox") }, { MODKEY, XK_a, XK_j, spawn, SHCMD("jetbrains-toolbox") },
// // NeoVim // NeoVim
// {2, {{MODKEY, XK_a}, {0, XK_n}}, spawn, SHCMD(TERMINAL " -e nvim") }, { MODKEY, XK_a, XK_n, spawn, SHCMD(TERMINAL " -e nvim") },
// // Vim // Vim
// {2, {{MODKEY, XK_a}, {0, XK_v}}, spawn, SHCMD(TERMINAL " -e vim") }, { MODKEY, XK_a, XK_v, spawn, SHCMD(TERMINAL " -e vim") },
// // emacs // emacs
// {2, {{MODKEY, XK_a}, {0, XK_e}}, spawn, SHCMD("emacs") }, { MODKEY, XK_a, XK_e, spawn, SHCMD("emacs") },
// /************************************* Start personalize apps *************************************/ /************************************* Start personalize apps *************************************/
// // nitrogen // nitrogen
// {2, {{MODKEY, XK_p}, {0, XK_b}}, spawn, SHCMD("nitrogen") }, { MODKEY, XK_p, XK_b, spawn, SHCMD("nitrogen") },
// // nm-connection-editor // nm-connection-editor
// {2, {{MODKEY, XK_p}, {0, XK_n}}, spawn, SHCMD("nm-connection-editor") }, { MODKEY, XK_p, XK_n, spawn, SHCMD("nm-connection-editor") },
// /************************************* Start multi media apps *************************************/ /************************************* Start multi media apps *************************************/
// // cmus // cmus
// {2, {{MODKEY, XK_m}, {0, XK_c}}, spawn, SHCMD("sh -c \"" TERMINAL " -e cmus\" & sh -c \"cmus-rpc --link\"") }, { MODKEY, XK_m, XK_c, spawn, SHCMD("sh -c \"" TERMINAL " -e cmus\" & sh -c \"cmus-rpc --link\"") },
// // vlc // vlc
// {2, {{MODKEY, XK_m}, {0, XK_v}}, spawn, SHCMD("vlc") }, { MODKEY, XK_m, XK_v, spawn, SHCMD("vlc") },
// // vlc in the main terminal // vlc in the main terminal
// {2, {{MODKEY, XK_m}, {ShiftMask, XK_v}}, spawn, SHCMD(TERMINAL "nvlc") }, // { MODKEY|ShiftMask, XK_m, XK_v, spawn, SHCMD(TERMINAL "nvlc") },
// /************************************* Start the emoji piker apps *************************************/ /************************************* Start the emoji piker apps *************************************/
// // Emoji selector (rofi) // Emoji selector (rofi)
// {1, {{Mod4Mask, XK_e}}, spawn, SHCMD("rofimoji") }, { Mod4Mask, -1, XK_e, spawn, SHCMD("rofimoji") },
// /************************************* dwm keys *************************************/ /************************************* dwm keys *************************************/
// // Full screen mode // Full screen mode
// {1, {{MODKEY, XK_f}}, fullscreen, {0} }, { MODKEY, -1, XK_f, fullscreen, {0} },
// // Toggle the slstatus bar (hide/show) // Toggle the slstatus bar (hide/show)
// {1, {{MODKEY, XK_b}}, togglebar, {0} }, { MODKEY, -1, XK_b, togglebar, {0} },
// // Change the focus // Change the focus
// {1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }, { MODKEY, -1, XK_j, focusstack, {.i = +1 } },
// {1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }, { MODKEY, -1, XK_k, focusstack, {.i = -1 } },
// // Change the stack layout (horizontal/virtecal) // Change the stack layout (horizontal/virtecal)
// {1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }, { MODKEY, -1, XK_i, incnmaster, {.i = +1 } },
// {1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }, { MODKEY, -1, XK_d, incnmaster, {.i = -1 } },
// // Change the focus window size (in the tile mode) // Change the focus window size (in the tile mode)
// {1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }, { MODKEY, -1, XK_h, setmfact, {.f = -0.05} },
// {1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }, { MODKEY, -1, XK_l, setmfact, {.f = +0.05} },
// // { MODKEY, XK_Return, zoom, {0} }, // { MODKEY, XK_Return, zoom, {0} },
// {1, {{MODKEY, XK_Tab}}, view, {0} }, { MODKEY, -1, XK_Tab, view, {0} },
//
// {1, {{MODKEY|ShiftMask, XK_j}}, movestack, {.i = +1 } }, { MODKEY|ShiftMask, -1, XK_j, movestack, {.i = +1 } },
// {1, {{MODKEY|ShiftMask, XK_k}}, movestack, {.i = -1 } }, { MODKEY|ShiftMask, -1, XK_k, movestack, {.i = -1 } },
// // Toogle styky mode // Toogle styky mode
// {1, {{MODKEY|ShiftMask, XK_s}}, togglesticky, {0} }, { MODKEY|ShiftMask, -1, XK_s, togglesticky, {0} },
//
// // Quit from the foucsed window (kill) // Quit from the foucsed window (kill)
// {2, {{MODKEY, XK_q}, {0, XK_q}}, killclient, {0} }, { MODKEY, XK_q, XK_q, killclient, {0} },
// /************************* Switch between layouts *************************/ /************************* Switch between layouts *************************/
// // Tiled layout // Tiled layout
// {2, {{MODKEY, XK_s}, {0, XK_t}}, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_s, XK_t, setlayout, {.v = &layouts[0]} },
// // Floating layout // Floating layout
// {2, {{MODKEY, XK_s}, {0, XK_f}}, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_s, XK_f, setlayout, {.v = &layouts[1]} },
// // Monocle layout // Monocle layout
// {2, {{MODKEY, XK_s}, {0, XK_m}}, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_s, XK_m, setlayout, {.v = &layouts[2]} },
// // Grid layout // Grid layout
// {2, {{MODKEY, XK_s}, {0, XK_g}}, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_s, XK_g, setlayout, {.v = &layouts[3]} },
// // Spiral layout // Spiral layout
// {2, {{MODKEY, XK_s}, {0, XK_r}}, setlayout, {.v = &layouts[4]} }, { MODKEY, XK_s, XK_r, setlayout, {.v = &layouts[4]} },
// // Dwindle layout // Dwindle layout
// {2, {{MODKEY, XK_s}, {ShiftMask, XK_r}}, setlayout, {.v = &layouts[5]} }, { MODKEY, XK_s, XK_d, setlayout, {.v = &layouts[5]} },
// // Centerd master layout // Centerd master layout
// {2, {{MODKEY, XK_s}, {0, XK_c}}, setlayout, {.v = &layouts[6]} }, { MODKEY, XK_s, XK_c, setlayout, {.v = &layouts[6]} },
// // Centerd floating master layout // Centerd floating master layout
// {2, {{MODKEY, XK_s}, {ShiftMask, XK_c}}, setlayout, {.v = &layouts[7]} }, { MODKEY, XK_s, XK_x, setlayout, {.v = &layouts[7]} },
// // Toggle between current layout and tile layout
// // Toggle between current layout and tile layout { MODKEY, XK_s, XK_s, setlayout, {0} },
// {2, {{MODKEY, XK_s}, {0, XK_space}}, setlayout, {0} },
// // Toggle floating window // Toggle floating window
// {1, {{MODKEY|Mod1Mask, XK_f}}, togglefloating, {0} }, { MODKEY|Mod1Mask, -1, XK_f, togglefloating, {0} },
// // View all tags // View all tags
// {1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }, { MODKEY, -1, XK_0, view, {.ui = ~0 } },
// // Mirror the current tagg in all tags // Mirror the current tagg in all tags
// {1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }, { MODKEY|ShiftMask, -1, XK_0, tag, {.ui = ~0 } },
// // I don't know // I don't know
// {1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }, { MODKEY, -1, XK_comma, focusmon, {.i = -1 } },
// {1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }, { MODKEY, -1, XK_period, focusmon, {.i = +1 } },
// {1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }, { MODKEY|ShiftMask, -1, XK_comma, tagmon, {.i = -1 } },
// {1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }, { MODKEY|ShiftMask, -1, XK_period, tagmon, {.i = +1 } },
/************************* Tag keys *************************/ /************************* Tag keys *************************/
TAGKEYS( XK_1, 0) TAGKEYS( -1, XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( -1, XK_2, 1)
TAGKEYS( XK_3, 2) TAGKEYS( -1, XK_3, 2)
TAGKEYS( XK_4, 3) TAGKEYS( -1, XK_4, 3)
TAGKEYS( XK_5, 4) TAGKEYS( -1, XK_5, 4)
TAGKEYS( XK_6, 5) TAGKEYS( -1, XK_6, 5)
TAGKEYS( XK_7, 6) TAGKEYS( -1, XK_7, 6)
TAGKEYS( XK_8, 7) TAGKEYS( -1, XK_8, 7)
TAGKEYS( XK_9, 8) TAGKEYS( -1, XK_9, 8)
TAGKEYS( XK_semicolon, 9) TAGKEYS( -1, XK_semicolon, 9)
/* ---------------------------------- Control Keys ---------------------------------- */ /* ---------------------------------- Control Keys ---------------------------------- */
// // Brightness controllers (requires xbacklight) // Brightness controllers (requires xbacklight)
// {1, {{0, XF86XK_MonBrightnessUp}}, spawn, SHCMD("xbacklight -inc 5") }, { 0, -1, XF86XK_MonBrightnessUp, spawn, SHCMD("xbacklight -inc 5") },
// {1, {{0, XF86XK_MonBrightnessDown}}, spawn, SHCMD("xbacklight -dec 5") }, { 0, -1, XF86XK_MonBrightnessDown, spawn, SHCMD("xbacklight -dec 5") },
// // Sound controllers (requires pamixer) // Sound controllers (requires pamixer)
// {1, {{0, XF86XK_AudioRaiseVolume}}, spawn, SHCMD("pamixer --allow-boost -i 4") }, { 0, -1, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 4") },
// {1, {{0, XF86XK_AudioLowerVolume}}, spawn, SHCMD("pamixer --allow-boost -d 4") }, { 0, -1, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 4") },
// {1, {{0, XF86XK_AudioMute}}, spawn, SHCMD("pamixer -t") }, { 0, -1, XF86XK_AudioMute, spawn, SHCMD("pamixer -t") },
// // Media controls (requires playerctl) // Media controls (requires playerctl)
// {1, {{0, XF86XK_AudioPlay}}, spawn, SHCMD("playerctl play-pause") }, { 0, -1, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") },
// {1, {{0, XF86XK_AudioStop}}, spawn, SHCMD("playerctl stop") }, { 0, -1, XF86XK_AudioStop, spawn, SHCMD("playerctl stop") },
// {1, {{0, XF86XK_AudioNext}}, spawn, SHCMD("playerctl next") }, { 0, -1, XF86XK_AudioNext, spawn, SHCMD("playerctl next") },
// {1, {{0, XF86XK_AudioPrev}}, spawn, SHCMD("playerctl previous") }, { 0, -1, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") },
// // Mute and unmute mic // Mute and unmute mic
// {1, {{0, XF86XK_AudioMicMute}}, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") }, { 0, -1, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
// // Take a screenshot // Take a screenshot
// {1, {{0, XK_Print}}, spawn, SHCMD(SCREENSHOT) }, { 0, -1, XK_Print, spawn, SHCMD(SCREENSHOT) },
// /* ---------------------------------- lock Keys ---------------------------------- */ /* ---------------------------------- lock Keys ---------------------------------- */
// // Lock the screen // Lock the screen
// {1, {{MODKEY|ShiftMask, XK_x}}, spawn, SHCMD("betterlockscreen -l dim") }, { MODKEY|ShiftMask, -1, XK_x, spawn, SHCMD("betterlockscreen -l dim") },
// {1, {{0, XF86XK_Suspend}}, spawn, SHCMD("betterlockscreen -l dim") }, { 0, -1, XF86XK_Suspend, spawn, SHCMD("betterlockscreen -l dim") },
// // Kill dwm (super + shift + alt + q) // // Kill dwm (super + shift + alt + q)
// {1, {{MODKEY|ShiftMask|Mod1Mask, XK_q}}, quit, {0} }, // { MODKEY|ShiftMask|Mod1Mask, -1, XK_q, quit, {0} },
}; };
/* button definitions */ /* button definitions */