From e69bc8e1dbd8a91257eb3485351747eb29636004 Mon Sep 17 00:00:00 2001
From: ghaushe <ghaushe@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Tue, 21 Jan 2003 03:49:00 +0000
Subject: [PATCH] minor optimization for main-menu flash.  No longer draw to
 the entire screen

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@571 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/gfxlib.h         |  1 +
 sc2/src/sc2code/libs/graphics/frame.c |  2 +-
 sc2/src/sc2code/sis.c                 | 32 ++++++++++++++-------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/sc2/src/sc2code/libs/gfxlib.h b/sc2/src/sc2code/libs/gfxlib.h
index 387df96b2..00ee01e2f 100644
--- a/sc2/src/sc2code/libs/gfxlib.h
+++ b/sc2/src/sc2code/libs/gfxlib.h
@@ -319,6 +319,7 @@ extern void DrawBatch (PPRIMITIVE pBasePrim, PRIM_LINKS PrimLinks,
 extern void BatchGraphics (void);
 extern void UnbatchGraphics (void);
 extern void FlushGraphics (void);
+extern void ClearBackGround (PRECT pClipRect);
 extern void ClearDrawable (void);
 extern CONTEXT_REF CreateContext (void);
 extern BOOLEAN DestroyContext (CONTEXT_REF ContextRef);
diff --git a/sc2/src/sc2code/libs/graphics/frame.c b/sc2/src/sc2code/libs/graphics/frame.c
index d466cac67..a79661dec 100644
--- a/sc2/src/sc2code/libs/graphics/frame.c
+++ b/sc2/src/sc2code/libs/graphics/frame.c
@@ -80,7 +80,7 @@ GetFrameValidRect (PRECT pValidRect, HOT_SPOT *pOldHot)
 	return (TRUE);
 }
 
-static void
+void
 ClearBackGround (PRECT pClipRect)
 {
 	if (_get_context_bg_func ())
diff --git a/sc2/src/sc2code/sis.c b/sc2/src/sc2code/sis.c
index b97960250..53ae82685 100644
--- a/sc2/src/sc2code/sis.c
+++ b/sc2/src/sc2code/sis.c
@@ -1133,8 +1133,8 @@ int flash_rect_func(void *data)
 #define CACHE_SIZE 10
 	DWORD TimeIn, WaitTime;
 	SIZE strength, fstrength, incr;
-	RECT new_rect;
-	FRAME new_frame;
+	RECT cached_rect, framesize_rect;
+	FRAME cached_frame;
 	Task task = (Task)data;
 	int cached[CACHE_SIZE];
 	STAMP cached_stamp[CACHE_SIZE];
@@ -1157,12 +1157,14 @@ int flash_rect_func(void *data)
 		LockMutex (flash_mutex);
 		if (flash_changed)
 		{
-			new_rect = flash_rect;
-			new_frame = flash_frame;
+			cached_rect = flash_rect;
+			cached_frame = flash_frame;
 			flash_changed = 0;
 			UnlockMutex (flash_mutex);
 			//  Wait for the ExtraScreen to get initialized
 			FlushGraphics ();
+			if (cached_frame)
+				GetFrameRect (cached_frame, &framesize_rect);
 			for (i = 0; i < CACHE_SIZE; i++)
 			{
 				cached[i] = 0;
@@ -1176,11 +1178,11 @@ int flash_rect_func(void *data)
 		SetSemaphore (GraphicsSem);
 		OldContext = SetContext (ScreenContext);
 		
-		if (new_rect.extent.width)
+		if (cached_rect.extent.width)
 		{
 			BatchGraphics ();
-			SetContextClipRect (&new_rect);
-			if (new_frame)
+			SetContextClipRect (&cached_rect);
+			if (cached_frame)
 			{
 #define MIN_F_STRENGTH -3
 #define MAX_F_STRENGTH 3
@@ -1202,12 +1204,12 @@ int flash_rect_func(void *data)
 					{
 						STAMP s;
 
-						ClearDrawable ();
+						ClearBackGround (&framesize_rect);
 
 						SetGraphicStrength (fstrength > 0 ? fstrength : -fstrength, 16);
 					
 						s.origin.x = s.origin.y = 0;
-						s.frame = new_frame;
+						s.frame = cached_frame;
 						DrawStamp (&s);
 
 						if (fstrength < 0)
@@ -1216,15 +1218,15 @@ int flash_rect_func(void *data)
 							SetGraphicStrength (8, -8); // add to (partial mask)
 					}
 
-					DrawFromExtraScreen (&new_rect);
+					DrawFromExtraScreen (&framesize_rect);
 					SetGraphicStrength (4, 4);
 					{
 						STAMP *pStamp;
 						pStamp = &cached_stamp[fstrength - MIN_F_STRENGTH];
 						cached[fstrength - MIN_F_STRENGTH] = 1;
-						pStamp->origin.x = 0;
-						pStamp->origin.y = 0;
-						pStamp->frame = CaptureDrawable (LoadDisplayPixmap (&new_rect, (FRAME)0));
+						pStamp->origin.x = framesize_rect.corner.x;
+						pStamp->origin.y = framesize_rect.corner.y;
+						pStamp->frame = CaptureDrawable (LoadDisplayPixmap (&framesize_rect, (FRAME)0));
 					}
 				}
 			}
@@ -1239,7 +1241,7 @@ int flash_rect_func(void *data)
 				else
 				{
 					SetGraphicStrength (strength, 4);
-					DrawFromExtraScreen (&new_rect);
+					DrawFromExtraScreen (&cached_rect);
 					SetGraphicStrength (4, 4);
 
 					{
@@ -1248,7 +1250,7 @@ int flash_rect_func(void *data)
 						cached[strength - MIN_STRENGTH] = 1;
 						pStamp->origin.x = 0;
 						pStamp->origin.y = 0;
-						pStamp->frame = CaptureDrawable (LoadDisplayPixmap (&new_rect, (FRAME)0));
+						pStamp->frame = CaptureDrawable (LoadDisplayPixmap (&cached_rect, (FRAME)0));
 					}
 				}
 			}