2.5: X11
[blender.git] / source / blender / editors / interface / view2d_ops.c
index 44f1655af9547a6c57f8c601adfcc515935a9bcb..14872f05f8a16be37b7d5bd69bbfdddaec58d3d9 100644 (file)
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_vec_types.h"
 #include "DNA_view2d_types.h"
 
 #include "BLI_blenlib.h"
 
-#include "BKE_global.h"
+#include "BKE_context.h"
 #include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 
 #include "BIF_gl.h"
 
+#include "ED_screen.h"
+
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-/* ********************************************************* */
-/* General Polling Funcs */
-
-/* Check if mouse is within scrollbars 
- *     - Returns appropriate code for match
- *             'h' = in horizontal scrollbar
- *             'v' = in vertical scrollbar
- *             0 = not in scrollbar
- *     
- *     - x,y   = mouse coordinates in screen (not region) space
- */
-static short mouse_in_v2d_scrollers (const bContext *C, View2D *v2d, int x, int y)
+static int view2d_poll(bContext *C)
 {
-       ARegion *ar= C->region;
-       int co[2];
-       
-       /* clamp x,y to region-coordinates first */
-       co[0]= x - ar->winrct.xmin;
-       co[1]= y - ar->winrct.ymin;
-       
-       /* check if within scrollbars */
-       if (v2d->scroll & (V2D_SCROLL_HORIZONTAL|V2D_SCROLL_HORIZONTAL_O)) {
-               if (IN_2D_HORIZ_SCROLL(v2d, co)) return 'h';
-       }
-       if (v2d->scroll & V2D_SCROLL_VERTICAL) {
-               if (IN_2D_VERT_SCROLL(v2d, co)) return 'v';
-       }       
-       
-       /* not found */
-       return 0;
-} 
+       ARegion *ar= CTX_wm_region(C);
 
+       return (ar != NULL) && (ar->v2d.flag & V2D_IS_INITIALISED);
+}
 
 /* ********************************************************* */
 /* VIEW PANNING OPERATOR                                                                */
@@ -98,7 +76,8 @@ static short mouse_in_v2d_scrollers (const bContext *C, View2D *v2d, int x, int
  
 /* temp customdata for operator */
 typedef struct v2dViewPanData {
-       ARegion *region;                /* region we're operating in */
+       bScreen *sc;                    /* screen where view pan was initiated */
+       ScrArea *sa;                    /* area where view pan was initiated */
        View2D *v2d;                    /* view2d we're operating in */
        
        float facx, facy;               /* amount to move view relative to zoom */
@@ -107,19 +86,24 @@ typedef struct v2dViewPanData {
        int startx, starty;             /* mouse x/y values in window when operator was initiated */
        int lastx, lasty;               /* previous x/y values of mouse in window */
        
-       short in_scroller;              /* activated in scrollbar */
+       short in_scroller;              /* for MMB in scrollers (old feature in past, but now not that useful) */
 } v2dViewPanData;
  
 /* initialise panning customdata */
 static int view_pan_init(bContext *C, wmOperator *op)
 {
+       ARegion *ar= CTX_wm_region(C);
        v2dViewPanData *vpd;
-       ARegion *ar;
        View2D *v2d;
        float winx, winy;
        
        /* regions now have v2d-data by default, so check for region */
-       if (C->region == NULL)
+       if (ar == NULL)
+               return 0;
+               
+       /* check if panning is allowed at all */
+       v2d= &ar->v2d;
+       if ((v2d->keepofs & V2D_LOCKOFS_X) && (v2d->keepofs & V2D_LOCKOFS_Y))
                return 0;
        
        /* set custom-data for operator */
@@ -127,12 +111,13 @@ static int view_pan_init(bContext *C, wmOperator *op)
        op->customdata= vpd;
        
        /* set pointers to owners */
-       vpd->region= ar= C->region;
-       vpd->v2d= v2d= &ar->v2d;
+       vpd->sc= CTX_wm_screen(C);
+       vpd->sa= CTX_wm_area(C);
+       vpd->v2d= v2d;
        
        /* calculate translation factor - based on size of view */
-       winx= (float)(ar->winrct.xmax - ar->winrct.xmin);
-       winy= (float)(ar->winrct.ymax - ar->winrct.ymin);
+       winx= (float)(ar->winrct.xmax - ar->winrct.xmin + 1);
+       winy= (float)(ar->winrct.ymax - ar->winrct.ymin + 1);
        vpd->facx= (v2d->cur.xmax - v2d->cur.xmin) / winx;
        vpd->facy= (v2d->cur.ymax - v2d->cur.ymin) / winy;
        
@@ -160,9 +145,12 @@ static void view_pan_apply(bContext *C, wmOperator *op)
                v2d->cur.ymax += dy;
        }
        
+       /* validate that view is in valid configuration after this operation */
+       UI_view2d_curRect_validate(v2d);
+       
        /* request updates to be done... */
-       WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
-       /* XXX: add WM_NOTE_TIME_CHANGED? */
+       ED_area_tag_redraw(vpd->sa);
+       UI_view2d_sync(vpd->sc, vpd->sa, v2d, V2D_LOCK_COPY);
 }
 
 /* cleanup temp customdata  */
@@ -190,12 +178,13 @@ static int view_pan_exec(bContext *C, wmOperator *op)
 /* set up modal operator and relevant settings */
 static int view_pan_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
+       wmWindow *window= CTX_wm_window(C);
        v2dViewPanData *vpd;
        View2D *v2d;
        
        /* set up customdata */
        if (!view_pan_init(C, op))
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
        
        vpd= op->customdata;
        v2d= vpd->v2d;
@@ -206,19 +195,15 @@ static int view_pan_invoke(bContext *C, wmOperator *op, wmEvent *event)
        RNA_int_set(op->ptr, "deltax", 0);
        RNA_int_set(op->ptr, "deltay", 0);
        
-       vpd->in_scroller= mouse_in_v2d_scrollers(C, v2d, event->x, event->y);
-       
-#if 0 // XXX - enable this when cursors are working properly
        if (v2d->keepofs & V2D_LOCKOFS_X)
-               WM_set_cursor(C, BC_NS_SCROLLCURSOR);
+               WM_cursor_modal(window, BC_NS_SCROLLCURSOR);
        else if (v2d->keepofs & V2D_LOCKOFS_Y)
-               WM_set_cursor(C, BC_EW_SCROLLCURSOR);
+               WM_cursor_modal(window, BC_EW_SCROLLCURSOR);
        else
-               WM_set_cursor(C, BC_NSEW_SCROLLCURSOR);
-#endif // XXX - enable this when cursors are working properly
+               WM_cursor_modal(window, BC_NSEW_SCROLLCURSOR);
        
        /* add temp handler */
-       WM_event_add_modal_handler(C, &C->window->handlers, op);
+       WM_event_add_modal_handler(C, &window->handlers, op);
 
        return OPERATOR_RUNNING_MODAL;
 }
