2.5
[blender-staging.git] / source / blender / editors / screen / screen_ops.c
index 98012119c5009069a35b54b8df4a2e52efe7f3a7..c991a63e762c4786c91deb67b52079e6c009e99b 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include <math.h>
+
 #include "MEM_guardedalloc.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_object_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_curve_types.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;
@@ -113,11 +136,7 @@ int ED_operator_timeline_active(bContext *C)
 
 int ED_operator_outliner_active(bContext *C)
 {
-       if(ed_spacetype_test(C, SPACE_OOPS)) {
-               SpaceOops *so= (SpaceOops *)CTX_wm_space_data(C);
-               return (so->type == SO_OUTLINER);
-       }
-       return 0;
+       return ed_spacetype_test(C, SPACE_OUTLINER);
 }
 
 int ED_operator_file_active(bContext *C)
@@ -137,7 +156,12 @@ int ED_operator_buttons_active(bContext *C)
 
 int ED_operator_node_active(bContext *C)
 {
-       return ed_spacetype_test(C, SPACE_NODE);
+       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)
@@ -150,6 +174,11 @@ 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);
@@ -163,28 +192,92 @@ int ED_operator_editmesh(bContext *C)
        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= ((Mesh *)obedit->data)->edit_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;
+       }
+
+       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) && (CustomData_has_layer(&em->fdata, CD_MTFACE)))
+       if(em && (em->faces.first)) {
+               BKE_mesh_end_editmesh(obedit->data, em);
                return 1;
+       }
 
+       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 != ((Mesh *)obedit->data)->edit_mesh;
+               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 ************************** */
 
@@ -214,7 +307,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 */
@@ -283,6 +376,8 @@ static void actionzone_apply(bContext *C, wmOperator *op)
 {
        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;
@@ -344,29 +439,144 @@ void SCREEN_OT_actionzone(wmOperatorType *ot)
        ot->modal= actionzone_modal;
        
        ot->poll= ED_operator_areaactive;
+       RNA_def_int(ot->srna, "modifier", 0, 0, 2, "modifier", "modifier state", 0, 2);
+}
+
+/* ************** swap area operator *********************************** */
+
+/* operator state vars used:  
+                                       sa1             start area
+                                       sa2             area to swap with
+
+       functions:
+
+       init()   set custom data for operator, based on actionzone event custom data
+
+       cancel()        cancel the operator
+
+       exit()  cleanup, send notifier
+
+       callbacks:
+
+       invoke() gets called on shift+lmb drag in actionzone
+            call init(), add handler
+
+       modal()  accept modal events while doing it
+
+*/
+
+typedef struct sAreaSwapData {
+       ScrArea *sa1, *sa2;
+} sAreaSwapData;
+
+static int area_swap_init(bContext *C, wmOperator *op, wmEvent *event)
+{
+       sAreaSwapData *sd= NULL;
+       sActionzoneData *sad= event->customdata;
+
+       if(sad==NULL || sad->sa1==NULL)
+                                       return 0;
+       
+       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)
+{
 
-/* *********** Rip area operator ****************** */
+       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;
+}
+
+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 */
-/* (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)
+static int area_dupli_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
        wmWindow *newwin, *win;
        bScreen *newsc, *sc;
        ScrArea *sa;
        rcti rect;
+       sActionzoneData *sad= event->customdata;
+
+       if(sad==NULL)
+               return OPERATOR_PASS_THROUGH;
        
        win= CTX_wm_window(C);
        sc= CTX_wm_screen(C);
-       sa= CTX_wm_area(C);
+       sa= sad->sa1;
 
        /*  poll() checks area context, but we don't accept full-area windows */
-       if(sc->full != SCREENNORMAL) 
+       if(sc->full != SCREENNORMAL) {
+               actionzone_exit(C, op);
                return OPERATOR_CANCELLED;
+       }
        
        /* adds window to WM */
        rect= sa->totrct;
@@ -382,17 +592,18 @@ static int screen_area_rip_op(bContext *C, wmOperator *op)
        
        /* screen, areas init */
        WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+
+       actionzone_exit(C, op);
        
        return OPERATOR_FINISHED;
 }
 
-void SCREEN_OT_area_rip(wmOperatorType *ot)
+void SCREEN_OT_area_dupli(wmOperatorType *ot)
 {
-       ot->name= "Rip Area into New Window";
-       ot->idname= "SCREEN_OT_area_rip";
+       ot->name= "Duplicate Area into New Window";
+       ot->idname= "SCREEN_OT_area_dupli";
        
-       ot->invoke= WM_operator_confirm;
-       ot->exec= screen_area_rip_op;
+       ot->invoke= area_dupli_invoke;
        ot->poll= ED_operator_areaactive;
 }
 
