RNA
[blender-staging.git] / source / blender / editors / screen / screen_ops.c
index c342962c2daa652540083f433b0e43d77c5ae407..dae7a7cedd5e76627b0c99d5b12fc8c890f62ae0 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <math.h>
+
 #include "MEM_guardedalloc.h"
 
-#include "BLI_blenlib.h"
 #include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+#include "BLI_editVert.h"
+
+#include "DNA_armature_types.h"
+#include "DNA_image_types.h"
+#include "DNA_object_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_scene_types.h"
 
+#include "BKE_blender.h"
 #include "BKE_context.h"
+#include "BKE_customdata.h"
+#include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_idprop.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
+#include "BKE_mesh.h"
+#include "BKE_multires.h"
+#include "BKE_report.h"
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
-#include "DNA_scene_types.h"
-
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_markers.h"
+#include "ED_util.h"
 #include "ED_screen.h"
+#include "ED_mesh.h"
 #include "ED_screen_types.h"
 
+#include "RE_pipeline.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
+#include "UI_interface.h"
+#include "UI_resources.h"
+
 #include "screen_intern.h"     /* own module include */
 
 /* ************** Exported Poll tests ********************** */
 
+int ED_operator_regionactive(bContext *C)
+{
+       if(CTX_wm_window(C)==NULL) return 0;
+       if(CTX_wm_screen(C)==NULL) return 0;
+       if(CTX_wm_region(C)==NULL) return 0;
+       return 1;
+}
+
 int ED_operator_areaactive(bContext *C)
 {
        if(CTX_wm_window(C)==NULL) return 0;
@@ -75,6 +107,180 @@ int ED_operator_screen_mainwinactive(bContext *C)
        return 1;
 }
 
+int ED_operator_scene_editable(bContext *C)
+{
+       Scene *scene= CTX_data_scene(C);
+       if(scene && scene->id.lib==NULL)
+               return 1;
+       return 0;
+}
+
+static int ed_spacetype_test(bContext *C, int type)
+{
+       if(ED_operator_areaactive(C)) {
+               SpaceLink *sl= (SpaceLink *)CTX_wm_space_data(C);
+               return sl && (sl->spacetype == type);
+       }
+       return 0;
+}
+
+int ED_operator_view3d_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_VIEW3D);
+}
+
+int ED_operator_timeline_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_TIME);
+}
+
+int ED_operator_outliner_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_OUTLINER);
+}
+
+int ED_operator_file_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_FILE);
+}
+
+int ED_operator_action_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_ACTION);
+}
+
+int ED_operator_buttons_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_BUTS);
+}
+
+int ED_operator_node_active(bContext *C)
+{
+       if(ed_spacetype_test(C, SPACE_NODE)) {
+               SpaceNode *snode= (SpaceNode *)CTX_wm_space_data(C);
+               if(snode->edittree)
+                       return 1;
+       }
+       return 0;
+}
+
+int ED_operator_ipo_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_IPO);
+}
+
+int ED_operator_sequencer_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_SEQ);
+}
+
+int ED_operator_image_active(bContext *C)
+{
+       return ed_spacetype_test(C, SPACE_IMAGE);
+}
+
+int ED_operator_object_active(bContext *C)
+{
+       return NULL != CTX_data_active_object(C);
+}
+
+int ED_operator_editmesh(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       if(obedit && obedit->type==OB_MESH)
+               return NULL != ((Mesh *)obedit->data)->edit_mesh;
+       return 0;
+}
+
+int ED_operator_editarmature(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       if(obedit && obedit->type==OB_ARMATURE)
+               return NULL != ((bArmature *)obedit->data)->edbo;
+       return 0;
+}
+
+int ED_operator_posemode(bContext *C)
+{
+       Object *obact= CTX_data_active_object(C);
+       Object *obedit= CTX_data_edit_object(C);
+       
+       if ((obact != obedit) && (obact) && (obact->type==OB_ARMATURE))
+               return (obact->flag & OB_POSEMODE)!=0;
+               
+       return 0;
+}
+
+
+int ED_operator_uvedit(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       EditMesh *em= NULL;
+
+       if(obedit && obedit->type==OB_MESH)
+               em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
+
+       if(em && (em->faces.first) && (CustomData_has_layer(&em->fdata, CD_MTFACE))) {
+               BKE_mesh_end_editmesh(obedit->data, em);
+               return 1;
+       }
+
+       if(obedit)
+               BKE_mesh_end_editmesh(obedit->data, em);
+       return 0;
+}
+
+int ED_operator_uvmap(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       EditMesh *em= NULL;
+
+       if(obedit && obedit->type==OB_MESH)
+               em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
+
+       if(em && (em->faces.first)) {
+               BKE_mesh_end_editmesh(obedit->data, em);
+               return 1;
+       }
+
+       if(obedit)
+               BKE_mesh_end_editmesh(obedit->data, em);
+       return 0;
+}
+
+int ED_operator_editsurfcurve(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       if(obedit && ELEM(obedit->type, OB_CURVE, OB_SURF))
+               return NULL != ((Curve *)obedit->data)->editnurb;
+       return 0;
+}
+
+
+int ED_operator_editcurve(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       if(obedit && obedit->type==OB_CURVE)
+               return NULL != ((Curve *)obedit->data)->editnurb;
+       return 0;
+}
+
+int ED_operator_editsurf(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       if(obedit && obedit->type==OB_SURF)
+               return NULL != ((Curve *)obedit->data)->editnurb;
+       return 0;
+}
+
+int ED_operator_editfont(bContext *C)
+{
+       Object *obedit= CTX_data_edit_object(C);
+       if(obedit && obedit->type==OB_FONT)
+               return NULL != ((Curve *)obedit->data)->editfont;
+       return 0;
+}
+
 /* *************************** action zone operator ************************** */
 
 /* operator state vars used:  
@@ -103,7 +309,7 @@ callbacks:
 typedef struct sActionzoneData {
        ScrArea *sa1, *sa2;
        AZone *az;
-       int x, y, gesture_dir;
+       int x, y, gesture_dir, modifier;
 } sActionzoneData;
 
 /* used by other operators too */
@@ -119,46 +325,51 @@ static ScrArea *screen_areahascursor(bScreen *scr, int x, int y)
        return sa;
 }
 