@@ -233,20 +218,8 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
                case MOUSEMOVE:
                {
                        /* calculate new delta transform, then store mouse-coordinates for next-time */
-                       switch (vpd->in_scroller) {
-                               case 'h': /* horizontal scrollbar - so only horizontal scroll (inverse direction) */
-                                       RNA_int_set(op->ptr, "deltax", (event->x - vpd->lastx));
-                                       RNA_int_set(op->ptr, "deltay", 0);
-                                       break;
-                               case 'v': /* vertical scrollbar - so only vertical scroll (inverse direction) */
-                                       RNA_int_set(op->ptr, "deltax", 0);
-                                       RNA_int_set(op->ptr, "deltay", (event->y - vpd->lasty));
-                                       break;
-                               default:
-                                       RNA_int_set(op->ptr, "deltax", (vpd->lastx - event->x));
-                                       RNA_int_set(op->ptr, "deltay", (vpd->lasty - event->y));
-                                       break;
-                       }
+                       RNA_int_set(op->ptr, "deltax", (vpd->lastx - event->x));
+                       RNA_int_set(op->ptr, "deltay", (vpd->lasty - event->y));
                        
                        vpd->lastx= event->x;
                        vpd->lasty= event->y;
@@ -258,25 +231,11 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
                case MIDDLEMOUSE:
                        if (event->val==0) {
                                /* calculate overall delta mouse-movement for redo */
-                               switch (vpd->in_scroller) {
-                                       case 'h': /* horizontal scrollbar - so only horizontal scroll (inverse direction) */
-                                               RNA_int_set(op->ptr, "deltax", (vpd->lastx - vpd->startx));
-                                               RNA_int_set(op->ptr, "deltay", 0);
-                                               break;
-                                       case 'v': /* vertical scrollbar - so only vertical scroll (inverse direction) */
-                                               RNA_int_set(op->ptr, "deltax", 0);
-                                               RNA_int_set(op->ptr, "deltay", (vpd->lasty - vpd->starty));
-                                               break;
-                                       default:
-                                               RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
-                                               RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
-                                               break;
-                               }
                                RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
                                RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
                                
                                view_pan_exit(C, op);
-                               //WM_set_cursor(C, CURSOR_STD);         // XXX - enable this when cursors are working properly  
+                               WM_cursor_restore(CTX_wm_window(C));
                                
                                return OPERATOR_FINISHED;
                        }
@@ -286,22 +245,23 @@ static int view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
        return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_View2D_OT_view_pan(wmOperatorType *ot)
+void VIEW2D_OT_pan(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-       
        /* identifiers */
        ot->name= "Pan View";
-       ot->idname= "ED_View2D_OT_view_pan";
+       ot->idname= "VIEW2D_OT_pan";
        
        /* api callbacks */
        ot->exec= view_pan_exec;
        ot->invoke= view_pan_invoke;
        ot->modal= view_pan_modal;
        
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER|OPTYPE_BLOCKING;
+       
        /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX);
 }
 
 /* ------------------ Scrollwheel Versions (2) ---------------------- */
@@ -309,9 +269,18 @@ void ED_View2D_OT_view_pan(wmOperatorType *ot)
 /* this operator only needs this single callback, where it callsthe view_pan_*() methods */
 static int view_scrollright_exec(bContext *C, wmOperator *op)
 {
+       v2dViewPanData *vpd;
+       
        /* initialise default settings (and validate if ok to run) */
        if (!view_pan_init(C, op))
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
+               
+       /* also, check if can pan in horizontal axis */
+       vpd= op->customdata;
+       if (vpd->v2d->keepofs & V2D_LOCKOFS_X) {
+               view_pan_exit(C, op);
+               return OPERATOR_PASS_THROUGH;
+       }
        
        /* set RNA-Props - only movement in positive x-direction */
        RNA_int_set(op->ptr, "deltax", 20);
@@ -324,20 +293,21 @@ static int view_scrollright_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrollright(wmOperatorType *ot)
+void VIEW2D_OT_scroll_right(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-       
        /* identifiers */
        ot->name= "Scroll Right";
-       ot->idname= "ED_View2D_OT_view_rightscroll";
+       ot->idname= "VIEW2D_OT_scroll_right";
        
        /* api callbacks */
        ot->exec= view_scrollright_exec;
        
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER;
+       
        /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX);
 }
 
 
@@ -345,9 +315,18 @@ void ED_View2D_OT_view_scrollright(wmOperatorType *ot)
 /* this operator only needs this single callback, where it callsthe view_pan_*() methods */
 static int view_scrollleft_exec(bContext *C, wmOperator *op)
 {
+       v2dViewPanData *vpd;
+       
        /* initialise default settings (and validate if ok to run) */
        if (!view_pan_init(C, op))
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
+               
+       /* also, check if can pan in horizontal axis */
+       vpd= op->customdata;
+       if (vpd->v2d->keepofs & V2D_LOCKOFS_X) {
+               view_pan_exit(C, op);
+               return OPERATOR_PASS_THROUGH;
+       }
        
        /* set RNA-Props - only movement in negative x-direction */
        RNA_int_set(op->ptr, "deltax", -20);
@@ -360,30 +339,41 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrollleft(wmOperatorType *ot)
+void VIEW2D_OT_scroll_left(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-       
        /* identifiers */
        ot->name= "Scroll Left";
-       ot->idname= "ED_View2D_OT_view_leftscroll";
+       ot->idname= "VIEW2D_OT_scroll_left";
        
        /* api callbacks */
        ot->exec= view_scrollleft_exec;
        
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER;
+       
        /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX);
 }
 
+
 /* this operator only needs this single callback, where it callsthe view_pan_*() methods */
 static int view_scrolldown_exec(bContext *C, wmOperator *op)
 {
+       v2dViewPanData *vpd;
+       
        /* initialise default settings (and validate if ok to run) */
        if (!view_pan_init(C, op))
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
+               
+       /* also, check if can pan in vertical axis */
+       vpd= op->customdata;
+       if (vpd->v2d->keepofs & V2D_LOCKOFS_Y) {
+               view_pan_exit(C, op);
+               return OPERATOR_PASS_THROUGH;
+       }
        
-       /* set RNA-Props - only movement in positive x-direction */
+       /* set RNA-Props */
        RNA_int_set(op->ptr, "deltax", 0);
        RNA_int_set(op->ptr, "deltay", -20);
        
@@ -394,20 +384,21 @@ static int view_scrolldown_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrolldown(wmOperatorType *ot)
+void VIEW2D_OT_scroll_down(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-       
        /* identifiers */
        ot->name= "Scroll Down";
-       ot->idname= "ED_View2D_OT_view_downscroll";
+       ot->idname= "VIEW2D_OT_scroll_down";
        
        /* api callbacks */
        ot->exec= view_scrolldown_exec;
        
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER;
+       
        /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX);
 }
 
 
@@ -415,11 +406,20 @@ void ED_View2D_OT_view_scrolldown(wmOperatorType *ot)
 /* this operator only needs this single callback, where it callsthe view_pan_*() methods */
 static int view_scrollup_exec(bContext *C, wmOperator *op)
 {
+       v2dViewPanData *vpd;
+       
        /* initialise default settings (and validate if ok to run) */
        if (!view_pan_init(C, op))
-               return OPERATOR_CANCELLED;
+               return OPERATOR_PASS_THROUGH;
+               
+       /* also, check if can pan in vertical axis */
+       vpd= op->customdata;
+       if (vpd->v2d->keepofs & V2D_LOCKOFS_Y) {
+               view_pan_exit(C, op);
+               return OPERATOR_PASS_THROUGH;
+       }
        
-       /* set RNA-Props - only movement in negative x-direction */
+       /* set RNA-Props */
        RNA_int_set(op->ptr, "deltax", 0);
        RNA_int_set(op->ptr, "deltay", 20);
        
@@ -430,53 +430,202 @@ static int view_scrollup_exec(bContext *C, wmOperator *op)
        return OPERATOR_FINISHED;
 }
 
