diff options
author | Åsmund Vikane <aasvi93@hotmail.com> | 2018-07-30 20:41:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-30 20:41:27 +0200 |
commit | 64536ff9ffba113b56f833bca0bd4a38b25556d2 (patch) | |
tree | 785cc751dcb3117fb4deb9f82574b94d0ea1a0e9 | |
parent | a1da10d6d393f0a3f1f56f7a9a14d1e868bfcbe7 (diff) | |
parent | 93917e6609a709cdcff4f23ed6c788cfe6bcc838 (diff) | |
download | skhd-64536ff9ffba113b56f833bca0bd4a38b25556d2.tar.gz skhd-64536ff9ffba113b56f833bca0bd4a38b25556d2.zip |
Merge pull request #45 from kylef/kylef/meh
Add meh keyword
Diffstat (limited to '')
-rw-r--r-- | src/hotkey.h | 5 | ||||
-rw-r--r-- | src/parse.c | 2 | ||||
-rw-r--r-- | src/tokenize.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/hotkey.h b/src/hotkey.h index e616303..f06ce90 100644 --- a/src/hotkey.h +++ b/src/hotkey.h @@ -49,7 +49,10 @@ enum hotkey_flag Hotkey_Flag_Hyper = (Hotkey_Flag_Cmd | Hotkey_Flag_Alt | Hotkey_Flag_Shift | - Hotkey_Flag_Control) + Hotkey_Flag_Control), + Hotkey_Flag_Meh = (Hotkey_Flag_Control | + Hotkey_Flag_Shift | + Hotkey_Flag_Alt) }; #include "hashtable.h" diff --git a/src/parse.c b/src/parse.c index 5439a0f..0b09f02 100644 --- a/src/parse.c +++ b/src/parse.c @@ -158,7 +158,7 @@ internal enum hotkey_flag modifier_flags_value[] = Hotkey_Flag_Shift, Hotkey_Flag_LShift, Hotkey_Flag_RShift, Hotkey_Flag_Cmd, Hotkey_Flag_LCmd, Hotkey_Flag_RCmd, Hotkey_Flag_Control, Hotkey_Flag_LControl, Hotkey_Flag_RControl, - Hotkey_Flag_Fn, Hotkey_Flag_Hyper, + Hotkey_Flag_Fn, Hotkey_Flag_Hyper, Hotkey_Flag_Meh, }; internal uint32_t diff --git a/src/tokenize.h b/src/tokenize.h index d6bd4bf..3c1bd31 100644 --- a/src/tokenize.h +++ b/src/tokenize.h @@ -7,7 +7,7 @@ static const char *modifier_flags_str[] = "shift", "lshift", "rshift", "cmd", "lcmd", "rcmd", "ctrl", "lctrl", "rctrl", - "fn", "hyper", + "fn", "hyper", "meh", }; static const char *literal_keycode_str[] = |