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

revert(keys): un-apply keychain patch

Browse source
This commit is contained in:
Anas Elgarhy 2023-08-30 08:11:12 +03:00
parent 1adcb169c3
commit 139e337b91
No known key found for this signature in database
GPG key ID: 0501802A1D496528
5 changed files with 79 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/archy_dwm.c
View file

@ -97,7 +97,6 @@ static Display *dpy;
static Drw *drw;
static Monitor *mons, *selmon;
static Window root, wmcheckwin;
static KeySym keychain = -1;
/* configuration, allows nested code to access above variables */
#include "config.h"
@ -909,14 +908,10 @@ grabkeys(void) {
unsigned int i, j;
unsigned int modifiers[] = {0, LockMask, numlockmask, numlockmask | LockMask};
KeyCode code;
KeyCode chain;
XUngrabKey(dpy, AnyKey, AnyModifier, root);
for (i = 0; i < LENGTH(keys); i++)
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++)
XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
True, GrabModeAsync, GrabModeAsync);
@ -944,36 +939,16 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
void
keypress(XEvent *e) {
unsigned int i, j;
unsigned int i;
KeySym keysym;
XKeyEvent *ev;
int current = 0;
unsigned int modifiers[] = {0, LockMask, numlockmask, numlockmask | LockMask};
ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode) ev->keycode, 0);
for (i = 0; i < LENGTH(keys); i++) {
if (keysym == keys[i].keysym && keys[i].chain == -1
if (keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func)
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();
}
}

144
src/keys/keys.c
View file