-void ED_View2D_OT_view_scrollup(wmOperatorType *ot)
+void VIEW2D_OT_scroll_up(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-       
        /* identifiers */
        ot->name= "Scroll Up";
-       ot->idname= "ED_View2D_OT_view_upscroll";
+       ot->idname= "VIEW2D_OT_scroll_up";
        
        /* api callbacks */
        ot->exec= view_scrollup_exec;
        
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER;
+       
        /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "deltax", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "deltay", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "deltax", 0, INT_MIN, INT_MAX, "Delta X", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "deltay", 0, INT_MIN, INT_MAX, "Delta Y", "", INT_MIN, INT_MAX);
 }
 
 /* ********************************************************* */
-/* VIEW ZOOMING OPERATOR                                                                */
+/* SINGLE-STEP VIEW ZOOMING OPERATOR                                            */
 
 /*     This group of operators come in several forms:
- *             1) Modal 'dragging' with MMB - where movement of mouse dictates amount to zoom view by
- *             2) Scrollwheel 'steps' - rolling mousewheel by one step moves view by predefined amount
+ *             1) Scrollwheel 'steps' - rolling mousewheel by one step zooms view by predefined amount
+ *             2) Scrollwheel 'steps' + alt + ctrl/shift - zooms view on one axis only (ctrl=x, shift=y)  // XXX this could be implemented...
  *             3) Pad +/- Keys - pressing each key moves the zooms the view by a predefined amount
  *
  *     In order to make sure this works, each operator must define the following RNA-Operator Props:
- *             zoomfacx, zoomfacy      - sometimes it's still useful to have non-uniform scaling  
+ *             zoomfacx, zoomfacy      - These two zoom factors allow for non-uniform scaling.
+ *                                                       It is safe to scale by 0, as these factors are used to determine
+ *                                                       amount to enlarge 'cur' by
  */
 
-/* ------------------ Shared 'core' stuff ---------------------- */
+/* ------------------ 'Shared' stuff ------------------------ */
+/* check if step-zoom can be applied */
+static short view_zoomstep_ok(bContext *C)
+{
+       ARegion *ar= CTX_wm_region(C);
+       View2D *v2d;
+       
+       /* check if there's a region in context to work with */
+       if (ar == NULL)
+               return 0;
+       v2d= &ar->v2d;
+       
+       /* check that 2d-view is zoomable */
+       if ((v2d->keepzoom & V2D_LOCKZOOM_X) && (v2d->keepzoom & V2D_LOCKZOOM_Y))
+               return 0;
+               
+       /* view is zoomable */
+       return 1;
+}
+/* apply transform to view (i.e. adjust 'cur' rect) */
+static void view_zoomstep_apply(bContext *C, wmOperator *op)
+{
+       ARegion *ar= CTX_wm_region(C);
+       View2D *v2d= &ar->v2d;
+       float dx, dy;
+       
+       /* calculate amount to move view by */
+       dx= (v2d->cur.xmax - v2d->cur.xmin) * (float)RNA_float_get(op->ptr, "zoomfacx");
+       dy= (v2d->cur.ymax - v2d->cur.ymin) * (float)RNA_float_get(op->ptr, "zoomfacy");
+       
+       /* only resize view on an axis if change is allowed */
+       if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) {
+               if (v2d->keepofs & V2D_LOCKOFS_X) {
+                       v2d->cur.xmax -= 2*dx;
+               }
+               else {
+                       v2d->cur.xmin += dx;
+                       v2d->cur.xmax -= dx;
+               }
+       }
+       if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0) {
+               if (v2d->keepofs & V2D_LOCKOFS_Y) {
+                       v2d->cur.ymax -= 2*dy;
+               }
+               else {
+                       v2d->cur.ymin += dy;
+                       v2d->cur.ymax -= dy;
+               }
+       }
+       
+       /* validate that view is in valid configuration after this operation */
+       UI_view2d_curRect_validate(v2d);
+       
+       /* request updates to be done... */
+       ED_area_tag_redraw(CTX_wm_area(C));
+       UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
+}
+
+/* --------------- Individual Operators ------------------- */
+
+/* this operator only needs this single callback, where it calls the view_zoom_*() methods */
+static int view_zoomin_exec(bContext *C, wmOperator *op)
+{
+       /* check that there's an active region, as View2D data resides there */
+       if (!view_zoomstep_ok(C))
+               return OPERATOR_PASS_THROUGH;
+       
+       /* set RNA-Props - zooming in by uniform factor */
+       RNA_float_set(op->ptr, "zoomfacx", 0.0375f);
+       RNA_float_set(op->ptr, "zoomfacy", 0.0375f);
+       
+       /* apply movement, then we're done */
+       view_zoomstep_apply(C, op);
+       
+       return OPERATOR_FINISHED;
+}
+
+void VIEW2D_OT_zoom_in(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Zoom In";
+       ot->idname= "VIEW2D_OT_zoom_in";
+       
+       /* api callbacks */
+       ot->exec= view_zoomin_exec;
+       
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER;
+       
+       /* rna - must keep these in sync with the other operators */
+       RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX);
+       RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX);
+}
+
+
+
+/* this operator only needs this single callback, where it callsthe view_zoom_*() methods */
+static int view_zoomout_exec(bContext *C, wmOperator *op)
+{
+       /* check that there's an active region, as View2D data resides there */
+       if (!view_zoomstep_ok(C))
+               return OPERATOR_PASS_THROUGH;
+       
+       /* set RNA-Props - zooming in by uniform factor */
+       RNA_float_set(op->ptr, "zoomfacx", -0.0375f);
+       RNA_float_set(op->ptr, "zoomfacy", -0.0375f);
+       
+       /* apply movement, then we're done */
+       view_zoomstep_apply(C, op);
+       
+       return OPERATOR_FINISHED;
+}
 
+void VIEW2D_OT_zoom_out(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Zoom Out";
+       ot->idname= "VIEW2D_OT_zoom_out";
+       
+       /* api callbacks */
+       ot->exec= view_zoomout_exec;
+       
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER;
+       
+       /* rna - must keep these in sync with the other operators */
+       RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX);
+       RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX);
+}
+
+/* ********************************************************* */
+/* DRAG-ZOOM OPERATOR                                                                   */
+
+/*     MMB Drag - allows non-uniform scaling by dragging mouse
+ *
+ *     In order to make sure this works, each operator must define the following RNA-Operator Props:
+ *             deltax, deltay  - amounts to add to each side of the 'cur' rect
+ */
+/* ------------------ Shared 'core' stuff ---------------------- */
 /* temp customdata for operator */
 typedef struct v2dViewZoomData {
-       ARegion *region;                /* region we're operating in */
        View2D *v2d;                    /* view2d we're operating in */
        
-       int startx, starty;             /* mouse x/y values in window when operator was initiated */
        int lastx, lasty;               /* previous x/y values of mouse in window */
+       float dx, dy;                   /* running tally of previous delta values (for obtaining final zoom) */
 } v2dViewZoomData;
  
