2.5
authorTon Roosendaal <ton@blender.org>
Fri, 12 Dec 2008 18:47:12 +0000 (18:47 +0000)
committerTon Roosendaal <ton@blender.org>
Fri, 12 Dec 2008 18:47:12 +0000 (18:47 +0000)
- Added rudimentary support for Ipo window
  (Joshua can check on view2d issues for this? :)

- removed ED_area.h, added ED_space_api.h

21 files changed:
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_space_api.h [moved from source/blender/editors/include/ED_area.h with 97% similarity]
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_api/space.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_ipo/Makefile
source/blender/editors/space_ipo/SConscript [new file with mode: 0644]
source/blender/editors/space_ipo/ipo_header.c [new file with mode: 0644]
source/blender/editors/space_ipo/ipo_intern.h [new file with mode: 0644]
source/blender/editors/space_ipo/space_ipo.c [new file with mode: 0644]
source/blender/editors/space_outliner/outliner_header.c
source/blender/editors/space_outliner/space_outliner.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_time/time_header.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_header.c [new file with mode: 0644]
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_screen_types.h
source/blender/windowmanager/intern/wm_event_system.c

index f7638ae1d10f93fc21a5b1b1f4db298e261a70f6..7548c9ca97066a9ed2ff5ccbdacde280fafc844d 100644 (file)
@@ -5063,10 +5063,30 @@ static void area_add_header_region(ScrArea *sa, ListBase *lb)
 /* 2.50 patch */
 static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
 {
-       ARegion *ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
+       ARegion *ar;
+       
+       if(sl) {
+               /* first channels for ipo action nla... */
+               switch(sl->spacetype) {
+                       case SPACE_IPO:
+                               ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
+                               BLI_addtail(lb, ar);
+                               ar->regiontype= RGN_TYPE_CHANNELS;
+                               ar->alignment= RGN_ALIGN_RIGHT;
+                               
+                               break;
+                       case SPACE_ACTION:
+                               break;
+                       case SPACE_NLA:
+                               break;
+               }
+       }
+       /* main region */
+       ar= MEM_callocN(sizeof(ARegion), "area region from do_versions");
        
        BLI_addtail(lb, ar);
        ar->winrct= sa->totrct;
+       
        ar->regiontype= RGN_TYPE_WINDOW;
        
        if(sl) {
@@ -5097,19 +5117,19 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
                                ar->v2d.min[1]= ar->v2d.max[1]= 500.0;
                        }
                                break;
+                       case SPACE_IPO:
+                       {
+                               SpaceIpo *sipo= (SpaceIpo *)sl;
+                               memcpy(&ar->v2d, &sipo->v2d, sizeof(View2D));
+                               
+                               ar->v2d.scroll= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM);
+                               ar->v2d.scroll |= (V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_LEFT);
+                               
+                       }
                        //case SPACE_XXX: // FIXME... add other ones
                                //      memcpy(&ar->v2d, &((SpaceXxx *)sl)->v2d, sizeof(View2D));
                                //      break;
                }
-               /* further subdivision case, channels for ipo action nla... */
-               switch(sl->spacetype) {
-                       case SPACE_IPO:
-                               break;
-                       case SPACE_ACTION:
-                               break;
-                       case SPACE_NLA:
-                               break;
-               }
        }
 }
 
similarity index 97%
rename from source/blender/editors/include/ED_area.h
rename to source/blender/editors/include/ED_space_api.h
index 63c6cd7e13f0d2f4bb5a8dab7389ef362f0a5bbe..aea5b1b9502ef742f32890ca551207714d836d5a 100644 (file)
@@ -35,6 +35,7 @@
 void ED_spacetype_outliner(void);
 void ED_spacetype_time(void);
 void ED_spacetype_view3d(void);
+void ED_spacetype_ipo(void);
 
 #endif /* ED_AREA_H */
 
index 73ff3e9fe0547f713defe7e1947f2ede72b5d273..32813041d2d4fc57329b7a6825d6175482f869de 100644 (file)
@@ -39,7 +39,6 @@
 #include "BKE_screen.h"
 #include "BKE_utildefines.h"
 
