We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] GapiTransform fixed

libsdl-1.2.svn-gapitransform.diff (text/plain), 4.01 KB, created by Andrey on 2009-09-18 23:19:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey

Created: 2009-09-18 23:19:57 UTC

Size: 4.01 KB

patch

obsolete

>Index: src/video/windib/SDL_dibevents.c
>===================================================================
>--- src/video/windib/SDL_dibevents.c	(revision 4719)
>+++ src/video/windib/SDL_dibevents.c	(working copy)
>@@ -88,74 +88,37 @@
> 	return key;
> }
> 
>-/* for gapi landscape mode */
>-static void GapiTransform(SDL_ScreenOrientation rotate, char hires, Sint16 *x, Sint16 *y) {
>+static void GapiTransform(GapiInfo *gapiInfo, LONG *x, LONG *y) {
>     Sint16 rotatedX;
>     Sint16 rotatedY;
> 
>-    if (hires) {
>-        *x = *x * 2;
>-        *y = *y * 2;
>+    if(gapiInfo->userOrientation == SDL_ORIENTATION_UP &&
>+       gapiInfo->gapiOrientation == SDL_ORIENTATION_RIGHT)
>+    {
>+        rotatedX = *x;
>+        rotatedY = *y;
>+        *x = rotatedX;
>+        *y = rotatedY;
>+     }
>+    else
>+    if(gapiInfo->userOrientation == SDL_ORIENTATION_RIGHT &&
>+       gapiInfo->gapiOrientation == SDL_ORIENTATION_RIGHT)
>+    {
>+        rotatedX = (2 * ((SDL_VideoSurface->offset%SDL_VideoSurface->pitch)/
>+                    SDL_VideoSurface->format->BytesPerPixel))
>+                    + SDL_VideoSurface->w - *y;
>+        rotatedY = *x;
>+        *x = rotatedX;
>+        *y = rotatedY;
>     }
>-
>-    switch(rotate) {
>-        case SDL_ORIENTATION_UP:
>-            {
>-/* this code needs testing on a real device!
>-   So it will be enabled later */
>-/*
>-#ifdef _WIN32_WCE
>-#if _WIN32_WCE >= 420
>-                // test device orientation
>-                // FIXME: do not check every mouse message
>-                DEVMODE settings;
>-                SDL_memset(&settings, 0, sizeof(DEVMODE));
>-                settings.dmSize = sizeof(DEVMODE);
>-                settings.dmFields = DM_DISPLAYORIENTATION;
>-                ChangeDisplaySettingsEx(NULL, &settings, NULL, CDS_TEST, NULL);
>-                if( settings.dmOrientation == DMDO_90 )
>-                {
>-                    rotatedX = SDL_VideoSurface->h - *x;
>-                    rotatedY = *y;
>-                    *x = rotatedX;
>-                    *y = rotatedY;
>-                }
>-#endif
>-#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 = (2 * ((SDL_VideoSurface->offset%SDL_VideoSurface->pitch)/
>-                               SDL_VideoSurface->format->BytesPerPixel))
>-                               + SDL_VideoSurface->w - *y;
>-            rotatedY = *x;
>-            *x = rotatedX;
>-            *y = rotatedY;
>-            break;
>-        case SDL_ORIENTATION_LEFT:
>-            if (!SDL_VideoSurface)
>-                break;
>-            rotatedX = *y;
>-                       rotatedY = (2 * (SDL_VideoSurface->offset/SDL_VideoSurface->pitch))
>-                               + SDL_VideoSurface->h - *x;
>-            *x = rotatedX;
>-            *y = rotatedY;
>-            break;
>+    else
>+    {
>+        rotatedX = SDL_VideoSurface->w - *y;
>+        rotatedY = *x;
>+        *y = rotatedY;
>+        *x = rotatedX;
>     }
> }
>-
> #endif 
> 
> 
>@@ -363,7 +326,7 @@
> 		ScreenToClient(SDL_Window, &mouse);
> #ifdef SDL_VIDEO_DRIVER_GAPI
>        if (SDL_VideoSurface && this->hidden->gapiInfo)
>-			GapiTransform(this->hidden->gapiInfo->coordinateTransform, this->hidden->gapiInfo->hiresFix, &mouse.x, &mouse.y);
>+			GapiTransform(this->hidden->gapiInfo, &mouse.x, &mouse.y);
> #endif
> 		posted = SDL_PrivateMouseMotion(0, 0, mouse.x, mouse.y);
> 	}

Actions: View | Diff

Attachments on bug 795: 355 | 356 | 365 | 366 | 367

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.