-/* initialise zooming customdata */
-static int view_zoom_init(bContext *C, wmOperator *op)
+/* initialise panning customdata */
+static int view_zoomdrag_init(bContext *C, wmOperator *op)
 {
+       ARegion *ar= CTX_wm_region(C);
        v2dViewZoomData *vzd;
-       ARegion *ar;
+       View2D *v2d;
        
        /* regions now have v2d-data by default, so check for region */
-       if (C->region == NULL)
+       if (ar == NULL)
+               return 0;
+       v2d= &ar->v2d;
+       
+       /* check that 2d-view is zoomable */
+       if ((v2d->keepzoom & V2D_LOCKZOOM_X) && (v2d->keepzoom & V2D_LOCKZOOM_Y))
                return 0;
        
        /* set custom-data for operator */
@@ -484,163 +633,776 @@ static int view_zoom_init(bContext *C, wmOperator *op)
        op->customdata= vzd;
        
        /* set pointers to owners */
-       vzd->region= ar= C->region;
-       vzd->v2d= &ar->v2d;
+       vzd->v2d= v2d;
        
        return 1;
 }
 
 /* apply transform to view (i.e. adjust 'cur' rect) */
-static void view_zoom_apply(bContext *C, wmOperator *op)
+static void view_zoomdrag_apply(bContext *C, wmOperator *op)
 {
        v2dViewZoomData *vzd= op->customdata;
        View2D *v2d= vzd->v2d;
        float dx, dy;
        
-       /* calculate amount to move view by */
-       dx= (v2d->cur.xmax - v2d->cur.xmin) * (float)RNA_float_get(op->ptr, "zoomfacx");
-       dy= (v2d->cur.ymax - v2d->cur.ymin) * (float)RNA_float_get(op->ptr, "zoomfacy");
+       /* get amount to move view by */
+       dx= RNA_float_get(op->ptr, "deltax");
+       dy= RNA_float_get(op->ptr, "deltay");
        
        /* only move view on an axis if change is allowed */
-       // FIXME: this still only allows for zooming around 'center' of view... userdefined center is more useful!
-       if ((v2d->keepofs & V2D_LOCKOFS_X)==0) {
-               v2d->cur.xmin += dx;
-               v2d->cur.xmax -= dx;
+       if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) {
+               if (v2d->keepofs & V2D_LOCKOFS_X) {
+                       v2d->cur.xmax -= 2*dx;
+               }
+               else {
+                       v2d->cur.xmin += dx;
+                       v2d->cur.xmax -= dx;
+               }
        }
-       if ((v2d->keepofs & V2D_LOCKOFS_Y)==0) {
-               v2d->cur.ymin += dy;
-               v2d->cur.ymax -= dy;
+       if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0) {
+               if (v2d->keepofs & V2D_LOCKOFS_Y) {
+                       v2d->cur.ymax -= 2*dy;
+               }
+               else {
+                       v2d->cur.ymin += dy;
+                       v2d->cur.ymax -= dy;
+               }
        }
        
+       /* validate that view is in valid configuration after this operation */
+       UI_view2d_curRect_validate(v2d);
+       
        /* request updates to be done... */
-       WM_event_add_notifier(C, WM_NOTE_AREA_REDRAW, 0, NULL);
-       /* XXX: add WM_NOTE_TIME_CHANGED? */
+       ED_area_tag_redraw(CTX_wm_area(C));
+       UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
 }
 
 /* cleanup temp customdata  */
-static void view_zoom_exit(bContext *C, wmOperator *op)
+static void view_zoomdrag_exit(bContext *C, wmOperator *op)
 {
        if (op->customdata) {
                MEM_freeN(op->customdata);
                op->customdata= NULL;                           
        }
-}
+} 
 
-/* ------------------ Single-step non-modal zoom (2 and 3) ---------------------- */
+/* for 'redo' only, with no user input */
+static int view_zoomdrag_exec(bContext *C, wmOperator *op)
+{
+       if (!view_zoomdrag_init(C, op))
+               return OPERATOR_PASS_THROUGH;
+       
+       view_zoomdrag_apply(C, op);
+       view_zoomdrag_exit(C, op);
+       return OPERATOR_FINISHED;
+}
 
-/* this operator only needs this single callback, where it callsthe view_zoom_*() methods */
-// FIXME: this should be invoke (with event pointer), so that we can do non-modal but require pointer for centerpoint
-static int view_zoomin_exec(bContext *C, wmOperator *op)
+/* set up modal operator and relevant settings */
+static int view_zoomdrag_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-       /* initialise default settings (and validate if ok to run) */
-       if (!view_zoom_init(C, op))
-               return OPERATOR_CANCELLED;
+       wmWindow *window= CTX_wm_window(C);
+       v2dViewZoomData *vzd;
+       View2D *v2d;
        
-       /* set RNA-Props - zooming in by uniform factor */
-       RNA_float_set(op->ptr, "zoomfacx", 0.0375);
-       RNA_float_set(op->ptr, "zoomfacy", 0.0375);
+       /* set up customdata */
+       if (!view_zoomdrag_init(C, op))
+               return OPERATOR_PASS_THROUGH;
        
-       /* apply movement, then we're done */
-       view_zoom_apply(C, op);
-       view_zoom_exit(C, op);
+       vzd= op->customdata;
+       v2d= vzd->v2d;
        
-       return OPERATOR_FINISHED;
+       /* set initial settings */
+       vzd->lastx= event->x;
+       vzd->lasty= event->y;
+       RNA_float_set(op->ptr, "deltax", 0);
+       RNA_float_set(op->ptr, "deltay", 0);
+       
+       if (v2d->keepofs & V2D_LOCKOFS_X)
+               WM_cursor_modal(window, BC_NS_SCROLLCURSOR);
+       else if (v2d->keepofs & V2D_LOCKOFS_Y)
+               WM_cursor_modal(window, BC_EW_SCROLLCURSOR);
+       else
+               WM_cursor_modal(window, BC_NSEW_SCROLLCURSOR);
+       
+       /* add temp handler */
+       WM_event_add_modal_handler(C, &window->handlers, op);
+
+       return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_View2D_OT_view_zoomin(wmOperatorType *ot)
+/* handle user input - calculations of mouse-movement need to be done here, not in the apply callback! */
+static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
-       PropertyRNA *prop;
+       v2dViewZoomData *vzd= op->customdata;
+       View2D *v2d= vzd->v2d;
        