-#include "ED_area.h"
 #include "ED_screen.h"
 #include "ED_screen_types.h"
 
@@ -385,7 +384,7 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
        sa->type= BKE_spacetype_from_id(sa->spacetype);
        
        if(sa->type==NULL) {
-               sa->spacetype= SPACE_VIEW3D;
+               sa->butspacetype= sa->spacetype= SPACE_VIEW3D;
                sa->type= BKE_spacetype_from_id(sa->spacetype);
        }
        
index de2e0d37f8c62543beac5a609eef2ddc7b655227..24778674ddadb89011253ffd98784322c171bfb8 100644 (file)
@@ -44,7 +44,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_area.h"
 #include "ED_screen.h"
 #include "ED_screen_types.h"
 
index 8e49da0420ae770c01a8b9127bd897d5ce7ce087..2a065afca693ed986c5fd331d30910683a1cb8b5 100644 (file)
@@ -38,7 +38,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_area.h"
 #include "ED_markers.h"
 #include "ED_screen.h"
 #include "ED_screen_types.h"
index df844dc527d7b32c242d4267c006c524758b7796..1d9e3ac97ff6068aa817b90d53fda333be00a460 100644 (file)
@@ -37,7 +37,6 @@
 #include "BKE_global.h"
 #include "BKE_screen.h"
 
-#include "ED_area.h"
 #include "ED_screen.h"
 
 /* */
index 8997daf3a7fb6a5ec48f0d440251059c8a6a8b16..6b13bcad3d6687351b4f857c5acdf2b9e7cdde6f 100644 (file)
@@ -38,7 +38,7 @@
 #include "BIF_gl.h"
 
 #include "ED_screen.h"
-#include "ED_area.h"
+#include "ED_space_api.h"
 
 
 ARegionType *ED_regiontype_from_id(SpaceType *st, int regionid)
@@ -64,7 +64,7 @@ void ED_spacetypes_init(void)
        ED_spacetype_outliner();
        ED_spacetype_time();
        ED_spacetype_view3d();
-//     ED_spacetype_ipo();
+       ED_spacetype_ipo();
 //     ...
        
        /* register operator types for screen and all spaces */
index 53f8caef97ebd998bfe31fe5a9c0b2ea8bd8f3f7..deb61b90362eb07767a2c40c9ff4e2f3def6087e 100644 (file)
@@ -35,6 +35,7 @@ include nan_compile.mk
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 
 # not very neat....
