2.5

Part one of wrapping up area/region management.
Read design doc here:
http://wiki.blender.org/index.php/BlenderDev/Blender2.5/AreaManager

This commit:
- brings keymap storage to WM, based on names/types. This structure
  allows rna-ifying it too, so you can browse keymaps etc.
- creating areas and regions works slightly different now, wich
  regiontypes stored in areatype.

Todo:
- better callbacks and structure for defining which handlers need to
  be added.
- using region types to validate regions
- proper implementation of local region data
- code method for customizing keymaps. Current idea is that you have
  to indicate an entire keymap to be custom, to prevent too complicated
  merging problems of default and custom maps (like order, multiple keys
  for same operator, disabling options, etc).

1 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index f7029700f9c..fec3038ca88 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -277,7 +277,7 @@ static void ui_tooltip_region_free(ARegion *ar)
 
 ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 {
-	static ARegionType type={NULL, NULL, NULL, NULL, NULL};
+	static ARegionType type;
 	ARegion *ar;
 	uiTooltipData *data;
 	int x1, x2, y1, y2, winx, winy;
@@ -288,6 +288,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 	/* create area region */
 	ar= ui_add_temporary_region(C->window->screen);
 
+	memset(&type, 0, sizeof(ARegionType));
 	type.draw= ui_tooltip_region_draw;
 	type.free= ui_tooltip_region_free;
 	ar->type= &type;
@@ -596,7 +597,8 @@ static void ui_block_region_free(ARegion *ar)
 
 uiMenuBlockHandle *ui_menu_block_create(bContext *C, ARegion *butregion, uiBut *but, uiBlockFuncFP block_func, void *arg)
 {
-	static ARegionType type={NULL, NULL, NULL, NULL, NULL};
+	static ARegionType type;
+	ListBase *keymap= WM_keymap_listbase(C->wm, "Interface", 0, 0);
 	ARegion *ar;
 	uiBlock *block;
 	uiBut *bt;
@@ -609,11 +611,12 @@ uiMenuBlockHandle *ui_menu_block_create(bContext *C, ARegion *butregion, uiBut *
 	/* create area region */
 	ar= ui_add_temporary_region(C->window->screen);
 
+	memset(&type, 0, sizeof(ARegionType));
 	type.draw= ui_block_region_draw;
 	type.free= ui_block_region_free;
 	ar->type= &type;
 
-	WM_event_add_keymap_handler(&ar->handlers, &C->wm->uikeymap);
+	WM_event_add_keymap_handler(&ar->handlers, keymap);
 
 	handle->region= ar;
 	ar->regiondata= handle;