+       /* execute the events */
+       switch (event->type) {
+               case MOUSEMOVE:
+               {
+                       float dx, dy;
+                       
+                       /* calculate new delta transform, based on zooming mode */
+                       if (U.viewzoom == USER_ZOOM_SCALE) {
+                               /* 'scale' zooming */
+                               float dist;
+                               
+                               /* x-axis transform */
+                               dist = (v2d->mask.xmax - v2d->mask.xmin) / 2.0f;
+                               dx= 1.0f - ((float)fabs(vzd->lastx - dist) + 2.0f) / ((float)fabs(event->x - dist) + 2.0f);
+                               dx*= 0.5f * (v2d->cur.xmax - v2d->cur.xmin);
+                               
+                               /* y-axis transform */
+                               dist = (v2d->mask.ymax - v2d->mask.ymin) / 2.0f;
+                               dy= 1.0f - ((float)fabs(vzd->lasty - dist) + 2.0f) / ((float)fabs(event->y - dist) + 2.0f);
+                               dy*= 0.5f * (v2d->cur.ymax - v2d->cur.ymin);
+                       }
+                       else {
+                               /* 'continuous' or 'dolly' */
+                               float fac;
+                               
+                               /* x-axis transform */
+                               fac= 0.01f * (event->x - vzd->lastx);
+                               dx= fac * (v2d->cur.xmax - v2d->cur.xmin);
+                               
+                               /* y-axis transform */
+                               fac= 0.01f * (event->y - vzd->lasty);
+                               dy= fac * (v2d->cur.ymax - v2d->cur.ymin);
+                               
+                               /* continous zoom shouldn't move that fast... */
+                               if (U.viewzoom == USER_ZOOM_CONT) { // XXX store this setting as RNA prop?
+                                       dx /= 20.0f;
+                                       dy /= 20.0f;
+                               }
+                       }
+                       
+                       /* set transform amount, and add current deltas to stored total delta (for redo) */
+                       RNA_float_set(op->ptr, "deltax", dx);
+                       RNA_float_set(op->ptr, "deltay", dy);
+                       vzd->dx += dx;
+                       vzd->dy += dy;
+                       
+                       /* store mouse coordinates for next time, if not doing continuous zoom
+                        *      - continuous zoom only depends on distance of mouse to starting point to determine rate of change
+                        */
+                       if (U.viewzoom != USER_ZOOM_CONT) { // XXX store this setting as RNA prop?
+                               vzd->lastx= event->x;
+                               vzd->lasty= event->y;
+                       }
+                       
+                       /* apply zooming */
+                       view_zoomdrag_apply(C, op);
+               }
+                       break;
+                       
+               case MIDDLEMOUSE:
+                       if (event->val==0) {
+                               /* for redo, store the overall deltas - need to respect zoom-locks here... */
+                               if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0)
+                                       RNA_float_set(op->ptr, "deltax", vzd->dx);
+                               else
+                                       RNA_float_set(op->ptr, "deltax", 0);
+                                       
+                               if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0)
+                                       RNA_float_set(op->ptr, "deltay", vzd->dy);
+                               else
+                                       RNA_float_set(op->ptr, "deltay", 0);
+                               
+                               /* free customdata */
+                               view_zoomdrag_exit(C, op);
+                               WM_cursor_restore(CTX_wm_window(C));
+                               
+                               return OPERATOR_FINISHED;
+                       }
+                       break;
+       }
+
+       return OPERATOR_RUNNING_MODAL;
+}
+
+void VIEW2D_OT_zoom(wmOperatorType *ot)
+{
        /* identifiers */
-       ot->name= "Zoom In";
-       ot->idname= "ED_View2D_OT_view_zoomin";
+       ot->name= "Zoom View";
+       ot->idname= "VIEW2D_OT_zoom";
        
        /* api callbacks */
-       ot->exec= view_zoomin_exec;
+       ot->exec= view_zoomdrag_exec;
+       ot->invoke= view_zoomdrag_invoke;
+       ot->modal= view_zoomdrag_modal;
+       
+       /* operator is repeatable */
+       ot->flag= OPTYPE_REGISTER|OPTYPE_BLOCKING;
        
        /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "zoomfacx", PROP_FLOAT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "zoomfacy", PROP_FLOAT, PROP_NONE);
+       RNA_def_float(ot->srna, "deltax", 0, -FLT_MAX, FLT_MAX, "Delta X", "", -FLT_MAX, FLT_MAX);
+       RNA_def_float(ot->srna, "deltay", 0, -FLT_MAX, FLT_MAX, "Delta Y", "", -FLT_MAX, FLT_MAX);
 }
 
+/* ********************************************************* */
+/* BORDER-ZOOM */
 
-
-/* this operator only needs this single callback, where it callsthe view_zoom_*() methods */
-// FIXME: this should be invoke (with event pointer), so that we can do non-modal but require pointer for centerpoint
-static int view_zoomout_exec(bContext *C, wmOperator *op)
+/* The user defines a rect using standard borderselect tools, and we use this rect to 
+ * define the new zoom-level of the view in the following ways:
+ *     1) LEFTMOUSE - zoom in to view
+ *     2) RIGHTMOUSE - zoom out of view
+ *
+ * Currently, these key mappings are hardcoded, but it shouldn't be too important to
+ * have custom keymappings for this...
+ */
+static int view_borderzoom_exec(bContext *C, wmOperator *op)
 {
-       /* initialise default settings (and validate if ok to run) */
-       if (!view_zoom_init(C, op))
-               return OPERATOR_CANCELLED;
+       ARegion *ar= CTX_wm_region(C);
+       View2D *v2d= &ar->v2d;
+       rctf rect;
+       int event_type;
+       
+       /* convert coordinates of rect to 'tot' rect coordinates */
+       UI_view2d_region_to_view(v2d, RNA_int_get(op->ptr, "xmin"), RNA_int_get(op->ptr, "ymin"), &rect.xmin, &rect.ymin);
+       UI_view2d_region_to_view(v2d, RNA_int_get(op->ptr, "xmax"), RNA_int_get(op->ptr, "ymax"), &rect.xmax, &rect.ymax);
+       
+       /* check if zooming in/out view */
+       // XXX hardcoded for now!
+       event_type= RNA_int_get(op->ptr, "event_type");
+       
+       if (event_type == LEFTMOUSE) {
+               /* zoom in: 
+                *      - 'cur' rect will be defined by the coordinates of the border region 
+                *      - just set the 'cur' rect to have the same coordinates as the border region
+                *        if zoom is allowed to be changed
+                */
+               if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) {
+                       v2d->cur.xmin= rect.xmin;
+                       v2d->cur.xmax= rect.xmax;
+               }
+               if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0) {
+                       v2d->cur.ymin= rect.ymin;
+                       v2d->cur.ymax= rect.ymax;
+               }
+       }
+       else {
+               /* zoom out:
+                *      - the current 'cur' rect coordinates are going to end upwhere the 'rect' ones are, 
+                *        but the 'cur' rect coordinates will need to be adjusted to take in more of the view
+                *      - calculate zoom factor, and adjust using center-point
+                */
+               float zoom, center, size;
+               
+               // TODO: is this zoom factor calculation valid? It seems to produce same results everytime...
+               if ((v2d->keepzoom & V2D_LOCKZOOM_X)==0) {
+                       size= (v2d->cur.xmax - v2d->cur.xmin);
+                       zoom= size / (rect.xmax - rect.xmin);
+                       center= (v2d->cur.xmax + v2d->cur.xmin) * 0.5f;
+                       
+                       v2d->cur.xmin= center - (size * zoom);
+                       v2d->cur.xmax= center + (size * zoom);
+               }
+               if ((v2d->keepzoom & V2D_LOCKZOOM_Y)==0) {
+                       size= (v2d->cur.ymax - v2d->cur.ymin);
+                       zoom= size / (rect.ymax - rect.ymin);
+                       center= (v2d->cur.ymax + v2d->cur.ymin) * 0.5f;
+                       
+                       v2d->cur.ymin= center - (size * zoom);
+                       v2d->cur.ymax= center + (size * zoom);
+               }
+       }
        
-       /* set RNA-Props - zooming in by uniform factor */
-       RNA_float_set(op->ptr, "zoomfacx", -0.0375);
-       RNA_float_set(op->ptr, "zoomfacy", -0.0375);
+       /* validate that view is in valid configuration after this operation */
+       UI_view2d_curRect_validate(v2d);
        