@@ -807,6 +1018,10 @@ static int area_split_invoke(bContext *C, wmOperator *op, wmEvent *event)
        if(event->type==EVT_ACTIONZONE) {
                sActionzoneData *sad= event->customdata;
                int dir;
+
+               if(sad->modifier>0) {
+                       return OPERATOR_PASS_THROUGH;
+               }
                
                /* verify *sad itself */
                if(sad==NULL || sad->sa1==NULL || sad->az==NULL)
@@ -952,6 +1167,7 @@ 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, NC_SCENE|ND_FRAME, CTX_data_scene(C));
 
        return OPERATOR_FINISHED;
@@ -965,7 +1181,7 @@ void SCREEN_OT_frame_offset(wmOperatorType *ot)
        ot->exec= frame_offset_exec;
 
        ot->poll= ED_operator_screenactive;
-       ot->flag= OPTYPE_REGISTER;
+       ot->flag= 0;
 
        /* rna */
        RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
@@ -978,26 +1194,36 @@ void SCREEN_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;
@@ -1022,17 +1248,19 @@ void SCREEN_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 SCREEN_OT_screen_full_area(wmOperatorType *ot)
 {
-       ot->name = "Toggle Full Area in Screen";
+       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;
+
 }
 
 
@@ -1157,6 +1385,10 @@ static int area_join_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
        if(event->type==EVT_ACTIONZONE) {
                sActionzoneData *sad= event->customdata;
+
+               if(sad->modifier>0) {
+                       return OPERATOR_PASS_THROUGH;
+               }
                
                /* verify *sad itself */
                if(sad==NULL || sad->sa1==NULL || sad->sa2==NULL)
@@ -1303,7 +1535,7 @@ void SCREEN_OT_area_join(wmOperatorType *ot)
        ot->invoke= area_join_invoke;
        ot->modal= area_join_modal;
 
-       ot->poll= ED_operator_screenactive;
+       ot->poll= ED_operator_areaactive;
 
        /* rna */
        RNA_def_int(ot->srna, "x1", -100, INT_MIN, INT_MAX, "X 1", "", INT_MIN, INT_MAX);
@@ -1318,14 +1550,10 @@ static int repeat_last_exec(bContext *C, wmOperator *op)
 {
        wmOperator *lastop= CTX_wm_manager(C)->operators.last;
        
-       if(lastop) {
-               if(lastop->type->poll==NULL || lastop->type->poll(C)) {
-                       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 SCREEN_OT_repeat_last(wmOperatorType *ot)
@@ -1345,23 +1573,23 @@ static int repeat_history_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
        wmWindowManager *wm= CTX_wm_manager(C);
        wmOperator *lastop;
+       uiPopupMenu *pup;
+       uiLayout *layout;
        int items, i;
-       char *menu, *p;
        
        items= BLI_countlist(&wm->operators);
        if(items==0)
                return OPERATOR_CANCELLED;
        
-       menu= MEM_callocN(items * OP_MAX_TYPENAME, "string");
-       
-       p= menu + sprintf(menu, "%s %%t", op->type->name);
+       pup= uiPupMenuBegin(C, op->type->name, 0);
+       layout= uiPupMenuLayout(pup);
+
        for (i=items-1, lastop= wm->operators.last; lastop; lastop= lastop->prev, i--)
-               p+= sprintf(p, "|%s %%x%d", lastop->type->name, i);
-       
-       uiPupmenuOperator(C, i/20, op, "index", menu);
-       MEM_freeN(menu);
+               uiItemIntO(layout, lastop->type->name, 0, op->type->idname, "index", i);
+
+       uiPupMenuEnd(C, pup);
        
-       return OPERATOR_RUNNING_MODAL;
+       return OPERATOR_CANCELLED;
 }
 
 static int repeat_history_exec(bContext *C, wmOperator *op)
@@ -1374,10 +1602,7 @@ static int repeat_history_exec(bContext *C, wmOperator *op)
                BLI_remlink(&wm->operators, op);
                BLI_addtail(&wm->operators, op);
                
-               if(op->type->poll==NULL || op->type->poll(C)) {
-                       printf("repeat %s\n", op->type->idname);
-                       op->type->exec(C, op);
-               }
+               WM_operator_repeat(C, op);
        }
                                         
        return OPERATOR_FINISHED;
@@ -1398,6 +1623,36 @@ void SCREEN_OT_repeat_history(wmOperatorType *ot)
        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 */
@@ -1463,6 +1718,7 @@ static int region_foursplit_exec(bContext *C, wmOperator *op)
                if(sa->spacetype==SPACE_VIEW3D) {
                        RegionView3D *rv3d= ar->regiondata;
                        rv3d->viewlock= 0;
+                       rv3d->rflag &= ~RV3D_CLIPPING;
                }
                
                for(ar= sa->regionbase.first; ar; ar= arn) {
@@ -1527,6 +1783,7 @@ void SCREEN_OT_region_foursplit(wmOperatorType *ot)
        ot->invoke= WM_operator_confirm;
        ot->exec= region_foursplit_exec;
        ot->poll= ED_operator_areaactive;
+       ot->flag= OPTYPE_REGISTER;
 }
 
 
@@ -1548,10 +1805,43 @@ static int region_flip_exec(bContext *C, wmOperator *op)
                ar->alignment= RGN_ALIGN_LEFT;
        
        WM_event_add_notifier(C, NC_SCREEN|NA_EDITED, NULL);
+       printf("executed region flip\n");
        
        return OPERATOR_FINISHED;
 }
 
+static void testfunc(bContext *C, void *argv, int arg)
+{
+       printf("arg %d\n", arg);
+}
+
+static void newlevel1(bContext *C, uiLayout *layout, void *arg)
+{
+       uiLayoutFunc(layout, testfunc, NULL);
+       
+       uiItemV(layout, "First", ICON_PROP_ON, 1);
+       uiItemV(layout, "Second", ICON_PROP_CON, 2);
+       uiItemV(layout, "Third", ICON_SMOOTHCURVE, 3);
+       uiItemV(layout, "Fourth", ICON_SHARPCURVE, 4);  
+}
+
+static int testing123(bContext *C, wmOperator *op, wmEvent *event)
+{
+       uiPopupMenu *pup= uiPupMenuBegin(C, "Hello world", 0);
+       uiLayout *layout= uiPupMenuLayout(pup);
+       
+       uiLayoutContext(layout, WM_OP_EXEC_DEFAULT);
+       uiItemO(layout, NULL, ICON_PROP_ON, "SCREEN_OT_region_flip");
+       uiItemO(layout, NULL, ICON_PROP_CON, "SCREEN_OT_screen_full_area");
+       uiItemO(layout, NULL, ICON_SMOOTHCURVE, "SCREEN_OT_region_foursplit");
+       uiItemMenuF(layout, "Submenu", 0, newlevel1);
+       
+       uiPupMenuEnd(C, pup);
+       
+       /* this operator is only for a menu, not used further */
+       return OPERATOR_CANCELLED;
+}
+
 void SCREEN_OT_region_flip(wmOperatorType *ot)
 {
        /* identifiers */
@@ -1559,22 +1849,81 @@ void SCREEN_OT_region_flip(wmOperatorType *ot)
        ot->idname= "SCREEN_OT_region_flip";
        
        /* api callbacks */
-       ot->invoke= WM_operator_confirm;
+       ot->invoke= testing123; // XXX WM_operator_confirm;
        ot->exec= region_flip_exec;
        
        ot->poll= ED_operator_areaactive;
+       ot->flag= OPTYPE_REGISTER;
+       
+       RNA_def_int(ot->srna, "test", 0, INT_MIN, INT_MAX, "test", "", INT_MIN, INT_MAX);
+
 }
 
-/* ****************** 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)
+{
+       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(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->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)
@@ -1585,13 +1934,65 @@ static int screen_animation_play(bContext *C, wmOperator *op, wmEvent *event)
                                scene->r.cfra= scene->r.sfra;
                }
 
-               WM_event_add_notifier(C, NC_SCENE|ND_FRAME, CTX_data_scene(C));
+               /* 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;
 }
 
+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 */
@@ -1603,6 +2004,7 @@ void SCREEN_OT_animation_play(wmOperatorType *ot)
        
        ot->poll= ED_operator_screenactive;
        
+       
 }
 
 /* ************** border select operator (template) ***************************** */
