s/SHCMD/RCMD/g and indentation changes
This commit is contained in:
speediegq
parent
e3596e021f
commit
ce938163a4
98
keybinds.h
98
keybinds.h
|
|
@ -2,8 +2,8 @@
|
|||
*
|
||||
* Example keybind:
|
||||
*
|
||||
* { MODIFIER1, -1, XK_1, spawn, SHCMD(TERMINAL "echo "Hello world!") },
|
||||
* { MODIFIER1, XK_F1, XK_1, spawn, SHCMD(TERMINAL "echo "Hello world! Pressing two keys in a row is based!") },
|
||||
* { MODIFIER1, -1, XK_1, spawn, RCMD(TERMINAL "echo "Hello world!") },
|
||||
* { MODIFIER1, XK_F1, XK_1, spawn, RCMD(TERMINAL "echo "Hello world! Pressing two keys in a row is based!") },
|
||||
*
|
||||
* Modifiers
|
||||
*
|
||||
|
|
@ -19,38 +19,38 @@
|
|||
*/
|
||||
|
||||
static const Key keys[] = {
|
||||
/* modifier chain key key function argument */
|
||||
/* modifier chain key key function argument */
|
||||
|
||||
/* Application keybinds */
|
||||
{ MODIFIER1|ShiftMask, -1, XK_semicolon, spawn, SHCMD(RUN) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_Return, spawn, SHCMD(TERMINAL) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_s, spawn, SHCMD(SCREENSHOT) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_f, spawn, SHCMD(TERMINAL FILEMANAGER) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_w, spawn, SHCMD(BROWSER) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_o, spawn, SHCMD("speedwm-dfmpeg") },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_t, spawn, SHCMD(TERMINAL EDITOR) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_a, spawn, SHCMD(TERMINAL MIXER) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_m, spawn, SHCMD(TERMINAL MUSIC) },
|
||||
{ MODIFIER2, -1, XK_Tab, spawn, SHCMD("speedwm-winnav") },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_x, spawn, SHCMD(TERMINAL SYSTEMSTAT) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_i, spawn, SHCMD(OPENPDF) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_Escape, spawn, SHCMD("speedwm-shutdown") },
|
||||
{ MODIFIER1|ControlMask, -1, XK_Tab, spawn, SHCMD("speedwm-utils -layout") },
|
||||
{ MODIFIER1|ControlMask, -1, XK_h, spawn, SHCMD(TERMINAL "speedwm-help -2") },
|
||||
{ MODIFIER1|ControlMask, -1, XK_s, spawn, SHCMD(SCREENSHOT_FULL) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_u, spawn, SHCMD(TERMINAL RSS) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_m, spawn, SHCMD(KILLMUSIC) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_1, spawn, SHCMD(VOL_MUTE) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_2, spawn, SHCMD(VOL_DOWN) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_3, spawn, SHCMD(VOL_UP) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_k, spawn, SHCMD(VOL_OUTPUT_SPEAKER) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Escape, spawn, SHCMD("speedwm-utils") },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_s, spawn, SHCMD("speedwm-swal") },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_n, spawn, SHCMD(NETWORK) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_b, spawn, SHCMD(BLUETOOTH) },
|
||||
{ MODIFIER1, -1, XK_s, spawn, SHCMD("speedwm-core -toggle") },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_m, spawn, SHCMD(TERMINAL EMAIL) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_e, spawn, SHCMD("speedwm_run -configure") },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_semicolon, spawn, RCMD(RUN) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_Return, spawn, RCMD(TERMINAL) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_s, spawn, RCMD(SCREENSHOT) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_f, spawn, RCMD(TERMINAL FILEMANAGER) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_w, spawn, RCMD(BROWSER) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_o, spawn, RCMD("speedwm-dfmpeg") },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_t, spawn, RCMD(TERMINAL EDITOR) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_a, spawn, RCMD(TERMINAL MIXER) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_m, spawn, RCMD(TERMINAL MUSIC) },
|
||||
{ MODIFIER2, -1, XK_Tab, spawn, RCMD("speedwm-winnav") },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_x, spawn, RCMD(TERMINAL SYSTEMSTAT) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_i, spawn, RCMD(OPENPDF) },
|
||||
{ MODIFIER1|ShiftMask, -1, XK_Escape, spawn, RCMD("speedwm-shutdown") },
|
||||
{ MODIFIER1|ControlMask, -1, XK_Tab, spawn, RCMD("speedwm-utils -layout") },
|
||||
{ MODIFIER1|ControlMask, -1, XK_h, spawn, RCMD(TERMINAL "speedwm-help -2") },
|
||||
{ MODIFIER1|ControlMask, -1, XK_s, spawn, RCMD(SCREENSHOT_FULL) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_u, spawn, RCMD(TERMINAL RSS) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_m, spawn, RCMD(KILLMUSIC) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_1, spawn, RCMD(VOL_MUTE) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_2, spawn, RCMD(VOL_DOWN) },
|
||||
{ MODIFIER1|ControlMask, -1, XK_3, spawn, RCMD(VOL_UP) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_k, spawn, RCMD(VOL_OUTPUT_SPEAKER) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Escape, spawn, RCMD("speedwm-utils") },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_s, spawn, RCMD("speedwm-swal") },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_n, spawn, RCMD(NETWORK) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_b, spawn, RCMD(BLUETOOTH) },
|
||||
{ MODIFIER1, -1, XK_s, spawn, RCMD("speedwm-core -toggle") },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_m, spawn, RCMD(TERMINAL EMAIL) },
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_e, spawn, RCMD("speedwm_run -configure") },
|
||||
|
||||
/* Layout keybinds */
|
||||
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_a, cyclelayout, {.i = -1 } },
|
||||
|
|
@ -139,12 +139,12 @@ static const Key keys[] = {
|
|||
{ MODIFIER1|ControlMask, -1, XK_o, show, {0} },
|
||||
|
||||
/* Chained keybinds */
|
||||
{ MODIFIER1, XK_c, XK_w, spawn, SHCMD(TERMINAL "speedwm-core -curl-weather") },
|
||||
{ MODIFIER1, XK_c, XK_m, spawn, SHCMD(TERMINAL "speedwm-core -curl-cheatsheet") },
|
||||
{ MODIFIER1, XK_r, XK_v, spawn, SHCMD(TERMINAL VISUALIZER) },
|
||||
{ MODIFIER1|ShiftMask, XK_e, XK_a, spawn, SHCMD("speedwm-virtualkeyboard") },
|
||||
{ MODIFIER1|ShiftMask, XK_e, XK_e, spawn, SHCMD("speedwm-virtualkeyboard -e") },
|
||||
{ MODIFIER1|ShiftMask, XK_e, XK_c, spawn, SHCMD("speedwm-virtualkeyboard -c") },
|
||||
{ MODIFIER1, XK_c, XK_w, spawn, RCMD(TERMINAL "speedwm-core -curl-weather") },
|
||||
{ MODIFIER1, XK_c, XK_m, spawn, RCMD(TERMINAL "speedwm-core -curl-cheatsheet") },
|
||||
{ MODIFIER1, XK_r, XK_v, spawn, RCMD(TERMINAL VISUALIZER) },
|
||||
{ MODIFIER1|ShiftMask, XK_e, XK_a, spawn, RCMD("speedwm-virtualkeyboard") },
|
||||
{ MODIFIER1|ShiftMask, XK_e, XK_e, spawn, RCMD("speedwm-virtualkeyboard -e") },
|
||||
{ MODIFIER1|ShiftMask, XK_e, XK_c, spawn, RCMD("speedwm-virtualkeyboard -c") },
|
||||
{ MODIFIER2|ShiftMask, XK_q, XK_o, killunsel, {0} },
|
||||
|
||||
/* Gap keybinds */
|
||||
|
|
@ -163,16 +163,16 @@ static const Key keys[] = {
|
|||
|
||||
/* Media buttons */
|
||||
#if USEMEDIA
|
||||
{ 0, -1, XF86XK_AudioMute, spawn, SHCMD(VOL_MUTE) },
|
||||
{ 0, -1, XF86XK_AudioRaiseVolume, spawn, SHCMD(VOL_UP) },
|
||||
{ 0, -1, XF86XK_AudioLowerVolume, spawn, SHCMD(VOL_DOWN) },
|
||||
{ 0, -1, XF86XK_AudioPrev, spawn, SHCMD(PREVMUSIC) },
|
||||
{ 0, -1, XF86XK_AudioNext, spawn, SHCMD(NEXTMUSIC) },
|
||||
{ 0, -1, XF86XK_AudioStop, spawn, SHCMD(KILLMUSIC) },
|
||||
{ 0, -1, XF86XK_WWW, spawn, SHCMD(BROWSER) },
|
||||
{ 0, -1, XF86XK_PowerOff, spawn, SHCMD("speedwm-shutdown") },
|
||||
{ 0, -1, XF86XK_Sleep, spawn, SHCMD(LOCKER) },
|
||||
{ 0, -1, XF86XK_Mail, spawn, SHCMD(TERMINAL EMAIL) },
|
||||
{ 0, -1, XF86XK_TaskPane, spawn, SHCMD(TERMINAL SYSTEMSTAT) },
|
||||
{ 0, -1, XF86XK_AudioMute, spawn, RCMD(VOL_MUTE) },
|
||||
{ 0, -1, XF86XK_AudioRaiseVolume, spawn, RCMD(VOL_UP) },
|
||||
{ 0, -1, XF86XK_AudioLowerVolume, spawn, RCMD(VOL_DOWN) },
|
||||
{ 0, -1, XF86XK_AudioPrev, spawn, RCMD(PREVMUSIC) },
|
||||
{ 0, -1, XF86XK_AudioNext, spawn, RCMD(NEXTMUSIC) },
|
||||
{ 0, -1, XF86XK_AudioStop, spawn, RCMD(KILLMUSIC) },
|
||||
{ 0, -1, XF86XK_WWW, spawn, RCMD(BROWSER) },
|
||||
{ 0, -1, XF86XK_PowerOff, spawn, RCMD("speedwm-shutdown") },
|
||||
{ 0, -1, XF86XK_Sleep, spawn, RCMD(LOCKER) },
|
||||
{ 0, -1, XF86XK_Mail, spawn, RCMD(TERMINAL EMAIL) },
|
||||
{ 0, -1, XF86XK_TaskPane, spawn, RCMD(TERMINAL SYSTEMSTAT) },
|
||||
#endif
|
||||
};
|
||||
|
|
|
|||
2
mouse.h
2
mouse.h
|
|
@ -22,7 +22,7 @@ static const Button buttons[] = {
|
|||
{ ClkStatusText, 0, Button2, spawn, {.v = statuscmd } },
|
||||
{ ClkStatusText, 0, Button3, spawn, {.v = statuscmd } },
|
||||
{ ClkWinTitle, 0, Button1, togglewin, {0} },
|
||||
{ ClkWinTitle, 0, Button3, spawn, SHCMD("speedwm-utils") },
|
||||
{ ClkWinTitle, 0, Button3, spawn, RCMD("speedwm-utils") },
|
||||
{ ClkTagBar, 0, Button1, view, {0} },
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@
|
|||
#define SESSION_FILE "/tmp/speedwm-session" /* Session file. This file may be used as a list of windows and their tagnum */
|
||||
|
||||
/* Misc */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ shell, "-c", cmd, NULL } }
|
||||
#define TAGKEYS(CHAIN,KEY,TAG) { MODIFIER1, CHAIN, KEY, view, {.ui = 1 << TAG} }, \
|
||||
{ MODIFIER1|ShiftMask, CHAIN, KEY, previewtag, {.ui = TAG} }, \
|
||||
|
||||
|
|
|
|||
|
|
@ -611,6 +611,11 @@ static xcb_connection_t *xcon;
|
|||
|
||||
/* Configuration */
|
||||
#include "options.h" /* Include options */
|
||||
|
||||
/* Shell command */
|
||||
#define RCMD(cmd) {.v = (const char*[]){ shell, "-c", cmd, NULL } },
|
||||
|
||||
/* Rest of the headers */
|
||||
#include "layouts.c" /* Enable patched layouts */
|
||||
#include "autostart.h" /* Add autostart support */
|
||||
#include "colors.h" /* Include colors */
|
||||
|
|
@ -619,12 +624,14 @@ static xcb_connection_t *xcon;
|
|||
#include "xresources.h" /* Include .Xresources/Pywal support */
|
||||
#include "keybinds.h" /* Include keybinds */
|
||||
|
||||
/* IPC support */
|
||||
#if USEIPC
|
||||
#include "ipc.h" /* Include IPC */
|
||||
#include "toggle/ipc-cli.c"
|
||||
#include "toggle/ipc-yajl.c"
|
||||
#endif
|
||||
|
||||
/* Mouse support */
|
||||
#if USEMOUSE
|
||||
static const char *statuscmd[] = { shell, "-c", NULL, NULL };
|
||||
#include "mouse.h" /* Include mouse support */
|
||||
|
|
|
|||
Loading…
Reference in a new issue