+/* quick poll to save operators to be created and handled */
+static int actionzone_area_poll(bContext *C)
+{
+       wmWindow *win= CTX_wm_window(C);
+       ScrArea *sa= CTX_wm_area(C);
+       
+       if(sa && win) {
+               AZone *az;
+               int x= win->eventstate->x;
+               int y= win->eventstate->y;
+               
+               for(az= sa->actionzones.first; az; az= az->next)
+                       if(BLI_in_rcti(&az->rect, x, y))
+                          return 1;
+       }       
+       return 0;
+}
 
 AZone *is_in_area_actionzone(ScrArea *sa, int x, int y)
 {
        AZone *az= NULL;
-       int i= 0;
        
-       for(az= sa->actionzones.first, i= 0; az; az= az->next, i++) {
-               if(az->type == AZONE_TRI) {
-                       if(IsPointInTri2DInts(az->x1, az->y1, az->x2, az->y2, x, y)) 
-                               break;
-               }
-               if(az->type == AZONE_QUAD) {
-                       if(az->x1 < x && x < az->x2 && az->y1 < y && y < az->y2) 
-                               break;
+       for(az= sa->actionzones.first; az; az= az->next) {
+               if(BLI_in_rcti(&az->rect, x, y)) {
+                       if(az->type == AZONE_AREA) {
+                               if(IsPointInTri2DInts(az->x1, az->y1, az->x2, az->y2, x, y)) 
+                                       break;
+                       }
+                       else if(az->type == AZONE_REGION) {
+                               float v1[2], v2[2], v3[2], pt[2];
+                               
+                               v1[0]= az->x1; v1[1]= az->y1;
+                               v2[0]= az->x2; v2[1]= az->y2;
+                               v3[0]= az->x3; v3[1]= az->y3;
+                               pt[0]= x; pt[1]=y;
+
+                               if(IsPointInTri2D(v1, v2, v3, pt)) 
+                                       break;
+                       }
                }
        }
        
        return az;
 }
 
-static int actionzone_invoke(bContext *C, wmOperator *op, wmEvent *event)
-{
-       AZone *az= is_in_area_actionzone(CTX_wm_area(C), event->x, event->y);
-       sActionzoneData *sad;
-       
-       /* quick escape */
-       if(az==NULL)
-               return OPERATOR_PASS_THROUGH;
-       
-       /* ok we do the actionzone */
-       sad= op->customdata= MEM_callocN(sizeof(sActionzoneData), "sActionzoneData");
-       sad->sa1= CTX_wm_area(C);
-       sad->az= az;
-       sad->x= event->x; sad->y= event->y;
-       
-       /* add modal handler */
-       WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
-       
-       return OPERATOR_RUNNING_MODAL;
-}
 
 static void actionzone_exit(bContext *C, wmOperator *op)
 {
@@ -168,13 +379,19 @@ static void actionzone_exit(bContext *C, wmOperator *op)
 }
 
 /* send EVT_ACTIONZONE event */
-static void actionzone_apply(bContext *C, wmOperator *op)
+static void actionzone_apply(bContext *C, wmOperator *op, int type)
 {
        wmEvent event;
        wmWindow *win= CTX_wm_window(C);
+       sActionzoneData *sad= op->customdata;
+       
+       sad->modifier= RNA_int_get(op->ptr, "modifier");
        
        event= *(win->eventstate);      /* XXX huh huh? make api call */
-       event.type= EVT_ACTIONZONE;
+       if(type==AZONE_AREA)
+               event.type= EVT_ACTIONZONE_AREA;
+       else
+               event.type= EVT_ACTIONZONE_REGION;
        event.customdata= op->customdata;
        event.customdatafree= TRUE;
        op->customdata= NULL;
@@ -182,10 +399,41 @@ static void actionzone_apply(bContext *C, wmOperator *op)
        wm_event_add(win, &event);
 }
 
+static int actionzone_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       AZone *az= is_in_area_actionzone(CTX_wm_area(C), event->x, event->y);
+       sActionzoneData *sad;
+       
+       /* quick escape */
+       if(az==NULL)
+               return OPERATOR_PASS_THROUGH;
+       
+       /* ok we do the actionzone */
+       sad= op->customdata= MEM_callocN(sizeof(sActionzoneData), "sActionzoneData");
+       sad->sa1= CTX_wm_area(C);
+       sad->az= az;
+       sad->x= event->x; sad->y= event->y;
+       
+       /* region azone directly reacts on mouse clicks */
+       if(sad->az->type==AZONE_REGION) {
+               actionzone_apply(C, op, AZONE_REGION);
+               actionzone_exit(C, op);
+               return OPERATOR_FINISHED;
+       }
+       else {
+               /* add modal handler */
+               WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+               
+               return OPERATOR_RUNNING_MODAL;
+       }
+}
+
+
 static int actionzone_modal(bContext *C, wmOperator *op, wmEvent *event)
 {
        sActionzoneData *sad= op->customdata;
        int deltax, deltay;
+       int mindelta= sad->az->type==AZONE_REGION?1:12;
        
        switch(event->type) {
                case MOUSEMOVE:
@@ -194,155 +442,282 @@ static int actionzone_modal(bContext *C, wmOperator *op, wmEvent *event)
                        deltay= (event->y - sad->y);
                        
                        if(deltay > ABS(deltax))
-                               sad->gesture_dir= AZONE_N;
+                               sad->gesture_dir= 'n';
                        else if(deltax > ABS(deltay))
-                               sad->gesture_dir= AZONE_E;
+                               sad->gesture_dir= 'e';
                        else if(deltay < -ABS(deltax))
-                               sad->gesture_dir= AZONE_S;
+                               sad->gesture_dir= 's';
                        else
-                               sad->gesture_dir= AZONE_W;
+                               sad->gesture_dir= 'w';
                        
                        /* gesture is large enough? */
-                       if(ABS(deltax) > 12 || ABS(deltay) > 12) {
+                       if(ABS(deltax) > mindelta || ABS(deltay) > mindelta) {
                                
                                /* second area, for join */
                                sad->sa2= screen_areahascursor(CTX_wm_screen(C), event->x, event->y);
                                /* apply sends event */
-                               actionzone_apply(C, op);
+                               actionzone_apply(C, op, sad->az->type);
                                actionzone_exit(C, op);
                                
                                return OPERATOR_FINISHED;
                        }
                                break;
                case ESCKEY:
-               case LEFTMOUSE:
                        actionzone_exit(C, op);
                        return OPERATOR_CANCELLED;
+               case LEFTMOUSE:                         
+                       actionzone_exit(C, op);
+                       return OPERATOR_CANCELLED;
+
        }
        
        return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_SCR_OT_actionzone(wmOperatorType *ot)
+void SCREEN_OT_actionzone(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Handle area action zones";
-       ot->idname= "ED_SCR_OT_actionzone";
+       ot->idname= "SCREEN_OT_actionzone";
        
        ot->invoke= actionzone_invoke;
        ot->modal= actionzone_modal;
        
-       ot->poll= ED_operator_areaactive;
-}
-
-
-/* *********** Rip area operator ****************** */
-
-
-/* operator callback */
-/* (ton) removed attempt to merge ripped area with another, don't think this is desired functionality.
-conventions: 'atomic' and 'dont think for user' :) */
-static int screen_area_rip_op(bContext *C, wmOperator *op)
-{
-       wmWindow *newwin, *win;
-       bScreen *newsc, *sc;
-       ScrArea *sa;
-       rcti rect;
-       
-       win= CTX_wm_window(C);
-       sc= CTX_wm_screen(C);
-       sa= CTX_wm_area(C);
-
-       /*  poll() checks area context, but we don't accept full-area windows */
-       if(sc->full != SCREENNORMAL) 
-               return OPERATOR_CANCELLED;
-       
-       /* adds window to WM */
-       rect= sa->totrct;
-       BLI_translate_rcti(&rect, win->posx, win->posy);
-       newwin= WM_window_open(C, &rect);
-       
-       /* allocs new screen and adds to newly created window, using window size */
-       newsc= screen_add(newwin, sc->id.name+2);
-       newwin->screen= newsc;
-       
-       /* copy area to new screen */
-       area_copy_data((ScrArea *)newsc->areabase.first, sa, 0);
-       
-       /* screen, areas init */
-       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
-       
-       return OPERATOR_FINISHED;
-}
-
-void ED_SCR_OT_area_rip(wmOperatorType *ot)
-{
-       ot->name= "Rip Area into New Window";
-       ot->idname= "ED_SCR_OT_area_rip";
-       
-       ot->invoke= WM_operator_confirm;
-       ot->exec= screen_area_rip_op;
-       ot->poll= ED_operator_areaactive;
+       ot->poll= actionzone_area_poll;
+       RNA_def_int(ot->srna, "modifier", 0, 0, 2, "modifier", "modifier state", 0, 2);
 }
 
-
-/* ************** move area edge operator *********************************** */
+/* ************** swap area operator *********************************** */
 
 /* operator state vars used:  
-           x, y                        mouse coord near edge
-           delta            movement of edge
+                                       sa1             start area
+                                       sa2             area to swap with
 
        functions:
 
-       init()   set default property values, find edge based on mouse coords, test
-            if the edge can be moved, select edges, calculate min and max movement
+       init()   set custom data for operator, based on actionzone event custom data
 
-       apply() apply delta on selection
+       cancel()        cancel the operator
 
        exit()  cleanup, send notifier
 
-       cancel() cancel moving
-
        callbacks:
 
-       exec()   execute without any user interaction, based on properties
-            call init(), apply(), exit()
-
-       invoke() gets called on mouse click near edge
+       invoke() gets called on shift+lmb drag in actionzone
             call init(), add handler
 
        modal()  accept modal events while doing it
-                       call apply() with delta motion
-            call exit() and remove handler
 
 */
 
-typedef struct sAreaMoveData {
-       int bigger, smaller, origval;
-       char dir;
-} sAreaMoveData;
+typedef struct sAreaSwapData {
+       ScrArea *sa1, *sa2;
+} sAreaSwapData;
 
-/* helper call to move area-edge, sets limits */
-static void area_move_set_limits(bScreen *sc, int dir, int *bigger, int *smaller)
+static int area_swap_init(bContext *C, wmOperator *op, wmEvent *event)
 {
-       ScrArea *sa;
-       
-       /* we check all areas and test for free space with MINSIZE */
-       *bigger= *smaller= 100000;
+       sAreaSwapData *sd= NULL;
+       sActionzoneData *sad= event->customdata;
+
+       if(sad==NULL || sad->sa1==NULL)
+                                       return 0;
        
-       for(sa= sc->areabase.first; sa; sa= sa->next) {
-               if(dir=='h') {
-                       int y1= sa->v2->vec.y - sa->v1->vec.y-AREAMINY;
-                       
-                       /* if top or down edge selected, test height */
-                       if(sa->v1->flag && sa->v4->flag)
-                               *bigger= MIN2(*bigger, y1);
-                       else if(sa->v2->flag && sa->v3->flag)
-                               *smaller= MIN2(*smaller, y1);
-               }
-               else {
-                       int x1= sa->v4->vec.x - sa->v1->vec.x-AREAMINX;
-                       
+       sd= MEM_callocN(sizeof(sAreaSwapData), "sAreaSwapData");
+       sd->sa1= sad->sa1;
+       sd->sa2= sad->sa2;
+       op->customdata= sd;
+
+       return 1;
+}
+
+
+static void area_swap_exit(bContext *C, wmOperator *op)
+{
+       if(op->customdata)
+               MEM_freeN(op->customdata);
+       op->customdata= NULL;
+}
+
+static int area_swap_cancel(bContext *C, wmOperator *op)
+{
+       area_swap_exit(C, op);
+       return OPERATOR_CANCELLED;
+}
+
+static int area_swap_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+
+       if(!area_swap_init(C, op, event))
+               return OPERATOR_PASS_THROUGH;
+
+       /* add modal handler */
+       WM_cursor_modal(CTX_wm_window(C), BC_SWAPAREA_CURSOR);
+       WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+       
+       return OPERATOR_RUNNING_MODAL;
+
+}
+
+static int area_swap_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+       sActionzoneData *sad= op->customdata;
+
+       switch(event->type) {
+               case MOUSEMOVE:
+                       /* second area, for join */
+                       sad->sa2= screen_areahascursor(CTX_wm_screen(C), event->x, event->y);
+                       break;
+               case LEFTMOUSE: /* release LMB */
+                       if(event->val==0) {
+                               if(sad->sa1 == sad->sa2) {
+
+                                       return area_swap_cancel(C, op);
+                               }
+                               ED_area_swapspace(C, sad->sa1, sad->sa2);
+
+                               area_swap_exit(C, op);
+
+                               WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+
+                               return OPERATOR_FINISHED;
+                       }
+                       break;
+
+               case ESCKEY:
+                       return area_swap_cancel(C, op);
+       }
+       return OPERATOR_RUNNING_MODAL;
+}
+
+static void SCREEN_OT_area_swap(wmOperatorType *ot)
+{
+       ot->name= "Swap areas";
+       ot->idname= "SCREEN_OT_area_swap";
+
+       ot->invoke= area_swap_invoke;
+       ot->modal= area_swap_modal;
+       ot->poll= ED_operator_areaactive;
+}
+
+/* *********** Duplicate area as new window operator ****************** */
+
+/* operator callback */
+static int area_dupli_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       wmWindow *newwin, *win;
+       bScreen *newsc, *sc;
+       ScrArea *sa;
+       rcti rect;
+       
+       win= CTX_wm_window(C);
+       sc= CTX_wm_screen(C);
+       sa= CTX_wm_area(C);
+       
+       /* XXX hrmf! */
+       if(event->type==EVT_ACTIONZONE_AREA) {
+               sActionzoneData *sad= event->customdata;
+
+               if(sad==NULL)
+                       return OPERATOR_PASS_THROUGH;
+       
+               sa= sad->sa1;
+       }
+       
+       /*  poll() checks area context, but we don't accept full-area windows */
+       if(sc->full != SCREENNORMAL) {
+               if(event->type==EVT_ACTIONZONE_AREA)
+                       actionzone_exit(C, op);
+               return OPERATOR_CANCELLED;
+       }
+       
+       /* adds window to WM */
+       rect= sa->totrct;
+       BLI_translate_rcti(&rect, win->posx, win->posy);
+       newwin= WM_window_open(C, &rect);
+       
+       /* allocs new screen and adds to newly created window, using window size */
+       newsc= screen_add(newwin, CTX_data_scene(C), sc->id.name+2);
+       newwin->screen= newsc;
+       
+       /* copy area to new screen */
+       area_copy_data((ScrArea *)newsc->areabase.first, sa, 0);
+       
+       /* screen, areas init */
+       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+
+       if(event->type==EVT_ACTIONZONE_AREA)
+               actionzone_exit(C, op);
+       
+       return OPERATOR_FINISHED;
+}
+
+static void SCREEN_OT_area_dupli(wmOperatorType *ot)
+{
+       ot->name= "Duplicate Area into New Window";
+       ot->idname= "SCREEN_OT_area_dupli";
+       
+       ot->invoke= area_dupli_invoke;
+       ot->poll= ED_operator_areaactive;
+}
+
+
+/* ************** move area edge operator *********************************** */
+
+/* operator state vars used:  
+           x, y                        mouse coord near edge
+           delta            movement of edge
+
+       functions:
+
+       init()   set default property values, find edge based on mouse coords, test
+            if the edge can be moved, select edges, calculate min and max movement
+
+       apply() apply delta on selection
+
+       exit()  cleanup, send notifier
+
+       cancel() cancel moving
+
+       callbacks:
+
+       exec()   execute without any user interaction, based on properties
+            call init(), apply(), exit()
+
+       invoke() gets called on mouse click near edge
+            call init(), add handler
+
+       modal()  accept modal events while doing it
+                       call apply() with delta motion
+            call exit() and remove handler
+
+*/
+
+typedef struct sAreaMoveData {
+       int bigger, smaller, origval;
+       char dir;
+} sAreaMoveData;
+
+/* helper call to move area-edge, sets limits */
+static void area_move_set_limits(bScreen *sc, int dir, int *bigger, int *smaller)
+{
+       ScrArea *sa;
+       
+       /* we check all areas and test for free space with MINSIZE */
+       *bigger= *smaller= 100000;
+       
+       for(sa= sc->areabase.first; sa; sa= sa->next) {
+               if(dir=='h') {
+                       int y1= sa->v2->vec.y - sa->v1->vec.y-AREAMINY;
+                       
+                       /* if top or down edge selected, test height */
+                       if(sa->v1->flag && sa->v4->flag)
+                               *bigger= MIN2(*bigger, y1);
+                       else if(sa->v2->flag && sa->v3->flag)
+                               *smaller= MIN2(*smaller, y1);
+               }
+               else {
+                       int x1= sa->v4->vec.x - sa->v1->vec.x-AREAMINX;
+                       
                        /* if left or right edge selected, test width */
                        if(sa->v1->flag && sa->v2->flag)
                                *bigger= MIN2(*bigger, x1);
@@ -413,7 +788,7 @@ static void area_move_apply_do(bContext *C, int origval, int delta, int dir, int
                }
        }
 
-       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
 }
 
 static void area_move_apply(bContext *C, wmOperator *op)
@@ -506,13 +881,11 @@ static int area_move_modal(bContext *C, wmOperator *op, wmEvent *event)
        return OPERATOR_RUNNING_MODAL;
 }
 
-void ED_SCR_OT_area_move(wmOperatorType *ot)
+void SCREEN_OT_area_move(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-
        /* identifiers */
        ot->name= "Move area edges";
-       ot->idname= "ED_SCR_OT_area_move";
+       ot->idname= "SCREEN_OT_area_move";
 
        ot->exec= area_move_exec;
        ot->invoke= area_move_invoke;
@@ -522,9 +895,9 @@ void ED_SCR_OT_area_move(wmOperatorType *ot)
        ot->poll= ED_operator_screen_mainwinactive; /* when mouse is over area-edge */
 
        /* rna */
-       prop= RNA_def_property(ot->srna, "x", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "y", PROP_INT, PROP_NONE);
-       prop= RNA_def_property(ot->srna, "delta", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "y", 0, INT_MIN, INT_MAX, "Y", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
 }
 
 /* ************** split area operator *********************************** */
@@ -592,7 +965,7 @@ static int area_split_init(bContext *C, wmOperator *op)
        if(sa==NULL) return 0;
        
        /* required properties */
-       dir= RNA_enum_get(op->ptr, "dir");
+       dir= RNA_enum_get(op->ptr, "direction");
        
        /* minimal size */
        if(dir=='v' && sa->winx < 2*AREAMINX) return 0;
@@ -647,8 +1020,8 @@ static int area_split_apply(bContext *C, wmOperator *op)
        float fac;
        int dir;
        
-       fac= RNA_float_get(op->ptr, "fac");
-       dir= RNA_enum_get(op->ptr, "dir");
+       fac= RNA_float_get(op->ptr, "factor");
+       dir= RNA_enum_get(op->ptr, "direction");
 
        sd->narea= area_split(CTX_wm_window(C), sc, sd->sarea, dir, fac);
        
@@ -667,7 +1040,7 @@ static int area_split_apply(bContext *C, wmOperator *op)
                if(dir=='h') sd->origval= sd->nedge->v1->vec.y;
                else sd->origval= sd->nedge->v1->vec.x;
 
-               WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+               WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
                
                return 1;
        }               
@@ -682,7 +1055,7 @@ static void area_split_exit(bContext *C, wmOperator *op)
                op->customdata = NULL;
        }
        
-       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
 
        /* this makes sure aligned edges will result in aligned grabbing */
        removedouble_scrverts(CTX_wm_screen(C));
@@ -695,9 +1068,17 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
        sAreaSplitData *sd;
        
-       if(event->type==EVT_ACTIONZONE) {
+       if(event->type==EVT_ACTIONZONE_AREA) {
                sActionzoneData *sad= event->customdata;
                int dir;
+
+               if(sad->modifier>0) {
+                       return OPERATOR_PASS_THROUGH;
+               }
+               
+               /* no full window splitting allowed */
+               if(CTX_wm_area(C)->full)
+                       return OPERATOR_PASS_THROUGH;
                
                /* verify *sad itself */
                if(sad==NULL || sad->sa1==NULL || sad->az==NULL)
@@ -708,15 +1089,15 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event)
                        return OPERATOR_PASS_THROUGH;
                
                /* prepare operator state vars */
-               if(sad->gesture_dir==AZONE_N || sad->gesture_dir==AZONE_S) {
+               if(sad->gesture_dir=='n' || sad->gesture_dir=='s') {
                        dir= 'h';
-                       RNA_float_set(op->ptr, "fac", ((float)(event->x - sad->sa1->v1->vec.x)) / (float)sad->sa1->winx);
+                       RNA_float_set(op->ptr, "factor", ((float)(event->x - sad->sa1->v1->vec.x)) / (float)sad->sa1->winx);
                }
                else {
                        dir= 'v';
-                       RNA_float_set(op->ptr, "fac", ((float)(event->y - sad->sa1->v1->vec.y)) / (float)sad->sa1->winy);
+                       RNA_float_set(op->ptr, "factor", ((float)(event->y - sad->sa1->v1->vec.y)) / (float)sad->sa1->winy);
                }
-               RNA_enum_set(op->ptr, "dir", dir);
+               RNA_enum_set(op->ptr, "direction", dir);
 
                /* general init, also non-UI case, adds customdata, sets area and defaults */
                if(!area_split_init(C, op))
@@ -785,15 +1166,15 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event)
        /* execute the events */
        switch(event->type) {
                case MOUSEMOVE:
-                       dir= RNA_enum_get(op->ptr, "dir");
+                       dir= RNA_enum_get(op->ptr, "direction");
                        
                        sd->delta= (dir == 'v')? event->x - sd->origval: event->y - sd->origval;
                        area_move_apply_do(C, sd->origval, sd->delta, dir, sd->bigger, sd->smaller);
                        
                        fac= (dir == 'v') ? event->x-sd->origmin : event->y-sd->origmin;
-                       RNA_float_set(op->ptr, "fac", fac / (float)sd->origsize);
+                       RNA_float_set(op->ptr, "factor", fac / (float)sd->origsize);
                        
-                       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+                       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
                        break;
                        
                case LEFTMOUSE:
@@ -811,16 +1192,14 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event)
 }
 
 static EnumPropertyItem prop_direction_items[] = {
-       {'h', "HORIZONTAL", "Horizontal", ""},
-       {'v', "VERTICAL", "Vertical", ""},
-       {0, NULL, NULL, NULL}};
+       {'h', "HORIZONTAL", 0, "Horizontal", ""},
+       {'v', "VERTICAL", 0, "Vertical", ""},
+       {0, NULL, 0, NULL, NULL}};
 