@ -23,130 +23,130 @@ static Key keys[] = {
/* modifier chain key key function argument */
/* ---------------------------------- Apps Keys ---------------------------------- */
// Dmenu (launcher)
{MODKEY | ShiftMask, -1, XK_d, spawn, {.v = dmenucmd}},
{MODKEY | ShiftMask, XK_d, spawn, {.v = dmenucmd}},
// Rofi launcher (small)
{MODKEY | ShiftMask | ControlMask, -1, XK_d, spawn, SHCMD("rofi -show drun")},
{MODKEY, -1, XK_Return, spawn, {.v = termcmd}},
{MODKEY | ShiftMask | ControlMask, XK_d, spawn, SHCMD("rofi -show drun")},
{MODKEY, XK_Return, spawn, {.v = termcmd}},
/************************************* Start the web browers *************************************/
// Firefox-developer-edition
{MODKEY, XK_w, XK_f, spawn, SHCMD("firefox-developer-edition")},
{MODKEY | ShiftMask, XK_f, spawn, SHCMD("firefox-developer-edition")},
// brave-beta
{MODKEY, XK_w, XK_b, spawn, SHCMD("brave-beta")},
{MODKEY | ShiftMask, XK_b, spawn, SHCMD("brave-beta")},
// Google chrome stable
{MODKEY, XK_w, XK_g, spawn, SHCMD("google-chrome-stable")},
{MODKEY | ShiftMask, XK_g, spawn, SHCMD("google-chrome-stable")},
// Tor brower
{MODKEY, XK_w, XK_t, spawn, SHCMD("tor-browser")},
{MODKEY | ShiftMask, XK_t, spawn, SHCMD("tor-browser")},
/************************************* Start the caht/email/\* apps *************************************/
// Discord
{MODKEY, XK_c, XK_d, spawn, SHCMD("discord")},
{MODKEY | ShiftMask, XK_d, spawn, SHCMD("discord")},
// Obsidian
{MODKEY, XK_c, XK_o, spawn, SHCMD("obsidian")},
{MODKEY | ShiftMask, XK_o, spawn, SHCMD("obsidian")},
/************************************* Start the dev apps *************************************/
// Jetbrains toolbox
{MODKEY, XK_a, XK_j, spawn, SHCMD("jetbrains-toolbox")},
{MODKEY | ShiftMask, XK_j, spawn, SHCMD("jetbrains-toolbox")},
/************************************* Start multi media apps *************************************/
{MODKEY, -1, XK_l, spawn, SHCMD("luncher")},
{MODKEY, XK_l, spawn, SHCMD("luncher")},
// cmus
{MODKEY, XK_m, XK_c, spawn, {.v = CMUS}},
{MODKEY | ShiftMask, XK_c, spawn, {.v = CMUS}},
// Spotify
{MODKEY, XK_m, XK_s, spawn, {.v = SPOTIFY}},
{MODKEY | ShiftMask, XK_s, spawn, {.v = SPOTIFY}},
/************************************* Start the emoji piker apps *************************************/
// Emoji selector (rofi)
{Mod4Mask, -1, XK_e, spawn, SHCMD("rofimoji")},
{Mod4Mask, XK_e, spawn, SHCMD("rofimoji")},
/************************************* dwm keys *************************************/
// Full screen mode
{MODKEY, -1, XK_f, fullscreen, {0}},
{MODKEY, XK_f, fullscreen, {0}},
// Toggle the slstatus bar (hide/show)
{MODKEY, -1, XK_b, togglebar, {0}},
{MODKEY, XK_b, togglebar, {0}},
// Change the focus
{MODKEY, -1, XK_j, focusstack, {.i = +1}},
{MODKEY, -1, XK_k, focusstack, {.i = -1}},
{MODKEY, XK_j, focusstack, {.i = +1}},
{MODKEY, XK_k, focusstack, {.i = -1}},
// Change the stack layout (horizontal/virtecal)
{MODKEY, -1, XK_i, incnmaster, {.i = +1}},
{MODKEY, -1, XK_d, incnmaster, {.i = -1}},
{MODKEY, XK_i, incnmaster, {.i = +1}},
{MODKEY, XK_d, incnmaster, {.i = -1}},
// Change the focus window size (in the tile mode)
{MODKEY, -1, XK_h, setmfact, {.f = -0.05f}},
{MODKEY, -1, XK_l, setmfact, {.f = +0.05f}},
{MODKEY, -1, XK_Tab, view, {0}},
{MODKEY | ShiftMask, -1, XK_j, movestack, {.i = +1}},
{MODKEY | ShiftMask, -1, XK_k, movestack, {.i = -1}},
{MODKEY, XK_h, setmfact, {.f = -0.05f}},
{MODKEY, XK_l, setmfact, {.f = +0.05f}},
{MODKEY, XK_Tab, view, {0}},
{MODKEY | ShiftMask, XK_j, movestack, {.i = +1}},
{MODKEY | ShiftMask, XK_k, movestack, {.i = -1}},
// Toogle styky mode
{MODKEY | ShiftMask, -1, XK_s, togglesticky, {0}},
{MODKEY | ShiftMask, XK_s, togglesticky, {0}},
// Quit from the foucsed window (kill)
{MODKEY, XK_q, XK_q, killclient, {0}},
{MODKEY, XK_q, killclient, {0}},
/************************* Switch between layouts *************************/
// Tiled layout
{MODKEY, XK_s, XK_t, setlayout, {.v = &layouts[0]}},
{MODKEY, XK_t, setlayout, {.v = &layouts[0]}},
// Floating layout
{MODKEY, XK_s, XK_f, setlayout, {.v = &layouts[1]}},
{MODKEY, XK_f, setlayout, {.v = &layouts[1]}},
// Monocle layout
{MODKEY, XK_s, XK_m, setlayout, {.v = &layouts[2]}},
{MODKEY, XK_m, setlayout, {.v = &layouts[2]}},
// Grid layout
{MODKEY, XK_s, XK_g, setlayout, {.v = &layouts[3]}},
{MODKEY, XK_g, setlayout, {.v = &layouts[3]}},
// Spiral layout
{MODKEY, XK_s, XK_r, setlayout, {.v = &layouts[4]}},
{MODKEY, XK_r, setlayout, {.v = &layouts[4]}},
// Dwindle layout
{MODKEY, XK_s, XK_d, setlayout, {.v = &layouts[5]}},
{MODKEY, XK_d, setlayout, {.v = &layouts[5]}},
// Centerd master layout
{MODKEY, XK_s, XK_c, setlayout, {.v = &layouts[6]}},
{MODKEY, XK_c, setlayout, {.v = &layouts[6]}},
// Centerd floating master layout
{MODKEY, XK_s, XK_x, setlayout, {.v = &layouts[7]}},
{MODKEY, XK_x, setlayout, {.v = &layouts[7]}},
// Toggle between current layout and tile layout
{MODKEY, XK_s, XK_s, setlayout, {0}},
{MODKEY, XK_s, setlayout, {0}},
// Toggle floating window
{MODKEY | Mod1Mask, -1, XK_f, togglefloating, {0}},
{MODKEY | Mod1Mask, XK_f, togglefloating, {0}},
// View all tags
{MODKEY, -1, XK_0, view, {.ui = ~0}},
{MODKEY, XK_0, view, {.ui = ~0}},
// Mirror the current tagg in all tags
{MODKEY | ShiftMask, -1, XK_0, tag, {.ui = ~0}},
{MODKEY | ShiftMask, XK_0, tag, {.ui = ~0}},
// I don't know
{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}},
{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}},
/************************* Tag keys *************************/
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)
TAGKEYS(-1, XK_semicolon, 9)
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_semicolon, 9)
/* ---------------------------------- Control Keys ---------------------------------- */
// Brightness controllers (requires xbacklight)
{0, -1, XF86XK_MonBrightnessUp, spawn, SHCMD("brightness up")},
{0, -1, XF86XK_MonBrightnessDown, spawn, SHCMD("brightness down")},
{0, XF86XK_MonBrightnessUp, spawn, SHCMD("brightness up")},
{0, XF86XK_MonBrightnessDown, spawn, SHCMD("brightness down")},
// Sound controllers (requires pamixer)
{0, -1, XF86XK_AudioRaiseVolume, spawn, SHCMD("volume-control up")},
{0, -1, XF86XK_AudioLowerVolume, spawn, SHCMD("volume-control down")},
{0, -1, XF86XK_AudioMute, spawn, SHCMD("volume-control mute")},
{0, XF86XK_AudioRaiseVolume, spawn, SHCMD("volume-control up")},
{0, XF86XK_AudioLowerVolume, spawn, SHCMD("volume-control down")},
{0, XF86XK_AudioMute, spawn, SHCMD("volume-control mute")},
// Media controls (requires playerctl)
{0, -1, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause")},
{0, -1, XF86XK_AudioStop, spawn, SHCMD("playerctl stop")},
{0, -1, XF86XK_AudioNext, spawn, SHCMD("playerctl next")},
{0, -1, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous")},
{0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause")},
{0, XF86XK_AudioStop, spawn, SHCMD("playerctl stop")},
{0, XF86XK_AudioNext, spawn, SHCMD("playerctl next")},
{0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous")},
{Mod1Mask, -1, XK_F1, spawn, SHCMD("playerctl volume 0.0")},
{Mod1Mask, -1, XK_F2, spawn, SHCMD("playerctl volume 0.1-")},
{Mod1Mask, -1, XK_F3, spawn, SHCMD("playerctl volume 0.1+")},
{Mod1Mask, XK_F1, spawn, SHCMD("playerctl volume 0.0")},
{Mod1Mask, XK_F2, spawn, SHCMD("playerctl volume 0.1-")},
{Mod1Mask, XK_F3, spawn, SHCMD("playerctl volume 0.1+")},
// Mute and unmute mic
{0, -1, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle")},
{0, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle")},
// Take a screenshot
{0, -1, XK_Print, spawn, SHCMD("~/take-screenshot")},
{Mod1Mask, -1, XK_Print, spawn, SHCMD("take-screenshot --region")},
{Mod2Mask, -1, XK_Print, spawn, SHCMD("take-screenshot --activewindow")},
{Mod1Mask | Mod2Mask, -1, XK_Print, spawn, SHCMD("take-screenshot --fullscreen --background --copy-image")},
{0, XK_Print, spawn, SHCMD("~/take-screenshot")},
{Mod1Mask, XK_Print, spawn, SHCMD("take-screenshot --region")},
{Mod2Mask, XK_Print, spawn, SHCMD("take-screenshot --activewindow")},
{Mod1Mask | Mod2Mask, XK_Print, spawn, SHCMD("take-screenshot --fullscreen --background --copy-image")},
/* ---------------------------------- lock Keys ---------------------------------- */
// Lock the screen
{MODKEY | ShiftMask, -1, XK_x, spawn, SHCMD("betterlockscreen -l dim")},
{MODKEY | ShiftMask, XK_x, spawn, SHCMD("betterlockscreen -l dim")},
// // Kill dwm (super + shift + alt + q)
// { MODKEY|ShiftMask|Mod1Mask, -1, XK_q, quit, {0} },
// { MODKEY|ShiftMask|Mod1Mask, XK_q, quit, {0} },
};

15
src/keys/keys.h
View file

@ -6,7 +6,6 @@
typedef struct {
unsigned int mod;
KeySym chain;
KeySym keysym;
void (*func)(const Arg *);
@ -17,15 +16,11 @@ typedef struct {
/* key definitions */
#define MODKEY Mod4Mask // Super key
#define TAGKEYS(CHAIN, KEY, TAG) \
{MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG}}, \
{MODKEY | ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG}}, \
{MODKEY | ControlMask | ShiftMask, \
CHAIN, \
KEY, \
toggletag, \
{.ui = 1 << TAG}},
#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}},
// Include all the key bindings
#ifndef KEYS_C