Update: Remove old keybinds that weren't useful, change all keybinds

that use the MODIFIER2 modifier and update keybinds accordingly
This commit is contained in:
speediegq 2022-10-03 13:30:51 +02:00
parent 72e4cb5eee
commit 694f121cd2
5 changed files with 35 additions and 43 deletions

View file

@ -29,9 +29,8 @@
- Super+b | Show/hide the speedwm bar
- Super+s | Show/hide the systray
- Super+j/k | Move focus between visible windows
- Super+Control+Space | Moves focus to the Master window (or back if Master is already focused)
- Super+Alt+j/k | Increase/decrease gaps between windows in tiling layout by 1
- Super+Alt+u/d | Increase/decrease gaps between windows in tiling layout by 5
- Super+m | Moves focus to the Master window (or back if Master is already focused)
- Super+Control+u/d | Increase/decrease gaps between windows by 5
- Super+Control+j/k | Move focus between hidden windows (Can then 'Show')
- Super+a/d | Increase/decrease size of each window
- Super+o | Hide a window
@ -101,37 +100,36 @@
- Super+Control+Shift+Esc | Open speedwm-utils
- Super+Control+Shift+Arrow | Resize the window to the screen size.
- Super+Control+Shift+s | Set a wallpaper
- Super+Control+Shift+n | Connect to WLAN
- Super+Control+Shift+b | Connect to a Bluetooth device
- Super+Control+Shift+f | Open up a list of dotfiles in dmenu that you can edit.
- Super+Control+Shift+n | Connect to WLAN (Using iwd)
- Super+Control+Shift+b | Connect to a Bluetooth device (Using bluez)
- Super+Control+Shift+f | Open up a list of speedwm config files in dmenu that you can edit.
- Super+Control+Shift+q | Pauses your music
- Super+Control+Shift+w | Decreases your music volume
- Super+Control+Shift+e | Increase your music volume
- Super+Control+Shift+r | Restart speedwm
- Super+Alt+s | Make the current selected window sticky
- Super+Alt+Up/Down | Resize the window keeping the aspect ratio of it.
- Alt+Tab | Switch windows quickly and easily
- Alt+Control+j/k | Change window size vertically (cfact)
- Super+w/e | Resize the window keeping the aspect ratio of it.
- Super+Tab | Switch between windows and tags.
- Super+Control+Shift+j/k | Change window size vertically (cfact)
-- Chained keybinds --
- Super+c & w | Curl wttr.in and open in less
- Super+c & m | Ask the user for a topic and curl cheat.sh
- Super+c & w | Get the weather (Using wttr.in)
- Super+c & n | Switch to the next track
- Super+c & p | Switch to the previous track
- Super+g & t | Toggle gaps
- Super+g & 0 | Reset gaps
- Super+g & i | Increase inner gaps by 1
- Super+Shift+g & i | Decrease inner gaps by 1
- Super+g & o | Increase outer gaps by 1
- Super+g & j/k | Increase/decrease gaps between windows by 1
- Super+Shift+g & i | Decrease inner gaps by 1
- Super+Shift+g & o | Decrease outer gaps by 1
- Super+r & v | Open the defined music visualizer
- Super+r & s | Run screenkey if it is installed
- Super+r & d | Kill screenkey
- Super+Shift+e & a | Open the virtual keyboard
- Super+Shift+e & e | Open a list of all emojis and copy the selection
- Super+Shift+e & a | Open a list of copypasta and copy the selection
- Alt+Shift+q & o | Kill every window except the focused
- Super+Shift+k & o | Kill every window except the focused
- Super+Shift+t & s | Make the current selected window sticky
-- Extras --

View file

