diff options
author | Ton Roosendaal <ton@blender.org> | 2008-11-29 18:10:31 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-11-29 18:10:31 +0300 |
commit | 78218d89d68861cf96884ce6553ea587b4f6eeb4 (patch) | |
tree | 2189de563ae91e91c1b37a3cb3632b45f7b5ce96 /source/blender/windowmanager | |
parent | f07f6f6fa0f7bef70c76a1a8e1eab65ecf501804 (diff) |
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 3 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 19 | ||||
-rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 8 |
3 files changed, 23 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 618d430b4bd..ba8da93495c 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -110,6 +110,7 @@ int wm_gesture_evaluate(bContext *C, wmGesture *gesture) else if(theta==-2) val= EVT_GESTURE_S; else if(theta==-3) val= EVT_GESTURE_SW; +#if 0 /* debug */ if(val==1) printf("tweak north\n"); if(val==2) printf("tweak north-east\n"); @@ -119,7 +120,7 @@ int wm_gesture_evaluate(bContext *C, wmGesture *gesture) if(val==6) printf("tweak south-west\n"); if(val==7) printf("tweak west\n"); if(val==8) printf("tweak north-west\n"); - +#endif return val; } } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 260709906ba..7dacae6da91 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -38,9 +38,10 @@ #include "BKE_blender.h" #include "BKE_global.h" +#include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_idprop.h" +#include "BKE_utildefines.h" #include "RNA_access.h" #include "RNA_define.h" @@ -81,7 +82,7 @@ void WM_operatortype_append(void (*opfunc)(wmOperatorType*)) BLI_addtail(&global_ops, ot); } -/* ************ default ops, exported *********** */ +/* ************ default op callbacks, exported *********** */ int WM_operator_confirm(bContext *C, wmOperator *op, wmEvent *event) { @@ -159,6 +160,11 @@ static void border_select_apply(bContext *C, wmOperator *op, int event_type) wmGesture *gesture= op->customdata; rcti *rect= gesture->customdata; + if(rect->xmin > rect->xmax) + SWAP(int, rect->xmin, rect->xmax); + if(rect->ymin > rect->ymax) + SWAP(int, rect->ymin, rect->ymax); + /* operator arguments and storage. */ RNA_int_set(op->ptr, "xmin", rect->xmin); RNA_int_set(op->ptr, "ymin", rect->ymin); @@ -282,7 +288,12 @@ static int tweak_gesture_modal(bContext *C, wmOperator *op, wmEvent *event) wmEvent event; event= *(C->window->eventstate); - event.type= EVT_TWEAK; + if(gesture->event_type==LEFTMOUSE) + event.type= EVT_TWEAK_L; + else if(gesture->event_type==RIGHTMOUSE) + event.type= EVT_TWEAK_R; + else + event.type= EVT_TWEAK_M; event.val= val; /* mouse coords! */ wm_event_add(C->window, &event); @@ -342,7 +353,7 @@ void wm_operatortype_init(void) void wm_window_keymap(wmWindowManager *wm) { /* note, this doesn't replace existing keymap items */ - WM_keymap_verify_item(&wm->windowkeymap, "WM_OT_window_duplicate", AKEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(&wm->windowkeymap, "WM_OT_window_duplicate", AKEY, KM_PRESS, KM_CTRL|KM_ALT, 0); WM_keymap_verify_item(&wm->windowkeymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0); WM_keymap_verify_item(&wm->windowkeymap, "WM_OT_window_fullscreen_toggle", FKEY, KM_PRESS, 0, 0); WM_keymap_verify_item(&wm->windowkeymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0); diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 1edaec417c2..265132eacf9 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -260,8 +260,12 @@ /* **************** BLENDER GESTURE EVENTS ********************* */ #define EVT_ACTIONZONE 0x5001 -#define EVT_TWEAK 0x5002 -#define EVT_GESTURE 0x5003 +/* tweak events, for L M R mousebuttons */ +#define EVT_TWEAK_L 0x5002 +#define EVT_TWEAK_M 0x5003 +#define EVT_TWEAK_R 0x5004 + +#define EVT_GESTURE 0x5005 /* value of tweaks and line gestures, note, KM_ANY (-1) works for this case too */ #define EVT_GESTURE_N 1 |