-       /* apply movement, then we're done */
-       view_zoom_apply(C, op);
-       view_zoom_exit(C, op);
+       /* request updates to be done... */
+       ED_area_tag_redraw(CTX_wm_area(C));
+       UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
        
        return OPERATOR_FINISHED;
+} 
+
+void VIEW2D_OT_zoom_border(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Zoom to Border";
+       ot->idname= "VIEW2D_OT_zoom_border";
+       
+       /* api callbacks */
+       ot->invoke= WM_border_select_invoke;
+       ot->exec= view_borderzoom_exec;
+       ot->modal= WM_border_select_modal;
+       
+       ot->poll= ED_operator_areaactive;
+       
+       /* 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);
 }
 
-void ED_View2D_OT_view_zoomout(wmOperatorType *ot)
+/* ********************************************************* */
+/* SCROLLERS */
+
+/*     Scrollers should behave in the following ways, when clicked on with LMB (and dragged):
+ *             1) 'Handles' on end of 'bubble' - when the axis that the scroller represents is zoomable, 
+ *                     enlarge 'cur' rect on the relevant side 
+ *             2) 'Bubble'/'bar' - just drag, and bar should move with mouse (view pans opposite)
+ *
+ *     In order to make sure this works, each operator must define the following RNA-Operator Props:
+ *             deltax, deltay  - define how much to move view by (relative to zoom-correction factor)
+ */
+
+/* customdata for scroller-invoke data */
+typedef struct v2dScrollerMove {
+       View2D *v2d;                    /* View2D data that this operation affects */
+       
+       short scroller;                 /* scroller that mouse is in ('h' or 'v') */
+       short zone;                             /* -1 is min zoomer, 0 is bar, 1 is max zoomer */ // XXX find some way to provide visual feedback of this (active colour?)
+       
+       float fac;                              /* view adjustment factor, based on size of region */
+       float delta;                    /* amount moved by mouse on axis of interest */
+       
+       int lastx, lasty;               /* previous mouse coordinates (in screen coordinates) for determining movement */
+} v2dScrollerMove;
+
+
+/* View2DScrollers is typedef'd in UI_view2d.h 
+ * This is a CUT DOWN VERSION of the 'real' version, which is defined in view2d.c, as we only need focus bubble info
+ * WARNING: the start of this struct must not change, so that it stays in sync with the 'real' version
+ *                For now, we don't need to have a separate (internal) header for structs like this...
+ */
+struct View2DScrollers {       
+               /* focus bubbles */
+       int vert_min, vert_max; /* vertical scrollbar */
+       int hor_min, hor_max;   /* horizontal scrollbar */
+};
+
+/* quick enum for vsm->zone (scroller handles) */
+enum {
+       SCROLLHANDLE_MIN= -1,
+       SCROLLHANDLE_BAR,
+       SCROLLHANDLE_MAX
+} eV2DScrollerHandle_Zone;
+
+/* ------------------------ */
+
+/* check if mouse is within scroller handle 
+ *     - mouse                 =       relevant mouse coordinate in region space
+ *     - sc_min, sc_max        =       extents of scroller
+ *     - sh_min, sh_max        =       positions of scroller handles
+ */
+static short mouse_in_scroller_handle(int mouse, int sc_min, int sc_max, int sh_min, int sh_max)
+{
+       short in_min, in_max, in_view=1;
+       
+       /* firstly, check if 
+        *      - 'bubble' fills entire scroller 
+        *      - 'bubble' completely out of view on either side 
+        */
+       if ((sh_min <= sc_min) && (sh_max >= sc_max)) in_view= 0;
+       if (sh_min == sh_max) {
+               if (sh_min <= sc_min) in_view= 0;
+               if (sh_max >= sc_max) in_view= 0;
+       }
+       else {
+               if (sh_max <= sc_min) in_view= 0;
+               if (sh_min >= sc_max) in_view= 0;
+       }
+       
+       
+       if (in_view == 0) {
+               return SCROLLHANDLE_BAR;
+       }
+       
+       /* check if mouse is in or past either handle */
+       in_max= ( (mouse >= (sh_max - V2D_SCROLLER_HANDLE_SIZE)) && (mouse <= (sh_max + V2D_SCROLLER_HANDLE_SIZE)) );
+       in_min= ( (mouse <= (sh_min + V2D_SCROLLER_HANDLE_SIZE)) && (mouse >= (sh_min - V2D_SCROLLER_HANDLE_SIZE)) );
+       
+       /* check if overlap --> which means user clicked on bar, as bar is within handles region */
+       if (in_max && in_min)
+               return SCROLLHANDLE_BAR;
+       else if (in_max)
+               return SCROLLHANDLE_MAX;
+       else if (in_min)
+               return SCROLLHANDLE_MIN;
+               
+       /* unlikely to happen, though we just cover it in case */
+       return SCROLLHANDLE_BAR;
+} 
+
+/* initialise customdata for scroller manipulation operator */
+static void scroller_activate_init(bContext *C, wmOperator *op, wmEvent *event, short in_scroller)
 {
-       PropertyRNA *prop;
+       v2dScrollerMove *vsm;
+       View2DScrollers *scrollers;
+       ARegion *ar= CTX_wm_region(C);
+       View2D *v2d= &ar->v2d;
+       float mask_size;
+       int x, y;
        
+       /* set custom-data for operator */
+       vsm= MEM_callocN(sizeof(v2dScrollerMove), "v2dScrollerMove");
+       op->customdata= vsm;
+       
+       /* set general data */
+       vsm->v2d= v2d;
+       vsm->scroller= in_scroller;
+       
+       /* store mouse-coordinates, and convert mouse/screen coordinates to region coordinates */
+       vsm->lastx = event->x;
+       vsm->lasty = event->y;
+       x= event->x - ar->winrct.xmin;
+       y= event->y - ar->winrct.ymin;
+       
+       /* 'zone' depends on where mouse is relative to bubble 
+        *      - zooming must be allowed on this axis, otherwise, default to pan
+        */
+       scrollers= UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
+       if (in_scroller == 'h') {
+               /* horizontal scroller - calculate adjustment factor first */
+               mask_size= (float)(v2d->hor.xmax - v2d->hor.xmin);
+               vsm->fac= (v2d->tot.xmax - v2d->tot.xmin) / mask_size;
+               
+               /* get 'zone' (i.e. which part of scroller is activated) */
+               if (v2d->keepzoom & V2D_LOCKZOOM_X) {
+                       /* default to scroll, as handles not usable */
+                       vsm->zone= SCROLLHANDLE_BAR;
+               }
+               else {
+                       /* check which handle we're in */
+                       vsm->zone= mouse_in_scroller_handle(x, v2d->hor.xmin, v2d->hor.xmax, scrollers->hor_min, scrollers->hor_max); 
+               }
+       }
+       else {
+               /* vertical scroller - calculate adjustment factor first */
+               mask_size= (float)(v2d->vert.ymax - v2d->vert.ymin);
+               vsm->fac= (v2d->tot.ymax - v2d->tot.ymin) / mask_size;
+               
+               /* get 'zone' (i.e. which part of scroller is activated) */
+               if (v2d->keepzoom & V2D_LOCKZOOM_Y) {
+                       /* default to scroll, as handles not usable */
+                       vsm->zone= SCROLLHANDLE_BAR;
+               }
+               else {
+                       /* check which handle we're in */
+                       vsm->zone= mouse_in_scroller_handle(y, v2d->vert.ymin, v2d->vert.ymax, scrollers->vert_min, scrollers->vert_max); 
+               }
+       }
+       
+       UI_view2d_scrollers_free(scrollers);
+       ED_region_tag_redraw(ar);
+}
+
+/* cleanup temp customdata  */
+static void scroller_activate_exit(bContext *C, wmOperator *op)
+{
+       if (op->customdata) {
+               v2dScrollerMove *vsm= op->customdata;
+
+               vsm->v2d->scroll_ui &= ~(V2D_SCROLL_H_ACTIVE|V2D_SCROLL_V_ACTIVE);
+               
+               MEM_freeN(op->customdata);
+               op->customdata= NULL;           
+               
+               ED_region_tag_redraw(CTX_wm_region(C));
+       }
+} 
+
+/* apply transform to view (i.e. adjust 'cur' rect) */
+static void scroller_activate_apply(bContext *C, wmOperator *op)
+{
+       v2dScrollerMove *vsm= op->customdata;
+       View2D *v2d= vsm->v2d;
+       float temp;
+       
+       /* calculate amount to move view by */
+       temp= vsm->fac * vsm->delta;
+       
+       /* type of movement */
+       switch (vsm->zone) {
+               case SCROLLHANDLE_MIN:
+               case SCROLLHANDLE_MAX:
+                       
+                       /* only expand view on axis if zoom is allowed */
+                       if ((vsm->scroller == 'h') && !(v2d->keepzoom & V2D_LOCKZOOM_X))
+                               v2d->cur.xmin -= temp;
+                       if ((vsm->scroller == 'v') && !(v2d->keepzoom & V2D_LOCKZOOM_Y))
+                               v2d->cur.ymin -= temp;
+               
+                       /* only expand view on axis if zoom is allowed */
+                       if ((vsm->scroller == 'h') && !(v2d->keepzoom & V2D_LOCKZOOM_X))
+                               v2d->cur.xmax += temp;
+                       if ((vsm->scroller == 'v') && !(v2d->keepzoom & V2D_LOCKZOOM_Y))
+                               v2d->cur.ymax += temp;
+                       break;
+               
+               default: /* SCROLLHANDLE_BAR */
+                       /* only move view on an axis if panning is allowed */
+                       if ((vsm->scroller == 'h') && !(v2d->keepofs & V2D_LOCKOFS_X)) {
+                               v2d->cur.xmin += temp;
+                               v2d->cur.xmax += temp;
+                       }
+                       if ((vsm->scroller == 'v') && !(v2d->keepofs & V2D_LOCKOFS_Y)) {
+                               v2d->cur.ymin += temp;
+                               v2d->cur.ymax += temp;
+                       }
+                       break;
+       }
+       
+       /* validate that view is in valid configuration after this operation */
+       UI_view2d_curRect_validate(v2d);
+       
+       /* request updates to be done... */
+       ED_area_tag_redraw(CTX_wm_area(C));
+       UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
+}
+
+/* handle user input for scrollers - calculations of mouse-movement need to be done here, not in the apply callback! */
+static int scroller_activate_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+       v2dScrollerMove *vsm= op->customdata;
+       
+       /* execute the events */
+       switch (event->type) {
+               case MOUSEMOVE:
+               {
+                       /* calculate new delta transform, then store mouse-coordinates for next-time */
+                       if (vsm->zone != SCROLLHANDLE_MIN) {
+                               /* if using bar (i.e. 'panning') or 'max' zoom widget */
+                               switch (vsm->scroller) {
+                                       case 'h': /* horizontal scroller - so only horizontal movement ('cur' moves opposite to mouse) */
+                                               vsm->delta= (float)(event->x - vsm->lastx);
+                                               break;
+                                       case 'v': /* vertical scroller - so only vertical movement ('cur' moves opposite to mouse) */
+                                               vsm->delta= (float)(event->y - vsm->lasty);
+                                               break;
+                               }
+                       }
+                       else {
+                               /* using 'min' zoom widget */
+                               switch (vsm->scroller) {
+                                       case 'h': /* horizontal scroller - so only horizontal movement ('cur' moves with mouse) */
+                                               vsm->delta= (float)(vsm->lastx - event->x);
+                                               break;
+                                       case 'v': /* vertical scroller - so only vertical movement ('cur' moves with to mouse) */
+                                               vsm->delta= (float)(vsm->lasty - event->y);
+                                               break;
+                               }
+                       }
+                       
+                       /* store previous coordinates */
+                       vsm->lastx= event->x;
+                       vsm->lasty= event->y;
+                       
+                       scroller_activate_apply(C, op);
+               }
+                       break;
+                       
+               case LEFTMOUSE:
+                       if (event->val==0) {
+                               scroller_activate_exit(C, op);
+                               return OPERATOR_FINISHED;
+                       }
+                       break;
+       }
+
+       return OPERATOR_RUNNING_MODAL;
+}
+
+
+/* a click (or click drag in progress) should have occurred, so check if it happened in scrollbar */
+static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       ARegion *ar= CTX_wm_region(C);
+       View2D *v2d= &ar->v2d;
+       short in_scroller= 0;
+               
+       /* check if mouse in scrollbars, if they're enabled */
+       in_scroller= UI_view2d_mouse_in_scrollers(C, v2d, event->x, event->y);
+       
+       /* if in a scroller, init customdata then set modal handler which will catch mousedown to start doing useful stuff */
+       if (in_scroller) {
+               v2dScrollerMove *vsm;
+               
+               /* initialise customdata */
+               scroller_activate_init(C, op, event, in_scroller);
+               vsm= (v2dScrollerMove *)op->customdata;
+               
+               /* check if zone is inappropriate (i.e. 'bar' but panning is banned), so cannot continue */
+               if (vsm->zone == SCROLLHANDLE_BAR) {
+                       if ( ((vsm->scroller=='h') && (v2d->keepofs & V2D_LOCKOFS_X)) ||
+                                ((vsm->scroller=='v') && (v2d->keepofs & V2D_LOCKOFS_Y)) )
+                       {
+                               /* free customdata initialised */
+                               scroller_activate_exit(C, op);
+                               
+                               /* can't catch this event for ourselves, so let it go to someone else? */
+                               return OPERATOR_PASS_THROUGH;
+                       }                       
+               }
+               
+               if(vsm->scroller=='h')
+                       v2d->scroll_ui |= V2D_SCROLL_H_ACTIVE;
+               else
+                       v2d->scroll_ui |= V2D_SCROLL_V_ACTIVE;
+               
+               /* still ok, so can add */
+               WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+               return OPERATOR_RUNNING_MODAL;
+       }
+       else {
+               /* not in scroller, so nothing happened... (pass through let's something else catch event) */
+               return OPERATOR_PASS_THROUGH;
+       }
+}
+
+/* LMB-Drag in Scrollers - not repeatable operator! */
+void VIEW2D_OT_scroller_activate(wmOperatorType *ot)
+{
        /* identifiers */
-       ot->name= "Zoom Out";
-       ot->idname= "ED_View2D_OT_view_zoomout";
+       ot->name= "Scroller Activate";
+       ot->idname= "VIEW2D_OT_scroller_activate";
+
+       /* flags */
+       ot->flag= OPTYPE_BLOCKING;
        
        /* api callbacks */
-       ot->exec= view_zoomout_exec;
-       
-       /* rna - must keep these in sync with the other operators */
-       prop= RNA_def_property(ot->srna, "zoomfacx", PROP_FLOAT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "zoomfacy", PROP_FLOAT, PROP_NONE);
+       ot->invoke= scroller_activate_invoke;
+       ot->modal= scroller_activate_modal;
+       ot->poll= view2d_poll;
 }
 
 /* ********************************************************* */