-void ED_SCR_OT_area_split(wmOperatorType *ot)
+void SCREEN_OT_area_split(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-
        ot->name = "Split area";
-       ot->idname = "ED_SCR_OT_area_split";
+       ot->idname = "SCREEN_OT_area_split";
        
        ot->exec= area_split_exec;
        ot->invoke= area_split_invoke;
@@ -830,15 +1209,123 @@ void ED_SCR_OT_area_split(wmOperatorType *ot)
        ot->flag= OPTYPE_REGISTER;
        
        /* rna */
-       prop= RNA_def_property(ot->srna, "dir", PROP_ENUM, PROP_NONE);
-       RNA_def_property_enum_items(prop, prop_direction_items);
-       RNA_def_property_enum_default(prop, 'h');
+       RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', "Direction", "");
+       RNA_def_float(ot->srna, "factor", 0.5f, 0.0, 1.0, "Factor", "", 0.0, 1.0);
+}
+
+
+
+/* ************** scale region edge operator *********************************** */
+
+typedef struct RegionMoveData {
+       ARegion *ar;
+       int bigger, smaller, origval;
+       int origx, origy;
+       char edge;
+       
+} RegionMoveData;
+
+static int region_scale_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       sActionzoneData *sad= event->customdata;
+       AZone *az= sad->az;
+       
+       if(az->ar) {
+               RegionMoveData *rmd= MEM_callocN(sizeof(RegionMoveData), "RegionMoveData");
+               
+               op->customdata= rmd;
+               
+               rmd->ar= az->ar;
+               rmd->edge= az->edge;
+               rmd->origx= event->x;
+               rmd->origy= event->y;
+               if(rmd->edge=='l' || rmd->edge=='r') 
+                       rmd->origval= rmd->ar->type->minsizex;
+               else
+                       rmd->origval= rmd->ar->type->minsizey;
+               
+               /* add temp handler */
+               WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+               
+               return OPERATOR_RUNNING_MODAL;
+       }
+       
+       return OPERATOR_FINISHED;
+}
+
+static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+       RegionMoveData *rmd= op->customdata;
+       int delta;
+       
+       /* execute the events */
+       switch(event->type) {
+               case MOUSEMOVE:
+                       
+                       if(rmd->edge=='l' || rmd->edge=='r') {
+                               delta= event->x - rmd->origx;
+                               if(rmd->edge=='l') delta= -delta;
+                               rmd->ar->type->minsizex= rmd->origval + delta;
+                               CLAMP(rmd->ar->type->minsizex, 0, 1000);
+                               if(rmd->ar->type->minsizex < 10) {
+                                       rmd->ar->type->minsizex= 10;
+                                       rmd->ar->flag |= RGN_FLAG_HIDDEN;
+                               }
+                               else
+                                       rmd->ar->flag &= ~RGN_FLAG_HIDDEN;
+                       }
+                       else {
+                               delta= event->y - rmd->origy;
+                               if(rmd->edge=='b') delta= -delta;
+                               rmd->ar->type->minsizey= rmd->origval + delta;
+                               CLAMP(rmd->ar->type->minsizey, 0, 1000);
+                               if(rmd->ar->type->minsizey < 10) {
+                                       rmd->ar->type->minsizey= 10;
+                                       rmd->ar->flag |= RGN_FLAG_HIDDEN;
+                               }
+                               else
+                                       rmd->ar->flag &= ~RGN_FLAG_HIDDEN;
+                       }
+                       
+                       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+                                       
+                       break;
+                       
+               case LEFTMOUSE:
+                       if(event->val==0) {
+                               
+                               if(ABS(event->x - rmd->origx) < 2 && ABS(event->y - rmd->origy) < 2) {
+                                       rmd->ar->flag ^= RGN_FLAG_HIDDEN;
+                                       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+                               }                               
+                               MEM_freeN(op->customdata);
+                               op->customdata = NULL;
+
+                               return OPERATOR_FINISHED;
+                       }
+                       break;
+                       
+               case ESCKEY:
+                       ;
+       }
+       
+       return OPERATOR_RUNNING_MODAL;
+}
 
