[Bf-blender-cvs] [4bb8dba340e] master: Cleanup: move keymap helpers into own file
Campbell Barton
noreply at git.blender.org
Sun Sep 2 11:29:23 CEST 2018
Commit: 4bb8dba340e0ac570f4a4eb628d0be09c92713b7
Author: Campbell Barton
Date: Sun Sep 2 19:34:36 2018 +1000
Branches: master
https://developer.blender.org/rB4bb8dba340e0ac570f4a4eb628d0be09c92713b7
Cleanup: move keymap helpers into own file
===================================================================
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/WM_keymap.h
M source/blender/windowmanager/intern/wm_keymap.c
A source/blender/windowmanager/intern/wm_keymap_utils.c
===================================================================
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 810cceb5fc3..ebf55c64906 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -64,6 +64,7 @@ set(SRC
intern/wm_init_exit.c
intern/wm_jobs.c
intern/wm_keymap.c
+ intern/wm_keymap_utils.c
intern/wm_menu_type.c
intern/wm_operator_props.c
intern/wm_operator_type.c
diff --git a/source/blender/windowmanager/WM_keymap.h b/source/blender/windowmanager/WM_keymap.h
index c6dad2ef03c..0538df83c60 100644
--- a/source/blender/windowmanager/WM_keymap.h
+++ b/source/blender/windowmanager/WM_keymap.h
@@ -58,14 +58,12 @@ void WM_keyconfig_update_operatortype(void);
void WM_keymap_init (struct bContext *C);
void WM_keymap_free (struct wmKeyMap *keymap);
-wmKeyMapItem *WM_keymap_verify_item(struct wmKeyMap *keymap, const char *idname, int type,
- int val, int modifier, int keymodifier);
-wmKeyMapItem *WM_keymap_add_item(struct wmKeyMap *keymap, const char *idname, int type,
- int val, int modifier, int keymodifier);
-wmKeyMapItem *WM_keymap_add_menu(struct wmKeyMap *keymap, const char *idname, int type,
- int val, int modifier, int keymodifier);
-wmKeyMapItem *WM_keymap_add_menu_pie(struct wmKeyMap *keymap, const char *idname, int type,
- int val, int modifier, int keymodifier);
+wmKeyMapItem *WM_keymap_verify_item(
+ struct wmKeyMap *keymap, const char *idname, int type,
+ int val, int modifier, int keymodifier);
+wmKeyMapItem *WM_keymap_add_item(
+ struct wmKeyMap *keymap, const char *idname, int type,
+ int val, int modifier, int keymodifier);
bool WM_keymap_remove_item(struct wmKeyMap *keymap, struct wmKeyMapItem *kmi);
int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, char *result, const int result_len);
@@ -74,13 +72,24 @@ wmKeyMap *WM_keymap_list_find(ListBase *lb, const char *idname, int spaceid, int
wmKeyMap *WM_keymap_ensure(struct wmKeyConfig *keyconf, const char *idname, int spaceid, int regionid);
wmKeyMap *WM_keymap_find_all(const struct bContext *C, const char *idname, int spaceid, int regionid);
wmKeyMap *WM_keymap_active(struct wmWindowManager *wm, struct wmKeyMap *keymap);
-wmKeyMap *WM_keymap_guess_opname(const struct bContext *C, const char *opname);
bool WM_keymap_remove(struct wmKeyConfig *keyconfig, struct wmKeyMap *keymap);
bool WM_keymap_poll(struct bContext *C, struct wmKeyMap *keymap);
wmKeyMapItem *WM_keymap_item_find_id(struct wmKeyMap *keymap, int id);
bool WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2);
+/* keymap_utils.c */
+
+/** Wrappers for #WM_keymap_add_item */
+wmKeyMapItem *WM_keymap_add_menu(
+ struct wmKeyMap *keymap, const char *idname, int type,
+ int val, int modifier, int keymodifier);
+wmKeyMapItem *WM_keymap_add_menu_pie(
+ struct wmKeyMap *keymap, const char *idname, int type,
+ int val, int modifier, int keymodifier);
+
+wmKeyMap *WM_keymap_guess_opname(const struct bContext *C, const char *opname);
+
/* Modal Keymap */
int WM_modalkeymap_items_to_string(
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index ccf06155f25..be147606c46 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -477,21 +477,6 @@ wmKeyMapItem *WM_keymap_add_item(wmKeyMap *keymap, const char *idname, int type,
return kmi;
}
-/* menu wrapper for WM_keymap_add_item */
-wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
-{
- wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu", type, val, modifier, keymodifier);
- RNA_string_set(kmi->ptr, "name", idname);
- return kmi;
-}
-
-wmKeyMapItem *WM_keymap_add_menu_pie(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier)
-{
- wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu_pie", type, val, modifier, keymodifier);
- RNA_string_set(kmi->ptr, "name", idname);
- return kmi;
-}
-
bool WM_keymap_remove_item(wmKeyMap *keymap, wmKeyMapItem *kmi)
{
if (BLI_findindex(&keymap->items, kmi) != -1) {
@@ -1664,265 +1649,6 @@ wmKeyMapItem *WM_keymap_item_find_id(wmKeyMap *keymap, int id)
return NULL;
}
-/* Guess an appropriate keymap from the operator name */
-/* Needs to be kept up to date with Keymap and Operator naming */
-wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname)
-{
- /* Op types purposely skipped for now:
- * BRUSH_OT
- * BOID_OT
- * BUTTONS_OT
- * CONSTRAINT_OT
- * PAINT_OT
- * ED_OT
- * FLUID_OT
- * TEXTURE_OT
- * UI_OT
- * VIEW2D_OT
- * WORLD_OT
- */
-
- wmKeyMap *km = NULL;
- SpaceLink *sl = CTX_wm_space_data(C);
-
- /* Window */
- if (STRPREFIX(opname, "WM_OT")) {
- km = WM_keymap_find_all(C, "Window", 0, 0);
- }
- /* Screen & Render */
- else if (STRPREFIX(opname, "SCREEN_OT") ||
- STRPREFIX(opname, "RENDER_OT") ||
- STRPREFIX(opname, "SOUND_OT") ||
- STRPREFIX(opname, "SCENE_OT"))
- {
- km = WM_keymap_find_all(C, "Screen", 0, 0);
- }
- /* Grease Pencil */
- else if (STRPREFIX(opname, "GPENCIL_OT")) {
- km = WM_keymap_find_all(C, "Grease Pencil", 0, 0);
- }
- /* Markers */
- else if (STRPREFIX(opname, "MARKER_OT")) {
- km = WM_keymap_find_all(C, "Markers", 0, 0);
- }
- /* Import/Export*/
- else if (STRPREFIX(opname, "IMPORT_") ||
- STRPREFIX(opname, "EXPORT_"))
- {
- km = WM_keymap_find_all(C, "Window", 0, 0);
- }
-
-
- /* 3D View */
- else if (STRPREFIX(opname, "VIEW3D_OT")) {
- km = WM_keymap_find_all(C, "3D View", sl->spacetype, 0);
- }
- else if (STRPREFIX(opname, "OBJECT_OT")) {
- /* exception, this needs to work outside object mode too */
- if (STRPREFIX(opname, "OBJECT_OT_mode_set"))
- km = WM_keymap_find_all(C, "Object Non-modal", 0, 0);
- else
- km = WM_keymap_find_all(C, "Object Mode", 0, 0);
- }
- /* Object mode related */
- else if (STRPREFIX(opname, "GROUP_OT") ||
- STRPREFIX(opname, "MATERIAL_OT") ||
- STRPREFIX(opname, "PTCACHE_OT") ||
- STRPREFIX(opname, "RIGIDBODY_OT"))
- {
- km = WM_keymap_find_all(C, "Object Mode", 0, 0);
- }
-
- /* Editing Modes */
- else if (STRPREFIX(opname, "MESH_OT")) {
- km = WM_keymap_find_all(C, "Mesh", 0, 0);
-
- /* some mesh operators are active in object mode too, like add-prim */
- if (km && !WM_keymap_poll((bContext *)C, km)) {
- km = WM_keymap_find_all(C, "Object Mode", 0, 0);
- }
- }
- else if (STRPREFIX(opname, "CURVE_OT") ||
- STRPREFIX(opname, "SURFACE_OT"))
- {
- km = WM_keymap_find_all(C, "Curve", 0, 0);
-
- /* some curve operators are active in object mode too, like add-prim */
- if (km && !WM_keymap_poll((bContext *)C, km)) {
- km = WM_keymap_find_all(C, "Object Mode", 0, 0);
- }
- }
- else if (STRPREFIX(opname, "ARMATURE_OT") ||
- STRPREFIX(opname, "SKETCH_OT"))
- {
- km = WM_keymap_find_all(C, "Armature", 0, 0);
- }
- else if (STRPREFIX(opname, "POSE_OT") ||
- STRPREFIX(opname, "POSELIB_OT"))
- {
- km = WM_keymap_find_all(C, "Pose", 0, 0);
- }
- else if (STRPREFIX(opname, "SCULPT_OT")) {
- switch (CTX_data_mode_enum(C)) {
- case OB_MODE_SCULPT:
- km = WM_keymap_find_all(C, "Sculpt", 0, 0);
- break;
- case OB_MODE_EDIT:
- km = WM_keymap_find_all(C, "UV Sculpt", 0, 0);
- break;
- }
- }
- else if (STRPREFIX(opname, "MBALL_OT")) {
- km = WM_keymap_find_all(C, "Metaball", 0, 0);
-
- /* some mball operators are active in object mode too, like add-prim */
- if (km && !WM_keymap_poll((bContext *)C, km)) {
- km = WM_keymap_find_all(C, "Object Mode", 0, 0);
- }
- }
- else if (STRPREFIX(opname, "LATTICE_OT")) {
- km = WM_keymap_find_all(C, "Lattice", 0, 0);
- }
- else if (STRPREFIX(opname, "PARTICLE_OT")) {
- km = WM_keymap_find_all(C, "Particle", 0, 0);
- }
- else if (STRPREFIX(opname, "FONT_OT")) {
- km = WM_keymap_find_all(C, "Font", 0, 0);
- }
- /* Paint Face Mask */
- else if (STRPREFIX(opname, "PAINT_OT_face_select")) {
- km = WM_keymap_find_all(C, "Face Mask", 0, 0);
- }
- else if (STRPREFIX(opname, "PAINT_OT")) {
- /* check for relevant mode */
- switch (CTX_data_mode_enum(C)) {
- case OB_MODE_WEIGHT_PAINT:
- km = WM_keymap_find_all(C, "Weight Paint", 0, 0);
- break;
- case OB_MODE_VERTEX_PAINT:
- km = WM_keymap_find_all(C, "Vertex Paint", 0, 0);
- break;
- case OB_MODE_TEXTURE_PAINT:
- km = WM_keymap_find_all(C, "Image Paint", 0, 0);
- break;
- }
- }
- /* Timeline */
- else if (STRPREFIX(opname, "TIME_OT")) {
- km = WM_keymap_find_all(C, "Timeline", sl->spacetype, 0);
- }
- /* Image Editor */
- else if (STRPREFIX(opname, "IMAGE_OT")) {
- km = WM_keymap_find_all(C, "Image", sl->spacetype, 0);
- }
- /* Clip Editor */
- else if (STRPREFIX(opname, "CLIP_OT")) {
- km = WM_keymap_find_all(C, "Clip", sl->spacetype, 0);
- }
- else if (STRPREFIX(opname, "MASK_OT")) {
- km = WM_keymap_find_all(C, "Mask Editing", 0, 0);
- }
- /* UV Editor */
- else if (STRPREFIX(opname, "UV_OT")) {
- /* Hack to allow using UV unwrapping ops from 3DView/editmode.
- * Mesh keymap is probably not ideal, but best place I could find to put those. */
- if (sl->spacetype == SPACE_VIEW3D) {
- km = WM_keymap_find_all(C, "Mesh", 0, 0);
- if (km && !WM_keymap_poll((bContext *)C, km)) {
- km = NULL;
- }
- }
- if (!km) {
- km = WM_keymap_find_all(C, "UV Editor", 0, 0);
- }
- }
- /* Node Editor */
- else if (STRPREFIX(opname, "NODE_OT")) {
- km = WM_keymap_find_all(C, "Node Editor", sl->spacetype, 0);
- }
- /* Animation Editor Channels */
- else if (STRPREFIX(opname, "ANIM_OT_channels")) {
- km = WM_keymap_find_all(C, "Animation Channels", 0, 0);
- }
- /* Animation Generic - after channels */
- else if (STRPREFIX(opname, "ANIM_OT")) {
- km = WM_keymap_find_all(C, "Animation", 0, 0);
- }
- /* Graph Editor */
- else if (STRPREFIX(opname, "GRAPH_OT")) {
- km = WM_keymap_find
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list