-/* Scrollers */
+/* RESET */
+
+static int reset_exec(bContext *C, wmOperator *op)
+{
+       uiStyle *style= U.uistyles.first;
+       ARegion *ar= CTX_wm_region(C);
+       View2D *v2d= &ar->v2d;
+       int winx, winy;
+
+       /* zoom 1.0 */
+       winx= (float)(v2d->mask.xmax - v2d->mask.xmin + 1);
+       winy= (float)(v2d->mask.ymax - v2d->mask.ymin + 1);
+
+       v2d->cur.xmax= v2d->cur.xmin + winx;
+       v2d->cur.ymax= v2d->cur.ymin + winy;
+       
+       /* align */
+       if(v2d->align) {
+               /* posx and negx flags are mutually exclusive, so watch out */
+               if ((v2d->align & V2D_ALIGN_NO_POS_X) && !(v2d->align & V2D_ALIGN_NO_NEG_X)) {
+                       v2d->cur.xmax= 0.0f;
+                       v2d->cur.xmin= v2d->winx*style->panelzoom;
+               }
+               else if ((v2d->align & V2D_ALIGN_NO_NEG_X) && !(v2d->align & V2D_ALIGN_NO_POS_X)) {
+                       v2d->cur.xmax= (v2d->cur.xmax - v2d->cur.xmin)*style->panelzoom;
+                       v2d->cur.xmin= 0.0f;
+               }
+
+               /* - posx and negx flags are mutually exclusive, so watch out */
+               if ((v2d->align & V2D_ALIGN_NO_POS_Y) && !(v2d->align & V2D_ALIGN_NO_NEG_Y)) {
+                       v2d->cur.ymax= 0.0f;
+                       v2d->cur.ymin= -v2d->winy*style->panelzoom;
+               }
+               else if ((v2d->align & V2D_ALIGN_NO_NEG_Y) && !(v2d->align & V2D_ALIGN_NO_POS_Y)) {
+                       v2d->cur.ymax= (v2d->cur.ymax - v2d->cur.ymin)*style->panelzoom;
+                       v2d->cur.ymin= 0.0f;
+               }
+       }
 
+       /* validate that view is in valid configuration after this operation */
+       UI_view2d_curRect_validate(v2d);
+       
+       /* request updates to be done... */
+       ED_area_tag_redraw(CTX_wm_area(C));
+       UI_view2d_sync(CTX_wm_screen(C), CTX_wm_area(C), v2d, V2D_LOCK_COPY);
+       
+       return OPERATOR_FINISHED;
+}
+void VIEW2D_OT_reset(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Reset View";
+       ot->idname= "VIEW2D_OT_reset";
+       
+       /* api callbacks */
+       ot->exec= reset_exec;
+       ot->poll= view2d_poll;
+       
+       /* flags */
+       ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
  
 /* ********************************************************* */
 /* Registration */
 
 void ui_view2d_operatortypes(void)
 {
-       WM_operatortype_append(ED_View2D_OT_view_pan);
+       WM_operatortype_append(VIEW2D_OT_pan);
+       
+       WM_operatortype_append(VIEW2D_OT_scroll_left);
+       WM_operatortype_append(VIEW2D_OT_scroll_right);
+       WM_operatortype_append(VIEW2D_OT_scroll_up);
+       WM_operatortype_append(VIEW2D_OT_scroll_down);
        
-       WM_operatortype_append(ED_View2D_OT_view_scrollleft);
-       WM_operatortype_append(ED_View2D_OT_view_scrollright);
-       WM_operatortype_append(ED_View2D_OT_view_scrollup);
-       WM_operatortype_append(ED_View2D_OT_view_scrolldown);
+       WM_operatortype_append(VIEW2D_OT_zoom_in);
+       WM_operatortype_append(VIEW2D_OT_zoom_out);
        
-       WM_operatortype_append(ED_View2D_OT_view_zoomin);
-       WM_operatortype_append(ED_View2D_OT_view_zoomout);
+       WM_operatortype_append(VIEW2D_OT_zoom);
+       WM_operatortype_append(VIEW2D_OT_zoom_border);
+       
+       WM_operatortype_append(VIEW2D_OT_scroller_activate);
+
+       WM_operatortype_append(VIEW2D_OT_reset);
 }
 
 void UI_view2d_keymap(wmWindowManager *wm)
 {
-       ui_view2d_operatortypes();
+       ListBase *keymap= WM_keymap_listbase(wm, "View2D", 0, 0);
+       
+       /* pan/scroll */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_pan", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0);
        
-       /* pan/scroll operators */
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_right", WHEELDOWNMOUSE, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, KM_CTRL, 0);
        
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_rightscroll", WHEELDOWNMOUSE, KM_ANY, KM_CTRL, 0);
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_leftscroll", WHEELUPMOUSE, KM_ANY, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, KM_SHIFT, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", WHEELUPMOUSE, KM_PRESS, KM_SHIFT, 0);
        
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_downscroll", WHEELDOWNMOUSE, KM_ANY, KM_SHIFT, 0);
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_upscroll", WHEELUPMOUSE, KM_ANY, KM_SHIFT, 0);
+       /* zoom - single step */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_out", WHEELOUTMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_in", WHEELINMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_out", PADMINUS, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_in", PADPLUSKEY, KM_PRESS, 0, 0);
        
