Mercurial > sdl-ios-xcode

--- a/src/video/gapi/SDL_gapivideo.c	Wed Nov 05 20:08:17 2008 +0000
+++ b/src/video/gapi/SDL_gapivideo.c	Fri Nov 07 04:15:36 2008 +0000
@@ -651,6 +651,7 @@
 	}

 	gapi->userOrientation = SDL_ORIENTATION_UP;
+       gapi->systemOrientation = SDL_ORIENTATION_UP;
 	video->flags = SDL_FULLSCREEN;	/* Clear flags, GAPI supports fullscreen only */

 	/* GAPI or VGA? */
@@ -669,18 +670,21 @@
 	}

 	/* detect user landscape mode */
-	if( (width > height) && (GetSystemMetrics(SM_CXSCREEN) < GetSystemMetrics(SM_CYSCREEN)))
+       if( (width > height) && (gapi->gxProperties.cxWidth < gapi->gxProperties.cyHeight))
 		gapi->userOrientation = SDL_ORIENTATION_RIGHT;

+       if(GetSystemMetrics(SM_CYSCREEN) < GetSystemMetrics(SM_CXSCREEN))
+               gapi->systemOrientation = SDL_ORIENTATION_RIGHT;
+
 	/* shall we apply hires fix? for example when we do not use hires resource */
 	gapi->hiresFix = 0;
-	if( gapi->userOrientation == SDL_ORIENTATION_RIGHT )
+       if( gapi->systemOrientation == gapi->userOrientation )
 	{
-		if( (width > GetSystemMetrics(SM_CYSCREEN)) || (height > GetSystemMetrics(SM_CXSCREEN)))
+               if( (width > GetSystemMetrics(SM_CXSCREEN)) || (height > GetSystemMetrics(SM_CYSCREEN)))
 			gapi->hiresFix = 1;
 	} else
-		if( (width > GetSystemMetrics(SM_CXSCREEN)) || (height > GetSystemMetrics(SM_CYSCREEN)))
-			if( !((width == GetSystemMetrics(SM_CYSCREEN)) && (height == GetSystemMetrics(SM_CXSCREEN)))) // user portrait, device landscape
+               if( (width > GetSystemMetrics(SM_CYSCREEN)) || (height > GetSystemMetrics(SM_CXSCREEN)))
+//                     if( !((width == gapi->gxProperties.cyHeight) && (height == gapi->gxProperties.cxWidth))) // user portrait, device landscape
 				gapi->hiresFix = 1;

 	switch( gapi->userOrientation )
@@ -750,21 +754,30 @@
 	WIN_FlushMessageQueue();

 	/* Open GAPI display */
-	if( !gapi->useVga && this->hidden->useGXOpenDisplay )
+       if( !gapi->useVga && this->hidden->useGXOpenDisplay && !this->hidden->alreadyGXOpened )
+       {
+               this->hidden->alreadyGXOpened = 1;
 		if( !gapi->gxFunc.GXOpenDisplay(SDL_Window, GX_FULLSCREEN) )
 		{
 			SDL_SetError("Couldn't initialize GAPI");
 			return(NULL);
 		}
+       }

 #if REPORT_VIDEO_INFO
 	printf("Video properties:\n");
 	printf("display bpp: %d\n", gapi->gxProperties.cBPP);
 	printf("display width: %d\n", gapi->gxProperties.cxWidth);
 	printf("display height: %d\n", gapi->gxProperties.cyHeight);
+       printf("system display width: %d\n", GetSystemMetrics(SM_CXSCREEN));
+       printf("system display height: %d\n", GetSystemMetrics(SM_CYSCREEN));
 	printf("x pitch: %d\n", gapi->gxProperties.cbxPitch);
 	printf("y pitch: %d\n", gapi->gxProperties.cbyPitch);
 	printf("gapi flags: 0x%x\n", gapi->gxProperties.ffFormat);
