Mercurial > sdl-ios-xcode

changeset 488:0a111805b53a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed missing cursor after shadow buffer flip (thanks Jan!)
author Sam Lantinga <slouken@libsdl.org>
date Mon, 09 Sep 2002 03:22:19 +0000
parents 414d77a36716
children d90349051cab
files src/video/SDL_video.c
diffstat 1 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/SDL_video.c	Mon Sep 02 21:42:15 2002 +0000
+++ b/src/video/SDL_video.c	Mon Sep 09 03:22:19 2002 +0000
@@ -966,9 +966,9 @@
 
 	if ( screen == SDL_ShadowSurface ) {
 		/* Blit the shadow surface using saved mapping */
-	        SDL_Palette *pal = screen->format->palette;
+		SDL_Palette *pal = screen->format->palette;
 		SDL_Color *saved_colors = NULL;
-	        if ( pal && !(SDL_VideoSurface->flags & SDL_HWPALETTE) ) {
+		if ( pal && !(SDL_VideoSurface->flags & SDL_HWPALETTE) ) {
 			/* simulated 8bpp, use correct physical palette */
 			saved_colors = pal->colors;
 			if ( video->gammacols ) {
@@ -994,8 +994,9 @@
 						SDL_VideoSurface, &rects[i]);
 			}
 		}
-		if ( saved_colors )
+		if ( saved_colors ) {
 			pal->colors = saved_colors;
+		}
 
 		/* Fall through to video surface update */
 		screen = SDL_VideoSurface;
@@ -1027,9 +1028,9 @@
 	/* Copy the shadow surface to the video surface */
 	if ( screen == SDL_ShadowSurface ) {
 		SDL_Rect rect;
-	        SDL_Palette *pal = screen->format->palette;
+		SDL_Palette *pal = screen->format->palette;
 		SDL_Color *saved_colors = NULL;
-	        if ( pal && !(SDL_VideoSurface->flags & SDL_HWPALETTE) ) {
+		if ( pal && !(SDL_VideoSurface->flags & SDL_HWPALETTE) ) {
 			/* simulated 8bpp, use correct physical palette */
 			saved_colors = pal->colors;
 			if ( video->gammacols ) {
@@ -1045,10 +1046,22 @@
 		rect.y = 0;
 		rect.w = screen->w;
 		rect.h = screen->h;
-		SDL_LowerBlit(SDL_ShadowSurface,&rect, SDL_VideoSurface,&rect);
+		if ( SHOULD_DRAWCURSOR(SDL_cursorstate) ) {
+			SDL_LockCursor();
+			SDL_DrawCursor(SDL_ShadowSurface);
+			SDL_LowerBlit(SDL_ShadowSurface, &rect,
+					SDL_VideoSurface, &rect);
+			SDL_EraseCursor(SDL_ShadowSurface);
+			SDL_UnlockCursor();
+		} else {
+			SDL_LowerBlit(SDL_ShadowSurface, &rect,
+					SDL_VideoSurface, &rect);
+		}
+		if ( saved_colors ) {
+			pal->colors = saved_colors;
+		}
 
-		if ( saved_colors )
-			pal->colors = saved_colors;
+		/* Fall through to video surface update */
 		screen = SDL_VideoSurface;
 	}
 	if ( (screen->flags & SDL_DOUBLEBUF) == SDL_DOUBLEBUF ) {