diff --git a/source/blender/editors/space_ipo/SConscript b/source/blender/editors/space_ipo/SConscript
new file mode 100644 (file)
index 0000000..f1fc6d8
--- /dev/null
@@ -0,0 +1,9 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
+incs += ' #/intern/guardedalloc #/extern/glew/include'
+
+env.BlenderLib ( 'bf_editors_space_ipo', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] )
diff --git a/source/blender/editors/space_ipo/ipo_header.c b/source/blender/editors/space_ipo/ipo_header.c
new file mode 100644 (file)
index 0000000..4f5ebfb
--- /dev/null
@@ -0,0 +1,166 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_global.h"
+#include "BKE_screen.h"
+
+#include "ED_screen.h"
+#include "ED_util.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "ipo_intern.h"
+
+
+/* ************************ header area region *********************** */
+
+static void do_viewmenu(bContext *C, void *arg, int event)
+{
+       
+}
+
+static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+       ScrArea *curarea= C->area;
+       uiBlock *block;
+       short yco= 0, menuwidth=120;
+       
+       block= uiBeginBlock(C, handle->region, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       uiBlockSetButmFunc(block, do_viewmenu, NULL);
+       
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+                                        menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+       
+       if(curarea->headertype==HEADERTOP) {
+               uiBlockSetDirection(block, UI_DOWN);
+       }
+       else {
+               uiBlockSetDirection(block, UI_TOP);
+               uiBlockFlipOrder(block);
+       }
+       
+       uiTextBoundsBlock(block, 50);
+       uiEndBlock(C, block);
+       
+       return block;
+}
+
+#define B_NEWSPACE             100
+
+static void do_ipo_buttons(bContext *C, void *arg, int event)
+{
+       switch(event) {
+               case B_NEWSPACE:
+                       ED_newspace(C->area, C->area->butspacetype);
+                       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+                       break;
+               }
+}
+
+
+void ipo_header_buttons(const bContext *C, ARegion *ar)
+{
+       ScrArea *sa= C->area;
+       uiBlock *block;
+       int xco, yco= 3;
+       
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       uiBlockSetHandleFunc(block, do_ipo_buttons, NULL);
+       
+       if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER);
+       else uiBlockSetCol(block, TH_HEADERDESEL);
+
+       xco = 8;
+       
+       uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, 
+                                         windowtype_pup(), xco, yco, XIC+10, YIC, 
+                                         &(C->area->butspacetype), 1.0, SPACEICONMAX, 0, 0, 
+                                         "Displays Current Window Type. "
+                                         "Click for menu of available types.");
+       
+       xco += XIC + 14;
+       
+       uiBlockSetEmboss(block, UI_EMBOSSN);
+       if (sa->flag & HEADER_NO_PULLDOWN) {
+               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
+                                                ICON_DISCLOSURE_TRI_RIGHT,
+                                                xco,yco,XIC,YIC-2,
+                                                &(sa->flag), 0, 0, 0, 0, 
+                                                "Show pulldown menus");
+       }
+       else {
+               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
+                                                ICON_DISCLOSURE_TRI_DOWN,
+                                                xco,yco,XIC,YIC-2,
+                                                &(sa->flag), 0, 0, 0, 0, 
+                                                "Hide pulldown menus");
+       }
+       uiBlockSetEmboss(block, UI_EMBOSS);
+       xco+=XIC;
+       
+       if((sa->flag & HEADER_NO_PULLDOWN)==0) {
+               int xmax;
+               
+               /* pull down menus */
+               uiBlockSetEmboss(block, UI_EMBOSSP);
+               
+               xmax= GetButStringLength("View");
+               uiDefPulldownBut(block, dummy_viewmenu, C->area, 
+                                                "View", xco, yco-2, xmax-3, 24, "");
+       }
+       
+       uiBlockSetEmboss(block, UI_EMBOSS);
+
+       /* always as last  */
+       sa->headbutlen= xco+XIC+80; // +80 because the last button is not an icon
+       
+       uiEndBlock(C, block);
+       uiDrawBlock(block);
+}
+
+
diff --git a/source/blender/editors/space_ipo/ipo_intern.h b/source/blender/editors/space_ipo/ipo_intern.h
new file mode 100644 (file)
index 0000000..86b20d4
--- /dev/null
@@ -0,0 +1,39 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef ED_IPO_INTERN_H
+#define ED_IPO_INTERN_H
+
+/* internal exports only */
+
+
+/* ipo_header.c */
+void ipo_header_buttons(const bContext *C, ARegion *ar);
+
+
+#endif /* ED_IPO_INTERN_H */
+
diff --git a/source/blender/editors/space_ipo/space_ipo.c b/source/blender/editors/space_ipo/space_ipo.c
new file mode 100644 (file)
index 0000000..811d29d
--- /dev/null
@@ -0,0 +1,287 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "DNA_ipo_types.h"
+#include "DNA_object_types.h"
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "BLI_rand.h"
+
+#include "BKE_global.h"
+#include "BKE_screen.h"
+
+#include "ED_space_api.h"
+#include "ED_screen.h"
+
+#include "BIF_gl.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "ED_markers.h"
+
+#include "ipo_intern.h"        // own include
+
+/* ******************** default callbacks for ipo space ***************** */
+
+static SpaceLink *ipo_new(void)
+{
+       ARegion *ar;
+       SpaceIpo *sipo;
+       
+       sipo= MEM_callocN(sizeof(SpaceIpo), "initipo");
+       sipo->spacetype= SPACE_IPO;
+       sipo->blocktype= ID_OB;
+       
+       /* header */
+       ar= MEM_callocN(sizeof(ARegion), "header for ipo");
+       
+       BLI_addtail(&sipo->regionbase, ar);
+       ar->regiontype= RGN_TYPE_HEADER;
+       ar->alignment= RGN_ALIGN_BOTTOM;
+       UI_view2d_header_default(&ar->v2d);
+       
+       /* channels */
+       ar= MEM_callocN(sizeof(ARegion), "main area for ipo");
+       
+       BLI_addtail(&sipo->regionbase, ar);
+       ar->regiontype= RGN_TYPE_CHANNELS;
+       ar->alignment= RGN_ALIGN_RIGHT;
+       
+       /* XXX view2d init for channels */
+       
+       /* main area */
+       ar= MEM_callocN(sizeof(ARegion), "main area for ipo");
+       
+       BLI_addtail(&sipo->regionbase, ar);
+       ar->regiontype= RGN_TYPE_WINDOW;
+       
+       ar->v2d.tot.xmin= 0.0f;
+       ar->v2d.tot.ymin= -10.0f;
+       ar->v2d.tot.xmax= 250.0;
+       ar->v2d.tot.ymax= 10.0f;
+       
+       ar->v2d.cur= ar->v2d.tot;
+       
+       ar->v2d.min[0]= 0.01f;
+       ar->v2d.min[1]= 0.01f;
+       
+       ar->v2d.max[0]= MAXFRAMEF;
+       ar->v2d.max[1]= 10000.0f;
+       
+       ar->v2d.scroll= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM);
+       ar->v2d.scroll |= (V2D_SCROLL_LEFT|V2D_SCROLL_SCALE_LEFT);
+       
+       ar->v2d.keeptot= 0;
+       
+       /* channel list region XXX */
+
+       
+       return (SpaceLink *)sipo;
+}
+
+/* not spacelink itself */
+static void ipo_free(SpaceLink *sl)
+{      
+       SpaceIpo *si= (SpaceIpo*) sl;
+       
+       if(si->editipo) MEM_freeN(si->editipo);
+       // XXX free_ipokey(&si->ipokey);
+
+}
+
+
+/* spacetype; init callback */
+static void ipo_init(struct wmWindowManager *wm, ScrArea *sa)
+{
+
+}
+
+static SpaceLink *ipo_duplicate(SpaceLink *sl)
+{
+       SpaceIpo *sipon= MEM_dupallocN(sl);
+       
+       /* clear or remove stuff from old */
+       sipon->editipo= NULL;
+       sipon->ipokey.first= sipon->ipokey.last= NULL;
+       
+       return (SpaceLink *)sipon;
+}
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void ipo_main_area_init(wmWindowManager *wm, ARegion *ar)
+{
+       ListBase *keymap;
+       
+       UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy);
+       
+       /* own keymap */
+       keymap= WM_keymap_listbase(wm, "Ipo", SPACE_IPO, 0);    /* XXX weak? */
+       WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+}
+
+static void ipo_main_area_draw(const bContext *C, ARegion *ar)
+{
+       /* draw entirely, view changes should be handled here */
+       SpaceIpo *sipo= C->area->spacedata.first;
+       View2D *v2d= &ar->v2d;
+       View2DGrid *grid;
+       View2DScrollers *scrollers;
+       float col[3];
+       int unit;
+       
+       /* clear and setup matrix */
+       UI_GetThemeColor3fv(TH_BACK, col);
+       glClearColor(col[0], col[1], col[2], 0.0);
+       glClear(GL_COLOR_BUFFER_BIT);
+       
+       UI_view2d_view_ortho(C, v2d);
+       
+       /* grid */
+       unit= (sipo->flag & TIME_DRAWFRAMES)? V2D_UNIT_FRAMES: V2D_UNIT_SECONDS;
+       grid= UI_view2d_grid_calc(C, v2d, unit, V2D_GRID_CLAMP, ar->winx, ar->winy);
+       UI_view2d_grid_draw(C, v2d, grid, (V2D_VERTICAL_LINES|V2D_VERTICAL_AXIS));
+       UI_view2d_grid_free(grid);
+               
+       /* markers */
+       UI_view2d_view_orthoSpecial(C, v2d, 1);
+       draw_markers_time(C, 0);
+       
+       /* reset view matrix */
+       UI_view2d_view_restore(C);
+       
+       /* scrollers */
+       scrollers= UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY);
+       UI_view2d_scrollers_draw(C, v2d, scrollers);
+       UI_view2d_scrollers_free(scrollers);
+}
+
+void ipo_operatortypes(void)
+{
+}
+
+void ipo_keymap(struct wmWindowManager *wm)
+{
+}
+
+/* add handlers, stuff you only do once or on area/region changes */
+static void ipo_header_area_init(wmWindowManager *wm, ARegion *ar)
+{
+       UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy);
+}
+
+static void ipo_header_area_draw(const bContext *C, ARegion *ar)
+{
+       float col[3];
+       
+       /* clear */
+       if(ED_screen_area_active(C))
+               UI_GetThemeColor3fv(TH_HEADER, col);
+       else
+               UI_GetThemeColor3fv(TH_HEADERDESEL, col);
+       
+       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);
+       
+       ipo_header_buttons(C, ar);
+       
+       /* restore view matrix? */
+       UI_view2d_view_restore(C);
+}
+
+static void ipo_main_area_listener(ARegion *ar, wmNotifier *wmn)
+{
+       /* context changes */
+}
+
+/* only called once, from space/spacetypes.c */
+void ED_spacetype_ipo(void)
+{
+       SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype time");
+       ARegionType *art;
+       
+       st->spaceid= SPACE_IPO;
+       
+       st->new= ipo_new;
+       st->free= ipo_free;
+       st->init= ipo_init;
+       st->duplicate= ipo_duplicate;
+       st->operatortypes= ipo_operatortypes;
+       st->keymap= ipo_keymap;
+       
+       /* regions: main window */
+       art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
+       art->regionid = RGN_TYPE_WINDOW;
+       art->init= ipo_main_area_init;
+       art->draw= ipo_main_area_draw;
+       art->listener= ipo_main_area_listener;
+
+       BLI_addhead(&st->regiontypes, art);
+       
+       /* regions: header */
+       art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
+       art->regionid = RGN_TYPE_HEADER;
+       art->minsizey= HEADERY;
+       art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
+       
+       art->init= ipo_header_area_init;
+       art->draw= ipo_header_area_draw;
+       
+       BLI_addhead(&st->regiontypes, art);
+       
+       /* regions: channels */
+       art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
+       art->regionid = RGN_TYPE_CHANNELS;
+       art->minsizex= 80;
+       art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
+       
+//     art->init= ipo_channel_area_init;
+//     art->draw= ipo_channel_area_draw;
+       
+       BLI_addhead(&st->regiontypes, art);
+       
+       
+       BKE_spacetype_register(st);
+}
+
index 5026c4d2137dfcc69001a4a88f5b96c86ca7a462..87e3253dae9726cf082cc173ce8ec6e9847a9782 100644 (file)
@@ -41,7 +41,6 @@
 #include "BKE_global.h"
 #include "BKE_screen.h"
 