@@ -1663,6 +2065,415 @@ void SCREEN_OT_border_select(wmOperatorType *ot)
 }
 #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(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 */
@@ -1672,26 +2483,34 @@ void ED_operatortypes_screen(void)
        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(SCREEN_OT_area_move);
        WM_operatortype_append(SCREEN_OT_area_split);
        WM_operatortype_append(SCREEN_OT_area_join);
-       WM_operatortype_append(SCREEN_OT_area_rip);
+       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_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(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 */
        WM_operatortype_append(ED_OT_undo);
-       WM_operatortype_append(ED_OT_redo);
-       ED_marker_operatortypes();      
+       WM_operatortype_append(ED_OT_redo);     
        
 }
 
@@ -1700,41 +2519,60 @@ void ED_keymap_screen(wmWindowManager *wm)
 {
        ListBase *keymap= WM_keymap_listbase(wm, "Screen", 0, 0);
        
-       WM_keymap_verify_item(keymap, "SCREEN_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);
        
+       /* screen tools */
        WM_keymap_verify_item(keymap, "SCREEN_OT_area_move", LEFTMOUSE, KM_PRESS, 0, 0);
        WM_keymap_verify_item(keymap, "SCREEN_OT_area_split", EVT_ACTIONZONE, 0, 0, 0);
        WM_keymap_verify_item(keymap, "SCREEN_OT_area_join", EVT_ACTIONZONE, 0, 0, 0);
-       WM_keymap_verify_item(keymap, "SCREEN_OT_area_rip", RKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_dupli", EVT_ACTIONZONE, 0, KM_SHIFT, 0);
+       WM_keymap_verify_item(keymap, "SCREEN_OT_area_swap", EVT_ACTIONZONE, 0, KM_ALT, 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 */
        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);
        
-       /*frame offsets*/
-       WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", TIMER0, KM_ANY, KM_ANY, 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_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);
                                                  
-       /* 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);
+       
 }