@ -41,7 +41,7 @@ static const Key keys[] = {
{ MODIFIER1|SHIFT, -1, XK_t, spawn, RCMD(TERMINAL EDITOR) },
{ MODIFIER1|SHIFT, -1, XK_a, spawn, RCMD(TERMINAL MIXER) },
{ MODIFIER1|SHIFT, -1, XK_m, spawn, RCMD(TERMINAL MUSIC) },
{ MODIFIER2, -1, XK_Tab, spawn, RCMD("speedwm-winnav") },
{ MODIFIER1, -1, XK_Tab, spawn, RCMD("speedwm-winnav") },
{ MODIFIER1|SHIFT, -1, XK_x, spawn, RCMD(TERMINAL SYSTEMSTAT) },
{ MODIFIER1|SHIFT, -1, XK_c, spawn, RCMD(TERMINAL CHAT) },
{ MODIFIER1|SHIFT, -1, XK_i, spawn, RCMD(OPENPDF) },
@ -57,7 +57,6 @@ static const Key keys[] = {
{ MODIFIER1|CONTROL|SHIFT, -1, XK_q, spawn, RCMD(PAUSEMUSIC) },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_w, spawn, RCMD(DOWNMUSIC) },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_e, spawn, RCMD(UPMUSIC) },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_k, spawn, RCMD(VOL_OUTPUT_SPEAKER) },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_Escape, spawn, RCMD("speedwm-utils") },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_s, spawn, RCMD("speedwm-swal") },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_n, spawn, RCMD(NETWORK) },
@ -80,9 +79,6 @@ static const Key keys[] = {
#endif
{ MODIFIER1, -1, XK_space, setlayout, {0} },
/* Sticky keybinds */
{ MODIFIER2|MODIFIER1, -1, XK_s, togglesticky, {0} },
/* Scratchpad keybinds */
{ MODIFIER1, -1, XK_minus, scratchpad_show, {0} },
{ MODIFIER1|SHIFT, -1, XK_minus, scratchpad_hide, {0} },
@ -92,16 +88,16 @@ static const Key keys[] = {
{ MODIFIER1, -1, XK_f, togglefullscr, {0} },
{ MODIFIER1, -1, XK_b, togglebar, {0} },
{ MODIFIER1, -1, XK_r, resetnmaster, {0} },
{ MODIFIER1|CONTROL, -1, XK_space, focusmaster, {0} },
{ MODIFIER1, -1, XK_m, focusmaster, {0} },
{ MODIFIER1, -1, XK_j, focusstackvis, {.i = +1 } },
{ MODIFIER1, -1, XK_k, focusstackvis, {.i = -1 } },
{ MODIFIER1|CONTROL, -1, XK_j, focusstackhid, {.i = +1 } },
{ MODIFIER1|CONTROL, -1, XK_k, focusstackhid, {.i = -1 } },
{ MODIFIER1, -1, XK_a, setmfact, {.f = -0.05} },
{ MODIFIER1, -1, XK_d, setmfact, {.f = +0.05} },
{ MODIFIER2|CONTROL, -1, XK_k, setcfact, {.f = +0.25} },
{ MODIFIER2|CONTROL, -1, XK_j, setcfact, {.f = -0.25} },
{ MODIFIER2|CONTROL, -1, XK_0, setcfact, {.f = 0.00} },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_k, setcfact, {.f = +0.25} },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_j, setcfact, {.f = -0.25} },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_0, setcfact, {.f = 0.00} },
{ MODIFIER1, -1, XK_Return, zoom, {0} },
{ MODIFIER1|SHIFT, -1, XK_q, killclient, {0} },
{ MODIFIER1|SHIFT, -1, XK_space, togglefloating, {0} },
@ -119,6 +115,8 @@ static const Key keys[] = {
{ MODIFIER1, -1, XK_t, toggleopacity, {0} },
/* Floating mode keybinds */
{ MODIFIER1, -1, XK_w, moveresizeaspect, {.i = +24} },
{ MODIFIER1, -1, XK_e, moveresizeaspect, {.i = -24} },
{ MODIFIER1, -1, XK_Down, moveresize, {.v = "0x 25y 0w 0h" } },
{ MODIFIER1, -1, XK_Up, moveresize, {.v = "0x -25y 0w 0h" } },
{ MODIFIER1, -1, XK_Right, moveresize, {.v = "25x 0y 0w 0h" } },
@ -127,8 +125,6 @@ static const Key keys[] = {
{ MODIFIER1|SHIFT, -1, XK_Up, moveresize, {.v = "0x 0y 0w -25h" } },
{ MODIFIER1|SHIFT, -1, XK_Right, moveresize, {.v = "0x 0y 25w 0h" } },
{ MODIFIER1|SHIFT, -1, XK_Left, moveresize, {.v = "0x 0y -25w 0h" } },
{ MODIFIER2|SHIFT, -1, XK_Down, moveresizeaspect, {.i = +24} },
{ MODIFIER2|SHIFT, -1, XK_Up, moveresizeaspect, {.i = -24} },
{ MODIFIER1|CONTROL, -1, XK_Up, moveresizeedge, {.v = "t"} },
{ MODIFIER1|CONTROL, -1, XK_Down, moveresizeedge, {.v = "b"} },
{ MODIFIER1|CONTROL, -1, XK_Left, moveresizeedge, {.v = "l"} },
@ -160,20 +156,17 @@ static const Key keys[] = {
{ MODIFIER1, XK_c, XK_w, spawn, RCMD(TERMINAL "speedwm-core -curl-weather") },
{ MODIFIER1, XK_c, XK_n, spawn, RCMD(NEXTMUSIC) },
{ MODIFIER1, XK_c, XK_p, spawn, RCMD(PREVMUSIC) },
{ MODIFIER1, XK_c, XK_m, spawn, RCMD(TERMINAL "speedwm-core -curl-cheatsheet") },
{ MODIFIER1, XK_r, XK_v, spawn, RCMD(TERMINAL VISUALIZER) },
{ MODIFIER1, XK_r, XK_s, spawn, RCMD("screenkey") },
{ MODIFIER1, XK_r, XK_d, spawn, RCMD("pkill screenkey") },
{ MODIFIER1|SHIFT, XK_k, XK_o, killunsel, {0} },
{ MODIFIER1|SHIFT, XK_e, XK_a, spawn, RCMD("speedwm-virtualkeyboard") },
{ MODIFIER1|SHIFT, XK_e, XK_e, spawn, RCMD("speedwm-virtualkeyboard -e") },
{ MODIFIER1|SHIFT, XK_e, XK_c, spawn, RCMD("speedwm-virtualkeyboard -c") },
{ MODIFIER2|SHIFT, XK_q, XK_o, killunsel, {0} },
{ MODIFIER1|SHIFT, XK_t, XK_s, togglesticky, {0} },
/* Gap keybinds */
{ MODIFIER1|MODIFIER2, -1, XK_j, incrgaps, {.i = +1 } },
{ MODIFIER1|MODIFIER2, -1, XK_k, incrgaps, {.i = -1 } },
{ MODIFIER1|MODIFIER2, -1, XK_d, incrgaps, {.i = +5 } },
{ MODIFIER1|MODIFIER2, -1, XK_u, incrgaps, {.i = -5 } },
{ MODIFIER1|CONTROL, -1, XK_d, incrgaps, {.i = +5 } },
{ MODIFIER1|CONTROL, -1, XK_u, incrgaps, {.i = -5 } },
/* Chained gap keybinds */
{ MODIFIER1, XK_g, XK_t, togglegaps, {0} },
@ -182,6 +175,8 @@ static const Key keys[] = {
{ MODIFIER1|SHIFT, XK_g, XK_i, incrigaps, {.i = -1} },
{ MODIFIER1, XK_g, XK_o, incrogaps, {.i = +1} },
{ MODIFIER1|SHIFT, XK_g, XK_o, incrogaps, {.i = -1} },
{ MODIFIER1|SHIFT, XK_g, XK_j, incrgaps, {.i = +1 } },
{ MODIFIER1|SHIFT, XK_g, XK_k, incrgaps, {.i = -1 } },
/* Media buttons */
#if USEMEDIA

View file

@ -78,7 +78,6 @@
#define VOL_DOWN "speedwm-audioctrl -lower" /* Command to run when decreasing volume */
#define VOL_UP "speedwm-audioctrl -raise" /* Command to run when increasing volume */
#define VOL_MUTE "speedwm-audioctrl -mute" /* Command to run when muting volume */
#define VOL_OUTPUT_SPEAKER "speedwm-audioctrl -switch" /* Command to run when enabling speakers */
/* Modifier keys
* Mod4Mask | Super (Windows/command) key
@ -118,10 +117,10 @@ static float lowestmfact = 0.05; /* Lowest possible mfact v
/* Window gap options */
static int enablegaps = 1; /* Enable gaps */
static unsigned int gappih = 10; /* horiz inner gap between windows */
static unsigned int gappiv = 10; /* vert inner gap between windows */
static unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
static unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
static unsigned int gappih = 10; /* Horizontal inner gap between windows */
static unsigned int gappiv = 10; /* Vertical inner gap between windows */
static unsigned int gappoh = 10; /* Horizontal outer gap between windows and screen edge */
static unsigned int gappov = 10; /* Vertical outer gap between windows and screen edge */
static unsigned int smartgapsize = 0; /* Gaps for smartgaps. If set to zero, gaps will be disabled. */
static int smartgaps = 0; /* 1 means use different gap size when there is only one window */
@ -245,7 +244,10 @@ static int hidesticky = 0; /* Hide sticky indicator (1)
/* Status options */
static int statusallmons = 1; /* Draw status bar on all monitors */
/* Layout options */
/* Layout options
*
* The ifs are here so that you can toggle them. If you don't want/need a layout, you can disable it in the toggle.h header file.
*/
#if LAYOUT_MONOCLE
static unsigned int monocleclientcount = 0; /* Display client count in the Monocle layout */
static unsigned int monoclecount = 0; /* Display focused client and number of total clients in the Monocle layout */

View file

@ -55,8 +55,5 @@ OPT=$1
case "$OPT" in
"-curl-weather") clear ; curl -s wttr.in | head -n 38 | tail -n 37 && sleep 60 ;;
"-curl-cheatsheet") clear ; echo -n "What cheatsheet do you want to view?\nExample: vim\n > " ; read CHEATSHEET ; curl -s cheat.sh/$(echo $CHEATSHEET | tr '[:upper:]' '[:lower:]') > /tmp/cheatsheet
grep "Unknown topic." /tmp/cheatsheet && $0 -curl-cheatsheet && exit 0
less /tmp/cheatsheet ;;
"-update-speedwm") UPDATE_SPEEDWM ;;
esac

View file

@ -2814,7 +2814,7 @@ killunsel(const Arg *arg)
for (i = selmon->clients; i; i = i->next) {
if (ISVISIBLE(i) && i != selmon->sel) {
#if USESYSTRAY
if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
if (!sendevent(i->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0, 0, 0)) {
#else
if (!sendevent(selmon->sel, wmatom[WMDelete])) {
#endif