Cleanup: 'area' vs 'region'

Apparently this is the result of some sloppiness during 2.5 project and since then it confused people who were trying to understand the area-region relation (myself included).

Sorry if this causes merge conflicts for anyone, but at some point we really had to do it :/

5 files changed, 42 insertions, 42 deletions

diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 80d6858ea86..ffd801d2146 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -150,7 +150,7 @@ struct ImageUser *ntree_get_active_iuser(bNodeTree *ntree)
 /* 0: disable preview 
  * otherwise refresh preview
  *
- * XXX if you put this back, also check XXX in image_main_area_draw() */
+ * XXX if you put this back, also check XXX in image_main_region_draw() */
  * /
 void image_preview_event(int event)
 {
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 35a53afa550..d36ab5e10e2 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -816,7 +816,7 @@ static void draw_image_paint_helpers(const bContext *C, ARegion *ar, Scene *scen
 	}
 }
 
-/* draw main image area */
+/* draw main image region */
 
 void draw_image_main(const bContext *C, ARegion *ar)
 {
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h
index 6eaad302180..3b57d17f9f3 100644
--- a/source/blender/editors/space_image/image_intern.h
+++ b/source/blender/editors/space_image/image_intern.h
@@ -54,7 +54,7 @@ void draw_image_grease_pencil(struct bContext *C, bool onlyv2d);
 void draw_image_sample_line(struct SpaceImage *sima);
 
 /* image_ops.c */
-int space_image_main_area_poll(struct bContext *C);
+int space_image_main_region_poll(struct bContext *C);
 
 void IMAGE_OT_view_all(struct wmOperatorType *ot);
 void IMAGE_OT_view_pan(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 9a4a3b24e24..1d11e7c6287 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -230,7 +230,7 @@ static int space_image_poll(bContext *C)
 }
 #endif
 
-int space_image_main_area_poll(bContext *C)
+int space_image_main_region_poll(bContext *C)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
 	/* XXX ARegion *ar = CTX_wm_region(C); */
@@ -270,7 +270,7 @@ static int image_sample_poll(bContext *C)
 			return false;
 		}
 
