diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_screen.h | 56 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/screen.c | 89 |
2 files changed, 127 insertions, 18 deletions
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index e20b00a00e7..442ef7cf003 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -3,15 +3,12 @@ * * $Id$ * - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** 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. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * 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 @@ -29,12 +26,59 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ #ifndef BKE_SCREEN_H #define BKE_SCREEN_H +struct SpaceType; +struct ScrArea; +struct bScreen; +struct ARegion; +struct wmNotifier; + +/* spacetype has everything stored to get an editor working, it gets initialized via +spacetypes_init() in editors/area/spacetypes.c */ +/* an editor in Blender is a combined ScrArea + SpaceType + SpaceData */ + +typedef struct SpaceType { + struct SpaceType *next, *prev; + + char name[32]; /* for menus */ + int spaceid; /* unique space identifier */ + int iconid; /* icon lookup for menus */ + + struct SpaceLink *(*new)(void); /* calls init too */ + void (*free)(struct SpaceLink *sl); /* not free sl itself */ + + void (*init)(struct ScrArea *); /* init is to cope with internal contextual changes, adds handlers, sets screarea regions */ + void (*refresh)(struct bContext *, struct ScrArea *); /* refresh is for external bContext changes */ + + struct SpaceLink *(*duplicate)(struct SpaceLink *sl); /* after a spacedata copy, an init should result in exact same situation */ + + /* read and write... */ + +} SpaceType; + +/* region type gets allocated and freed in spacetype init/free callback */ +/* data storage for regions is in space struct (also width/height of regions!) */ +typedef struct ARegionType { + + void (*init)(const struct bContext *, struct ARegion *); /* add handlers, stuff you only do once or on area/region changes */ + void (*refresh)(const struct bContext *, struct ARegion *); /* refresh to match contextual changes */ + void (*draw)(const struct bContext *, struct ARegion *); /* draw entirely, windowsize changes should be handled here */ + + void (*listener)(struct ARegion *, struct wmNotifier *); +} ARegionType; + + +void BKE_screen_area_free(struct ScrArea *sa); void free_screen(struct bScreen *sc); +struct SpaceType *BKE_spacetype_from_id(int spaceid); +void BKE_spacetype_register(struct SpaceType *st); +void BKE_spacedata_freelist(ListBase *lb); +void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2); + #endif diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index b41fdbba5e4..33e131606c2 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -1,9 +1,7 @@ - -/* screen.c - * +/* * $Id$ * - * ***** BEGIN GP LICENSE BLOCK ***** + * ***** 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 @@ -22,9 +20,7 @@ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. * All rights reserved. * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. + * Contributor(s): Blender Foundation 2002-2008 * * ***** END GPL LICENSE BLOCK ***** */ @@ -34,20 +30,89 @@ #include <math.h> #include "DNA_screen_types.h" +#include "DNA_space_types.h" #include "BLI_blenlib.h" #include "BKE_screen.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "BPY_extern.h" + +/* keep global; this has to be accessible outside of windowmanager */ +static ListBase spacetypes= {NULL, NULL}; + +SpaceType *BKE_spacetype_from_id(int spaceid) +{ + SpaceType *st; + + for(st= spacetypes.first; st; st= st->next) { + if(st->spaceid==spaceid) + return st; + } + return NULL; +} + +void BKE_spacetype_register(SpaceType *st) +{ + BLI_addtail(&spacetypes, st); +} + +void BKE_spacedata_freelist(ListBase *lb) +{ + SpaceLink *sl; + + for (sl= lb->first; sl; sl= sl->next) { + SpaceType *st= BKE_spacetype_from_id(sl->spacetype); + + if(st && st->free) + st->free(sl); + } + + BLI_freelistN(lb); +} + +/* lb1 should be empty */ +void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2) +{ + SpaceLink *sl; + + lb1->first= lb2->last= NULL; /* to be sure */ + + for (sl= lb2->first; sl; sl= sl->next) { + SpaceType *st= BKE_spacetype_from_id(sl->spacetype); + + if(st && st->duplicate) + BLI_addtail(lb1, st->duplicate(sl)); + } +} + + +/* not area itself */ +void BKE_screen_area_free(ScrArea *sa) +{ + + BKE_spacedata_freelist(&sa->spacedata); + + BLI_freelistN(&sa->regionbase); + + BLI_freelistN(&sa->panels); + // uiFreeBlocks(&sa->uiblocks); + // uiFreePanels(&sa->panels); + + BPY_free_scriptlink(&sa->scriptlink); + +} /* don't free screen itself */ void free_screen(bScreen *sc) { - //XXX unlink_screen(sc); /* bad level call */ - + ScrArea *sa; + + for(sa= sc->areabase.first; sa; sa= sa->next) + BKE_screen_area_free(sa); + BLI_freelistN(&sc->vertbase); BLI_freelistN(&sc->edgebase); BLI_freelistN(&sc->areabase); } + + |