[Bf-blender-cvs] [f28be6d7e0e] temp-outliner-library-override-hierarchy: Event System: improve handling of unknown keys
Campbell Barton
noreply at git.blender.org
Fri Mar 25 14:17:21 CET 2022
Commit: f28be6d7e0eac6a184d93cfa63490295cf8fdcb9
Author: Campbell Barton
Date: Wed Mar 23 21:30:36 2022 +1100
Branches: temp-outliner-library-override-hierarchy
https://developer.blender.org/rBf28be6d7e0eac6a184d93cfa63490295cf8fdcb9
Event System: improve handling of unknown keys
When converting ghost keys to Blender's event system:
- All keys that aren't part of the GHOST_TKey enum map to EVENT_NONE
(ignored), note that it's an internal error if the value of key isn't
a known value.
- Modify the switch statement so any missing members of GHOST_TKey
warn at compile time (GCC & Clang only).
- GHOST_kKeyUnknown maps to EVT_UNKNOWNKEY.
We could ignore this key, changing can be evaluated separately.
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index e565b32662a..790b08437bd 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -4565,9 +4565,28 @@ static int convert_key(GHOST_TKey key)
case GHOST_kKeyMediaLast:
return EVT_MEDIALAST;
- default:
+ case GHOST_kKeyUnknown:
return EVT_UNKNOWNKEY;
+
+#if defined(__GNUC__) || defined(__clang__)
+ /* Ensure all members of this enum are handled, otherwise generate a compiler warning.
+ * Note that these members have been handled, these ranges are to satisfy the compiler. */
+ case GHOST_kKeyF1 ... GHOST_kKeyF24:
+ case GHOST_kKeyA ... GHOST_kKeyZ:
+ case GHOST_kKeyNumpad0 ... GHOST_kKeyNumpad9:
+ case GHOST_kKey0 ... GHOST_kKey9: {
+ BLI_assert_unreachable();
+ break;
+ }
+#else
+ default: {
+ break;
+ }
+#endif
}
+
+ CLOG_WARN(WM_LOG_EVENTS, "unknown event type %d from ghost", (int)key);
+ return EVENT_NONE;
}
static void wm_eventemulation(wmEvent *event, bool test_only)
More information about the Bf-blender-cvs
mailing list