-       prop= RNA_def_property(ot->srna, "fac", PROP_FLOAT, PROP_NONE);
-       RNA_def_property_range(prop, 0.0, 1.0);
-       RNA_def_property_float_default(prop, 0.5f);
+
+static void SCREEN_OT_region_scale(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Scale Region Size";
+       ot->idname= "SCREEN_OT_region_scale";
+       
+       ot->invoke= region_scale_invoke;
+       ot->modal= region_scale_modal;
+       
+       ot->poll= ED_operator_areaactive;
 }
 
+
 /* ************** frame change operator ***************************** */
 
 
@@ -850,24 +1337,24 @@ static int frame_offset_exec(bContext *C, wmOperator *op)
        delta = RNA_int_get(op->ptr, "delta");
 
        CTX_data_scene(C)->r.cfra += delta;
-       WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
-       /* XXX: add WM_NOTE_TIME_CHANGED? */
+
+       WM_event_add_notifier(C, NC_SCENE|ND_FRAME, CTX_data_scene(C));
 
        return OPERATOR_FINISHED;
 }
 
-void ED_SCR_OT_frame_offset(wmOperatorType *ot)
+void SCREEN_OT_frame_offset(wmOperatorType *ot)
 {
        ot->name = "Frame Offset";
-       ot->idname = "ED_SCR_OT_frame_offset";
+       ot->idname = "SCREEN_OT_frame_offset";
 
        ot->exec= frame_offset_exec;
 
        ot->poll= ED_operator_screenactive;
-       ot->flag= OPTYPE_REGISTER;
+       ot->flag= 0;
 
        /* rna */
-       RNA_def_property(ot->srna, "delta", PROP_INT, PROP_NONE);
+       RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
 }
 
 /* ************** switch screen operator ***************************** */
@@ -877,42 +1364,52 @@ void ED_SCR_OT_frame_offset(wmOperatorType *ot)
 static int screen_set_exec(bContext *C, wmOperator *op)
 {
        bScreen *screen= CTX_wm_screen(C);
+       ScrArea *sa= CTX_wm_area(C);
+       int tot= BLI_countlist(&CTX_data_main(C)->screen);
        int delta= RNA_int_get(op->ptr, "delta");
        
        /* this screen is 'fake', solve later XXX */
-       if(CTX_wm_area(C)->full)
+       if(sa && sa->full)
                return OPERATOR_CANCELLED;
        
        if(delta==1) {
-               screen= screen->id.next;
-               if(screen==NULL) screen= CTX_data_main(C)->screen.first;
+               while(tot--) {
+                       screen= screen->id.next;
+                       if(screen==NULL) screen= CTX_data_main(C)->screen.first;
+                       if(screen->winid==0 && screen->full==0)
+                               break;
+               }
        }
        else if(delta== -1) {
-               screen= screen->id.prev;
-               if(screen==NULL) screen= CTX_data_main(C)->screen.last;
+               while(tot--) {
+                       screen= screen->id.prev;
+                       if(screen==NULL) screen= CTX_data_main(C)->screen.last;
+                       if(screen->winid==0 && screen->full==0)
+                               break;
+               }
        }
        else {
                screen= NULL;
        }
        
        if(screen) {
-               ed_screen_set(C, screen);
+               ED_screen_set(C, screen);
                return OPERATOR_FINISHED;
        }
        return OPERATOR_CANCELLED;
 }
 
-void ED_SCR_OT_screen_set(wmOperatorType *ot)
+void SCREEN_OT_screen_set(wmOperatorType *ot)
 {
        ot->name = "Set Screen";
-       ot->idname = "ED_SCR_OT_screen_set";
+       ot->idname = "SCREEN_OT_screen_set";
        
        ot->exec= screen_set_exec;
        ot->poll= ED_operator_screenactive;
        
        /* rna */
-       RNA_def_property(ot->srna, "screen", PROP_POINTER, PROP_NONE);
-       RNA_def_property(ot->srna, "delta", PROP_INT, PROP_NONE);
+       RNA_def_pointer_runtime(ot->srna, "screen", &RNA_Screen, "Screen", "");
+       RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
 }
 
 /* ************** screen full-area operator ***************************** */
@@ -921,17 +1418,19 @@ void ED_SCR_OT_screen_set(wmOperatorType *ot)
 /* function to be called outside UI context, or for redo */
 static int screen_full_area_exec(bContext *C, wmOperator *op)
 {
-       ed_screen_fullarea(C);
+       ed_screen_fullarea(C, CTX_wm_area(C));
        return OPERATOR_FINISHED;
 }
 
-void ED_SCR_OT_screen_full_area(wmOperatorType *ot)
+void SCREEN_OT_screen_full_area(wmOperatorType *ot)
 {
-       ot->name = "Toggle Full Area in Screen";
-       ot->idname = "ED_SCR_OT_screen_full_area";
+       ot->name = "Toggle Make Area Fullscreen";
+       ot->idname = "SCREEN_OT_screen_full_area";
        
        ot->exec= screen_full_area_exec;
-       ot->poll= ED_operator_screenactive;
+       ot->poll= ED_operator_areaactive;
+       ot->flag= 0;
+
 }
 
 
@@ -1054,8 +1553,12 @@ static int area_join_exec(bContext *C, wmOperator *op)
 static int area_join_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 
-       if(event->type==EVT_ACTIONZONE) {
+       if(event->type==EVT_ACTIONZONE_AREA) {
                sActionzoneData *sad= event->customdata;
+
+               if(sad->modifier>0) {
+                       return OPERATOR_PASS_THROUGH;
+               }
                
                /* verify *sad itself */
                if(sad==NULL || sad->sa1==NULL || sad->sa2==NULL)
@@ -1096,7 +1599,7 @@ static int area_join_cancel(bContext *C, wmOperator *op)
                jd->sa2->flag &= ~AREA_FLAG_DRAWJOINTO;
        }
 
-       WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
+       WM_event_add_notifier(C, NC_WINDOW, NULL);
        
        area_join_exit(C, op);
 
@@ -1144,7 +1647,7 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event)
                                                                jd->sa2 = NULL;
                                                        }
                                                }