-		return space_image_main_area_poll(C);
+		return space_image_main_region_poll(C);
 	}
 	else {
 		return false;
@@ -401,7 +401,7 @@ void IMAGE_OT_view_pan(wmOperatorType *ot)
 	ot->invoke = image_view_pan_invoke;
 	ot->modal = image_view_pan_modal;
 	ot->cancel = image_view_pan_cancel;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_BLOCKING | OPTYPE_GRAB_CURSOR | OPTYPE_LOCK_BYPASS;
@@ -617,7 +617,7 @@ void IMAGE_OT_view_zoom(wmOperatorType *ot)
 	ot->invoke = image_view_zoom_invoke;
 	ot->modal = image_view_zoom_modal;
 	ot->cancel = image_view_zoom_cancel;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_BLOCKING | OPTYPE_GRAB_CURSOR | OPTYPE_LOCK_BYPASS;
@@ -672,7 +672,7 @@ void IMAGE_OT_view_ndof(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->invoke = image_view_ndof_invoke;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_LOCK_BYPASS;
@@ -744,7 +744,7 @@ void IMAGE_OT_view_all(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec = image_view_all_exec;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_LOCK_BYPASS;
@@ -808,7 +808,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
 
 static int image_view_selected_poll(bContext *C)
 {
-	return (space_image_main_area_poll(C) && (ED_operator_uvedit(C) || ED_operator_mask(C)));
+	return (space_image_main_region_poll(C) && (ED_operator_uvedit(C) || ED_operator_mask(C)));
 }
 
 void IMAGE_OT_view_selected(wmOperatorType *ot)
@@ -863,7 +863,7 @@ void IMAGE_OT_view_zoom_in(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke = image_view_zoom_in_invoke;
 	ot->exec = image_view_zoom_in_exec;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_LOCK_BYPASS;
@@ -912,7 +912,7 @@ void IMAGE_OT_view_zoom_out(wmOperatorType *ot)
 	/* api callbacks */
 	ot->invoke = image_view_zoom_out_invoke;
 	ot->exec = image_view_zoom_out_exec;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_LOCK_BYPASS;
@@ -959,7 +959,7 @@ void IMAGE_OT_view_zoom_ratio(wmOperatorType *ot)
 	
 	/* api callbacks */
 	ot->exec = image_view_zoom_ratio_exec;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_LOCK_BYPASS;
@@ -3079,7 +3079,7 @@ void IMAGE_OT_sample_line(wmOperatorType *ot)
 	ot->invoke = image_sample_line_invoke;
 	ot->modal = WM_gesture_straightline_modal;
 	ot->exec = image_sample_line_exec;
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 	ot->cancel = WM_gesture_straightline_cancel;
 	
 	/* flags */
@@ -3322,7 +3322,7 @@ static int change_frame_poll(bContext *C)
 	if (G.is_rendering)
 		return 0;
 
-	return space_image_main_area_poll(C);
+	return space_image_main_region_poll(C);
 }
 
 static void change_frame_apply(bContext *C, wmOperator *op)
@@ -3455,7 +3455,7 @@ void IMAGE_OT_read_renderlayers(wmOperatorType *ot)
 	ot->idname = "IMAGE_OT_read_renderlayers";
 	ot->description = "Read all the current scene's render layers from cache, as needed";
 
-	ot->poll = space_image_main_area_poll;
+	ot->poll = space_image_main_region_poll;
 	ot->exec = image_read_renderlayers_exec;
 
 	/* flags */
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 97e3390f142..93c446ab3cb 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -582,7 +582,7 @@ static int image_context(const bContext *C, const char *member, bContextDataResu
 /************************** main region ***************************/
 
 /* sets up the fields of the View2D from zoom and offset */
-static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar)
+static void image_main_region_set_view2d(SpaceImage *sima, ARegion *ar)
 {
 	Image *ima = ED_space_image(sima);
 	float x1, y1, w, h;
@@ -635,7 +635,7 @@ static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar)
 }
 
 /* add handlers, stuff you only do once or on area/region changes */
-static void image_main_area_init(wmWindowManager *wm, ARegion *ar)
+static void image_main_region_init(wmWindowManager *wm, ARegion *ar)
 {
 	wmKeyMap *keymap;
 	
@@ -670,7 +670,7 @@ static void image_main_area_init(wmWindowManager *wm, ARegion *ar)
 
 }
 
-static void image_main_area_draw(const bContext *C, ARegion *ar)
+static void image_main_region_draw(const bContext *C, ARegion *ar)
 {
 	/* draw entirely, view changes should be handled here */
 	SpaceImage *sima = CTX_wm_space_image(C);
@@ -704,7 +704,7 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
 		sima->iuser.scene = scene;
 
 	/* we set view2d from own zoom and offset each time */
-	image_main_area_set_view2d(sima, ar);
+	image_main_region_set_view2d(sima, ar);
 
 	/* we draw image in pixelspace */
 	draw_image_main(C, ar);
@@ -793,7 +793,7 @@ static void image_main_area_draw(const bContext *C, ARegion *ar)
 #endif
 }
 
-static void image_main_area_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar, wmNotifier *wmn)
+static void image_main_region_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -821,7 +821,7 @@ static void image_main_area_listener(bScreen *UNUSED(sc), ScrArea *sa, ARegion *
 /* *********************** buttons region ************************ */
 
 /* add handlers, stuff you only do once or on area/region changes */
-static void image_buttons_area_init(wmWindowManager *wm, ARegion *ar)
+static void image_buttons_region_init(wmWindowManager *wm, ARegion *ar)
 {
 	wmKeyMap *keymap;
 
@@ -832,12 +832,12 @@ static void image_buttons_area_init(wmWindowManager *wm, ARegion *ar)
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
 }
 
-static void image_buttons_area_draw(const bContext *C, ARegion *ar)
+static void image_buttons_region_draw(const bContext *C, ARegion *ar)
 {
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void image_buttons_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void image_buttons_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -873,7 +873,7 @@ static void image_buttons_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa)
 /* *********************** scopes region ************************ */
 
 /* add handlers, stuff you only do once or on area/region changes */
-static void image_tools_area_init(wmWindowManager *wm, ARegion *ar)
+static void image_tools_region_init(wmWindowManager *wm, ARegion *ar)
 {
 	wmKeyMap *keymap;
 	
@@ -884,7 +884,7 @@ static void image_tools_area_init(wmWindowManager *wm, ARegion *ar)
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
 }
 
-static void image_tools_area_draw(const bContext *C, ARegion *ar)
+static void image_tools_region_draw(const bContext *C, ARegion *ar)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
 	Scene *scene = CTX_data_scene(C);
@@ -910,7 +910,7 @@ static void image_tools_area_draw(const bContext *C, ARegion *ar)
 	ED_region_panels(C, ar, NULL, -1, true);
 }
 
-static void image_tools_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void image_tools_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -946,17 +946,17 @@ static void image_tools_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa),
 /************************* header region **************************/
 
 /* add handlers, stuff you only do once or on area/region changes */