-       /* zoom */
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_zoomout", WHEELUPMOUSE, KM_ANY, 0, 0);
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_zoomin", WHEELDOWNMOUSE, KM_ANY, 0, 0);
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_zoomout", PADMINUS, KM_PRESS, 0, 0);
-       WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_zoomin", PADPLUSKEY, KM_PRESS, 0, 0);
+       /* scroll up/down - no modifiers, only when zoom fails */
+               /* these may fail if zoom is disallowed, in which case they should pass on event */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", WHEELUPMOUSE, KM_PRESS, 0, 0);
+               /* these may be necessary if vertical scroll is disallowed */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_right", WHEELDOWNMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, 0, 0);
        
+       /* zoom - drag */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0);
        
-       /* scrollbars */
-       //WM_keymap_add_item(&wm->view2dkeymap, "ED_V2D_OT_scrollbar_activate", MOUSEMOVE, 0, 0, 0);
+       /* borderzoom - drag */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_border", BKEY, KM_PRESS, KM_SHIFT, 0);
+       
+       /* scrollers */
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroller_activate", LEFTMOUSE, KM_PRESS, 0, 0);
+
+       /* Alternative keymap for buttons listview */
+       keymap= WM_keymap_listbase(wm, "View2D Buttons List", 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_pan", MIDDLEMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", WHEELDOWNMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", WHEELUPMOUSE, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_out", PADMINUS, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_zoom_in", PADPLUSKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "VIEW2D_OT_reset", HOMEKEY, KM_PRESS, 0, 0);
 }