-                                               WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
+                                               WM_event_add_notifier(C, NC_WINDOW, NULL);
                                        } 
                                        else {
                                                /* we are back in the area previously selected for keeping 
@@ -1169,7 +1672,7 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event)
                                                                jd->sa2->flag |= AREA_FLAG_DRAWJOINTO;
                                                        }
                                                }
-                                               WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
+                                               WM_event_add_notifier(C, NC_WINDOW, NULL);
                                        }
                                }
                        }
@@ -1177,7 +1680,7 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event)
                case LEFTMOUSE:
                        if(event->val==0) {
                                area_join_apply(C, op);
-                               WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+                               WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
                                area_join_exit(C, op);
                                return OPERATOR_FINISHED;
                        }
@@ -1191,30 +1694,24 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event)
 }
 
 /* Operator for joining two areas (space types) */
-void ED_SCR_OT_area_join(wmOperatorType *ot)
+void SCREEN_OT_area_join(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
-
        /* identifiers */
        ot->name= "Join area";
-       ot->idname= "ED_SCR_OT_area_join";
+       ot->idname= "SCREEN_OT_area_join";
        
        /* api callbacks */
        ot->exec= area_join_exec;
        ot->invoke= area_join_invoke;
        ot->modal= area_join_modal;
 
-       ot->poll= ED_operator_screenactive;
+       ot->poll= ED_operator_areaactive;
 
        /* rna */
-       prop= RNA_def_property(ot->srna, "x1", PROP_INT, PROP_NONE);
-       RNA_def_property_int_default(prop, -100);
-       prop= RNA_def_property(ot->srna, "y1", PROP_INT, PROP_NONE);
-       RNA_def_property_int_default(prop, -100);
-       prop= RNA_def_property(ot->srna, "x2", PROP_INT, PROP_NONE);
-       RNA_def_property_int_default(prop, -100);
-       prop= RNA_def_property(ot->srna, "y2", PROP_INT, PROP_NONE);
-       RNA_def_property_int_default(prop, -100);
+       RNA_def_int(ot->srna, "x1", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "y1", -100, INT_MIN, INT_MAX, "Y 1", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "x2", -100, INT_MIN, INT_MAX, "X 2", "", INT_MIN, INT_MAX);
+       RNA_def_int(ot->srna, "y2", -100, INT_MIN, INT_MAX, "Y 2", "", INT_MIN, INT_MAX);
 }
 
 /* ************** repeat last operator ***************************** */
@@ -1223,70 +1720,244 @@ static int repeat_last_exec(bContext *C, wmOperator *op)
 {
        wmOperator *lastop= CTX_wm_manager(C)->operators.last;
        
-       if(lastop) {
-               printf("repeat %s\n", lastop->type->idname);
-               lastop->type->exec(C, lastop);
-       }
+       if(lastop)
+               WM_operator_repeat(C, lastop);
        
-       return OPERATOR_FINISHED;
+       return OPERATOR_CANCELLED;
 }
 
-void ED_SCR_OT_repeat_last(wmOperatorType *ot)
+void SCREEN_OT_repeat_last(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Repeat Last";
-       ot->idname= "ED_SCR_OT_repeat_last";
+       ot->idname= "SCREEN_OT_repeat_last";
        
        /* api callbacks */
-       ot->invoke= WM_operator_confirm;        
        ot->exec= repeat_last_exec;
        
        ot->poll= ED_operator_screenactive;
        
 }
 
-/* ************** region split operator ***************************** */
-
-/* insert a region in the area region list */
-static int region_split_exec(bContext *C, wmOperator *op)
+static int repeat_history_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
-       ScrArea *sa= CTX_wm_area(C);
-       ARegion *ar= CTX_wm_region(C);
-       ARegion *newar= BKE_area_region_copy(ar);
-       int dir= RNA_enum_get(op->ptr, "dir");
-       
-       BLI_insertlinkafter(&sa->regionbase, CTX_wm_region(C), newar);
-       
-       newar->alignment= ar->alignment;
+       wmWindowManager *wm= CTX_wm_manager(C);
+       wmOperator *lastop;
+       uiPopupMenu *pup;
+       uiLayout *layout;
+       int items, i;
+       
+       items= BLI_countlist(&wm->operators);
+       if(items==0)
+               return OPERATOR_CANCELLED;
        
-       if(dir=='h')
-               ar->alignment= RGN_ALIGN_HSPLIT;
-       else
-               ar->alignment= RGN_ALIGN_VSPLIT;
+       pup= uiPupMenuBegin(C, op->type->name, 0);
+       layout= uiPupMenuLayout(pup);
+
+       for (i=items-1, lastop= wm->operators.last; lastop; lastop= lastop->prev, i--)
+               uiItemIntO(layout, lastop->type->name, 0, op->type->idname, "index", i);
+
+       uiPupMenuEnd(C, pup);
        
-       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+       return OPERATOR_CANCELLED;
+}
+
+static int repeat_history_exec(bContext *C, wmOperator *op)
+{
+       wmWindowManager *wm= CTX_wm_manager(C);
        
+       op= BLI_findlink(&wm->operators, RNA_int_get(op->ptr, "index"));
+       if(op) {
+               /* let's put it as last operator in list */
+               BLI_remlink(&wm->operators, op);
+               BLI_addtail(&wm->operators, op);
+               
+               WM_operator_repeat(C, op);
+       }
+                                        
        return OPERATOR_FINISHED;
 }
 
-void ED_SCR_OT_region_split(wmOperatorType *ot)
+void SCREEN_OT_repeat_history(wmOperatorType *ot)
 {
-       PropertyRNA *prop;
+       /* identifiers */
+       ot->name= "Repeat History";
+       ot->idname= "SCREEN_OT_repeat_history";
+       
+       /* api callbacks */
+       ot->invoke= repeat_history_invoke;
+       ot->exec= repeat_history_exec;
+       
+       ot->poll= ED_operator_screenactive;
+       
+       RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "", 0, 1000);
+}
+
+/* ********************** redo operator ***************************** */
+
+static int redo_last_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       wmWindowManager *wm= CTX_wm_manager(C);
+       wmOperator *lastop;
+
+       /* only for operators that are registered and did an undo push */
+       for(lastop= wm->operators.last; lastop; lastop= lastop->prev)
+               if((lastop->type->flag & OPTYPE_REGISTER) && (lastop->type->flag & OPTYPE_UNDO))
+                       break;
        
+       if(lastop)
+               WM_operator_redo_popup(C, lastop);
+
+       return OPERATOR_CANCELLED;
+}
+
+void SCREEN_OT_redo_last(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Redo Last";
+       ot->idname= "SCREEN_OT_redo_last";
+       
+       /* api callbacks */
+       ot->invoke= redo_last_invoke;
+       
+       ot->poll= ED_operator_screenactive;
+}
+
+/* ************** region split operator ***************************** */
+
+/* insert a region in the area region list */
+static int region_split_exec(bContext *C, wmOperator *op)
+{
+       ARegion *ar= CTX_wm_region(C);
+       
+       if(ar->regiontype==RGN_TYPE_HEADER)
+               BKE_report(op->reports, RPT_ERROR, "Cannot split header");
+       else if(ar->alignment==RGN_ALIGN_QSPLIT)
+               BKE_report(op->reports, RPT_ERROR, "Cannot split further");
+       else {
+               ScrArea *sa= CTX_wm_area(C);
+               ARegion *newar= BKE_area_region_copy(sa->type, ar);
+               int dir= RNA_enum_get(op->ptr, "type");
+       
+               BLI_insertlinkafter(&sa->regionbase, ar, newar);
+               
+               newar->alignment= ar->alignment;
+               
+               if(dir=='h')
+                       ar->alignment= RGN_ALIGN_HSPLIT;
+               else
+                       ar->alignment= RGN_ALIGN_VSPLIT;
+               
+               WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+       }
+       
+       return OPERATOR_FINISHED;
+}
+
+void SCREEN_OT_region_split(wmOperatorType *ot)
+{
        /* identifiers */
        ot->name= "Split Region";
-       ot->idname= "ED_SCR_OT_region_split";
+       ot->idname= "SCREEN_OT_region_split";
        
        /* api callbacks */
-       ot->invoke= WM_operator_confirm;
+       ot->invoke= WM_menu_invoke;
        ot->exec= region_split_exec;
        ot->poll= ED_operator_areaactive;
        
-       prop= RNA_def_property(ot->srna, "dir", PROP_ENUM, PROP_NONE);
-       RNA_def_property_enum_items(prop, prop_direction_items);
-       RNA_def_property_enum_default(prop, 'h');
+       RNA_def_enum(ot->srna, "type", prop_direction_items, 'h', "Direction", "");
+}
+
+/* ************** region four-split operator ***************************** */
+
+/* insert a region in the area region list */
+static int region_foursplit_exec(bContext *C, wmOperator *op)
+{
+       ARegion *ar= CTX_wm_region(C);
+       
+       /* some rules... */
+       if(ar->regiontype!=RGN_TYPE_WINDOW)
+               BKE_report(op->reports, RPT_ERROR, "Only window region can be 4-splitted");
+       else if(ar->alignment==RGN_ALIGN_QSPLIT) {
+               ScrArea *sa= CTX_wm_area(C);
+               ARegion *arn;
+               
+               /* keep current region */
+               ar->alignment= 0;
+               
+               if(sa->spacetype==SPACE_VIEW3D) {
+                       RegionView3D *rv3d= ar->regiondata;
+                       rv3d->viewlock= 0;
+                       rv3d->rflag &= ~RV3D_CLIPPING;
+               }
+               
+               for(ar= sa->regionbase.first; ar; ar= arn) {
+                       arn= ar->next;
+                       if(ar->alignment==RGN_ALIGN_QSPLIT) {
+                               ED_region_exit(C, ar);
+                               BKE_area_region_free(sa->type, ar);
+                               BLI_remlink(&sa->regionbase, ar);
+                               MEM_freeN(ar);
+                       }
+               }
+               WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+       }
+       else if(ar->next)
+               BKE_report(op->reports, RPT_ERROR, "Only last region can be 4-splitted");
+       else {
+               ScrArea *sa= CTX_wm_area(C);
+               ARegion *newar;
+               int count;
+               
+               ar->alignment= RGN_ALIGN_QSPLIT;
+               
+               for(count=0; count<3; count++) {
+                       newar= BKE_area_region_copy(sa->type, ar);
+                       BLI_addtail(&sa->regionbase, newar);
+               }
+               
+               /* lock views and set them */
+               if(sa->spacetype==SPACE_VIEW3D) {
+                       RegionView3D *rv3d;
+                       
+                       rv3d= ar->regiondata;
+                       rv3d->viewlock= RV3D_LOCKED; rv3d->view= V3D_VIEW_FRONT; rv3d->persp= V3D_ORTHO;
+                       
+                       ar= ar->next;
+                       rv3d= ar->regiondata;
+                       rv3d->viewlock= RV3D_LOCKED; rv3d->view= V3D_VIEW_TOP; rv3d->persp= V3D_ORTHO;
+                       
+                       ar= ar->next;
+                       rv3d= ar->regiondata;
+                       rv3d->viewlock= RV3D_LOCKED; rv3d->view= V3D_VIEW_RIGHT; rv3d->persp= V3D_ORTHO;
+                       
+                       ar= ar->next;
+                       rv3d= ar->regiondata;
+                       rv3d->view= V3D_VIEW_CAMERA; rv3d->persp= V3D_CAMOB;
+               }
+               
+               WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+       }
+       
+       
+       return OPERATOR_FINISHED;
+}
+
+void SCREEN_OT_region_foursplit(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Split Region in 4 Parts";
+       ot->idname= "SCREEN_OT_region_foursplit";
+       
+       /* api callbacks */
+       ot->invoke= WM_operator_confirm;
+       ot->exec= region_foursplit_exec;
+       ot->poll= ED_operator_areaactive;
+       ot->flag= OPTYPE_REGISTER;
 }
 