-#include "ED_area.h"
 #include "ED_screen.h"
 #include "ED_util.h"
 
index d7c70def0f3479d0ed038274a92dd85881c0453e..229c473625f3362e4eaa8be594904466f7fed408 100644 (file)
@@ -52,7 +52,7 @@
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 
-#include "ED_area.h"
+#include "ED_space_api.h"
 #include "ED_screen.h"
 
 #include "WM_api.h"
index d6faefa856be4c75ce01e6141bf51423f2c412a9..7c6267f807179b0be7e5f482807452ae93344250 100644 (file)
@@ -41,7 +41,7 @@
 #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"
 
@@ -194,9 +194,6 @@ static void time_header_area_draw(const bContext *C, ARegion *ar)
        UI_view2d_view_restore(C);
 }
 
-static void time_header_area_free(ARegion *ar)
-{
-}
 
 /* ******************** default callbacks for time space ***************** */
 
@@ -306,7 +303,6 @@ void ED_spacetype_time(void)
        
        art->init= time_header_area_init;
        art->draw= time_header_area_draw;
-       art->free= time_header_area_free;
        BLI_addhead(&st->regiontypes, art);
                
        BKE_spacetype_register(st);
index 308e49377ada7d894328244de758bd04c802d283..8898fb296dbd5022dbe6c33545fb752e99248eec 100644 (file)
@@ -41,7 +41,6 @@
 #include "BKE_global.h"
 #include "BKE_screen.h"
 
