svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / blender / editors / space_time / space_time.c
index 78afe75d013e91f738436995906a21fe25a2656c..c4ca4d8522fafe151d14fb019e5015f6a57b677b 100644 (file)
 
 #include "BLI_blenlib.h"
 
+#include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_screen.h"
 
-#include "ED_area.h"
+#include "ED_space_api.h"
 #include "ED_screen.h"
 #include "ED_util.h"
 
@@ -64,7 +65,7 @@
 /* draws a current frame indicator for the TimeLine */
 static void time_draw_cfra_time(const bContext *C, SpaceTime *stime, ARegion *ar)
 {
-       Scene *scene= C->scene;
+       Scene *scene= CTX_data_scene(C);
        float vec[2];
        
        vec[0]= scene->r.cfra*scene->r.framelen;
@@ -84,15 +85,16 @@ static void time_draw_cfra_time(const bContext *C, SpaceTime *stime, ARegion *ar
 
 static void time_draw_sfra_efra(const bContext *C, SpaceTime *stime, ARegion *ar)
 {
-    View2D *v2d= UI_view2d_fromcontext(C);
+       View2D *v2d= UI_view2d_fromcontext(C);
+       Scene *scene= CTX_data_scene(C);
        
        /* draw darkened area outside of active timeline 
         * frame range used is preview range or scene range */
        UI_ThemeColorShade(TH_BACK, -25);
 
        if (PSFRA < PEFRA) {
-               glRectf(v2d->cur.xmin, v2d->cur.ymin, PSFRA, v2d->cur.ymax);
-               glRectf(PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
+               glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
+               glRectf((float)PEFRA, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
        }
        else {
                glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, v2d->cur.ymax);
@@ -100,8 +102,8 @@ static void time_draw_sfra_efra(const bContext *C, SpaceTime *stime, ARegion *ar
 
        UI_ThemeColorShade(TH_BACK, -60);
        /* thin lines where the actual frames are */
-       fdrawline(PSFRA, v2d->cur.ymin, PSFRA, v2d->cur.ymax);
-       fdrawline(PEFRA, v2d->cur.ymin, PEFRA, v2d->cur.ymax);
+       fdrawline((float)PSFRA, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
+       fdrawline((float)PEFRA, v2d->cur.ymin, (float)PEFRA, v2d->cur.ymax);
 }
 
 /* add handlers, stuff you only do once or on area/region changes */
@@ -109,7 +111,7 @@ static void time_main_area_init(wmWindowManager *wm, ARegion *ar)
 {
        ListBase *keymap;
        
-       UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy);
+       UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy);
        
        /* own keymap */
        keymap= WM_keymap_listbase(wm, "TimeLine", SPACE_TIME, 0);      /* XXX weak? */
@@ -120,7 +122,7 @@ static void time_main_area_init(wmWindowManager *wm, ARegion *ar)
 static void time_main_area_draw(const bContext *C, ARegion *ar)
 {
        /* draw entirely, view changes should be handled here */
-       SpaceTime *stime= C->area->spacedata.first;
+       SpaceTime *stime= (SpaceTime*)CTX_wm_space_data(C);
        View2D *v2d= &ar->v2d;
        View2DGrid *grid;
        View2DScrollers *scrollers;
@@ -139,7 +141,7 @@ static void time_main_area_draw(const bContext *C, ARegion *ar)
 
        /* grid */
        unit= (stime->flag & TIME_DRAWFRAMES)? V2D_UNIT_FRAMES: V2D_UNIT_SECONDS;
-       grid= UI_view2d_grid_calc(C, v2d, unit, V2D_GRID_CLAMP, ar->winx, ar->winy);
+       grid= UI_view2d_grid_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY, ar->winx, ar->winy);
        UI_view2d_grid_draw(C, v2d, grid, (V2D_VERTICAL_LINES|V2D_VERTICAL_AXIS));
        UI_view2d_grid_free(grid);
 
@@ -162,10 +164,23 @@ static void time_main_area_draw(const bContext *C, ARegion *ar)
 static void time_main_area_listener(ARegion *ar, wmNotifier *wmn)
 {
        /* context changes */
+       switch(wmn->category) {
+               
+               case NC_SCENE:
+                       /* any scene change for now */
+                       ED_region_tag_redraw(ar);
+                       break;
+       }
 }
 
 /* ************************ header time area region *********************** */
 
+/* add handlers, stuff you only do once or on area/region changes */
+static void time_header_area_init(wmWindowManager *wm, ARegion *ar)
+{
+       UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_HEADER, ar->winx, ar->winy);
+}
+
 static void time_header_area_draw(const bContext *C, ARegion *ar)
 {
        float col[3];
@@ -178,49 +193,82 @@ static void time_header_area_draw(const bContext *C, ARegion *ar)
                
        glClearColor(col[0], col[1], col[2], 0.0);
        glClear(GL_COLOR_BUFFER_BIT);
-
+       
+       /* set view2d view matrix for scrolling (without scrollers) */
+       UI_view2d_view_ortho(C, &ar->v2d);
+       
        time_header_buttons(C, ar);
+       
+       /* restore view matrix? */
+       UI_view2d_view_restore(C);
 }
 
-static void time_header_area_free(ARegion *ar)
+static void time_header_area_listener(ARegion *ar, wmNotifier *wmn)
 {
+       /* context changes */
+       switch(wmn->category) {
+               case NC_SCREEN:
+                       if(wmn->data==ND_ANIMPLAY)
+                               ED_region_tag_redraw(ar);
+                       break;
+               case NC_SCENE:
+                       switch (wmn->data) {
+                               case ND_FRAME:
+                               case ND_KEYINGSET:
+                                       ED_region_tag_redraw(ar);
+                               break;
+                       }
+       }
 }
 
 /* ******************** default callbacks for time space ***************** */
 
-static SpaceLink *time_new(void)
+static SpaceLink *time_new(const bContext *C)
 {
+       Scene *scene= CTX_data_scene(C);
+       ARegion *ar;
        SpaceTime *stime;
 
        stime= MEM_callocN(sizeof(SpaceTime), "inittime");
 
        stime->spacetype= SPACE_TIME;
-       stime->blockscale= 0.7;
        stime->redraws= TIME_ALL_3D_WIN|TIME_ALL_ANIM_WIN;
+       stime->flag |= TIME_DRAWFRAMES;
 
-       // XXX move to region!
-       stime->v2d.tot.xmin= -4.0;
-       stime->v2d.tot.ymin=  0.0;
-       stime->v2d.tot.xmax= (float)EFRA + 4.0;
-       //stime->v2d.tot.ymax= (float)stime->winy;
-
-       stime->v2d.cur= stime->v2d.tot;
+       /* header */
+       ar= MEM_callocN(sizeof(ARegion), "header for time");
+       
+       BLI_addtail(&stime->regionbase, ar);
+       ar->regiontype= RGN_TYPE_HEADER;
+       ar->alignment= RGN_ALIGN_BOTTOM;
+       
+       /* main area */
+       ar= MEM_callocN(sizeof(ARegion), "main area for time");
+       
+       BLI_addtail(&stime->regionbase, ar);
+       ar->regiontype= RGN_TYPE_WINDOW;
+       
+       ar->v2d.tot.xmin= (float)(SFRA - 4);
+       ar->v2d.tot.ymin= 0.0f;
+       ar->v2d.tot.xmax= (float)(EFRA + 4);
+       ar->v2d.tot.ymax= 50.0f;
+       
+       ar->v2d.cur= ar->v2d.tot;
 
-       stime->v2d.min[0]= 1.0;
-       //stime->v2d.min[1]= (float)stime->winy;
+       ar->v2d.min[0]= 1.0f;
+       ar->v2d.min[1]= 50.0f;
 
-       stime->v2d.max[0]= 32000.0;
-       //stime->v2d.max[1]= (float)stime->winy;
+       ar->v2d.max[0]= MAXFRAMEF;
+       ar->v2d.max[1]= 50.0; 
 
-       stime->v2d.minzoom= 0.1f;
-       stime->v2d.maxzoom= 10.0;
+       ar->v2d.minzoom= 0.1f;
+       ar->v2d.maxzoom= 10.0;
 
-       stime->v2d.scroll= 0;
-       stime->v2d.keepaspect= 0;
-       stime->v2d.keepzoom= 0;
-       stime->v2d.keeptot= 0;
+       ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_HORIZONTAL);
+       ar->v2d.align |= V2D_ALIGN_NO_NEG_Y;
+       ar->v2d.keepofs |= V2D_LOCKOFS_Y;
+       ar->v2d.keepzoom |= V2D_LOCKZOOM_Y;
 
-       stime->flag |= TIME_DRAWFRAMES;
 
        return (SpaceLink*)stime;
 }
@@ -236,7 +284,7 @@ static void time_free(SpaceLink *sl)
 /* validate spacedata, add own area level handlers */
 static void time_init(wmWindowManager *wm, ScrArea *sa)
 {
-
+       
 }
 
 static SpaceLink *time_duplicate(SpaceLink *sl)
@@ -247,7 +295,7 @@ static SpaceLink *time_duplicate(SpaceLink *sl)
        return (SpaceLink *)stimen;
 }
 
-/* only called once, from screen/spacetypes.c */
+/* only called once, from space_api/spacetypes.c */
 /* it defines all callbacks to maintain spaces */
 void ED_spacetype_time(void)
 {
@@ -267,7 +315,7 @@ void ED_spacetype_time(void)
        /* regions: main window */
        art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
        art->regionid = RGN_TYPE_WINDOW;
-       art->keymapflag= ED_KEYMAP_VIEW2D|ED_KEYMAP_MARKERS;
+       art->keymapflag= ED_KEYMAP_VIEW2D|ED_KEYMAP_MARKERS|ED_KEYMAP_ANIMATION|ED_KEYMAP_FRAMES;
        
        art->init= time_main_area_init;
        art->draw= time_main_area_draw;
@@ -279,10 +327,11 @@ void ED_spacetype_time(void)
        art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
        art->regionid = RGN_TYPE_HEADER;
        art->minsizey= HEADERY;
-       art->keymapflag= ED_KEYMAP_UI;
+       art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
        
+       art->init= time_header_area_init;
        art->draw= time_header_area_draw;
-       art->free= time_header_area_free;
+       art->listener= time_header_area_listener;
        BLI_addhead(&st->regiontypes, art);
                
        BKE_spacetype_register(st);