+
+
 /* ************** region flip operator ***************************** */
 
 /* flip a region alignment */
@@ -1303,55 +1974,173 @@ static int region_flip_exec(bContext *C, wmOperator *op)
        else if(ar->alignment==RGN_ALIGN_RIGHT)
                ar->alignment= RGN_ALIGN_LEFT;
        
-       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+       WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+       printf("executed region flip\n");
        
        return OPERATOR_FINISHED;
 }
 
-void ED_SCR_OT_region_flip(wmOperatorType *ot)
+
+void SCREEN_OT_region_flip(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Flip Region";
-       ot->idname= "ED_SCR_OT_region_flip";
+       ot->idname= "SCREEN_OT_region_flip";
        
        /* api callbacks */
-       ot->invoke= WM_operator_confirm;
        ot->exec= region_flip_exec;
        
        ot->poll= ED_operator_areaactive;
+       ot->flag= OPTYPE_REGISTER;
+
 }
 
-/* ****************** anim player, typically with timer ***************** */
+/* ****************** anim player, with timer ***************** */
 
-static int screen_animation_play(bContext *C, wmOperator *op, wmEvent *event)
+static int match_region_with_redraws(int spacetype, int regiontype, int redraws)
 {
-       wmWindow *win= CTX_wm_window(C);
+       if(regiontype==RGN_TYPE_WINDOW) {
+
+               switch (spacetype) {
+                       case SPACE_VIEW3D:
+                               if(redraws & TIME_ALL_3D_WIN)
+                                       return 1;
+                               break;
+                       case SPACE_IPO:
+                       case SPACE_ACTION:
+                       case SPACE_NLA:
+                               if(redraws & TIME_ALL_ANIM_WIN)
+                                       return 1;
+                               break;
+                       case SPACE_TIME:
+                               /* if only 1 window or 3d windows, we do timeline too */
+                               if(redraws & (TIME_ALL_ANIM_WIN|TIME_REGION|TIME_ALL_3D_WIN))
+                                       return 1;
+                               break;
+                       case SPACE_BUTS:
+                               if(redraws & TIME_ALL_BUTS_WIN)
+                                       return 1;
+                               break;
+                       case SPACE_SEQ:
+                               if(redraws & (TIME_SEQ|TIME_ALL_ANIM_WIN))
+                                       return 1;
+                               break;
+                       case SPACE_IMAGE:
+                               if(redraws & TIME_ALL_IMAGE_WIN)
+                                       return 1;
+                               break;
+                               
+               }
+       }
+       else if(regiontype==RGN_TYPE_UI) {
+               if(redraws & TIME_ALL_BUTS_WIN)
+                       return 1;
+       }
+       else if(regiontype==RGN_TYPE_HEADER) {
+               if(spacetype==SPACE_TIME)
+                       return 1;
+       }
+       return 0;
+}
+
+static int screen_animation_step(bContext *C, wmOperator *op, wmEvent *event)
+{
+       bScreen *screen= CTX_wm_screen(C);
        
-       if(win->animtimer==event->customdata) {
+       if(screen->animtimer==event->customdata) {
                Scene *scene= CTX_data_scene(C);
+               wmTimer *wt= screen->animtimer;
+               ScreenAnimData *sad= wt->customdata;
+               ScrArea *sa;
                
-               scene->r.cfra++;
-               if(scene->r.cfra > scene->r.efra)
-                       scene->r.cfra= scene->r.sfra;
+               if(scene->audio.flag & AUDIO_SYNC) {
+                       int step = floor(wt->duration * FPS);
+                       scene->r.cfra += step;
+                       wt->duration -= ((float)step)/FPS;
+               }
+               else
+                       scene->r.cfra++;
+               
+               if (scene->r.psfra) {
+                       if(scene->r.cfra > scene->r.pefra)
+                               scene->r.cfra= scene->r.psfra;
+               }
+               else {
+                       if(scene->r.cfra > scene->r.efra)
+                               scene->r.cfra= scene->r.sfra;
+               }
 
-               WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);
+               /* since we follow drawflags, we can't send notifier but tag regions ourselves */
+               ED_update_for_newframe(C, 1);
+               
+               for(sa= screen->areabase.first; sa; sa= sa->next) {
+                       ARegion *ar;
+                       for(ar= sa->regionbase.first; ar; ar= ar->next) {
+                               if(ar==sad->ar)
+                                       ED_region_tag_redraw(ar);
+                               else
+                                       if(match_region_with_redraws(sa->spacetype, ar->regiontype, sad->redraws))
+                                               ED_region_tag_redraw(ar);
+                       }
+               }
+               
+               //WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene);
                
                return OPERATOR_FINISHED;
        }
        return OPERATOR_PASS_THROUGH;
 }
 
-void ED_SCR_OT_animation_play(wmOperatorType *ot)
+static void SCREEN_OT_animation_step(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Animation Step";
+       ot->idname= "SCREEN_OT_animation_step";
+       
+       /* api callbacks */
+       ot->invoke= screen_animation_step;
+       
+       ot->poll= ED_operator_screenactive;
+       
+}
+
+/* ****************** anim player, starts or ends timer ***************** */
+
+/* toggle operator */
+static int screen_animation_play(bContext *C, wmOperator *op, wmEvent *event)
+{
+       bScreen *screen= CTX_wm_screen(C);
+       
+       if(screen->animtimer) {
+               ED_screen_animation_timer(C, 0, 0);
+       }
+       else {
+               /* todo: RNA properties to define play types */
+               ED_screen_animation_timer(C, TIME_REGION|TIME_ALL_3D_WIN, 1);
+               
+               if(screen->animtimer) {
+                       wmTimer *wt= screen->animtimer;
+                       ScreenAnimData *sad= wt->customdata;
+                       
+                       sad->ar= CTX_wm_region(C);
+               }
+       }
+       
+       return OPERATOR_FINISHED;
+}
+
+void SCREEN_OT_animation_play(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Animation player";
-       ot->idname= "ED_SCR_OT_animation_play";
+       ot->idname= "SCREEN_OT_animation_play";
        
        /* api callbacks */
        ot->invoke= screen_animation_play;
        
        ot->poll= ED_operator_screenactive;
        
+       
 }
 
 /* ************** border select operator (template) ***************************** */
@@ -1389,11 +2178,11 @@ static int border_select_do(bContext *C, wmOperator *op)
        return 1;
 }
 
-void ED_SCR_OT_border_select(wmOperatorType *ot)
+void SCREEN_OT_border_select(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Border select";
-       ot->idname= "ED_SCR_OT_border_select";
+       ot->idname= "SCREEN_OT_border_select";
        
        /* api callbacks */
        ot->exec= border_select_do;
@@ -1403,40 +2192,462 @@ void ED_SCR_OT_border_select(wmOperatorType *ot)
        ot->poll= ED_operator_areaactive;
        
        /* rna */
-       RNA_def_property(ot->srna, "event_type", PROP_INT, PROP_NONE);
-       RNA_def_property(ot->srna, "xmin", PROP_INT, PROP_NONE);
-       RNA_def_property(ot->srna, "xmax", PROP_INT, PROP_NONE);
-       RNA_def_property(ot->srna, "ymin", PROP_INT, PROP_NONE);
-       RNA_def_property(ot->srna, "ymax", PROP_INT, PROP_NONE);
+       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);
 
 }
 #endif
 
