Code cleanup: remove WM subwindows.

These no longer made much sense after regions were added, they just
duplicated state that was already in the regions.

1 files changed, 9 insertions, 38 deletions

diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index b8301b5d44d..f6a1e8913ff 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -52,7 +52,6 @@
 #include "WM_api.h"
 #include "WM_types.h"
 #include "WM_message.h"
-#include "wm_subwindow.h"
 
 #include "ED_screen.h"
 #include "ED_screen_types.h"
@@ -529,27 +528,15 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
 	wmWindow *win = CTX_wm_window(C);
 	ScrArea *sa = CTX_wm_area(C);
 	ARegionType *at = ar->type;
-	bool scissor_pad;
 
 	/* see BKE_spacedata_draw_locks() */
 	if (at->do_lock)
 		return;
 
-	/* if no partial draw rect set, full rect */
-	if (ar->drawrct.xmin == ar->drawrct.xmax) {
-		ar->drawrct = ar->winrct;
-		scissor_pad = true;
-	}
-	else {
-		/* extra clip for safety */
-		BLI_rcti_isect(&ar->winrct, &ar->drawrct, &ar->drawrct);
-		scissor_pad = false;
-	}
-
 	ar->do_draw |= RGN_DRAWING;
 	
-	/* note; this sets state, so we can use wmOrtho and friends */
-	wmSubWindowScissorSet(win, ar->swinid, &ar->drawrct, scissor_pad);
+	/* Set viewport, scissor, ortho and ar->drawrct. */
+	wmPartialViewport(&ar->drawrct, &ar->winrct, &ar->drawrct);
 
 	wmOrtho2_region_pixelspace(ar);
 	
@@ -1436,24 +1423,14 @@ static void area_calc_totrct(ScrArea *sa, int sizex, int sizey)
 
 
 /* used for area initialize below */
-static void region_subwindow(wmWindow *win, ARegion *ar, bool activate)
+static void region_subwindow(ARegion *ar)
 {
 	bool hidden = (ar->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL)) != 0;
 
 	if ((ar->alignment & RGN_SPLIT_PREV) && ar->prev)
 		hidden = hidden || (ar->prev->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL));
 
-	if (hidden) {
-		if (ar->swinid)
-			wm_subwindow_close(win, ar->swinid);
-		ar->swinid = 0;
-	}
-	else if (ar->swinid == 0) {
-		ar->swinid = wm_subwindow_open(win, &ar->winrct, activate);
-	}
-	else {
-		wm_subwindow_position(win, ar->swinid, &ar->winrct, activate);
-	}
+	ar->visible = !hidden;
 }
 
 static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *handlers, int flag)
@@ -1560,9 +1537,9 @@ void ED_area_initialize(wmWindowManager *wm, wmWindow *win, ScrArea *sa)
 	
 	/* region windows, default and own handlers */
 	for (ar = sa->regionbase.first; ar; ar = ar->next) {
-		region_subwindow(win, ar, false);
+		region_subwindow(ar);
 		
-		if (ar->swinid) {
+		if (ar->visible) {
 			/* default region handlers */
 			ed_default_handlers(wm, sa, &ar->handlers, ar->type->keymapflag);
 			/* own handlers */
@@ -1589,22 +1566,16 @@ static void region_update_rect(ARegion *ar)
 /**
  * Call to move a popup window (keep OpenGL context free!)
  */
-void ED_region_update_rect(bContext *C, ARegion *ar)
+void ED_region_update_rect(bContext *UNUSED(C), ARegion *ar)
 {
-	wmWindow *win = CTX_wm_window(C);
-
-	wm_subwindow_rect_set(win, ar->swinid, &ar->winrct);
-
 	region_update_rect(ar);
 }
 
 /* externally called for floating regions like menus */
-void ED_region_init(bContext *C, ARegion *ar)
+void ED_region_init(bContext *UNUSED(C), ARegion *ar)
 {
-//	ARegionType *at = ar->type;
-
 	/* refresh can be called before window opened */
-	region_subwindow(CTX_wm_window(C), ar, false);
+	region_subwindow(ar);
 
 	region_update_rect(ar);
 }