Expose a key-map preference "Fallback Tool (RMB)", disabled by default. The right mouse button uses the fallback tool (currently visible selection tool in the toolbar), instead of always tweaking. When any selection tool is active, right mouse always tweaks. To enable fallback selection on RMB, set the "Right Mouse Select Action" to "Selection Tool". Internal changes: - Add fall-back key-maps, separate key-maps needed for when the tool is run as a fall-back. This is needed so RMB-select can support fall-back tools, so left-mouse can be used when it's the active tool and RMB can be used as a fall-back action when another tool is active. - Add options field to tools so tools without gizmos can enable the full-back tool keymap. - Support multiple key-maps for keymap handlers. - Fall-back keymaps now co-exist with the tool-keymaps. So both keymaps may be active at once - using different mouse buttons. When gizmos are in use, a highlighted gizmo prioritizes the tool-keymap over the fall-back keymap. Resolves T83690. Reviewed By: JulienKaspar Ref D12493
188 lines
6.8 KiB
C
188 lines
6.8 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup RNA
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "RNA_define.h"
|
|
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_windowmanager_types.h"
|
|
#include "DNA_workspace_types.h"
|
|
|
|
#include "RNA_enum_types.h" /* own include */
|
|
|
|
#include "rna_internal.h" /* own include */
|
|
|
|
#ifdef RNA_RUNTIME
|
|
|
|
# include "BKE_paint.h"
|
|
|
|
# include "ED_screen.h"
|
|
|
|
static void rna_WorkSpaceTool_setup(ID *id,
|
|
bToolRef *tref,
|
|
bContext *C,
|
|
const char *idname,
|
|
/* Args for: 'bToolRef_Runtime'. */
|
|
int cursor,
|
|
const char *keymap,
|
|
const char *gizmo_group,
|
|
const char *data_block,
|
|
const char *op_idname,
|
|
int index,
|
|
int options,
|
|
const char *idname_fallback,
|
|
const char *keymap_fallback)
|
|
{
|
|
bToolRef_Runtime tref_rt = {0};
|
|
|
|
tref_rt.cursor = cursor;
|
|
STRNCPY(tref_rt.keymap, keymap);
|
|
STRNCPY(tref_rt.gizmo_group, gizmo_group);
|
|
STRNCPY(tref_rt.data_block, data_block);
|
|
STRNCPY(tref_rt.op, op_idname);
|
|
tref_rt.index = index;
|
|
tref_rt.flag = options;
|
|
|
|
/* While it's logical to assign both these values from setup,
|
|
* it's useful to stored this in DNA for re-use, exceptional case: write to the 'tref'. */
|
|
STRNCPY(tref->idname_fallback, idname_fallback);
|
|
STRNCPY(tref_rt.keymap_fallback, keymap_fallback);
|
|
|
|
WM_toolsystem_ref_set_from_runtime(C, (WorkSpace *)id, tref, &tref_rt, idname);
|
|
}
|
|
|
|
static void rna_WorkSpaceTool_refresh_from_context(ID *id, bToolRef *tref, Main *bmain)
|
|
{
|
|
WM_toolsystem_ref_sync_from_context(bmain, (WorkSpace *)id, tref);
|
|
}
|
|
|
|
static PointerRNA rna_WorkSpaceTool_operator_properties(bToolRef *tref,
|
|
ReportList *reports,
|
|
const char *idname)
|
|
{
|
|
wmOperatorType *ot = WM_operatortype_find(idname, true);
|
|
|
|
if (ot != NULL) {
|
|
PointerRNA ptr;
|
|
WM_toolsystem_ref_properties_ensure_from_operator(tref, ot, &ptr);
|
|
return ptr;
|
|
}
|
|
else {
|
|
BKE_reportf(reports, RPT_ERROR, "Operator '%s' not found!", idname);
|
|
}
|
|
return PointerRNA_NULL;
|
|
}
|
|
|
|
static PointerRNA rna_WorkSpaceTool_gizmo_group_properties(bToolRef *tref,
|
|
ReportList *reports,
|
|
const char *idname)
|
|
{
|
|
wmGizmoGroupType *gzgt = WM_gizmogrouptype_find(idname, false);
|
|
if (gzgt != NULL) {
|
|
PointerRNA ptr;
|
|
WM_toolsystem_ref_properties_ensure_from_gizmo_group(tref, gzgt, &ptr);
|
|
return ptr;
|
|
}
|
|
else {
|
|
BKE_reportf(reports, RPT_ERROR, "Gizmo group '%s' not found!", idname);
|
|
}
|
|
return PointerRNA_NULL;
|
|
}
|
|
|
|
#else
|
|
|
|
void RNA_api_workspace(StructRNA *srna)
|
|
{
|
|
FunctionRNA *func;
|
|
PropertyRNA *parm;
|
|
|
|
func = RNA_def_function(srna, "status_text_set_internal", "ED_workspace_status_text");
|
|
RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
|
|
RNA_def_function_ui_description(
|
|
func, "Set the status bar text, typically key shortcuts for modal operators");
|
|
parm = RNA_def_string(
|
|
func, "text", NULL, 0, "Text", "New string for the status bar, None clears the text");
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
|
RNA_def_property_clear_flag(parm, PROP_NEVER_NULL);
|
|
}
|
|
|
|
void RNA_api_workspace_tool(StructRNA *srna)
|
|
{
|
|
PropertyRNA *parm;
|
|
FunctionRNA *func;
|
|
|
|
static EnumPropertyItem options_items[] = {
|
|
{TOOLREF_FLAG_FALLBACK_KEYMAP, "KEYMAP_FALLBACK", 0, "Fallback", ""},
|
|
{0, NULL, 0, NULL, NULL},
|
|
};
|
|
|
|
func = RNA_def_function(srna, "setup", "rna_WorkSpaceTool_setup");
|
|
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_CONTEXT);
|
|
RNA_def_function_ui_description(func, "Set the tool settings");
|
|
|
|
parm = RNA_def_string(func, "idname", NULL, MAX_NAME, "Identifier", "");
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
|
|
|
/* 'bToolRef_Runtime' */
|
|
parm = RNA_def_property(func, "cursor", PROP_ENUM, PROP_NONE);
|
|
RNA_def_property_enum_items(parm, rna_enum_window_cursor_items);
|
|
RNA_def_string(func, "keymap", NULL, KMAP_MAX_NAME, "Key Map", "");
|
|
RNA_def_string(func, "gizmo_group", NULL, MAX_NAME, "Gizmo Group", "");
|
|
RNA_def_string(func, "data_block", NULL, MAX_NAME, "Data Block", "");
|
|
RNA_def_string(func, "operator", NULL, MAX_NAME, "Operator", "");
|
|
RNA_def_int(func, "index", 0, INT_MIN, INT_MAX, "Index", "", INT_MIN, INT_MAX);
|
|
RNA_def_enum_flag(func, "options", options_items, 0, "Tool Options", "");
|
|
|
|
RNA_def_string(func, "idname_fallback", NULL, MAX_NAME, "Fallback Identifier", "");
|
|
RNA_def_string(func, "keymap_fallback", NULL, KMAP_MAX_NAME, "Fallback Key Map", "");
|
|
|
|
/* Access tool operator options (optionally create). */
|
|
func = RNA_def_function(srna, "operator_properties", "rna_WorkSpaceTool_operator_properties");
|
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
|
parm = RNA_def_string(func, "operator", NULL, 0, "", "");
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
|
/* return */
|
|
parm = RNA_def_pointer(func, "result", "OperatorProperties", "", "");
|
|
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
|
|
RNA_def_function_return(func, parm);
|
|
|
|
/* Access gizmo-group options (optionally create). */
|
|
func = RNA_def_function(
|
|
srna, "gizmo_group_properties", "rna_WorkSpaceTool_gizmo_group_properties");
|
|
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
|
parm = RNA_def_string(func, "group", NULL, 0, "", "");
|
|
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
|
|
/* return */
|
|
parm = RNA_def_pointer(func, "result", "GizmoGroupProperties", "", "");
|
|
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
|
|
RNA_def_function_return(func, parm);
|
|
|
|
func = RNA_def_function(srna, "refresh_from_context", "rna_WorkSpaceTool_refresh_from_context");
|
|
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_MAIN);
|
|
}
|
|
|
|
#endif
|