diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-18 19:38:37 +0300 |
commit | b88ca3e6d113d161dd119bf1cec959c73b797af7 (patch) | |
tree | 6a8b73ca95f8a21742cba1e764d1e24cc5ae8db5 /source/blender/makesrna/intern/rna_wm.c | |
parent | 9e382dd2a3d8569201a3e5c1a8478166c77e9029 (diff) |
Cleanup: Resolve HKEY conflict
Both the MS headers and blender headers define the HKEY
which gives all kind of inclusion order issues.
This diff renames all *KEY constants to EVT_*KEY to resolve
this conflict.
Reviewed By: brecht , dfelinto
Differential Revision: http://developer.blender.org/D7164
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 242 |
1 files changed, 121 insertions, 121 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 7cba1c49a9b..515ed2b0743 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -198,128 +198,128 @@ const EnumPropertyItem rna_enum_event_type_items[] = { {EVT_TWEAK_M, "EVT_TWEAK_M", 0, "Tweak Middle", "TwkM"}, {EVT_TWEAK_R, "EVT_TWEAK_R", 0, "Tweak Right", "TwkR"}, {0, "", 0, NULL, NULL}, - {AKEY, "A", 0, "A", ""}, - {BKEY, "B", 0, "B", ""}, - {CKEY, "C", 0, "C", ""}, - {DKEY, "D", 0, "D", ""}, - {EKEY, "E", 0, "E", ""}, - {FKEY, "F", 0, "F", ""}, - {GKEY, "G", 0, "G", ""}, - {HKEY, "H", 0, "H", ""}, - {IKEY, "I", 0, "I", ""}, - {JKEY, "J", 0, "J", ""}, - {KKEY, "K", 0, "K", ""}, - {LKEY, "L", 0, "L", ""}, - {MKEY, "M", 0, "M", ""}, - {NKEY, "N", 0, "N", ""}, - {OKEY, "O", 0, "O", ""}, - {PKEY, "P", 0, "P", ""}, - {QKEY, "Q", 0, "Q", ""}, - {RKEY, "R", 0, "R", ""}, - {SKEY, "S", 0, "S", ""}, - {TKEY, "T", 0, "T", ""}, - {UKEY, "U", 0, "U", ""}, - {VKEY, "V", 0, "V", ""}, - {WKEY, "W", 0, "W", ""}, - {XKEY, "X", 0, "X", ""}, - {YKEY, "Y", 0, "Y", ""}, - {ZKEY, "Z", 0, "Z", ""}, + {EVT_AKEY, "A", 0, "A", ""}, + {EVT_BKEY, "B", 0, "B", ""}, + {EVT_CKEY, "C", 0, "C", ""}, + {EVT_DKEY, "D", 0, "D", ""}, + {EVT_EKEY, "E", 0, "E", ""}, + {EVT_FKEY, "F", 0, "F", ""}, + {EVT_GKEY, "G", 0, "G", ""}, + {EVT_HKEY, "H", 0, "H", ""}, + {EVT_IKEY, "I", 0, "I", ""}, + {EVT_JKEY, "J", 0, "J", ""}, + {EVT_KKEY, "K", 0, "K", ""}, + {EVT_LKEY, "L", 0, "L", ""}, + {EVT_MKEY, "M", 0, "M", ""}, + {EVT_NKEY, "N", 0, "N", ""}, + {EVT_OKEY, "O", 0, "O", ""}, + {EVT_PKEY, "P", 0, "P", ""}, + {EVT_QKEY, "Q", 0, "Q", ""}, + {EVT_RKEY, "R", 0, "R", ""}, + {EVT_SKEY, "S", 0, "S", ""}, + {EVT_TKEY, "T", 0, "T", ""}, + {EVT_UKEY, "U", 0, "U", ""}, + {EVT_VKEY, "V", 0, "V", ""}, + {EVT_WKEY, "W", 0, "W", ""}, + {EVT_XKEY, "X", 0, "X", ""}, + {EVT_YKEY, "Y", 0, "Y", ""}, + {EVT_ZKEY, "Z", 0, "Z", ""}, {0, "", 0, NULL, NULL}, - {ZEROKEY, "ZERO", 0, "0", ""}, - {ONEKEY, "ONE", 0, "1", ""}, - {TWOKEY, "TWO", 0, "2", ""}, - {THREEKEY, "THREE", 0, "3", ""}, - {FOURKEY, "FOUR", 0, "4", ""}, - {FIVEKEY, "FIVE", 0, "5", ""}, - {SIXKEY, "SIX", 0, "6", ""}, - {SEVENKEY, "SEVEN", 0, "7", ""}, - {EIGHTKEY, "EIGHT", 0, "8", ""}, - {NINEKEY, "NINE", 0, "9", ""}, + {EVT_ZEROKEY, "ZERO", 0, "0", ""}, + {EVT_ONEKEY, "ONE", 0, "1", ""}, + {EVT_TWOKEY, "TWO", 0, "2", ""}, + {EVT_THREEKEY, "THREE", 0, "3", ""}, + {EVT_FOURKEY, "FOUR", 0, "4", ""}, + {EVT_FIVEKEY, "FIVE", 0, "5", ""}, + {EVT_SIXKEY, "SIX", 0, "6", ""}, + {EVT_SEVENKEY, "SEVEN", 0, "7", ""}, + {EVT_EIGHTKEY, "EIGHT", 0, "8", ""}, + {EVT_NINEKEY, "NINE", 0, "9", ""}, {0, "", 0, NULL, NULL}, - {LEFTCTRLKEY, "LEFT_CTRL", 0, "Left Ctrl", "CtrlL"}, - {LEFTALTKEY, "LEFT_ALT", 0, "Left Alt", "AltL"}, - {LEFTSHIFTKEY, "LEFT_SHIFT", 0, "Left Shift", "ShiftL"}, - {RIGHTALTKEY, "RIGHT_ALT", 0, "Right Alt", "AltR"}, - {RIGHTCTRLKEY, "RIGHT_CTRL", 0, "Right Ctrl", "CtrlR"}, - {RIGHTSHIFTKEY, "RIGHT_SHIFT", 0, "Right Shift", "ShiftR"}, + {EVT_LEFTCTRLKEY, "LEFT_CTRL", 0, "Left Ctrl", "CtrlL"}, + {EVT_LEFTALTKEY, "LEFT_ALT", 0, "Left Alt", "AltL"}, + {EVT_LEFTSHIFTKEY, "LEFT_SHIFT", 0, "Left Shift", "ShiftL"}, + {EVT_RIGHTALTKEY, "RIGHT_ALT", 0, "Right Alt", "AltR"}, + {EVT_RIGHTCTRLKEY, "RIGHT_CTRL", 0, "Right Ctrl", "CtrlR"}, + {EVT_RIGHTSHIFTKEY, "RIGHT_SHIFT", 0, "Right Shift", "ShiftR"}, {0, "", 0, NULL, NULL}, - {OSKEY, "OSKEY", 0, "OS Key", "Cmd"}, - {APPKEY, "APP", 0, "Application", "App"}, - {GRLESSKEY, "GRLESS", 0, "Grless", ""}, - {ESCKEY, "ESC", 0, "Esc", ""}, - {TABKEY, "TAB", 0, "Tab", ""}, - {RETKEY, "RET", 0, "Return", "Enter"}, - {SPACEKEY, "SPACE", 0, "Spacebar", "Space"}, - {LINEFEEDKEY, "LINE_FEED", 0, "Line Feed", ""}, - {BACKSPACEKEY, "BACK_SPACE", 0, "Back Space", "BkSpace"}, - {DELKEY, "DEL", 0, "Delete", "Del"}, - {SEMICOLONKEY, "SEMI_COLON", 0, ";", ""}, - {PERIODKEY, "PERIOD", 0, ".", ""}, - {COMMAKEY, "COMMA", 0, ",", ""}, - {QUOTEKEY, "QUOTE", 0, "\"", ""}, - {ACCENTGRAVEKEY, "ACCENT_GRAVE", 0, "`", ""}, - {MINUSKEY, "MINUS", 0, "-", ""}, - {PLUSKEY, "PLUS", 0, "+", ""}, - {SLASHKEY, "SLASH", 0, "/", ""}, - {BACKSLASHKEY, "BACK_SLASH", 0, "\\", ""}, - {EQUALKEY, "EQUAL", 0, "=", ""}, - {LEFTBRACKETKEY, "LEFT_BRACKET", 0, "[", ""}, - {RIGHTBRACKETKEY, "RIGHT_BRACKET", 0, "]", ""}, - {LEFTARROWKEY, "LEFT_ARROW", 0, "Left Arrow", "←"}, - {DOWNARROWKEY, "DOWN_ARROW", 0, "Down Arrow", "↓"}, - {RIGHTARROWKEY, "RIGHT_ARROW", 0, "Right Arrow", "→"}, - {UPARROWKEY, "UP_ARROW", 0, "Up Arrow", "↑"}, - {PAD2, "NUMPAD_2", 0, "Numpad 2", "Pad2"}, - {PAD4, "NUMPAD_4", 0, "Numpad 4", "Pad4"}, - {PAD6, "NUMPAD_6", 0, "Numpad 6", "Pad6"}, - {PAD8, "NUMPAD_8", 0, "Numpad 8", "Pad8"}, - {PAD1, "NUMPAD_1", 0, "Numpad 1", "Pad1"}, - {PAD3, "NUMPAD_3", 0, "Numpad 3", "Pad3"}, - {PAD5, "NUMPAD_5", 0, "Numpad 5", "Pad5"}, - {PAD7, "NUMPAD_7", 0, "Numpad 7", "Pad7"}, - {PAD9, "NUMPAD_9", 0, "Numpad 9", "Pad9"}, - {PADPERIOD, "NUMPAD_PERIOD", 0, "Numpad .", "Pad."}, - {PADSLASHKEY, "NUMPAD_SLASH", 0, "Numpad /", "Pad/"}, - {PADASTERKEY, "NUMPAD_ASTERIX", 0, "Numpad *", "Pad*"}, - {PAD0, "NUMPAD_0", 0, "Numpad 0", "Pad0"}, - {PADMINUS, "NUMPAD_MINUS", 0, "Numpad -", "Pad-"}, - {PADENTER, "NUMPAD_ENTER", 0, "Numpad Enter", "PadEnter"}, - {PADPLUSKEY, "NUMPAD_PLUS", 0, "Numpad +", "Pad+"}, - {F1KEY, "F1", 0, "F1", ""}, - {F2KEY, "F2", 0, "F2", ""}, - {F3KEY, "F3", 0, "F3", ""}, - {F4KEY, "F4", 0, "F4", ""}, - {F5KEY, "F5", 0, "F5", ""}, - {F6KEY, "F6", 0, "F6", ""}, - {F7KEY, "F7", 0, "F7", ""}, - {F8KEY, "F8", 0, "F8", ""}, - {F9KEY, "F9", 0, "F9", ""}, - {F10KEY, "F10", 0, "F10", ""}, - {F11KEY, "F11", 0, "F11", ""}, - {F12KEY, "F12", 0, "F12", ""}, - {F13KEY, "F13", 0, "F13", ""}, - {F14KEY, "F14", 0, "F14", ""}, - {F15KEY, "F15", 0, "F15", ""}, - {F16KEY, "F16", 0, "F16", ""}, - {F17KEY, "F17", 0, "F17", ""}, - {F18KEY, "F18", 0, "F18", ""}, - {F19KEY, "F19", 0, "F19", ""}, - {F20KEY, "F20", 0, "F20", ""}, - {F21KEY, "F21", 0, "F21", ""}, - {F22KEY, "F22", 0, "F22", ""}, - {F23KEY, "F23", 0, "F23", ""}, - {F24KEY, "F24", 0, "F24", ""}, - {PAUSEKEY, "PAUSE", 0, "Pause", ""}, - {INSERTKEY, "INSERT", 0, "Insert", "Ins"}, - {HOMEKEY, "HOME", 0, "Home", ""}, - {PAGEUPKEY, "PAGE_UP", 0, "Page Up", "PgUp"}, - {PAGEDOWNKEY, "PAGE_DOWN", 0, "Page Down", "PgDown"}, - {ENDKEY, "END", 0, "End", ""}, + {EVT_OSKEY, "OSKEY", 0, "OS Key", "Cmd"}, + {EVT_APPKEY, "APP", 0, "Application", "App"}, + {EVT_GRLESSKEY, "GRLESS", 0, "Grless", ""}, + {EVT_ESCKEY, "ESC", 0, "Esc", ""}, + {EVT_TABKEY, "TAB", 0, "Tab", ""}, + {EVT_RETKEY, "RET", 0, "Return", "Enter"}, + {EVT_SPACEKEY, "SPACE", 0, "Spacebar", "Space"}, + {EVT_LINEFEEDKEY, "LINE_FEED", 0, "Line Feed", ""}, + {EVT_BACKSPACEKEY, "BACK_SPACE", 0, "Back Space", "BkSpace"}, + {EVT_DELKEY, "DEL", 0, "Delete", "Del"}, + {EVT_SEMICOLONKEY, "SEMI_COLON", 0, ";", ""}, + {EVT_PERIODKEY, "PERIOD", 0, ".", ""}, + {EVT_COMMAKEY, "COMMA", 0, ",", ""}, + {EVT_QUOTEKEY, "QUOTE", 0, "\"", ""}, + {EVT_ACCENTGRAVEKEY, "ACCENT_GRAVE", 0, "`", ""}, + {EVT_MINUSKEY, "MINUS", 0, "-", ""}, + {EVT_PLUSKEY, "PLUS", 0, "+", ""}, + {EVT_SLASHKEY, "SLASH", 0, "/", ""}, + {EVT_BACKSLASHKEY, "BACK_SLASH", 0, "\\", ""}, + {EVT_EQUALKEY, "EQUAL", 0, "=", ""}, + {EVT_LEFTBRACKETKEY, "LEFT_BRACKET", 0, "[", ""}, + {EVT_RIGHTBRACKETKEY, "RIGHT_BRACKET", 0, "]", ""}, + {EVT_LEFTARROWKEY, "LEFT_ARROW", 0, "Left Arrow", "←"}, + {EVT_DOWNARROWKEY, "DOWN_ARROW", 0, "Down Arrow", "↓"}, + {EVT_RIGHTARROWKEY, "RIGHT_ARROW", 0, "Right Arrow", "→"}, + {EVT_UPARROWKEY, "UP_ARROW", 0, "Up Arrow", "↑"}, + {EVT_PAD2, "NUMPAD_2", 0, "Numpad 2", "Pad2"}, + {EVT_PAD4, "NUMPAD_4", 0, "Numpad 4", "Pad4"}, + {EVT_PAD6, "NUMPAD_6", 0, "Numpad 6", "Pad6"}, + {EVT_PAD8, "NUMPAD_8", 0, "Numpad 8", "Pad8"}, + {EVT_PAD1, "NUMPAD_1", 0, "Numpad 1", "Pad1"}, + {EVT_PAD3, "NUMPAD_3", 0, "Numpad 3", "Pad3"}, + {EVT_PAD5, "NUMPAD_5", 0, "Numpad 5", "Pad5"}, + {EVT_PAD7, "NUMPAD_7", 0, "Numpad 7", "Pad7"}, + {EVT_PAD9, "NUMPAD_9", 0, "Numpad 9", "Pad9"}, + {EVT_PADPERIOD, "NUMPAD_PERIOD", 0, "Numpad .", "Pad."}, + {EVT_PADSLASHKEY, "NUMPAD_SLASH", 0, "Numpad /", "Pad/"}, + {EVT_PADASTERKEY, "NUMPAD_ASTERIX", 0, "Numpad *", "Pad*"}, + {EVT_PAD0, "NUMPAD_0", 0, "Numpad 0", "Pad0"}, + {EVT_PADMINUS, "NUMPAD_MINUS", 0, "Numpad -", "Pad-"}, + {EVT_PADENTER, "NUMPAD_ENTER", 0, "Numpad Enter", "PadEnter"}, + {EVT_PADPLUSKEY, "NUMPAD_PLUS", 0, "Numpad +", "Pad+"}, + {EVT_F1KEY, "F1", 0, "F1", ""}, + {EVT_F2KEY, "F2", 0, "F2", ""}, + {EVT_F3KEY, "F3", 0, "F3", ""}, + {EVT_F4KEY, "F4", 0, "F4", ""}, + {EVT_F5KEY, "F5", 0, "F5", ""}, + {EVT_F6KEY, "F6", 0, "F6", ""}, + {EVT_F7KEY, "F7", 0, "F7", ""}, + {EVT_F8KEY, "F8", 0, "F8", ""}, + {EVT_F9KEY, "F9", 0, "F9", ""}, + {EVT_F10KEY, "F10", 0, "F10", ""}, + {EVT_F11KEY, "F11", 0, "F11", ""}, + {EVT_F12KEY, "F12", 0, "F12", ""}, + {EVT_F13KEY, "F13", 0, "F13", ""}, + {EVT_F14KEY, "F14", 0, "F14", ""}, + {EVT_F15KEY, "F15", 0, "F15", ""}, + {EVT_F16KEY, "F16", 0, "F16", ""}, + {EVT_F17KEY, "F17", 0, "F17", ""}, + {EVT_F18KEY, "F18", 0, "F18", ""}, + {EVT_F19KEY, "F19", 0, "F19", ""}, + {EVT_F20KEY, "F20", 0, "F20", ""}, + {EVT_F21KEY, "F21", 0, "F21", ""}, + {EVT_F22KEY, "F22", 0, "F22", ""}, + {EVT_F23KEY, "F23", 0, "F23", ""}, + {EVT_F24KEY, "F24", 0, "F24", ""}, + {EVT_PAUSEKEY, "PAUSE", 0, "Pause", ""}, + {EVT_INSERTKEY, "INSERT", 0, "Insert", "Ins"}, + {EVT_HOMEKEY, "HOME", 0, "Home", ""}, + {EVT_PAGEUPKEY, "PAGE_UP", 0, "Page Up", "PgUp"}, + {EVT_PAGEDOWNKEY, "PAGE_DOWN", 0, "Page Down", "PgDown"}, + {EVT_ENDKEY, "END", 0, "End", ""}, {0, "", 0, NULL, NULL}, - {MEDIAPLAY, "MEDIA_PLAY", 0, "Media Play/Pause", ">/||"}, - {MEDIASTOP, "MEDIA_STOP", 0, "Media Stop", "Stop"}, - {MEDIAFIRST, "MEDIA_FIRST", 0, "Media First", "|<<"}, - {MEDIALAST, "MEDIA_LAST", 0, "Media Last", ">>|"}, + {EVT_MEDIAPLAY, "MEDIA_PLAY", 0, "Media Play/Pause", ">/||"}, + {EVT_MEDIASTOP, "MEDIA_STOP", 0, "Media Stop", "Stop"}, + {EVT_MEDIAFIRST, "MEDIA_FIRST", 0, "Media First", "|<<"}, + {EVT_MEDIALAST, "MEDIA_LAST", 0, "Media Last", ">>|"}, {0, "", 0, NULL, NULL}, {KM_TEXTINPUT, "TEXTINPUT", 0, "Text Input", "TxtIn"}, {0, "", 0, NULL, NULL}, @@ -883,7 +883,7 @@ static void rna_wmKeyMapItem_map_type_set(PointerRNA *ptr, int value) if (value != map_type) { switch (value) { case KMI_TYPE_KEYBOARD: - kmi->type = AKEY; + kmi->type = EVT_AKEY; kmi->val = KM_PRESS; break; case KMI_TYPE_TWEAK: @@ -919,10 +919,10 @@ static void rna_wmKeyMapItem_keymodifier_set(PointerRNA *ptr, int value) /* XXX, this should really be managed in an _itemf function, * giving a list of valid enums, then silently changing them when they are set is not * a good precedent, don't do this unless you have a good reason! */ - if (value == ESCKEY) { + if (value == EVT_ESCKEY) { /* pass */ } - else if (value >= AKEY) { + else if (value >= EVT_AKEY) { kmi->keymodifier = value; } else { |