From a0eec4c0d0826243ede500ba91ad495a26ced6dc Mon Sep 17 00:00:00 2001 From: speediegq Date: Sun, 9 Oct 2022 14:05:11 +0200 Subject: [PATCH] Change keybind #define --- keybinds.h | 116 ++++++++++++++++++++++++++--------------------------- speedwm.c | 2 + 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/keybinds.h b/keybinds.h index 26fdf96..282035b 100644 --- a/keybinds.h +++ b/keybinds.h @@ -2,8 +2,8 @@ * * Example keybind: * - * { 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!") }, + * { MODIFIER1, -1, XK_1, spawn, cmd( TERMINAL "echo 'Hello world!' ) }, + * { MODIFIER1, XK_F1, XK_1, spawn, cmd( TERMINAL "echo 'Hello world! Pressing two keys in a row is based!' ) }, * * Modifiers * @@ -40,42 +40,42 @@ static const Key keys[] = { /* modifier chain key key function argument */ /* Run keybinds */ - { MODIFIER1|SHIFT, -1, XK_semicolon, spawn, RCMD(RUN) }, - { MODIFIER1, -1, XK_semicolon, spawn, RCMD(RUN_DESKTOP) }, - { MODIFIER1|CONTROL|SHIFT, -1, XK_semicolon, spawn, RCMD(RUN_ALT) }, + { MODIFIER1|SHIFT, -1, XK_semicolon, spawn, cmd( RUN ) }, + { MODIFIER1, -1, XK_semicolon, spawn, cmd( RUN_DESKTOP ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_semicolon, spawn, cmd( RUN_ALT ) }, /* Application keybinds */ - { MODIFIER1|SHIFT, -1, XK_Return, spawn, RCMD(TERMINAL) }, - { MODIFIER1|SHIFT, -1, XK_s, spawn, RCMD(SCREENSHOT) }, - { MODIFIER1|SHIFT, -1, XK_f, spawn, RCMD(TERMINAL FILEMANAGER) }, - { MODIFIER1|SHIFT, -1, XK_w, spawn, RCMD(BROWSER) }, - { MODIFIER1|SHIFT, -1, XK_o, spawn, RCMD("speedwm-dfmpeg") }, - { MODIFIER1|SHIFT, -1, XK_d, spawn, RCMD(TERMINAL CHAT2) }, - { 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) }, - { 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_Escape, spawn, RCMD("speedwm-shutdown") }, - { MODIFIER1|SHIFT, -1, XK_u, spawn, RCMD(TERMINAL RSS) }, - { MODIFIER1|SHIFT, -1, XK_r, spawn, RCMD(TERMINAL EMAIL) }, - { MODIFIER1|CONTROL, -1, XK_Tab, spawn, RCMD("speedwm-utils layout") }, - { MODIFIER1|CONTROL, -1, XK_h, spawn, RCMD(TERMINAL "speedwm-help -2") }, - { MODIFIER1|CONTROL, -1, XK_s, spawn, RCMD(SCREENSHOT_FULL) }, - { MODIFIER1|CONTROL, -1, XK_m, spawn, RCMD(KILLMUSIC) }, - { MODIFIER1|CONTROL, -1, XK_q, spawn, RCMD(VOL_MUTE) }, - { MODIFIER1|CONTROL, -1, XK_w, spawn, RCMD(VOL_DOWN) }, - { MODIFIER1|CONTROL, -1, XK_e, spawn, RCMD(VOL_UP) }, - { 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_Escape, spawn, RCMD("speedwm-utils") }, - { MODIFIER1|CONTROL|SHIFT, -1, XK_s, spawn, RCMD("speedwm-swal") }, - { MODIFIER1|CONTROL|SHIFT, -1, XK_n, spawn, RCMD(NETWORK) }, - { MODIFIER1|CONTROL|SHIFT, -1, XK_b, spawn, RCMD(BLUETOOTH) }, - { MODIFIER1|CONTROL|SHIFT, -1, XK_f, spawn, RCMD("speedwm_run -configure") }, - { MODIFIER1|CONTROL|SHIFT, -1, XK_r, spawn, RCMD("speedwm_run -r") }, + { MODIFIER1|SHIFT, -1, XK_Return, spawn, cmd( TERMINAL ) }, + { MODIFIER1|SHIFT, -1, XK_s, spawn, cmd( SCREENSHOT ) }, + { MODIFIER1|SHIFT, -1, XK_f, spawn, cmd( TERMINAL FILEMANAGER ) }, + { MODIFIER1|SHIFT, -1, XK_w, spawn, cmd( BROWSER ) }, + { MODIFIER1|SHIFT, -1, XK_o, spawn, cmd( "speedwm-dfmpeg" ) }, + { MODIFIER1|SHIFT, -1, XK_d, spawn, cmd( TERMINAL CHAT2 ) }, + { MODIFIER1|SHIFT, -1, XK_t, spawn, cmd( TERMINAL EDITOR ) }, + { MODIFIER1|SHIFT, -1, XK_a, spawn, cmd( TERMINAL MIXER ) }, + { MODIFIER1|SHIFT, -1, XK_m, spawn, cmd( TERMINAL MUSIC ) }, + { MODIFIER1, -1, XK_Tab, spawn, cmd( "speedwm-winnav" ) }, + { MODIFIER1|SHIFT, -1, XK_x, spawn, cmd( TERMINAL SYSTEMSTAT ) }, + { MODIFIER1|SHIFT, -1, XK_c, spawn, cmd( TERMINAL CHAT ) }, + { MODIFIER1|SHIFT, -1, XK_Escape, spawn, cmd( "speedwm-shutdown" ) }, + { MODIFIER1|SHIFT, -1, XK_u, spawn, cmd( TERMINAL RSS ) }, + { MODIFIER1|SHIFT, -1, XK_r, spawn, cmd( TERMINAL EMAIL ) }, + { MODIFIER1|CONTROL, -1, XK_Tab, spawn, cmd( "speedwm-utils layout" ) }, + { MODIFIER1|CONTROL, -1, XK_h, spawn, cmd( TERMINAL "speedwm-help -2" ) }, + { MODIFIER1|CONTROL, -1, XK_s, spawn, cmd( SCREENSHOT_FULL ) }, + { MODIFIER1|CONTROL, -1, XK_m, spawn, cmd( KILLMUSIC ) }, + { MODIFIER1|CONTROL, -1, XK_q, spawn, cmd( VOL_MUTE ) }, + { MODIFIER1|CONTROL, -1, XK_w, spawn, cmd( VOL_DOWN ) }, + { MODIFIER1|CONTROL, -1, XK_e, spawn, cmd( VOL_UP ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_q, spawn, cmd( PAUSEMUSIC ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_w, spawn, cmd( DOWNMUSIC ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_e, spawn, cmd( UPMUSIC ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_Escape, spawn, cmd( "speedwm-utils" ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_s, spawn, cmd( "speedwm-swal" ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_n, spawn, cmd( NETWORK ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_b, spawn, cmd( BLUETOOTH ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_f, spawn, cmd( "speedwm_run -configure" ) }, + { MODIFIER1|CONTROL|SHIFT, -1, XK_r, spawn, cmd( "speedwm_run -r" ) }, #if USESYSTRAY { MODIFIER1, -1, XK_s, togglesystray, {0} }, #endif @@ -167,16 +167,16 @@ static const Key keys[] = { { MODIFIER1|CONTROL|SHIFT, -1, XK_p, hideall, {0} }, /* Chained keybinds */ - { 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_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, XK_c, XK_w, spawn, cmd( TERMINAL "speedwm-core -curl-weather" ) }, + { MODIFIER1, XK_c, XK_n, spawn, cmd( NEXTMUSIC ) }, + { MODIFIER1, XK_c, XK_p, spawn, cmd( PREVMUSIC ) }, + { MODIFIER1, XK_r, XK_v, spawn, cmd( TERMINAL VISUALIZER ) }, + { MODIFIER1, XK_r, XK_s, spawn, cmd( "screenkey" ) }, + { MODIFIER1, XK_r, XK_d, spawn, cmd( "pkill screenkey" ) }, { MODIFIER1, XK_t, XK_s, togglesticky, {0} }, { 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_a, spawn, cmd( "speedwm-virtualkeyboard" ) }, + { MODIFIER1|SHIFT, XK_e, XK_e, spawn, cmd( "speedwm-virtualkeyboard -e" ) }, /* Gap keybinds */ { MODIFIER1|CONTROL, -1, XK_z, incrgaps, {.i = +5 } }, @@ -194,19 +194,19 @@ static const Key keys[] = { /* Media buttons */ #if USEMEDIA - { 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_AudioPause, spawn, RCMD(PAUSEMUSIC) }, - { 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) }, - { 0, -1, XF86XK_WLAN, spawn, RCMD(KILLNETWORK) }, - { 0, -1, XF86XK_Music, spawn, RCMD(TERMINAL MUSIC) }, + { 0, -1, XF86XK_AudioMute, spawn, cmd( VOL_MUTE ) }, + { 0, -1, XF86XK_AudioRaiseVolume, spawn, cmd( VOL_UP ) }, + { 0, -1, XF86XK_AudioLowerVolume, spawn, cmd( VOL_DOWN ) }, + { 0, -1, XF86XK_AudioPrev, spawn, cmd( PREVMUSIC ) }, + { 0, -1, XF86XK_AudioNext, spawn, cmd( NEXTMUSIC ) }, + { 0, -1, XF86XK_AudioStop, spawn, cmd( KILLMUSIC ) }, + { 0, -1, XF86XK_AudioPause, spawn, cmd( PAUSEMUSIC ) }, + { 0, -1, XF86XK_WWW, spawn, cmd( BROWSER ) }, + { 0, -1, XF86XK_PowerOff, spawn, cmd( "speedwm-shutdown" ) }, + { 0, -1, XF86XK_Sleep, spawn, cmd( LOCKER ) }, + { 0, -1, XF86XK_Mail, spawn, cmd( TERMINAL EMAIL ) }, + { 0, -1, XF86XK_TaskPane, spawn, cmd( TERMINAL SYSTEMSTAT ) }, + { 0, -1, XF86XK_WLAN, spawn, cmd( KILLNETWORK ) }, + { 0, -1, XF86XK_Music, spawn, cmd( TERMINAL MUSIC ) }, #endif }; diff --git a/speedwm.c b/speedwm.c index 6d39061..82b3eed 100644 --- a/speedwm.c +++ b/speedwm.c @@ -683,6 +683,8 @@ static int systraypinningfailfirst = 1; /* Shell command */ #define RCMD(cmd) {.v = (const char*[]){ shell, "-c", cmd, NULL } }, +#define RCMD(cmd) {.v = (const char*[]){ shell, "-c", cmd, NULL } }, +#define cmd( cmd ) {.v = (const char*[]){ shell, "-c", cmd, NULL } }, #define SESSION_FILE "/tmp/speedwm-session" /* Modifiers */