+/* ****************************** render invoking ***************** */
+
+/* set callbacks, exported to sequence render too. 
+Only call in foreground (UI) renders. */
+
+/* returns biggest area that is not uv/image editor. Note that it uses buttons */
+/* window as the last possible alternative.                                                                       */
+static ScrArea *biggest_non_image_area(bContext *C)
+{
+       bScreen *sc= CTX_wm_screen(C);
+       ScrArea *sa, *big= NULL;
+       int size, maxsize= 0, bwmaxsize= 0;
+       short foundwin= 0;
+       
+       for(sa= sc->areabase.first; sa; sa= sa->next) {
+               if(sa->winx > 30 && sa->winy > 30) {
+                       size= sa->winx*sa->winy;
+                       if(sa->spacetype == SPACE_BUTS) {
+                               if(foundwin == 0 && size > bwmaxsize) {
+                                       bwmaxsize= size;
+                                       big= sa;        
+                               }
+                       }
+                       else if(sa->spacetype != SPACE_IMAGE && size > maxsize) {
+                               maxsize= size;
+                               big= sa;
+                               foundwin= 1;
+                       }
+               }
+       }
+       
+       return big;
+}
+
+static ScrArea *biggest_area(bContext *C)
+{
+       bScreen *sc= CTX_wm_screen(C);
+       ScrArea *sa, *big= NULL;
+       int size, maxsize= 0;
+       
+       for(sa= sc->areabase.first; sa; sa= sa->next) {
+               size= sa->winx*sa->winy;
+               if(size > maxsize) {
+                       maxsize= size;
+                       big= sa;
+               }
+       }
+       return big;
+}
+
+
+static ScrArea *find_area_showing_r_result(bContext *C)
+{
+       bScreen *sc= CTX_wm_screen(C);
+       ScrArea *sa;
+       SpaceImage *sima;
+       
+       /* find an imagewindow showing render result */
+       for(sa=sc->areabase.first; sa; sa= sa->next) {
+               if(sa->spacetype==SPACE_IMAGE) {
+                       sima= sa->spacedata.first;
+                       if(sima->image && sima->image->type==IMA_TYPE_R_RESULT)
+                               break;
+               }
+       }
+       return sa;
+}
+
+static void screen_set_image_output(bContext *C)
+{
+       ScrArea *sa;
+       SpaceImage *sima;
+       
+       sa= find_area_showing_r_result(C);
+       
+       if(sa==NULL) {
+               /* find largest open non-image area */
+               sa= biggest_non_image_area(C);
+               if(sa) {
+                       ED_area_newspace(C, sa, SPACE_IMAGE);
+                       sima= sa->spacedata.first;
+                       
+                       /* makes ESC go back to prev space */
+                       sima->flag |= SI_PREVSPACE;
+               }
+               else {
+                       /* use any area of decent size */
+                       sa= biggest_area(C);
+                       if(sa->spacetype!=SPACE_IMAGE) {
+                               // XXX newspace(sa, SPACE_IMAGE);
+                               sima= sa->spacedata.first;
+                               
+                               /* makes ESC go back to prev space */
+                               sima->flag |= SI_PREVSPACE;
+                       }
+               }
+       }
+       
+       sima= sa->spacedata.first;
+       
+       /* get the correct image, and scale it */
+       sima->image= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
+       
+       if(G.displaymode==2) { // XXX
+               if(sa->full==0) {
+                       sima->flag |= SI_FULLWINDOW;
+                       
+                       ed_screen_fullarea(C, sa);
+               }
+       }
+       
+}
+
+/* executes blocking render */
+static int screen_render_exec(bContext *C, wmOperator *op)
+{
+       Scene *scene= CTX_data_scene(C);
+       Render *re= RE_GetRender(scene->id.name);
+       
+       if(re==NULL) {
+               re= RE_NewRender(scene->id.name);
+       }
+       RE_test_break_cb(re, NULL, (int (*)(void *)) blender_test_break);
+       
+       if(RNA_boolean_get(op->ptr, "anim"))
+               RE_BlenderAnim(re, scene, scene->r.sfra, scene->r.efra, scene->frame_step);
+       else
+               RE_BlenderFrame(re, scene, scene->r.cfra);
+       
+       // no redraw needed, we leave state as we entered it
+       ED_update_for_newframe(C, 1);
+       
+       WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, scene);
+
+       return OPERATOR_FINISHED;
+}
+
+typedef struct RenderJob {
+       Scene *scene;
+       Render *re;
+       wmWindow *win;
+       int anim;
+       Image *image;
+       ImageUser iuser;
+       short *stop;
+       short *do_update;
+} RenderJob;
+
+static void render_freejob(void *rjv)
+{
+       RenderJob *rj= rjv;
+       
+       MEM_freeN(rj);
+}
+
+/* called inside thread! */
+static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrect)
+{
+       RenderJob *rj= rjv;
+       ImBuf *ibuf;
+       float x1, y1, *rectf= NULL;
+       int ymin, ymax, xmin, xmax;
+       int rymin, rxmin;
+       char *rectc;
+       
+       ibuf= BKE_image_get_ibuf(rj->image, &rj->iuser);
+       if(ibuf==NULL) return;
+
+       /* if renrect argument, we only refresh scanlines */
+       if(renrect) {
+               /* if ymax==recty, rendering of layer is ready, we should not draw, other things happen... */
+               if(rr->renlay==NULL || renrect->ymax>=rr->recty)
+                       return;
+               
+               /* xmin here is first subrect x coord, xmax defines subrect width */
+               xmin = renrect->xmin + rr->crop;
+               xmax = renrect->xmax - xmin - rr->crop;
+               if (xmax<2) return;
+               
+               ymin= renrect->ymin + rr->crop;
+               ymax= renrect->ymax - ymin - rr->crop;
+               if(ymax<2)
+                       return;
+               renrect->ymin= renrect->ymax;
+               
+       }
+       else {
+               xmin = ymin = rr->crop;
+               xmax = rr->rectx - 2*rr->crop;
+               ymax = rr->recty - 2*rr->crop;
+       }
+       
+       /* xmin ymin is in tile coords. transform to ibuf */
+       rxmin= rr->tilerect.xmin + xmin;
+       if(rxmin >= ibuf->x) return;
+       rymin= rr->tilerect.ymin + ymin;
+       if(rymin >= ibuf->y) return;
+       
+       if(rxmin + xmax > ibuf->x)
+               xmax= ibuf->x - rxmin;
+       if(rymin + ymax > ibuf->y)
+               ymax= ibuf->y - rymin;
+       
+       if(xmax < 1 || ymax < 1) return;
+       
+       /* find current float rect for display, first case is after composit... still weak */
+       if(rr->rectf)
+               rectf= rr->rectf;
+       else {
+               if(rr->rect32)
+                       return;
+               else {
+                       if(rr->renlay==NULL || rr->renlay->rectf==NULL) return;
+                       rectf= rr->renlay->rectf;
+               }
+       }
+       if(rectf==NULL) return;
+       
+       rectf+= 4*(rr->rectx*ymin + xmin);
+       rectc= (char *)(ibuf->rect + ibuf->x*rymin + rxmin);
+
+       for(y1= 0; y1<ymax; y1++) {
+               float *rf= rectf;
+               char *rc= rectc;
+               
+               /* XXX temp. because crop offset */
+               if( rectc >= (char *)(ibuf->rect)) {
+                       for(x1= 0; x1<xmax; x1++, rf += 4, rc+=4) {
+                               rc[0]= FTOCHAR(rf[0]);
+                               rc[1]= FTOCHAR(rf[1]);
+                               rc[2]= FTOCHAR(rf[2]);
+                               rc[3]= FTOCHAR(rf[3]);
+                       }
+               }
+               rectf += 4*rr->rectx;
+               rectc += 4*ibuf->x;
+       }
+       
+       /* make jobs timer to send notifier */
+       *(rj->do_update)= 1;
+}
+
+static void render_startjob(void *rjv, short *stop, short *do_update)
+{
+       RenderJob *rj= rjv;
+       
+       rj->stop= stop;
+       rj->do_update= do_update;
+       
+       if(rj->anim)
+               RE_BlenderAnim(rj->re, rj->scene, rj->scene->r.sfra, rj->scene->r.efra, rj->scene->frame_step);
+       else
+               RE_BlenderFrame(rj->re, rj->scene, rj->scene->r.cfra);
+}
+
+/* called by render, check job 'stop' value or the global */
+static int render_breakjob(void *rjv)
+{
+       RenderJob *rj= rjv;
+       
+       if(G.afbreek)
+               return 1;
+       if(rj->stop && *(rj->stop))
+               return 1;
+       return 0;
+}
+
+/* catch esc */
+static int screen_render_modal(bContext *C, wmOperator *op, wmEvent *event)
+{
+       /* no running blender, remove handler and pass through */
+       if(0==WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C)))
+          return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
+       
+       /* running render */
+       switch (event->type) {
+               case ESCKEY:
+                       return OPERATOR_RUNNING_MODAL;
+                       break;
+       }
+       return OPERATOR_PASS_THROUGH;
+}
+
+/* using context, starts job */
+static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+       /* new render clears all callbacks */
+       Scene *scene= CTX_data_scene(C);
+       Render *re;
+       wmJob *steve;
+       RenderJob *rj;
+       Image *ima;
+       
+       /* only one job at a time */
+       if(WM_jobs_test(CTX_wm_manager(C), scene))
+               return OPERATOR_CANCELLED;
+       
+       /* handle UI stuff */
+       WM_cursor_wait(1);
+
+       /* flush multires changes (for sculpt) */
+       multires_force_update(CTX_data_active_object(C));
+       
+       // get editmode results
+       // store spare
+       // get view3d layer, local layer, make this nice api call to render
+       // store spare
+       
+       /* ensure at least 1 area shows result */
+       screen_set_image_output(C);
+
+       /* job custom data */
+       rj= MEM_callocN(sizeof(RenderJob), "render job");
+       rj->scene= scene;
+       rj->win= CTX_wm_window(C);
+       rj->anim= RNA_boolean_get(op->ptr, "anim");
+       rj->iuser.scene= scene;
+       rj->iuser.ok= 1;
+       
+       /* setup job */
+       steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene);
+       WM_jobs_customdata(steve, rj, render_freejob);
+       WM_jobs_timer(steve, 0.2, NC_SCENE|ND_RENDER_RESULT, 0);
+       WM_jobs_callbacks(steve, render_startjob, NULL, NULL);
+       
+       /* get a render result image, and make sure it is empty */
+       ima= BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result");
+       BKE_image_signal(ima, NULL, IMA_SIGNAL_FREE);
+       rj->image= ima;
+       
+       /* setup new render */
+       re= RE_NewRender(scene->id.name);
+       RE_test_break_cb(re, rj, render_breakjob);
+       RE_display_draw_cb(re, rj, image_rect_update);
+       rj->re= re;
+       G.afbreek= 0;
+       
+       //      BKE_report in render!
+       //      RE_error_cb(re, error_cb);
+
+       WM_jobs_start(CTX_wm_manager(C), steve);
+       
+       G.afbreek= 0;
+       
+       WM_cursor_wait(0);
+       WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, scene);
+
+       /* add modal handler for ESC */
+       WM_event_add_modal_handler(C, &CTX_wm_window(C)->handlers, op);
+       
+       return OPERATOR_RUNNING_MODAL;
+}
+
+
+/* contextual render, using current scene, view3d? */
+void SCREEN_OT_render(wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Render";
+       ot->idname= "SCREEN_OT_render";
+       
+       /* api callbacks */
+       ot->invoke= screen_render_invoke;
+       ot->modal= screen_render_modal;
+       ot->exec= screen_render_exec;
+       
+       ot->poll= ED_operator_screenactive;
+       
+       RNA_def_int(ot->srna, "layers", 0, 0, INT_MAX, "Layers", "", 0, INT_MAX);
+       RNA_def_boolean(ot->srna, "anim", 0, "Animation", "");
+}
+
+/* *********************** cancel render viewer *************** */
+
+static int render_view_cancel_exec(bContext *C, wmOperator *unused)
+{
+       ScrArea *sa= CTX_wm_area(C);
+       SpaceImage *sima= sa->spacedata.first;
+       
+       if(sima->flag & SI_PREVSPACE) {
+               sima->flag &= ~SI_PREVSPACE;
+               
+               if(sima->flag & SI_FULLWINDOW) {
+                       sima->flag &= ~SI_FULLWINDOW;
+                       ED_screen_full_prevspace(C);
+               }
+               else
+                       ED_area_prevspace(C);
+       }
+       else if(sima->flag & SI_FULLWINDOW) {
+               sima->flag &= ~SI_FULLWINDOW;
+               ed_screen_fullarea(C, sa);
+       }               
+       
+       return OPERATOR_FINISHED;
+}
+
+void SCREEN_OT_render_view_cancel(struct wmOperatorType *ot)
+{
+       /* identifiers */
+       ot->name= "Cancel Render View";
+       ot->idname= "SCREEN_OT_render_view_cancel";
+       
+       /* api callbacks */
+       ot->exec= render_view_cancel_exec;
+       ot->poll= ED_operator_image_active;
+}
+
+
 /* ****************  Assigning operatortypes to global list, adding handlers **************** */
 
 /* called in spacetypes.c */
 void ED_operatortypes_screen(void)
 {
        /* generic UI stuff */
-       WM_operatortype_append(ED_SCR_OT_actionzone);
-       WM_operatortype_append(ED_SCR_OT_repeat_last);
+       WM_operatortype_append(SCREEN_OT_actionzone);
+       WM_operatortype_append(SCREEN_OT_repeat_last);
+       WM_operatortype_append(SCREEN_OT_repeat_history);
+       WM_operatortype_append(SCREEN_OT_redo_last);
        
        /* screen tools */
-       WM_operatortype_append(ED_SCR_OT_area_move);
-       WM_operatortype_append(ED_SCR_OT_area_split);
-       WM_operatortype_append(ED_SCR_OT_area_join);
-       WM_operatortype_append(ED_SCR_OT_area_rip);
-       WM_operatortype_append(ED_SCR_OT_region_split);
-       WM_operatortype_append(ED_SCR_OT_region_flip);
-       WM_operatortype_append(ED_SCR_OT_screen_set);
-       WM_operatortype_append(ED_SCR_OT_screen_full_area);
+       WM_operatortype_append(SCREEN_OT_area_move);
+       WM_operatortype_append(SCREEN_OT_area_split);
+       WM_operatortype_append(SCREEN_OT_area_join);
+       WM_operatortype_append(SCREEN_OT_area_dupli);
+       WM_operatortype_append(SCREEN_OT_area_swap);
+       WM_operatortype_append(SCREEN_OT_region_split);
+       WM_operatortype_append(SCREEN_OT_region_foursplit);
+       WM_operatortype_append(SCREEN_OT_region_flip);
+       WM_operatortype_append(SCREEN_OT_region_scale);
+       WM_operatortype_append(SCREEN_OT_screen_set);
+       WM_operatortype_append(SCREEN_OT_screen_full_area);
+       WM_operatortype_append(SCREEN_OT_screenshot);
+       WM_operatortype_append(SCREEN_OT_screencast);
        
        /*frame changes*/
-       WM_operatortype_append(ED_SCR_OT_frame_offset);
-       WM_operatortype_append(ED_SCR_OT_animation_play);
+       WM_operatortype_append(SCREEN_OT_frame_offset);
+       WM_operatortype_append(SCREEN_OT_animation_step);
+       WM_operatortype_append(SCREEN_OT_animation_play);
+       
+       /* render */
+       WM_operatortype_append(SCREEN_OT_render);
+       WM_operatortype_append(SCREEN_OT_render_view_cancel);
        
        /* tools shared by more space types */
-       ED_marker_operatortypes();      
+       WM_operatortype_append(ED_OT_undo);
+       WM_operatortype_append(ED_OT_redo);     
        
 }
 