-static void image_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar)
+static void image_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar)
 {
 	ED_region_header_init(ar);
 }
 
-static void image_header_area_draw(const bContext *C, ARegion *ar)
+static void image_header_region_draw(const bContext *C, ARegion *ar)
 {
 	ED_region_header(C, ar);
 }
 
-static void image_header_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void image_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
@@ -1005,9 +1005,9 @@ void ED_spacetype_image(void)
 	art = MEM_callocN(sizeof(ARegionType), "spacetype image region");
 	art->regionid = RGN_TYPE_WINDOW;
 	art->keymapflag = ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL;
-	art->init = image_main_area_init;
-	art->draw = image_main_area_draw;
-	art->listener = image_main_area_listener;
+	art->init = image_main_region_init;
+	art->draw = image_main_region_draw;
+	art->listener = image_main_region_listener;
 
 	BLI_addhead(&st->regiontypes, art);
 	
@@ -1016,9 +1016,9 @@ void ED_spacetype_image(void)
 	art->regionid = RGN_TYPE_UI;
 	art->prefsizex = 220; // XXX
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
-	art->listener = image_buttons_area_listener;
-	art->init = image_buttons_area_init;
-	art->draw = image_buttons_area_draw;
+	art->listener = image_buttons_region_listener;
+	art->init = image_buttons_region_init;
+	art->draw = image_buttons_region_draw;
 	BLI_addhead(&st->regiontypes, art);
 
 	ED_uvedit_buttons_register(art);
@@ -1029,9 +1029,9 @@ void ED_spacetype_image(void)
 	art->regionid = RGN_TYPE_TOOLS;
 	art->prefsizex = 220; // XXX
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES;
-	art->listener = image_tools_area_listener;
-	art->init = image_tools_area_init;
-	art->draw = image_tools_area_draw;
+	art->listener = image_tools_region_listener;
+	art->init = image_tools_region_init;
+	art->draw = image_tools_region_draw;
 	BLI_addhead(&st->regiontypes, art);
 
 	/* regions: header */
@@ -1039,9 +1039,9 @@ void ED_spacetype_image(void)
 	art->regionid = RGN_TYPE_HEADER;
 	art->prefsizey = HEADERY;
 	art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER;
-	art->listener = image_header_area_listener;
-	art->init = image_header_area_init;
-	art->draw = image_header_area_draw;
+	art->listener = image_header_region_listener;
+	art->init = image_header_region_init;
+	art->draw = image_header_region_draw;
 	
 	BLI_addhead(&st->regiontypes, art);