From c7cd1c8d0bfda4d0b043330d83e7f960761d5ea5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 14 Sep 2023 13:32:42 +1000 Subject: [PATCH] Cleanup: use enum literals for space_type & region_type arguments Also remove unique names for grease pencil keymaps. There was not advantage in having separate names for each grease pencil key-map. --- .../editors/animation/anim_channels_edit.cc | 2 +- .../blender/editors/animation/anim_markers.cc | 2 +- source/blender/editors/animation/anim_ops.cc | 2 +- .../blender/editors/armature/armature_ops.cc | 4 +- .../editors/asset/intern/asset_shelf.cc | 3 +- source/blender/editors/curve/curve_ops.cc | 4 +- .../editors/curves/intern/curves_ops.cc | 2 +- .../editors/gpencil_legacy/gpencil_ops.cc | 86 +++-- .../intern/grease_pencil_edit.cc | 6 +- .../editors/interface/interface_dropboxes.cc | 2 +- .../editors/interface/interface_ops.cc | 2 +- .../blender/editors/interface/view2d_ops.cc | 2 +- source/blender/editors/lattice/lattice_ops.cc | 2 +- source/blender/editors/mask/mask_edit.cc | 2 +- source/blender/editors/mesh/mesh_ops.cc | 2 +- source/blender/editors/metaball/mball_ops.cc | 2 +- source/blender/editors/object/object_ops.cc | 5 +- source/blender/editors/physics/physics_ops.cc | 4 +- source/blender/editors/screen/area.cc | 295 ++++++++++-------- source/blender/editors/screen/screen_ops.cc | 8 +- .../blender/editors/sculpt_paint/paint_ops.cc | 18 +- .../editors/space_action/action_ops.cc | 4 +- .../editors/space_action/space_action.cc | 10 +- .../editors/space_buttons/space_buttons.cc | 4 +- .../blender/editors/space_clip/space_clip.cc | 30 +- .../editors/space_console/space_console.cc | 6 +- .../blender/editors/space_file/space_file.cc | 20 +- .../blender/editors/space_graph/graph_ops.cc | 4 +- .../editors/space_graph/space_graph.cc | 10 +- .../editors/space_image/space_image.cc | 26 +- .../blender/editors/space_info/space_info.cc | 6 +- source/blender/editors/space_nla/nla_ops.cc | 6 +- source/blender/editors/space_nla/space_nla.cc | 12 +- source/blender/editors/space_node/node_ops.cc | 4 +- .../blender/editors/space_node/space_node.cc | 8 +- .../editors/space_outliner/outliner_ops.cc | 2 +- .../editors/space_outliner/space_outliner.cc | 2 +- .../editors/space_script/space_script.cc | 2 +- .../editors/space_sequencer/sequencer_ops.cc | 8 +- .../space_sequencer/space_sequencer.cc | 18 +- .../space_spreadsheet/space_spreadsheet.cc | 9 +- .../blender/editors/space_text/space_text.cc | 10 +- .../editors/space_topbar/space_topbar.cc | 2 +- .../editors/space_view3d/space_view3d.cc | 62 ++-- .../editors/space_view3d/view3d_navigate.cc | 3 +- .../editors/space_view3d/view3d_ops.cc | 4 +- source/blender/editors/uvedit/uvedit_ops.cc | 2 +- .../blender/windowmanager/intern/wm_keymap.cc | 8 +- .../windowmanager/intern/wm_keymap_utils.cc | 121 +++---- .../windowmanager/intern/wm_operators.cc | 2 +- .../blender/windowmanager/intern/wm_window.cc | 8 +- 51 files changed, 479 insertions(+), 389 deletions(-) diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc index 5030efb5b9d..477033f37e2 100644 --- a/source/blender/editors/animation/anim_channels_edit.cc +++ b/source/blender/editors/animation/anim_channels_edit.cc @@ -4370,7 +4370,7 @@ void ED_keymap_animchannels(wmKeyConfig *keyconf) { /* TODO: check on a poll callback for this, to get hotkeys into menus. */ - WM_keymap_ensure(keyconf, "Animation Channels", 0, 0); + WM_keymap_ensure(keyconf, "Animation Channels", SPACE_EMPTY, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index f7db245970e..686ab3cb590 100644 --- a/source/blender/editors/animation/anim_markers.cc +++ b/source/blender/editors/animation/anim_markers.cc @@ -1907,7 +1907,7 @@ void ED_operatortypes_marker() void ED_keymap_marker(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Markers", 0, 0); + WM_keymap_ensure(keyconf, "Markers", SPACE_EMPTY, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/animation/anim_ops.cc b/source/blender/editors/animation/anim_ops.cc index 7815b69cced..6fa95623069 100644 --- a/source/blender/editors/animation/anim_ops.cc +++ b/source/blender/editors/animation/anim_ops.cc @@ -695,7 +695,7 @@ void ED_operatortypes_anim() void ED_keymap_anim(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Animation", 0, 0); + WM_keymap_ensure(keyconf, "Animation", SPACE_EMPTY, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/armature/armature_ops.cc b/source/blender/editors/armature/armature_ops.cc index 13d668dfc24..1a36133f7df 100644 --- a/source/blender/editors/armature/armature_ops.cc +++ b/source/blender/editors/armature/armature_ops.cc @@ -179,11 +179,11 @@ void ED_keymap_armature(wmKeyConfig *keyconf) /* Armature ------------------------ */ /* only set in editmode armature, by space_view3d listener */ - keymap = WM_keymap_ensure(keyconf, "Armature", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Armature", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_editarmature; /* Pose ------------------------ */ /* only set in posemode, by space_view3d listener */ - keymap = WM_keymap_ensure(keyconf, "Pose", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Pose", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_posemode; } diff --git a/source/blender/editors/asset/intern/asset_shelf.cc b/source/blender/editors/asset/intern/asset_shelf.cc index 75003fe4cdc..2bc6fa38a40 100644 --- a/source/blender/editors/asset/intern/asset_shelf.cc +++ b/source/blender/editors/asset/intern/asset_shelf.cc @@ -271,7 +271,8 @@ void ED_asset_shelf_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_PANELS_UI, region->winx, region->winy); - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "View2D Buttons List", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); region->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; diff --git a/source/blender/editors/curve/curve_ops.cc b/source/blender/editors/curve/curve_ops.cc index e19b239067c..5e5f0aa9d86 100644 --- a/source/blender/editors/curve/curve_ops.cc +++ b/source/blender/editors/curve/curve_ops.cc @@ -149,11 +149,11 @@ void ED_operatormacros_curve() void ED_keymap_curve(wmKeyConfig *keyconf) { /* only set in editmode font, by space_view3d listener */ - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Font", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Font", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_editfont; /* only set in editmode curve, by space_view3d listener */ - keymap = WM_keymap_ensure(keyconf, "Curve", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_editsurfcurve; curve_pen_modal_keymap(keyconf); diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 2c330651d36..6ef71b1f4c9 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -1254,6 +1254,6 @@ void ED_keymap_curves(wmKeyConfig *keyconf) { using namespace blender::ed::curves; /* Only set in editmode curves, by space_view3d listener. */ - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Curves", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Curves", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = editable_curves_poll; } diff --git a/source/blender/editors/gpencil_legacy/gpencil_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_ops.cc index 25a1ddb03d0..57c3df7e5b4 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_ops.cc @@ -37,7 +37,7 @@ /* Generic Drawing Keymap - Annotations */ static void ed_keymap_gpencil_general(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Grease Pencil", 0, 0); + WM_keymap_ensure(keyconf, "Grease Pencil", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* ==================== */ @@ -314,7 +314,8 @@ static bool gpencil_stroke_weightmode_smear_poll(bContext *C) /* Stroke Editing Keymap - Only when editmode is enabled */ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Edit Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Edit Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); /* set poll callback - so that this keymap only gets enabled when stroke editmode is enabled */ keymap->poll = gpencil_stroke_editmode_poll; @@ -323,7 +324,8 @@ static void ed_keymap_gpencil_editing(wmKeyConfig *keyconf) /* Stroke Curve Editing Keymap - Only when editmode is enabled and in curve edit mode */ static void ed_keymap_gpencil_curve_editing(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Curve Edit Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Curve Edit Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); /* set poll callback - so that this keymap only gets enabled when curve editmode is enabled */ keymap->poll = gpencil_stroke_editmode_curve_poll; @@ -332,28 +334,32 @@ static void ed_keymap_gpencil_curve_editing(wmKeyConfig *keyconf) /* keys for draw with a drawing brush (no fill) */ static void ed_keymap_gpencil_painting_draw(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Paint (Draw brush)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Paint (Draw brush)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_paintmode_draw_poll; } /* keys for draw with a eraser brush (erase) */ static void ed_keymap_gpencil_painting_erase(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Paint (Erase)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Paint (Erase)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_paintmode_erase_poll; } /* keys for draw with a fill brush */ static void ed_keymap_gpencil_painting_fill(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Paint (Fill)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Paint (Fill)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_paintmode_fill_poll; } /* keys for draw with a tint brush */ static void ed_keymap_gpencil_painting_tint(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Paint (Tint)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Paint (Tint)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_paintmode_tint_poll; } @@ -361,7 +367,8 @@ static void ed_keymap_gpencil_painting_tint(wmKeyConfig *keyconf) static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf) { /* set poll callback - so that this keymap only gets enabled when stroke paintmode is enabled */ - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Paint Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Paint Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_paintmode_poll; } @@ -369,7 +376,8 @@ static void ed_keymap_gpencil_painting(wmKeyConfig *keyconf) static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf) { /* set poll callback - so that this keymap only gets enabled when stroke sculptmode is enabled */ - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_poll; } @@ -377,124 +385,144 @@ static void ed_keymap_gpencil_sculpting(wmKeyConfig *keyconf) static void ed_keymap_gpencil_weightpainting(wmKeyConfig *keyconf) { /* set poll callback - so that this keymap only gets enabled when stroke sculptmode is enabled */ - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Weight Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Weight Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_weightmode_poll; } static void ed_keymap_gpencil_vertexpainting(wmKeyConfig *keyconf) { /* set poll callback - so that this keymap only gets enabled when stroke vertex is enabled */ - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Vertex Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Vertex Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_vertexmode_poll; } /* keys for vertex with a draw brush */ static void ed_keymap_gpencil_vertexpainting_draw(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Vertex (Draw)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Vertex (Draw)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_vertexmode_draw_poll; } /* keys for vertex with a blur brush */ static void ed_keymap_gpencil_vertexpainting_blur(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Vertex (Blur)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Vertex (Blur)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_vertexmode_blur_poll; } /* keys for vertex with a average brush */ static void ed_keymap_gpencil_vertexpainting_average(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Vertex (Average)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Vertex (Average)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_vertexmode_average_poll; } /* keys for vertex with a smear brush */ static void ed_keymap_gpencil_vertexpainting_smear(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Vertex (Smear)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Vertex (Smear)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_vertexmode_smear_poll; } /* keys for vertex with a replace brush */ static void ed_keymap_gpencil_vertexpainting_replace(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Vertex (Replace)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Vertex (Replace)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_vertexmode_replace_poll; } /* keys for sculpt with a smooth brush */ static void ed_keymap_gpencil_sculptpainting_smooth(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Smooth)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Smooth)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_smooth_poll; } /* keys for sculpt with a thickness brush */ static void ed_keymap_gpencil_sculptpainting_thickness(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Thickness)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Thickness)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_thickness_poll; } /* keys for sculpt with a strength brush */ static void ed_keymap_gpencil_sculptpainting_strength(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Strength)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Strength)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_strength_poll; } /* keys for sculpt with a grab brush */ static void ed_keymap_gpencil_sculptpainting_grab(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Grab)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Grab)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_grab_poll; } /* keys for sculpt with a push brush */ static void ed_keymap_gpencil_sculptpainting_push(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Push)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Push)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_push_poll; } /* keys for sculpt with a twist brush */ static void ed_keymap_gpencil_sculptpainting_twist(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Twist)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Twist)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_twist_poll; } /* keys for sculpt with a pinch brush */ static void ed_keymap_gpencil_sculptpainting_pinch(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Pinch)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Pinch)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_pinch_poll; } /* keys for sculpt with a randomize brush */ static void ed_keymap_gpencil_sculptpainting_randomize(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Randomize)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Randomize)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_randomize_poll; } /* keys for sculpt with a clone brush */ static void ed_keymap_gpencil_sculptpainting_clone(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Sculpt (Clone)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Sculpt (Clone)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_sculptmode_clone_poll; } /* keys for weight with a draw brush */ static void ed_keymap_gpencil_weightpainting_draw(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Weight (Draw)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Weight (Draw)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_weightmode_draw_poll; } /* keys for weight with a blur brush */ static void ed_keymap_gpencil_weightpainting_blur(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Weight (Blur)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Weight (Blur)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_weightmode_blur_poll; } /* keys for weight with a average brush */ static void ed_keymap_gpencil_weightpainting_average(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Weight (Average)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Weight (Average)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_weightmode_average_poll; } /* keys for weight with a smear brush */ static void ed_keymap_gpencil_weightpainting_smear(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Stroke Weight (Smear)", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Stroke Weight (Smear)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = gpencil_stroke_weightmode_smear_poll; } diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index b0b132e9508..59fe52dcc61 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc @@ -83,13 +83,15 @@ bool grease_pencil_painting_poll(bContext *C) static void keymap_grease_pencil_editing(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Edit Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Edit Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = editable_grease_pencil_poll; } static void keymap_grease_pencil_painting(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Grease Pencil Paint Mode", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + keyconf, "Grease Pencil Paint Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = grease_pencil_painting_poll; } diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc index 0deb32d162d..da805f5f385 100644 --- a/source/blender/editors/interface/interface_dropboxes.cc +++ b/source/blender/editors/interface/interface_dropboxes.cc @@ -138,7 +138,7 @@ static char *ui_drop_material_tooltip(bContext *C, void ED_dropboxes_ui() { - ListBase *lb = WM_dropboxmap_find("User Interface", SPACE_EMPTY, 0); + ListBase *lb = WM_dropboxmap_find("User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_dropbox_add(lb, "UI_OT_view_drop", ui_view_drop_poll, nullptr, nullptr, ui_view_drop_tooltip); WM_dropbox_add(lb, diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 6a24aee5206..8419274a5b7 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -2631,7 +2631,7 @@ void ED_operatortypes_ui() void ED_keymap_ui(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "User Interface", 0, 0); + WM_keymap_ensure(keyconf, "User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); eyedropper_modal_keymap(keyconf); eyedropper_colorband_modal_keymap(keyconf); diff --git a/source/blender/editors/interface/view2d_ops.cc b/source/blender/editors/interface/view2d_ops.cc index 889daeb2780..c0976c24862 100644 --- a/source/blender/editors/interface/view2d_ops.cc +++ b/source/blender/editors/interface/view2d_ops.cc @@ -2344,7 +2344,7 @@ void ED_operatortypes_view2d() void ED_keymap_view2d(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "View2D", 0, 0); + WM_keymap_ensure(keyconf, "View2D", SPACE_EMPTY, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/lattice/lattice_ops.cc b/source/blender/editors/lattice/lattice_ops.cc index 7d74b732dd8..cc1cfe36029 100644 --- a/source/blender/editors/lattice/lattice_ops.cc +++ b/source/blender/editors/lattice/lattice_ops.cc @@ -29,6 +29,6 @@ void ED_operatortypes_lattice() void ED_keymap_lattice(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Lattice", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Lattice", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_editlattice; } diff --git a/source/blender/editors/mask/mask_edit.cc b/source/blender/editors/mask/mask_edit.cc index 29f0532bd38..a36404ad312 100644 --- a/source/blender/editors/mask/mask_edit.cc +++ b/source/blender/editors/mask/mask_edit.cc @@ -163,7 +163,7 @@ void ED_operatortypes_mask() void ED_keymap_mask(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Mask Editing", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_maskedit_poll; } diff --git a/source/blender/editors/mesh/mesh_ops.cc b/source/blender/editors/mesh/mesh_ops.cc index 56944ec5859..7088dae2e06 100644 --- a/source/blender/editors/mesh/mesh_ops.cc +++ b/source/blender/editors/mesh/mesh_ops.cc @@ -358,7 +358,7 @@ void ED_operatormacros_mesh() void ED_keymap_mesh(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Mesh", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Mesh", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_editmesh; knifetool_modal_keymap(keyconf); diff --git a/source/blender/editors/metaball/mball_ops.cc b/source/blender/editors/metaball/mball_ops.cc index 2a269a7f1b0..b3be4bf1292 100644 --- a/source/blender/editors/metaball/mball_ops.cc +++ b/source/blender/editors/metaball/mball_ops.cc @@ -47,6 +47,6 @@ void ED_operatormacros_metaball() void ED_keymap_metaball(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Metaball", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Metaball", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_editmball; } diff --git a/source/blender/editors/object/object_ops.cc b/source/blender/editors/object/object_ops.cc index bbfc3628261..e079efbc843 100644 --- a/source/blender/editors/object/object_ops.cc +++ b/source/blender/editors/object/object_ops.cc @@ -10,6 +10,7 @@ #include #include "DNA_object_types.h" +#include "DNA_space_types.h" #include "BKE_context.h" @@ -332,10 +333,10 @@ void ED_keymap_object(wmKeyConfig *keyconf) wmKeyMap *keymap; /* Objects, Regardless of Mode -------------------------------------------------- */ - keymap = WM_keymap_ensure(keyconf, "Object Non-modal", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Object Non-modal", SPACE_EMPTY, RGN_TYPE_WINDOW); /* Object Mode ---------------------------------------------------------------- */ /* NOTE: this keymap gets disabled in non-object-mode. */ - keymap = WM_keymap_ensure(keyconf, "Object Mode", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = object_mode_poll; } diff --git a/source/blender/editors/physics/physics_ops.cc b/source/blender/editors/physics/physics_ops.cc index 42f23498560..84b5fce9908 100644 --- a/source/blender/editors/physics/physics_ops.cc +++ b/source/blender/editors/physics/physics_ops.cc @@ -8,6 +8,8 @@ #include +#include "DNA_space_types.h" + #include "WM_api.hh" #include "ED_physics.hh" @@ -86,7 +88,7 @@ static void operatortypes_particle() static void keymap_particle(wmKeyConfig *keyconf) { - wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Particle", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(keyconf, "Particle", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = PE_poll; } diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index b2a931071a2..7d24be26d1d 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -1736,10 +1736,11 @@ static void ed_default_handlers( /* XXX: it would be good to have bound-box checks for some of these. */ if (flag & ED_KEYMAP_UI) { - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "User Interface", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(handlers, keymap); - ListBase *dropboxes = WM_dropboxmap_find("User Interface", 0, 0); + ListBase *dropboxes = WM_dropboxmap_find("User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_dropbox_handler(handlers, dropboxes); /* user interface widgets */ @@ -1761,22 +1762,22 @@ static void ed_default_handlers( } if (flag & ED_KEYMAP_VIEW2D) { /* 2d-viewport handling+manipulation */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(handlers, keymap); } if (flag & ED_KEYMAP_ANIMATION) { wmKeyMap *keymap; /* time-markers */ - keymap = WM_keymap_ensure(wm->defaultconf, "Markers", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Markers", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_poll(handlers, keymap, event_in_markers_region); /* time-scrub */ - keymap = WM_keymap_ensure(wm->defaultconf, "Time Scrub", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Time Scrub", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_poll(handlers, keymap, ED_time_scrub_event_in_region); /* frame changing and timeline operators (for time spaces) */ - keymap = WM_keymap_ensure(wm->defaultconf, "Animation", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Animation", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(handlers, keymap); } if (flag & ED_KEYMAP_TOOL) { @@ -1791,27 +1792,31 @@ static void ed_default_handlers( } if (flag & ED_KEYMAP_FRAMES) { /* frame changing/jumping (for all spaces) */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Frames", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Frames", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(handlers, keymap); } if (flag & ED_KEYMAP_HEADER) { /* standard keymap for headers regions */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Region Context Menu", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Region Context Menu", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(handlers, keymap); } if (flag & ED_KEYMAP_FOOTER) { /* standard keymap for footer regions */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Region Context Menu", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Region Context Menu", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(handlers, keymap); } if (flag & ED_KEYMAP_NAVBAR) { /* standard keymap for Navigation bar regions */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Region Context Menu", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Region Context Menu", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } if (flag & ED_KEYMAP_ASSET_SHELF) { /* standard keymap for asset shelf regions */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Asset Shelf", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Asset Shelf", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -1824,120 +1829,157 @@ static void ed_default_handlers( * For now, it's easier to just include all, * since you hardly want one without the others. */ - wmKeyMap *keymap_general = WM_keymap_ensure(wm->defaultconf, "Grease Pencil", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_general); - - wmKeyMap *keymap_curve_edit = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Curve Edit Mode", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_curve_edit); - - wmKeyMap *keymap_edit = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Edit Mode", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_edit); - - wmKeyMap *keymap_paint = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Paint Mode", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_paint); - - wmKeyMap *keymap_paint_draw = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Paint (Draw brush)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_paint_draw); - - wmKeyMap *keymap_paint_erase = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Paint (Erase)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_paint_erase); - - wmKeyMap *keymap_paint_fill = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Paint (Fill)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_paint_fill); - - wmKeyMap *keymap_paint_tint = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Paint (Tint)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_paint_tint); - - wmKeyMap *keymap_sculpt = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt Mode", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt); - - wmKeyMap *keymap_vertex = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Vertex Mode", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_vertex); - - wmKeyMap *keymap_vertex_draw = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Vertex (Draw)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_vertex_draw); - - wmKeyMap *keymap_vertex_blur = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Vertex (Blur)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_vertex_blur); - - wmKeyMap *keymap_vertex_average = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Vertex (Average)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_vertex_average); - - wmKeyMap *keymap_vertex_smear = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Vertex (Smear)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_vertex_smear); - - wmKeyMap *keymap_vertex_replace = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Vertex (Replace)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_vertex_replace); - - wmKeyMap *keymap_sculpt_smooth = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Smooth)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_smooth); - - wmKeyMap *keymap_sculpt_thickness = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Thickness)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_thickness); - - wmKeyMap *keymap_sculpt_strength = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Strength)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_strength); - - wmKeyMap *keymap_sculpt_grab = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Grab)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_grab); - - wmKeyMap *keymap_sculpt_push = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Push)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_push); - - wmKeyMap *keymap_sculpt_twist = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Twist)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_twist); - - wmKeyMap *keymap_sculpt_pinch = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Pinch)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_pinch); - - wmKeyMap *keymap_sculpt_randomize = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Randomize)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_randomize); - - wmKeyMap *keymap_sculpt_clone = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Sculpt (Clone)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_sculpt_clone); - - wmKeyMap *keymap_weight = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Weight Mode", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_weight); - - wmKeyMap *keymap_weight_draw = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Weight (Draw)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_weight_draw); - - wmKeyMap *keymap_weight_blur = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Weight (Blur)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_weight_blur); - - wmKeyMap *keymap_weight_average = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Weight (Average)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_weight_average); - - wmKeyMap *keymap_weight_smear = WM_keymap_ensure( - wm->defaultconf, "Grease Pencil Stroke Weight (Smear)", 0, 0); - WM_event_add_keymap_handler(handlers, keymap_weight_smear); + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Curve Edit Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Edit Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Paint Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, + "Grease Pencil Stroke Paint (Draw brush)", + SPACE_EMPTY, + RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Paint (Erase)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Paint (Fill)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Paint (Tint)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Vertex Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Vertex (Draw)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Vertex (Blur)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Vertex (Average)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Vertex (Smear)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Vertex (Replace)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Smooth)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, + "Grease Pencil Stroke Sculpt (Thickness)", + SPACE_EMPTY, + RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Strength)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Grab)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Push)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Twist)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Pinch)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, + "Grease Pencil Stroke Sculpt (Randomize)", + SPACE_EMPTY, + RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Sculpt (Clone)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Weight Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Weight (Draw)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Weight (Blur)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Weight (Average)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } + { + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Stroke Weight (Smear)", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_event_add_keymap_handler(handlers, keymap); + } } } @@ -3272,7 +3314,8 @@ void ED_region_panels_init(wmWindowManager *wm, ARegion *region) { UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_PANELS_UI, region->winx, region->winy); - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "View2D Buttons List", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 1986d30a844..5fa6edc6fb7 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -5927,16 +5927,16 @@ static void blend_file_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop void ED_keymap_screen(wmKeyConfig *keyconf) { /* Screen Editing ------------------------------------------------ */ - WM_keymap_ensure(keyconf, "Screen Editing", 0, 0); + WM_keymap_ensure(keyconf, "Screen Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); /* Screen General ------------------------------------------------ */ - WM_keymap_ensure(keyconf, "Screen", 0, 0); + WM_keymap_ensure(keyconf, "Screen", SPACE_EMPTY, RGN_TYPE_WINDOW); /* Anim Playback ------------------------------------------------ */ - WM_keymap_ensure(keyconf, "Frames", 0, 0); + WM_keymap_ensure(keyconf, "Frames", SPACE_EMPTY, RGN_TYPE_WINDOW); /* dropbox for entire window */ - ListBase *lb = WM_dropboxmap_find("Window", 0, 0); + ListBase *lb = WM_dropboxmap_find("Window", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_dropbox_add( lb, "WM_OT_drop_blend_file", blend_file_drop_poll, blend_file_drop_copy, nullptr, nullptr); WM_dropbox_add(lb, "UI_OT_drop_color", UI_drop_color_poll, UI_drop_color_copy, nullptr, nullptr); diff --git a/source/blender/editors/sculpt_paint/paint_ops.cc b/source/blender/editors/sculpt_paint/paint_ops.cc index e840125d15a..b170214bd18 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_ops.cc @@ -1562,31 +1562,33 @@ void ED_keymap_paint(wmKeyConfig *keyconf) { wmKeyMap *keymap; - keymap = WM_keymap_ensure(keyconf, "Paint Curve", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Paint Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = paint_curve_poll; /* Sculpt mode */ - keymap = WM_keymap_ensure(keyconf, "Sculpt", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Sculpt", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = SCULPT_mode_poll; /* Vertex Paint mode */ - keymap = WM_keymap_ensure(keyconf, "Vertex Paint", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Vertex Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = vertex_paint_mode_poll; /* Weight Paint mode */ - keymap = WM_keymap_ensure(keyconf, "Weight Paint", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Weight Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = weight_paint_mode_poll; /* Weight paint's Vertex Selection Mode. */ - keymap = WM_keymap_ensure(keyconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0); + keymap = WM_keymap_ensure( + keyconf, "Paint Vertex Selection (Weight, Vertex)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = vert_paint_poll; /* Image/Texture Paint mode */ - keymap = WM_keymap_ensure(keyconf, "Image Paint", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Image Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = image_texture_paint_poll; /* face-mask mode */ - keymap = WM_keymap_ensure(keyconf, "Paint Face Mask (Weight, Vertex, Texture)", 0, 0); + keymap = WM_keymap_ensure( + keyconf, "Paint Face Mask (Weight, Vertex, Texture)", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = facemask_paint_poll; /* paint stroke */ @@ -1594,7 +1596,7 @@ void ED_keymap_paint(wmKeyConfig *keyconf) WM_modalkeymap_assign(keymap, "SCULPT_OT_brush_stroke"); /* Curves Sculpt mode. */ - keymap = WM_keymap_ensure(keyconf, "Sculpt Curves", 0, 0); + keymap = WM_keymap_ensure(keyconf, "Sculpt Curves", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = CURVES_SCULPT_mode_poll; /* sculpt expand. */ diff --git a/source/blender/editors/space_action/action_ops.cc b/source/blender/editors/space_action/action_ops.cc index 4e0c755bf24..28c3c3d6e31 100644 --- a/source/blender/editors/space_action/action_ops.cc +++ b/source/blender/editors/space_action/action_ops.cc @@ -96,7 +96,7 @@ void ED_operatormacros_action() void action_keymap(wmKeyConfig *keyconf) { /* keymap for all regions */ - WM_keymap_ensure(keyconf, "Dopesheet Generic", SPACE_ACTION, 0); + WM_keymap_ensure(keyconf, "Dopesheet Generic", SPACE_ACTION, RGN_TYPE_WINDOW); /* channels */ /* Channels are not directly handled by the Action Editor module, @@ -107,5 +107,5 @@ void action_keymap(wmKeyConfig *keyconf) */ /* keyframes */ - WM_keymap_ensure(keyconf, "Dopesheet", SPACE_ACTION, 0); + WM_keymap_ensure(keyconf, "Dopesheet", SPACE_ACTION, RGN_TYPE_WINDOW); } diff --git a/source/blender/editors/space_action/space_action.cc b/source/blender/editors/space_action/space_action.cc index 1b554ba081d..37da9ac6867 100644 --- a/source/blender/editors/space_action/space_action.cc +++ b/source/blender/editors/space_action/space_action.cc @@ -159,9 +159,9 @@ static void action_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet", SPACE_ACTION, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet", SPACE_ACTION, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet Generic", SPACE_ACTION, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet Generic", SPACE_ACTION, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -264,10 +264,10 @@ static void action_channel_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet Generic", SPACE_ACTION, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet Generic", SPACE_ACTION, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -713,7 +713,7 @@ static void action_buttons_area_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet Generic", SPACE_ACTION, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Dopesheet Generic", SPACE_ACTION, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_buttons/space_buttons.cc b/source/blender/editors/space_buttons/space_buttons.cc index f28f29cf7c1..1d6417e9aa9 100644 --- a/source/blender/editors/space_buttons/space_buttons.cc +++ b/source/blender/editors/space_buttons/space_buttons.cc @@ -146,7 +146,7 @@ static void buttons_main_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Property Editor", SPACE_PROPERTIES, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Property Editor", SPACE_PROPERTIES, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -536,7 +536,7 @@ static void buttons_operatortypes() static void buttons_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Property Editor", SPACE_PROPERTIES, 0); + WM_keymap_ensure(keyconf, "Property Editor", SPACE_PROPERTIES, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc index 7709546f88a..49516d6eeae 100644 --- a/source/blender/editors/space_clip/space_clip.cc +++ b/source/blender/editors/space_clip/space_clip.cc @@ -227,7 +227,7 @@ static void clip_free(SpaceLink *sl) /* spacetype; init callback */ static void clip_init(wmWindowManager * /*wm*/, ScrArea *area) { - ListBase *lb = WM_dropboxmap_find("Clip", SPACE_CLIP, 0); + ListBase *lb = WM_dropboxmap_find("Clip", SPACE_CLIP, RGN_TYPE_WINDOW); /* add drop boxes */ WM_event_add_dropbox_handler(&area->handlers, lb); @@ -474,17 +474,17 @@ static void clip_operatortypes() static void clip_keymap(wmKeyConfig *keyconf) { /* ******** Global hotkeys available for all regions ******** */ - WM_keymap_ensure(keyconf, "Clip", SPACE_CLIP, 0); + WM_keymap_ensure(keyconf, "Clip", SPACE_CLIP, RGN_TYPE_WINDOW); /* ******** Hotkeys available for main region only ******** */ - WM_keymap_ensure(keyconf, "Clip Editor", SPACE_CLIP, 0); + WM_keymap_ensure(keyconf, "Clip Editor", SPACE_CLIP, RGN_TYPE_WINDOW); // keymap->poll = ED_space_clip_tracking_poll; /* ******** Hotkeys available for preview region only ******** */ - WM_keymap_ensure(keyconf, "Clip Graph Editor", SPACE_CLIP, 0); + WM_keymap_ensure(keyconf, "Clip Graph Editor", SPACE_CLIP, RGN_TYPE_WINDOW); /* ******** Hotkeys available for channels region only ******** */ - WM_keymap_ensure(keyconf, "Clip Dopesheet Editor", SPACE_CLIP, 0); + WM_keymap_ensure(keyconf, "Clip Dopesheet Editor", SPACE_CLIP, RGN_TYPE_WINDOW); } /* DO NOT make this static, this hides the symbol and breaks API generation script. */ @@ -548,7 +548,7 @@ static void clip_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) /* area+region dropbox definition */ static void clip_dropboxes() { - ListBase *lb = WM_dropboxmap_find("Clip", SPACE_CLIP, 0); + ListBase *lb = WM_dropboxmap_find("Clip", SPACE_CLIP, RGN_TYPE_WINDOW); WM_dropbox_add(lb, "CLIP_OT_open", clip_drop_poll, clip_drop_copy, nullptr, nullptr); } @@ -661,14 +661,14 @@ static void clip_main_region_init(wmWindowManager *wm, ARegion *region) * since the space clip manages own v2d in #movieclip_main_area_set_view2d */ /* mask polls mode */ - keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip Editor", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip Editor", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -826,16 +826,16 @@ static void clip_preview_region_init(wmWindowManager *wm, ARegion *region) /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); keymap = WM_keymap_ensure(wm->defaultconf, "Clip Time Scrub", SPACE_CLIP, RGN_TYPE_PREVIEW); WM_event_add_keymap_handler_poll(®ion->handlers, keymap, ED_time_scrub_event_in_region); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip Graph Editor", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip Graph Editor", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip Dopesheet Editor", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip Dopesheet Editor", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -962,7 +962,7 @@ static void clip_channels_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip Dopesheet Editor", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip Dopesheet Editor", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -1048,7 +1048,7 @@ static void clip_tools_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -1112,7 +1112,7 @@ static void clip_properties_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_console/space_console.cc b/source/blender/editors/space_console/space_console.cc index f07c92e580f..223dd84e8ab 100644 --- a/source/blender/editors/space_console/space_console.cc +++ b/source/blender/editors/space_console/space_console.cc @@ -124,11 +124,11 @@ static void console_main_region_init(wmWindowManager *wm, ARegion *region) } /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Console", SPACE_CONSOLE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Console", SPACE_CONSOLE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* Include after "Console" so cursor motion keys such as "Home" isn't overridden. */ - keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* add drop boxes */ @@ -244,7 +244,7 @@ static void console_operatortypes() static void console_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Console", SPACE_CONSOLE, 0); + WM_keymap_ensure(keyconf, "Console", SPACE_CONSOLE, RGN_TYPE_WINDOW); } /****************** header region ******************/ diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc index 96f713c8583..79f68712fa3 100644 --- a/source/blender/editors/space_file/space_file.cc +++ b/source/blender/editors/space_file/space_file.cc @@ -437,10 +437,10 @@ static void file_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); /* own keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Main", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Main", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -634,13 +634,13 @@ static void file_operatortypes() static void file_keymap(wmKeyConfig *keyconf) { /* keys for all regions */ - WM_keymap_ensure(keyconf, "File Browser", SPACE_FILE, 0); + WM_keymap_ensure(keyconf, "File Browser", SPACE_FILE, RGN_TYPE_WINDOW); /* keys for main region */ - WM_keymap_ensure(keyconf, "File Browser Main", SPACE_FILE, 0); + WM_keymap_ensure(keyconf, "File Browser Main", SPACE_FILE, RGN_TYPE_WINDOW); /* keys for button region (top) */ - WM_keymap_ensure(keyconf, "File Browser Buttons", SPACE_FILE, 0); + WM_keymap_ensure(keyconf, "File Browser Buttons", SPACE_FILE, RGN_TYPE_WINDOW); } static bool file_ui_region_poll(const RegionPollParams *params) @@ -670,7 +670,7 @@ static void file_tools_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); /* own keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -720,7 +720,7 @@ static void file_header_region_init(wmWindowManager *wm, ARegion *region) ED_region_header_init(region); - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -738,10 +738,10 @@ static void file_ui_region_init(wmWindowManager *wm, ARegion *region) region->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Buttons", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Buttons", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -758,7 +758,7 @@ static void file_execution_region_init(wmWindowManager *wm, ARegion *region) region->v2d.keepzoom |= V2D_LOCKZOOM_X | V2D_LOCKZOOM_Y; /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_graph/graph_ops.cc b/source/blender/editors/space_graph/graph_ops.cc index 6c2ec17a7b2..3df2f1c3496 100644 --- a/source/blender/editors/space_graph/graph_ops.cc +++ b/source/blender/editors/space_graph/graph_ops.cc @@ -522,7 +522,7 @@ void ED_operatormacros_graph() void graphedit_keymap(wmKeyConfig *keyconf) { /* keymap for all regions */ - WM_keymap_ensure(keyconf, "Graph Editor Generic", SPACE_GRAPH, 0); + WM_keymap_ensure(keyconf, "Graph Editor Generic", SPACE_GRAPH, RGN_TYPE_WINDOW); /* channels */ /* Channels are not directly handled by the Graph Editor module, @@ -533,7 +533,7 @@ void graphedit_keymap(wmKeyConfig *keyconf) */ /* keyframes */ - WM_keymap_ensure(keyconf, "Graph Editor", SPACE_GRAPH, 0); + WM_keymap_ensure(keyconf, "Graph Editor", SPACE_GRAPH, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc index ccdb941235a..cc228b19763 100644 --- a/source/blender/editors/space_graph/space_graph.cc +++ b/source/blender/editors/space_graph/space_graph.cc @@ -176,9 +176,9 @@ static void graph_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor", SPACE_GRAPH, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor", SPACE_GRAPH, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -361,9 +361,9 @@ static void graph_channel_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -410,7 +410,7 @@ static void graph_buttons_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Graph Editor Generic", SPACE_GRAPH, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc index 59982d06198..07115db0651 100644 --- a/source/blender/editors/space_image/space_image.cc +++ b/source/blender/editors/space_image/space_image.cc @@ -171,7 +171,7 @@ static void image_free(SpaceLink *sl) /* spacetype; init callback, add handlers */ static void image_init(wmWindowManager * /*wm*/, ScrArea *area) { - ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, 0); + ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, RGN_TYPE_WINDOW); /* add drop boxes */ WM_event_add_dropbox_handler(&area->handlers, lb); @@ -245,8 +245,8 @@ static void image_operatortypes() static void image_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Image Generic", SPACE_IMAGE, 0); - WM_keymap_ensure(keyconf, "Image", SPACE_IMAGE, 0); + WM_keymap_ensure(keyconf, "Image Generic", SPACE_IMAGE, RGN_TYPE_WINDOW); + WM_keymap_ensure(keyconf, "Image", SPACE_IMAGE, RGN_TYPE_WINDOW); } /* dropboxes */ @@ -274,7 +274,7 @@ static void image_drop_copy(bContext * /*C*/, wmDrag *drag, wmDropBox *drop) /* area+region dropbox definition */ static void image_dropboxes() { - ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, 0); + ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, RGN_TYPE_WINDOW); WM_dropbox_add(lb, "IMAGE_OT_open", image_drop_poll, image_drop_copy, nullptr, nullptr); } @@ -604,26 +604,26 @@ static void image_main_region_init(wmWindowManager *wm, ARegion *region) * since the space clip manages own v2d in #image_main_region_set_view2d */ /* mask polls mode */ - keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* image paint polls for mode */ - keymap = WM_keymap_ensure(wm->defaultconf, "Curve", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "UV Editor", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "UV Editor", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* own keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Image", SPACE_IMAGE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Image", SPACE_IMAGE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -780,7 +780,7 @@ static void image_buttons_region_init(wmWindowManager *wm, ARegion *region) region->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -894,7 +894,7 @@ static void image_tools_region_init(wmWindowManager *wm, ARegion *region) region->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_info/space_info.cc b/source/blender/editors/space_info/space_info.cc index c0955775885..36d7f16cc4a 100644 --- a/source/blender/editors/space_info/space_info.cc +++ b/source/blender/editors/space_info/space_info.cc @@ -101,7 +101,7 @@ static void info_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Info", SPACE_INFO, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Info", SPACE_INFO, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -169,8 +169,8 @@ static void info_operatortypes() static void info_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Window", 0, 0); - WM_keymap_ensure(keyconf, "Info", SPACE_INFO, 0); + WM_keymap_ensure(keyconf, "Window", SPACE_EMPTY, RGN_TYPE_WINDOW); + WM_keymap_ensure(keyconf, "Info", SPACE_INFO, RGN_TYPE_WINDOW); } /* add handlers, stuff you only do once or on area/region changes */ diff --git a/source/blender/editors/space_nla/nla_ops.cc b/source/blender/editors/space_nla/nla_ops.cc index 1a073619a1d..e46c960ffe6 100644 --- a/source/blender/editors/space_nla/nla_ops.cc +++ b/source/blender/editors/space_nla/nla_ops.cc @@ -171,7 +171,7 @@ void ED_operatormacros_nla() void nla_keymap(wmKeyConfig *keyconf) { /* keymap for all regions ------------------------------------------- */ - WM_keymap_ensure(keyconf, "NLA Generic", SPACE_NLA, 0); + WM_keymap_ensure(keyconf, "NLA Generic", SPACE_NLA, RGN_TYPE_WINDOW); /* channels ---------------------------------------------------------- */ /* Channels are not directly handled by the NLA Editor module, but are inherited from the @@ -182,8 +182,8 @@ void nla_keymap(wmKeyConfig *keyconf) * However, those operations which involve clicking on channels and/or * the placement of them in the view are implemented here instead */ - WM_keymap_ensure(keyconf, "NLA Channels", SPACE_NLA, 0); + WM_keymap_ensure(keyconf, "NLA Channels", SPACE_NLA, RGN_TYPE_WINDOW); /* data ------------------------------------------------------------- */ - WM_keymap_ensure(keyconf, "NLA Editor", SPACE_NLA, 0); + WM_keymap_ensure(keyconf, "NLA Editor", SPACE_NLA, RGN_TYPE_WINDOW); } diff --git a/source/blender/editors/space_nla/space_nla.cc b/source/blender/editors/space_nla/space_nla.cc index e284a7d4288..b96be397e48 100644 --- a/source/blender/editors/space_nla/space_nla.cc +++ b/source/blender/editors/space_nla/space_nla.cc @@ -162,13 +162,13 @@ static void nla_channel_region_init(wmWindowManager *wm, ARegion *region) /* own keymap */ /* own channels map first to override some channel keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "NLA Channels", SPACE_NLA, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "NLA Channels", SPACE_NLA, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* now generic channels map for everything else that can apply */ - keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Animation Channels", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "NLA Generic", SPACE_NLA, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "NLA Generic", SPACE_NLA, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -206,9 +206,9 @@ static void nla_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "NLA Editor", SPACE_NLA, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "NLA Editor", SPACE_NLA, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "NLA Generic", SPACE_NLA, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "NLA Generic", SPACE_NLA, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -295,7 +295,7 @@ static void nla_buttons_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "NLA Generic", SPACE_NLA, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "NLA Generic", SPACE_NLA, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_node/node_ops.cc b/source/blender/editors/space_node/node_ops.cc index ba3444e60fa..bcd91e3c106 100644 --- a/source/blender/editors/space_node/node_ops.cc +++ b/source/blender/editors/space_node/node_ops.cc @@ -113,10 +113,10 @@ void node_operatortypes() void node_keymap(wmKeyConfig *keyconf) { /* Entire Editor only ----------------- */ - WM_keymap_ensure(keyconf, "Node Generic", SPACE_NODE, 0); + WM_keymap_ensure(keyconf, "Node Generic", SPACE_NODE, RGN_TYPE_WINDOW); /* Main Region only ----------------- */ - WM_keymap_ensure(keyconf, "Node Editor", SPACE_NODE, 0); + WM_keymap_ensure(keyconf, "Node Editor", SPACE_NODE, RGN_TYPE_WINDOW); node_link_modal_keymap(keyconf); } diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc index 2516226e157..d8f6de04866 100644 --- a/source/blender/editors/space_node/space_node.cc +++ b/source/blender/editors/space_node/space_node.cc @@ -602,7 +602,7 @@ static void node_buttons_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -618,7 +618,7 @@ static void node_toolbar_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -655,10 +655,10 @@ static void node_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); /* own keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Generic", SPACE_NODE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Node Editor", SPACE_NODE, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Node Editor", SPACE_NODE, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* add drop boxes */ diff --git a/source/blender/editors/space_outliner/outliner_ops.cc b/source/blender/editors/space_outliner/outliner_ops.cc index 3ba1c55f1b2..b94df433274 100644 --- a/source/blender/editors/space_outliner/outliner_ops.cc +++ b/source/blender/editors/space_outliner/outliner_ops.cc @@ -101,7 +101,7 @@ void outliner_operatortypes() void outliner_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Outliner", SPACE_OUTLINER, 0); + WM_keymap_ensure(keyconf, "Outliner", SPACE_OUTLINER, RGN_TYPE_WINDOW); } /** \} */ diff --git a/source/blender/editors/space_outliner/space_outliner.cc b/source/blender/editors/space_outliner/space_outliner.cc index 5a4acd66ba3..8b8495d51c4 100644 --- a/source/blender/editors/space_outliner/space_outliner.cc +++ b/source/blender/editors/space_outliner/space_outliner.cc @@ -70,7 +70,7 @@ static void outliner_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Outliner", SPACE_OUTLINER, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Outliner", SPACE_OUTLINER, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* Add dropboxes */ diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc index 9cd09347a68..394a61425f8 100644 --- a/source/blender/editors/space_script/space_script.cc +++ b/source/blender/editors/space_script/space_script.cc @@ -97,7 +97,7 @@ static void script_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_STANDARD, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Script", SPACE_SCRIPT, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Script", SPACE_SCRIPT, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_sequencer/sequencer_ops.cc b/source/blender/editors/space_sequencer/sequencer_ops.cc index 225267a9d9f..207b12610e1 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.cc +++ b/source/blender/editors/space_sequencer/sequencer_ops.cc @@ -122,16 +122,16 @@ void sequencer_operatortypes() void sequencer_keymap(wmKeyConfig *keyconf) { /* Common items ------------------------------------------------------------------ */ - WM_keymap_ensure(keyconf, "SequencerCommon", SPACE_SEQ, 0); + WM_keymap_ensure(keyconf, "SequencerCommon", SPACE_SEQ, RGN_TYPE_WINDOW); /* Strips Region --------------------------------------------------------------- */ - WM_keymap_ensure(keyconf, "Sequencer", SPACE_SEQ, 0); + WM_keymap_ensure(keyconf, "Sequencer", SPACE_SEQ, RGN_TYPE_WINDOW); /* Preview Region ----------------------------------------------------------- */ - WM_keymap_ensure(keyconf, "SequencerPreview", SPACE_SEQ, 0); + WM_keymap_ensure(keyconf, "SequencerPreview", SPACE_SEQ, RGN_TYPE_WINDOW); /* Channels Region ----------------------------------------------------------- */ - WM_keymap_ensure(keyconf, "Sequencer Channels", SPACE_SEQ, 0); + WM_keymap_ensure(keyconf, "Sequencer Channels", SPACE_SEQ, RGN_TYPE_WINDOW); } void ED_operatormacros_sequencer() diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc index afbf7206152..584b9df4cf2 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.cc +++ b/source/blender/editors/space_sequencer/space_sequencer.cc @@ -458,15 +458,15 @@ static void sequencer_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); #if 0 - keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); #endif - keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* Own keymap. */ - keymap = WM_keymap_ensure(wm->defaultconf, "Sequencer", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Sequencer", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* Add drop boxes. */ @@ -691,7 +691,7 @@ static void sequencer_tools_region_init(wmWindowManager *wm, ARegion *region) region->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } @@ -714,15 +714,15 @@ static void sequencer_preview_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_CUSTOM, region->winx, region->winy); #if 0 - keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); #endif - keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* Own keymap. */ - keymap = WM_keymap_ensure(wm->defaultconf, "SequencerPreview", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "SequencerPreview", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); ListBase *lb = WM_dropboxmap_find("Sequencer", SPACE_SEQ, RGN_TYPE_PREVIEW); @@ -875,7 +875,7 @@ static void sequencer_buttons_region_init(wmWindowManager *wm, ARegion *region) { wmKeyMap *keymap; - keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "SequencerCommon", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); UI_panel_category_active_set_default(region, "Strip"); @@ -949,7 +949,7 @@ static void sequencer_channel_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); - keymap = WM_keymap_ensure(wm->defaultconf, "Sequencer Channels", SPACE_SEQ, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Sequencer Channels", SPACE_SEQ, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index b806025a9ce..81409b3553e 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -155,7 +155,7 @@ static SpaceLink *spreadsheet_duplicate(SpaceLink *sl) static void spreadsheet_keymap(wmKeyConfig *keyconf) { /* Entire editor only. */ - WM_keymap_ensure(keyconf, "Spreadsheet Generic", SPACE_SPREADSHEET, 0); + WM_keymap_ensure(keyconf, "Spreadsheet Generic", SPACE_SPREADSHEET, RGN_TYPE_WINDOW); } static void spreadsheet_id_remap(ScrArea * /*area*/, SpaceLink *slink, const IDRemapper *mappings) @@ -182,12 +182,13 @@ static void spreadsheet_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_LIST, region->winx, region->winy); { - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "View2D Buttons List", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } { wmKeyMap *keymap = WM_keymap_ensure( - wm->defaultconf, "Spreadsheet Generic", SPACE_SPREADSHEET, 0); + wm->defaultconf, "Spreadsheet Generic", SPACE_SPREADSHEET, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } } @@ -654,7 +655,7 @@ static void spreadsheet_sidebar_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); wmKeyMap *keymap = WM_keymap_ensure( - wm->defaultconf, "Spreadsheet Generic", SPACE_SPREADSHEET, 0); + wm->defaultconf, "Spreadsheet Generic", SPACE_SPREADSHEET, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_text/space_text.cc b/source/blender/editors/space_text/space_text.cc index 184e27bb8e3..f3b2ab3af50 100644 --- a/source/blender/editors/space_text/space_text.cc +++ b/source/blender/editors/space_text/space_text.cc @@ -217,8 +217,8 @@ static void text_operatortypes() static void text_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Text Generic", SPACE_TEXT, 0); - WM_keymap_ensure(keyconf, "Text", SPACE_TEXT, 0); + WM_keymap_ensure(keyconf, "Text Generic", SPACE_TEXT, RGN_TYPE_WINDOW); + WM_keymap_ensure(keyconf, "Text", SPACE_TEXT, RGN_TYPE_WINDOW); } const char *text_context_dir[] = {"edit_text", nullptr}; @@ -254,9 +254,9 @@ static void text_main_region_init(wmWindowManager *wm, ARegion *region) UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_STANDARD, region->winx, region->winy); /* own keymap */ - keymap = WM_keymap_ensure(wm->defaultconf, "Text Generic", SPACE_TEXT, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Text Generic", SPACE_TEXT, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Text", SPACE_TEXT, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Text", SPACE_TEXT, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); /* add drop boxes */ @@ -370,7 +370,7 @@ static void text_properties_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); /* own keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "Text Generic", SPACE_TEXT, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Text Generic", SPACE_TEXT, RGN_TYPE_WINDOW); WM_event_add_keymap_handler_v2d_mask(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_topbar/space_topbar.cc b/source/blender/editors/space_topbar/space_topbar.cc index 097e135c84c..fce425ac86d 100644 --- a/source/blender/editors/space_topbar/space_topbar.cc +++ b/source/blender/editors/space_topbar/space_topbar.cc @@ -91,7 +91,7 @@ static void topbar_main_region_init(wmWindowManager *wm, ARegion *region) } UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_HEADER, region->winx, region->winy); - keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 8ecb5cfdeef..84e7c14f356 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -399,85 +399,89 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *region) /* object ops. */ /* important to be before Pose keymap since they can both be enabled at once */ - keymap = WM_keymap_ensure(wm->defaultconf, "Paint Face Mask (Weight, Vertex, Texture)", 0, 0); + keymap = WM_keymap_ensure( + wm->defaultconf, "Paint Face Mask (Weight, Vertex, Texture)", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0); + keymap = WM_keymap_ensure( + wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* Before 'Weight/Vertex Paint' so adding curve points is not overridden. */ - keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* Before 'Pose' so weight paint menus aren't overridden by pose menus. */ - keymap = WM_keymap_ensure(wm->defaultconf, "Weight Paint", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Weight Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Vertex Paint", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Vertex Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* pose is not modal, operator poll checks for this */ - keymap = WM_keymap_ensure(wm->defaultconf, "Pose", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Pose", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Object Mode", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Curve", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Curves", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Curves", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Sculpt", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Sculpt", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Mesh", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Mesh", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Armature", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Armature", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Metaball", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Metaball", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Lattice", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Lattice", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Particle", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Particle", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Sculpt Curves", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Sculpt Curves", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* Note: Grease Pencil handlers used to be added using `ED_KEYMAP_GPENCIL` in * `ed_default_handlers` because it needed to be added to multiple editors (as other editors use * annotations.). But for OB_GREASE_PENCIL, we only need it to register the keymaps for the * 3D View. */ - keymap = WM_keymap_ensure(wm->defaultconf, "Grease Pencil Edit Mode", 0, 0); + keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Edit Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Grease Pencil Paint Mode", 0, 0); + keymap = WM_keymap_ensure( + wm->defaultconf, "Grease Pencil Paint Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* Edit-font key-map swallows almost all (because of text input). */ - keymap = WM_keymap_ensure(wm->defaultconf, "Font", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Font", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Object Non-modal", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Object Non-modal", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Frames", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Frames", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* own keymap, last so modes can override it */ - keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "3D View", SPACE_VIEW3D, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "3D View", SPACE_VIEW3D, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); /* add drop boxes */ @@ -1570,7 +1574,8 @@ static void view3d_main_region_cursor(wmWindow *win, ScrArea *area, ARegion *reg /* add handlers, stuff you only do once or on area/region changes */ static void view3d_header_region_init(wmWindowManager *wm, ARegion *region) { - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "3D View Generic", SPACE_VIEW3D, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); @@ -1686,7 +1691,7 @@ static void view3d_buttons_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -1923,7 +1928,7 @@ static void view3d_tools_region_init(wmWindowManager *wm, ARegion *region) ED_region_panels_init(wm, region); - keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); } @@ -1936,7 +1941,8 @@ static void view3d_tools_region_draw(const bContext *C, ARegion *region) /* add handlers, stuff you only do once or on area/region changes */ static void view3d_asset_shelf_region_init(wmWindowManager *wm, ARegion *region) { - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "3D View Generic", SPACE_VIEW3D, 0); + wmKeyMap *keymap = WM_keymap_ensure( + wm->defaultconf, "3D View Generic", SPACE_VIEW3D, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(®ion->handlers, keymap); ED_asset_shelf_region_init(wm, region); diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc index b9cbf37cf25..63bdd887e87 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate.cc @@ -410,7 +410,8 @@ struct ViewOpsData_Utility : ViewOpsData { { this->init_context(C); - wmKeyMap *keymap = WM_keymap_find_all(CTX_wm_manager(C), "3D View", SPACE_VIEW3D, 0); + wmKeyMap *keymap = WM_keymap_find_all( + CTX_wm_manager(C), "3D View", SPACE_VIEW3D, RGN_TYPE_WINDOW); wmKeyMap keymap_tmp = {}; LISTBASE_FOREACH (wmKeyMapItem *, kmi, &keymap->items) { diff --git a/source/blender/editors/space_view3d/view3d_ops.cc b/source/blender/editors/space_view3d/view3d_ops.cc index c5d0263803c..713933824d8 100644 --- a/source/blender/editors/space_view3d/view3d_ops.cc +++ b/source/blender/editors/space_view3d/view3d_ops.cc @@ -232,10 +232,10 @@ void view3d_operatortypes() void view3d_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "3D View Generic", SPACE_VIEW3D, 0); + WM_keymap_ensure(keyconf, "3D View Generic", SPACE_VIEW3D, RGN_TYPE_WINDOW); /* only for region 3D window */ - WM_keymap_ensure(keyconf, "3D View", SPACE_VIEW3D, 0); + WM_keymap_ensure(keyconf, "3D View", SPACE_VIEW3D, RGN_TYPE_WINDOW); fly_modal_keymap(keyconf); walk_modal_keymap(keyconf); diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index ac0b5a16220..8b043323c22 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -1970,7 +1970,7 @@ void ED_keymap_uvedit(wmKeyConfig *keyconf) { wmKeyMap *keymap; - keymap = WM_keymap_ensure(keyconf, "UV Editor", 0, 0); + keymap = WM_keymap_ensure(keyconf, "UV Editor", SPACE_EMPTY, RGN_TYPE_WINDOW); keymap->poll = ED_operator_uvedit; } diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index 4a841d1f22a..cc57a2eecfa 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -903,13 +903,14 @@ wmKeyMap *WM_modalkeymap_ensure(wmKeyConfig *keyconf, const char *idname, const EnumPropertyItem *items) { - wmKeyMap *km = WM_keymap_ensure(keyconf, idname, 0, 0); + wmKeyMap *km = WM_keymap_ensure(keyconf, idname, SPACE_EMPTY, RGN_TYPE_WINDOW); km->flag |= KEYMAP_MODAL; /* init modal items from default config */ wmWindowManager *wm = static_cast(G_MAIN->wm.first); if (wm->defaultconf && wm->defaultconf != keyconf) { - wmKeyMap *defaultkm = WM_keymap_list_find(&wm->defaultconf->keymaps, km->idname, 0, 0); + wmKeyMap *defaultkm = WM_keymap_list_find( + &wm->defaultconf->keymaps, km->idname, SPACE_EMPTY, RGN_TYPE_WINDOW); if (defaultkm) { km->modal_items = defaultkm->modal_items; @@ -1020,7 +1021,8 @@ static void wm_user_modal_keymap_set_items(wmWindowManager *wm, wmKeyMap *km) return; } - wmKeyMap *defaultkm = WM_keymap_list_find(&wm->defaultconf->keymaps, km->idname, 0, 0); + wmKeyMap *defaultkm = WM_keymap_list_find( + &wm->defaultconf->keymaps, km->idname, SPACE_EMPTY, RGN_TYPE_WINDOW); if (!defaultkm) { return; } diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.cc b/source/blender/windowmanager/intern/wm_keymap_utils.cc index a0714b419dd..e1ec4f5f1a9 100644 --- a/source/blender/windowmanager/intern/wm_keymap_utils.cc +++ b/source/blender/windowmanager/intern/wm_keymap_utils.cc @@ -178,7 +178,7 @@ wmKeyMap *WM_keymap_guess_from_context(const bContext *C) return nullptr; } - wmKeyMap *km = WM_keymap_find_all(CTX_wm_manager(C), km_id, 0, 0); + wmKeyMap *km = WM_keymap_find_all(CTX_wm_manager(C), km_id, SPACE_EMPTY, RGN_TYPE_WINDOW); BLI_assert(km); return km; } @@ -208,124 +208,125 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) } if (km == nullptr) { - km = WM_keymap_find_all(wm, "Window", 0, 0); + km = WM_keymap_find_all(wm, "Window", SPACE_EMPTY, RGN_TYPE_WINDOW); } } /* 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(wm, "Screen", 0, 0); + km = WM_keymap_find_all(wm, "Screen", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Grease Pencil */ else if (STRPREFIX(opname, "GPENCIL_OT")) { - km = WM_keymap_find_all(wm, "Grease Pencil", 0, 0); + km = WM_keymap_find_all(wm, "Grease Pencil", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "GREASE_PENCIL_OT")) { - km = WM_keymap_find_all(wm, "Grease Pencil", 0, 0); + km = WM_keymap_find_all(wm, "Grease Pencil", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Markers */ else if (STRPREFIX(opname, "MARKER_OT")) { - km = WM_keymap_find_all(wm, "Markers", 0, 0); + km = WM_keymap_find_all(wm, "Markers", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Import/Export */ else if (STRPREFIX(opname, "IMPORT_") || STRPREFIX(opname, "EXPORT_")) { - km = WM_keymap_find_all(wm, "Window", 0, 0); + km = WM_keymap_find_all(wm, "Window", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* 3D View */ else if (STRPREFIX(opname, "VIEW3D_OT")) { - km = WM_keymap_find_all(wm, "3D View", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "3D View", sl->spacetype, RGN_TYPE_WINDOW); } 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(wm, "Object Non-modal", 0, 0); + km = WM_keymap_find_all(wm, "Object Non-modal", SPACE_EMPTY, RGN_TYPE_WINDOW); } else { - km = WM_keymap_find_all(wm, "Object Mode", 0, 0); + km = WM_keymap_find_all(wm, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); } } /* 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(wm, "Object Mode", 0, 0); + km = WM_keymap_find_all(wm, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Editing Modes */ else if (STRPREFIX(opname, "MESH_OT")) { - km = WM_keymap_find_all(wm, "Mesh", 0, 0); + km = WM_keymap_find_all(wm, "Mesh", SPACE_EMPTY, RGN_TYPE_WINDOW); /* 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(wm, "Object Mode", 0, 0); + km = WM_keymap_find_all(wm, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); } } else if (STRPREFIX(opname, "CURVE_OT") || STRPREFIX(opname, "SURFACE_OT")) { - km = WM_keymap_find_all(wm, "Curve", 0, 0); + km = WM_keymap_find_all(wm, "Curve", SPACE_EMPTY, RGN_TYPE_WINDOW); /* 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(wm, "Object Mode", 0, 0); + km = WM_keymap_find_all(wm, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); } } else if (STRPREFIX(opname, "ARMATURE_OT") || STRPREFIX(opname, "SKETCH_OT")) { - km = WM_keymap_find_all(wm, "Armature", 0, 0); + km = WM_keymap_find_all(wm, "Armature", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "POSE_OT") || STRPREFIX(opname, "POSELIB_OT")) { - km = WM_keymap_find_all(wm, "Pose", 0, 0); + km = WM_keymap_find_all(wm, "Pose", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "SCULPT_OT")) { switch (CTX_data_mode_enum(C)) { case CTX_MODE_SCULPT: - km = WM_keymap_find_all(wm, "Sculpt", 0, 0); + km = WM_keymap_find_all(wm, "Sculpt", SPACE_EMPTY, RGN_TYPE_WINDOW); break; default: break; } } else if (STRPREFIX(opname, "CURVES_OT")) { - km = WM_keymap_find_all(wm, "Curves", 0, 0); + km = WM_keymap_find_all(wm, "Curves", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "SCULPT_CURVES_OT")) { - km = WM_keymap_find_all(wm, "Sculpt Curves", 0, 0); + km = WM_keymap_find_all(wm, "Sculpt Curves", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "MBALL_OT")) { - km = WM_keymap_find_all(wm, "Metaball", 0, 0); + km = WM_keymap_find_all(wm, "Metaball", SPACE_EMPTY, RGN_TYPE_WINDOW); /* Some meta-ball operators are active in object mode too, like add-primitive. */ if (km && !WM_keymap_poll((bContext *)C, km)) { - km = WM_keymap_find_all(wm, "Object Mode", 0, 0); + km = WM_keymap_find_all(wm, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); } } else if (STRPREFIX(opname, "LATTICE_OT")) { - km = WM_keymap_find_all(wm, "Lattice", 0, 0); + km = WM_keymap_find_all(wm, "Lattice", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "PARTICLE_OT")) { - km = WM_keymap_find_all(wm, "Particle", 0, 0); + km = WM_keymap_find_all(wm, "Particle", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "FONT_OT")) { - km = WM_keymap_find_all(wm, "Font", 0, 0); + km = WM_keymap_find_all(wm, "Font", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Paint Face Mask */ else if (STRPREFIX(opname, "PAINT_OT_face_select")) { - km = WM_keymap_find_all(wm, "Paint Face Mask (Weight, Vertex, Texture)", 0, 0); + km = WM_keymap_find_all( + wm, "Paint Face Mask (Weight, Vertex, Texture)", SPACE_EMPTY, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "PAINT_OT")) { /* check for relevant mode */ switch (CTX_data_mode_enum(C)) { case CTX_MODE_PAINT_WEIGHT: - km = WM_keymap_find_all(wm, "Weight Paint", 0, 0); + km = WM_keymap_find_all(wm, "Weight Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); break; case CTX_MODE_PAINT_VERTEX: - km = WM_keymap_find_all(wm, "Vertex Paint", 0, 0); + km = WM_keymap_find_all(wm, "Vertex Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); break; case CTX_MODE_PAINT_TEXTURE: - km = WM_keymap_find_all(wm, "Image Paint", 0, 0); + km = WM_keymap_find_all(wm, "Image Paint", SPACE_EMPTY, RGN_TYPE_WINDOW); break; case CTX_MODE_SCULPT: - km = WM_keymap_find_all(wm, "Sculpt", 0, 0); + km = WM_keymap_find_all(wm, "Sculpt", SPACE_EMPTY, RGN_TYPE_WINDOW); break; default: break; @@ -333,50 +334,50 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) } /* General 2D View, not bound to a specific spacetype. */ else if (STRPREFIX(opname, "VIEW2D_OT")) { - km = WM_keymap_find_all(wm, "View2D", 0, 0); + km = WM_keymap_find_all(wm, "View2D", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Image Editor */ else if (STRPREFIX(opname, "IMAGE_OT")) { - km = WM_keymap_find_all(wm, "Image", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Image", sl->spacetype, RGN_TYPE_WINDOW); } /* Clip Editor */ else if (STRPREFIX(opname, "CLIP_OT")) { - km = WM_keymap_find_all(wm, "Clip", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Clip", sl->spacetype, RGN_TYPE_WINDOW); } else if (STRPREFIX(opname, "MASK_OT")) { - km = WM_keymap_find_all(wm, "Mask Editing", 0, 0); + km = WM_keymap_find_all(wm, "Mask Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* 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(wm, "Mesh", 0, 0); + km = WM_keymap_find_all(wm, "Mesh", SPACE_EMPTY, RGN_TYPE_WINDOW); if (km && !WM_keymap_poll((bContext *)C, km)) { km = nullptr; } } if (!km) { - km = WM_keymap_find_all(wm, "UV Editor", 0, 0); + km = WM_keymap_find_all(wm, "UV Editor", SPACE_EMPTY, RGN_TYPE_WINDOW); } } /* Node Editor */ else if (STRPREFIX(opname, "NODE_OT")) { - km = WM_keymap_find_all(wm, "Node Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Node Editor", sl->spacetype, RGN_TYPE_WINDOW); } /* Animation Editor Channels */ else if (STRPREFIX(opname, "ANIM_OT_channels")) { - km = WM_keymap_find_all(wm, "Animation Channels", 0, 0); + km = WM_keymap_find_all(wm, "Animation Channels", SPACE_EMPTY, RGN_TYPE_WINDOW); } /* Animation Generic - after channels */ else if (STRPREFIX(opname, "ANIM_OT")) { if (sl->spacetype == SPACE_VIEW3D) { switch (CTX_data_mode_enum(C)) { case CTX_MODE_OBJECT: - km = WM_keymap_find_all(wm, "Object Mode", 0, 0); + km = WM_keymap_find_all(wm, "Object Mode", SPACE_EMPTY, RGN_TYPE_WINDOW); break; case CTX_MODE_POSE: - km = WM_keymap_find_all(wm, "Pose", 0, 0); + km = WM_keymap_find_all(wm, "Pose", SPACE_EMPTY, RGN_TYPE_WINDOW); break; default: break; @@ -387,83 +388,83 @@ wmKeyMap *WM_keymap_guess_opname(const bContext *C, const char *opname) } if (!km) { - km = WM_keymap_find_all(wm, "Animation", 0, 0); + km = WM_keymap_find_all(wm, "Animation", SPACE_EMPTY, RGN_TYPE_WINDOW); } } /* Graph Editor */ else if (STRPREFIX(opname, "GRAPH_OT")) { - km = WM_keymap_find_all(wm, "Graph Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Graph Editor", sl->spacetype, RGN_TYPE_WINDOW); } /* Dopesheet Editor */ else if (STRPREFIX(opname, "ACTION_OT")) { - km = WM_keymap_find_all(wm, "Dopesheet", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Dopesheet", sl->spacetype, RGN_TYPE_WINDOW); } /* NLA Editor */ else if (STRPREFIX(opname, "NLA_OT")) { - km = WM_keymap_find_all(wm, "NLA Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "NLA Editor", sl->spacetype, RGN_TYPE_WINDOW); } /* Script */ else if (STRPREFIX(opname, "SCRIPT_OT")) { - km = WM_keymap_find_all(wm, "Script", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Script", sl->spacetype, RGN_TYPE_WINDOW); } /* Text */ else if (STRPREFIX(opname, "TEXT_OT")) { - km = WM_keymap_find_all(wm, "Text", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Text", sl->spacetype, RGN_TYPE_WINDOW); } /* Sequencer */ else if (STRPREFIX(opname, "SEQUENCER_OT")) { - km = WM_keymap_find_all(wm, "Sequencer", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Sequencer", sl->spacetype, RGN_TYPE_WINDOW); } /* Console */ else if (STRPREFIX(opname, "CONSOLE_OT")) { - km = WM_keymap_find_all(wm, "Console", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Console", sl->spacetype, RGN_TYPE_WINDOW); } /* Console */ else if (STRPREFIX(opname, "INFO_OT")) { - km = WM_keymap_find_all(wm, "Info", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Info", sl->spacetype, RGN_TYPE_WINDOW); } /* File browser */ else if (STRPREFIX(opname, "FILE_OT")) { - km = WM_keymap_find_all(wm, "File Browser", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "File Browser", sl->spacetype, RGN_TYPE_WINDOW); } /* Logic Editor */ else if (STRPREFIX(opname, "LOGIC_OT")) { - km = WM_keymap_find_all(wm, "Logic Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Logic Editor", sl->spacetype, RGN_TYPE_WINDOW); } /* Outliner */ else if (STRPREFIX(opname, "OUTLINER_OT")) { - km = WM_keymap_find_all(wm, "Outliner", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Outliner", sl->spacetype, RGN_TYPE_WINDOW); } /* Transform */ else if (STRPREFIX(opname, "TRANSFORM_OT")) { /* check for relevant editor */ switch (sl->spacetype) { case SPACE_VIEW3D: - km = WM_keymap_find_all(wm, "3D View", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "3D View", sl->spacetype, RGN_TYPE_WINDOW); break; case SPACE_GRAPH: - km = WM_keymap_find_all(wm, "Graph Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Graph Editor", sl->spacetype, RGN_TYPE_WINDOW); break; case SPACE_ACTION: - km = WM_keymap_find_all(wm, "Dopesheet", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Dopesheet", sl->spacetype, RGN_TYPE_WINDOW); break; case SPACE_NLA: - km = WM_keymap_find_all(wm, "NLA Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "NLA Editor", sl->spacetype, RGN_TYPE_WINDOW); break; case SPACE_IMAGE: - km = WM_keymap_find_all(wm, "UV Editor", 0, 0); + km = WM_keymap_find_all(wm, "UV Editor", SPACE_EMPTY, RGN_TYPE_WINDOW); break; case SPACE_NODE: - km = WM_keymap_find_all(wm, "Node Editor", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Node Editor", sl->spacetype, RGN_TYPE_WINDOW); break; case SPACE_SEQ: - km = WM_keymap_find_all(wm, "Sequencer", sl->spacetype, 0); + km = WM_keymap_find_all(wm, "Sequencer", sl->spacetype, RGN_TYPE_WINDOW); break; } } /* User Interface */ else if (STRPREFIX(opname, "UI_OT")) { - km = WM_keymap_find_all(wm, "User Interface", 0, 0); + km = WM_keymap_find_all(wm, "User Interface", SPACE_EMPTY, RGN_TYPE_WINDOW); } return km; diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 20f80a3c8fb..18b9f02e978 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -4101,7 +4101,7 @@ static void gesture_zoom_border_modal_keymap(wmKeyConfig *keyconf) void wm_window_keymap(wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Window", 0, 0); + WM_keymap_ensure(keyconf, "Window", SPACE_EMPTY, RGN_TYPE_WINDOW); wm_gizmos_keymap(keyconf); gesture_circle_modal_keymap(keyconf); diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index 4a62a91790a..d901dbe7751 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -798,18 +798,18 @@ static void wm_window_ghostwindow_ensure(wmWindowManager *wm, wmWindow *win, boo } /* add keymap handlers (1 handler for all keys in map!) */ - wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Window", 0, 0); + wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "Window", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(&win->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Screen", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Screen", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(&win->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Screen Editing", 0, 0); + keymap = WM_keymap_ensure(wm->defaultconf, "Screen Editing", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_keymap_handler(&win->modalhandlers, keymap); /* Add drop boxes. */ { - ListBase *lb = WM_dropboxmap_find("Window", 0, 0); + ListBase *lb = WM_dropboxmap_find("Window", SPACE_EMPTY, RGN_TYPE_WINDOW); WM_event_add_dropbox_handler(&win->handlers, lb); } wm_window_title(wm, win);