@@ -1445,34 +2656,63 @@ void ED_keymap_screen(wmWindowManager *wm)
 {
        ListBase *keymap= WM_keymap_listbase(wm, "Screen", 0, 0);
        
-       WM_keymap_verify_item(keymap, "ED_SCR_OT_actionzone", LEFTMOUSE, KM_PRESS, 0, 0);
+       /* standard timers */
+       WM_keymap_add_item(keymap, "SCREEN_OT_animation_step", TIMER0, KM_ANY, KM_ANY, 0);
+       
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, 0, 0)->ptr, "modifier", 0);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "modifier", 1);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE, KM_PRESS, KM_ALT, 0)->ptr, "modifier", 2);
        
-       WM_keymap_verify_item(keymap, "ED_SCR_OT_area_move", LEFTMOUSE, KM_PRESS, 0, 0);
-       WM_keymap_verify_item(keymap, "ED_SCR_OT_area_split", EVT_ACTIONZONE, 0, 0, 0); /* action tria */
-       WM_keymap_verify_item(keymap, "ED_SCR_OT_area_join", EVT_ACTIONZONE, 0, 0, 0);  /* action tria */ 
-       WM_keymap_verify_item(keymap, "ED_SCR_OT_area_rip", RKEY, KM_PRESS, KM_ALT, 0);
-       RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_screen_set", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", 1);
-       RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_screen_set", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", -1);
-       WM_keymap_add_item(keymap, "ED_SCR_OT_screen_full_area", UPARROWKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "ED_SCR_OT_screen_full_area", DOWNARROWKEY, KM_PRESS, KM_CTRL, 0);
-       WM_keymap_add_item(keymap, "ED_SCR_OT_screen_full_area", SPACEKEY, KM_PRESS, KM_CTRL, 0);
+       /* screen tools */
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_split", EVT_ACTIONZONE_AREA, 0, 0, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_join", EVT_ACTIONZONE_AREA, 0, 0, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_dupli", EVT_ACTIONZONE_AREA, 0, KM_SHIFT, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_swap", EVT_ACTIONZONE_AREA, 0, KM_ALT, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_region_scale", EVT_ACTIONZONE_REGION, 0, 0, 0);
+                       /* area move after action zones */
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_move", LEFTMOUSE, KM_PRESS, 0, 0);
+       
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", 1);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", -1);
+       WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", UPARROWKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", DOWNARROWKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", SPACEKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_screenshot", F3KEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_screencast", F3KEY, KM_PRESS, KM_ALT, 0);
 
         /* tests */
-       RNA_enum_set(WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, 0, 0)->ptr, "dir", 'h');
-       RNA_enum_set(WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "dir", 'v');
+       WM_keymap_add_item(keymap, "SCREEN_OT_region_split", SKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_region_foursplit", SKEY, KM_PRESS, KM_CTRL|KM_ALT|KM_SHIFT, 0);
+       
+       WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_last", F4KEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0);
+       
+       RNA_string_set(WM_keymap_add_item(keymap, "SCRIPT_OT_python_file_run", F7KEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py");
+       WM_keymap_verify_item(keymap, "SCRIPT_OT_python_run_ui_scripts", F8KEY, KM_PRESS, 0, 0);
+
+       /* files */
+       WM_keymap_add_item(keymap, "FILE_OT_exec", RETKEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "FILE_OT_cancel", ESCKEY, KM_PRESS, 0, 0);
+       
+       /* undo */
+       WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_OSKEY, 0);
+       WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+       WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
                                                  
-       /*frame offsets*/
-       WM_keymap_add_item(keymap, "ED_SCR_OT_animation_play", TIMER, KM_ANY, 0, 0);
-       RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", UPARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 10);
-       RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -10);
-       RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1);
-       RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
-
-       WM_keymap_add_item(keymap, "ED_SCR_OT_region_flip", F5KEY, KM_PRESS, 0, 0);
-       WM_keymap_verify_item(keymap, "ED_SCR_OT_repeat_last", F4KEY, KM_PRESS, 0, 0);
-       
-       /* screen level global keymaps */
-       // err...
-       ED_marker_keymap(wm);
+       /* render */
+       WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY, KM_PRESS, 0, 0);
+       
+       /* frame offsets & play */
+       keymap= WM_keymap_listbase(wm, "Frames", 0, 0);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", UPARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 10);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -10);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1);
+       RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
+       WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT, 0);
+       
 }