+       printf("user orientation: %d\n", gapi->userOrientation);
+       printf("system orientation: %d\n", gapi->userOrientation);
+       printf("gapi orientation: %d\n", gapi->gapiOrientation);
+

 	if( !gapi->useVga && this->hidden->useGXOpenDisplay && gapi->needUpdate)
 	{
--- a/src/video/gapi/SDL_gapivideo.h	Wed Nov 05 20:08:17 2008 +0000
+++ b/src/video/gapi/SDL_gapivideo.h	Fri Nov 07 04:15:36 2008 +0000
@@ -126,21 +126,26 @@
    begin with DIB private structure to allow DIB events code sharing
 */
 struct SDL_PrivateVideoData {
-    HBITMAP screen_bmp;
-    HPALETTE screen_pal;
+	HBITMAP screen_bmp;
+	HPALETTE screen_pal;

 #define NUM_MODELISTS	4		/* 8, 16, 24, and 32 bits-per-pixel */
-    int SDL_nummodes[NUM_MODELISTS];
-    SDL_Rect **SDL_modelist[NUM_MODELISTS];
+	int SDL_nummodes[NUM_MODELISTS];
+	SDL_Rect **SDL_modelist[NUM_MODELISTS];
+	// The orientation of the video mode user wants to get
+	// Probably restricted to UP and RIGHT
 	SDL_ScreenOrientation userOrientation;
 	int invert;
 	char hiresFix; // using hires mode without defining hires resource
 // --------------
 	int useGXOpenDisplay; /* use GXOpenDispplay */
-    int w, h;
+	int alreadyGXOpened;
+	int w, h;
+	// The orientation of GAPI framebuffer.
+	// Never changes on the same device.
 	SDL_ScreenOrientation gapiOrientation;

-    void *buffer; // may be 8, 16, 24, 32 bpp
+	void *buffer; // may be 8, 16, 24, 32 bpp
 	PIXEL *videoMem;
 	BOOL needUpdate;
 	struct GXKeyList keyList;
@@ -153,6 +158,10 @@
 	int startOffset; // in bytes
 	int useVga;
 	int suspended; // do not pu anything into video memory
+	// The orientation of the system, as defined by SM_CXSCREEN and SM_CYSCREEN
+	// User can change it by using 'screen layout' in system options
+	// Restricted to UP or RIGHT
+	enum SDL_ScreenOrientation systemOrientation;
 };
--- a/src/video/wincommon/SDL_sysevents.c	Wed Nov 05 20:08:17 2008 +0000
+++ b/src/video/wincommon/SDL_sysevents.c	Fri Nov 07 04:15:36 2008 +0000
@@ -160,10 +160,22 @@
 #endif */
 			}
 			break;
+               // FIXME: Older version used just SDL_VideoSurface->(w, h)
+               // w and h are "clipped" while x and y are "raw", which caused
+               // x in former and y in latter case to be clipped in a wrong direction,
+               // thus offsetting the coordinate on 2 x clip pixels
+               //     (like, 128 for 640 -> 512 clipping).
+               // We will now try to extract and use raw values.
+               // The way to do that RIGHT is do (orientation-dependent) clipping before
+               // doing this transform, but it's hardly possible.
+
+               // SEE SDL_mouse.c /ClipOffset to understand these calculations.
 		case SDL_ORIENTATION_RIGHT:
 			if (!SDL_VideoSurface)
 				break;
-			rotatedX = SDL_VideoSurface->w - *y;
+                       rotatedX = (2 * ((SDL_VideoSurface->offset%SDL_VideoSurface->pitch)/
+                               SDL_VideoSurface->format->BytesPerPixel))
+                               + SDL_VideoSurface->w - *y;
 			rotatedY = *x;
 			*x = rotatedX;
 			*y = rotatedY;
@@ -172,7 +184,8 @@
 			if (!SDL_VideoSurface)
 				break;
 			rotatedX = *y;
-			rotatedY = SDL_VideoSurface->h - *x;
+                       rotatedY = (2 * (SDL_VideoSurface->offset/SDL_VideoSurface->pitch))
+                               + SDL_VideoSurface->h - *x;
 			*x = rotatedX;
 			*y = rotatedY;
 			break;