-#include "ED_area.h"
 #include "ED_screen.h"
 #include "ED_util.h"
 
index e2b1cb70a438236ae14e7a8f094450c381e713fb..d04ca14ffca57ee0db49c84d0855e7abb1af7fb4 100644 (file)
 #include "BKE_global.h"
 #include "BKE_screen.h"
 
-#include "ED_area.h"
+#include "ED_space_api.h"
 #include "ED_screen.h"
 
 #include "BIF_gl.h"
 
+#include "WM_api.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
 #include "UI_view2d.h"
 
 #include "view3d_intern.h"     // own include
@@ -182,7 +186,36 @@ void view3d_keymap(struct wmWindowManager *wm)
 {
 }
 
-/* only called once, from screen/spacetypes.c */
+/* add handlers, stuff you only do once or on area/region changes */
+static void view3d_header_area_init(wmWindowManager *wm, ARegion *ar)
+{
+       UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy);
+}
+
+static void view3d_header_area_draw(const bContext *C, ARegion *ar)
+{
+       float col[3];
+       
+       /* clear */
+       if(ED_screen_area_active(C))
+               UI_GetThemeColor3fv(TH_HEADER, col);
+       else
+               UI_GetThemeColor3fv(TH_HEADERDESEL, col);
+       
+       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);
+       
+       view3d_header_buttons(C, ar);
+       
+       /* restore view matrix? */
+       UI_view2d_view_restore(C);
+}
+
+
+/* only called once, from space/spacetypes.c */
 void ED_spacetype_view3d(void)
 {
        SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype time");
@@ -207,6 +240,10 @@ void ED_spacetype_view3d(void)
        art= MEM_callocN(sizeof(ARegionType), "spacetype time region");
        art->regionid = RGN_TYPE_HEADER;
        art->minsizey= HEADERY;
+       art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D;
+       
+       art->init= view3d_header_area_init;
+       art->draw= view3d_header_area_draw;
        
        BLI_addhead(&st->regiontypes, art);
        
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
new file mode 100644 (file)
index 0000000..a0e166b
--- /dev/null
@@ -0,0 +1,166 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_global.h"
+#include "BKE_screen.h"
+
+#include "ED_screen.h"
+#include "ED_util.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "view3d_intern.h"
+
+
+/* ************************ header area region *********************** */
+
+static void do_viewmenu(bContext *C, void *arg, int event)
+{
+       
+}
+
+static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused)
+{
+       ScrArea *curarea= C->area;
+       uiBlock *block;
+       short yco= 0, menuwidth=120;
+       
+       block= uiBeginBlock(C, handle->region, "dummy_viewmenu", UI_EMBOSSP, UI_HELV);
+       uiBlockSetButmFunc(block, do_viewmenu, NULL);
+       
+       uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, 
+                                        menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+       
+       if(curarea->headertype==HEADERTOP) {
+               uiBlockSetDirection(block, UI_DOWN);
+       }
+       else {
+               uiBlockSetDirection(block, UI_TOP);
+               uiBlockFlipOrder(block);
+       }
+       
+       uiTextBoundsBlock(block, 50);
+       uiEndBlock(C, block);
+       
+       return block;
+}
+
+#define B_NEWSPACE             100
+
+static void do_view3d_buttons(bContext *C, void *arg, int event)
+{
+       switch(event) {
+               case B_NEWSPACE:
+                       ED_newspace(C->area, C->area->butspacetype);
+                       WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL);
+                       break;
+               }
+}
+
+
+void view3d_header_buttons(const bContext *C, ARegion *ar)
+{
+       ScrArea *sa= C->area;
+       uiBlock *block;
+       int xco, yco= 3;
+       
+       block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV);
+       uiBlockSetHandleFunc(block, do_view3d_buttons, NULL);
+       
+       if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER);
+       else uiBlockSetCol(block, TH_HEADERDESEL);
+
+       xco = 8;
+       
+       uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, 
+                                         windowtype_pup(), xco, yco, XIC+10, YIC, 
+                                         &(C->area->butspacetype), 1.0, SPACEICONMAX, 0, 0, 
+                                         "Displays Current Window Type. "
+                                         "Click for menu of available types.");
+       
+       xco += XIC + 14;
+       
+       uiBlockSetEmboss(block, UI_EMBOSSN);
+       if (sa->flag & HEADER_NO_PULLDOWN) {
+               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
+                                                ICON_DISCLOSURE_TRI_RIGHT,
+                                                xco,yco,XIC,YIC-2,
+                                                &(sa->flag), 0, 0, 0, 0, 
+                                                "Show pulldown menus");
+       }
+       else {
+               uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, 
+                                                ICON_DISCLOSURE_TRI_DOWN,
+                                                xco,yco,XIC,YIC-2,
+                                                &(sa->flag), 0, 0, 0, 0, 
+                                                "Hide pulldown menus");
+       }
+       uiBlockSetEmboss(block, UI_EMBOSS);
+       xco+=XIC;
+       
+       if((sa->flag & HEADER_NO_PULLDOWN)==0) {
+               int xmax;
+               
+               /* pull down menus */
+               uiBlockSetEmboss(block, UI_EMBOSSP);
+               
+               xmax= GetButStringLength("View");
+               uiDefPulldownBut(block, dummy_viewmenu, C->area, 
+                                                "View", xco, yco-2, xmax-3, 24, "");
+       }
+       
+       uiBlockSetEmboss(block, UI_EMBOSS);
+
+       /* always as last  */
+       sa->headbutlen= xco+XIC+80; // +80 because the last button is not an icon
+       
+       uiEndBlock(C, block);
+       uiDrawBlock(block);
+}
+
+
index 32c3e51c11236b2ed530c9f78be823b26e80e392..40c30269d87fda7d4e7b536e82d56180415e4006 100644 (file)
@@ -38,6 +38,8 @@ typedef struct ViewDepths {
        char damaged;
 } ViewDepths;
 
+/* view3d_header.c */
+void view3d_header_buttons(const bContext *C, ARegion *ar);
 
 
 #endif /* ED_VIEW3D_INTERN_H */
index abc1041d6fec6abf2eb1988cb41db1798951f5e0..73ee9cd9114947d0ca105eaf96a437e9b4dbbc9f 100644 (file)
@@ -186,7 +186,8 @@ typedef struct ARegion {
 /* regiontype, first two are the default set */
 #define RGN_TYPE_WINDOW                0
 #define RGN_TYPE_HEADER                1
-#define RGN_TYPE_TEMPORARY     2
+#define RGN_TYPE_CHANNELS      2
+#define RGN_TYPE_TEMPORARY     3
 
 /* region alignment */
 #define RGN_ALIGN_NONE         0
index ff0d6b83b342d69a9142d543e5a259a4fb3ed908..88c29ddae29a88e508a846f2c2840360d7db7c1e 100644 (file)
@@ -44,7 +44,7 @@
 #include "BKE_global.h"
 
 #include "ED_screen.h"
-#include "ED_area.h"
+#include "ED_space_api.h"
 
 #include "RNA_access.h"