[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24388] trunk/blender/source/blender: - modal keymap for border select
Campbell Barton
ideasman42 at gmail.com
Fri Nov 6 23:51:08 CET 2009
Revision: 24388
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24388
Author: campbellbarton
Date: 2009-11-06 23:51:08 +0100 (Fri, 06 Nov 2009)
Log Message:
-----------
- modal keymap for border select
- revert circle select keys adjustments & view navigation while selecting (durian guys liked but allowed activating multiple circle select's at once)
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_console/console_report.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_buttons.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/wm_event_types.h
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2009-11-06 22:42:15 UTC (rev 24387)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c 2009-11-06 22:51:08 UTC (rev 24388)
@@ -1293,7 +1293,7 @@
bAnimContext ac;
rcti rect;
short selectmode=0;
- int event;
+ int gesture_mode;
/* get editor data */
if (ANIM_animdata_get_context(C, &ac) == 0)
@@ -1305,8 +1305,8 @@
rect.xmax= RNA_int_get(op->ptr, "xmax");
rect.ymax= RNA_int_get(op->ptr, "ymax");
- event= RNA_int_get(op->ptr, "event_type");
- if (event == LEFTMOUSE) // FIXME... hardcoded
+ gesture_mode= RNA_int_get(op->ptr, "gesture_mode");
+ if (gesture_mode == GESTURE_MODAL_SELECT)
selectmode = ACHANNEL_SETFLAG_ADD;
else
selectmode = ACHANNEL_SETFLAG_CLEAR;
@@ -1338,11 +1338,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* rna */
- RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+ WM_operator_properties_gesture_border(ot, FALSE);
}
/* ******************** Mouse-Click Operator *********************** */
Modified: trunk/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_markers.c 2009-11-06 22:42:15 UTC (rev 24387)
+++ trunk/blender/source/blender/editors/animation/anim_markers.c 2009-11-06 22:51:08 UTC (rev 24388)
@@ -814,7 +814,7 @@
ListBase *markers= context_get_markers(C);
TimeMarker *marker;
float xminf, xmaxf, yminf, ymaxf;
- int event_type= RNA_int_get(op->ptr, "event_type");
+ int gesture_mode= RNA_int_get(op->ptr, "gesture_mode");
int xmin= RNA_int_get(op->ptr, "xmin");
int xmax= RNA_int_get(op->ptr, "xmax");
int ymin= RNA_int_get(op->ptr, "ymin");
@@ -833,13 +833,12 @@
/* XXX marker context */
for(marker= markers->first; marker; marker= marker->next) {
if ((marker->frame > xminf) && (marker->frame <= xmaxf)) {
- /* XXX weak... */
- switch (event_type) {
- case LEFTMOUSE:
+ switch (gesture_mode) {
+ case GESTURE_MODAL_SELECT:
if ((marker->flag & SELECT) == 0)
marker->flag |= SELECT;
break;
- case RIGHTMOUSE:
+ case GESTURE_MODAL_DESELECT:
if (marker->flag & SELECT)
marker->flag &= ~SELECT;
break;
@@ -870,11 +869,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* rna */
- RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+ WM_operator_properties_gesture_border(ot, FALSE);
}
/* *********************** (de)select all ***************** */
Modified: trunk/blender/source/blender/editors/animation/drivers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/drivers.c 2009-11-06 22:42:15 UTC (rev 24387)
+++ trunk/blender/source/blender/editors/animation/drivers.c 2009-11-06 22:51:08 UTC (rev 24388)
@@ -367,7 +367,7 @@
PropertyRNA *prop= NULL;
char *path;
short success= 0;
- int index, length, all= RNA_boolean_get(op->ptr, "all");
+ int index, all= RNA_boolean_get(op->ptr, "all");
/* try to create driver using property retrieved from UI */
memset(&ptr, 0, sizeof(PointerRNA));
Modified: trunk/blender/source/blender/editors/space_action/action_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_select.c 2009-11-06 22:42:15 UTC (rev 24387)
+++ trunk/blender/source/blender/editors/space_action/action_select.c 2009-11-06 22:51:08 UTC (rev 24388)
@@ -300,7 +300,7 @@
bAnimContext ac;
rcti rect;
short mode=0, selectmode=0;
- int event;
+ int gesture_mode;
/* get editor data */
if (ANIM_animdata_get_context(C, &ac) == 0)
@@ -312,8 +312,8 @@
rect.xmax= RNA_int_get(op->ptr, "xmax");
rect.ymax= RNA_int_get(op->ptr, "ymax");
- event= RNA_int_get(op->ptr, "event_type");
- if (event == LEFTMOUSE) // FIXME... hardcoded
+ gesture_mode= RNA_int_get(op->ptr, "gesture_mode");
+ if (gesture_mode == GESTURE_MODAL_SELECT)
selectmode = SELECT_ADD;
else
selectmode = SELECT_SUBTRACT;
@@ -360,11 +360,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* rna */
- RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+ WM_operator_properties_gesture_border(ot, FALSE);
RNA_def_boolean(ot->srna, "axis_range", 0, "Axis Range", "");
}
Modified: trunk/blender/source/blender/editors/space_console/console_report.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_report.c 2009-11-06 22:42:15 UTC (rev 24387)
+++ trunk/blender/source/blender/editors/space_console/console_report.c 2009-11-06 22:51:08 UTC (rev 24388)
@@ -242,10 +242,9 @@
rcti rect;
//rctf rectf, rq;
- int val;
+ short selecting= (RNA_int_get(op->ptr, "gesture_mode")==GESTURE_MODAL_SELECT);
//short mval[2];
- val= RNA_int_get(op->ptr, "event_type");
rect.xmin= RNA_int_get(op->ptr, "xmin");
rect.ymin= RNA_int_get(op->ptr, "ymin");
rect.xmax= RNA_int_get(op->ptr, "xmax");
@@ -265,7 +264,7 @@
/* get the first report if none found */
if(report_min==NULL) {
- printf("find_min\n");
+ // printf("find_min\n");
for(report=reports->list.first; report; report=report->next) {
if(report->type & report_mask) {
report_min= report;
@@ -275,7 +274,7 @@
}
if(report_max==NULL) {
- printf("find_max\n");
+ // printf("find_max\n");
for(report=reports->list.last; report; report=report->prev) {
if(report->type & report_mask) {
report_max= report;
@@ -292,8 +291,10 @@
if((report->type & report_mask)==0)
continue;
- if(val==LEFTMOUSE) report->flag |= SELECT;
- else report->flag &= ~SELECT;
+ if(selecting)
+ report->flag |= SELECT;
+ else
+ report->flag &= ~SELECT;
}
ED_area_tag_redraw(CTX_wm_area(C));
@@ -321,11 +322,7 @@
/* ot->flag= OPTYPE_REGISTER; */
/* rna */
- RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
+ WM_operator_properties_gesture_border(ot, FALSE);
}
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2009-11-06 22:42:15 UTC (rev 24387)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2009-11-06 22:51:08 UTC (rev 24388)
@@ -124,12 +124,11 @@
}
}
-static FileSelect file_select(SpaceFile* sfile, ARegion* ar, const rcti* rect, short val)
+static FileSelect file_select(SpaceFile* sfile, ARegion* ar, const rcti* rect, short selecting)
{
int first_file = -1;
int last_file = -1;
int act_file;
- short selecting = (val == LEFTMOUSE);
FileSelect retval = FILE_SELECT_FILE;
FileSelectParams *params = ED_fileselect_get_params(sfile);
@@ -198,10 +197,10 @@
{
ARegion *ar= CTX_wm_region(C);
SpaceFile *sfile= CTX_wm_space_file(C);
- short val;
+ short selecting;
rcti rect;
- val= RNA_int_get(op->ptr, "event_type");
+ selecting= (RNA_int_get(op->ptr, "gesture_mode")==GESTURE_MODAL_SELECT);
rect.xmin= RNA_int_get(op->ptr, "xmin");
rect.ymin= RNA_int_get(op->ptr, "ymin");
rect.xmax= RNA_int_get(op->ptr, "xmax");
@@ -209,7 +208,7 @@
BLI_isect_rcti(&(ar->v2d.mask), &rect, &rect);
- if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val )) {
+ if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, selecting)) {
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
} else {
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
@@ -228,15 +227,10 @@
ot->invoke= WM_border_select_invoke;
ot->exec= file_border_select_exec;
ot->modal= WM_border_select_modal;
+ ot->poll= ED_operator_file_active;
/* rna */
- RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmin", 0, INT_MIN, INT_MAX, "X Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "xmax", 0, INT_MIN, INT_MAX, "X Max", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymin", 0, INT_MIN, INT_MAX, "Y Min", "", INT_MIN, INT_MAX);
- RNA_def_int(ot->srna, "ymax", 0, INT_MIN, INT_MAX, "Y Max", "", INT_MIN, INT_MAX);
-
- ot->poll= ED_operator_file_active;
+ WM_operator_properties_gesture_border(ot, 0);
}
static int file_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
@@ -259,7 +253,7 @@
/* single select, deselect all selected first */
file_deselect_all(sfile);
- if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val ))
+ if (FILE_SELECT_DIR == file_select(sfile, ar, &rect, val==LEFTMOUSE )) //LEFTMOUSE XXX, fixme
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL);
else
WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_PARAMS, NULL);
Modified: trunk/blender/source/blender/editors/space_graph/graph_select.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list