Fix

Author: Fancy2209

src/video/ogc/SDL_ogcmouse.c

@@ -29,6 +29,7 @@
 #include "SDL_ogcgxcommon.h"
 #include "SDL_ogcmouse.h"
 #include "SDL_ogcpixels.h"
+#include "SDL_ogcvideo.h"
 
 #include "../SDL_sysvideo.h"
 #include "../../render/SDL_sysrender.h"
@@ -175,7 +176,7 @@ void OGC_draw_cursor(_THIS)
     SDL_Mouse *mouse = SDL_GetMouse();
     OGC_CursorData *curdata;
     Mtx mv;
-    int screen_w, screen_h;
+    int screen_w, screen_h, viewport_w;
     float angle = 0.0f;
 
     if (!mouse || !mouse->cursor_shown ||
@@ -191,17 +192,15 @@ void OGC_draw_cursor(_THIS)
         if (!data->ir.valid) return;
     }
 
-    screen_w = _this->displays[0].current_mode.w;
+    viewport_w = _this->displays[0].current_mode.w;
+    screen_w = ((SDL_VideoData *)_this->displays[0].current_mode.driverdata)->vmode->fbWidth;
     screen_h = _this->displays[0].current_mode.h;
 
     curdata = mouse->cur_cursor->driverdata;
     OGC_load_texture(curdata->texels, curdata->w, curdata->h, GX_TF_RGBA8,
                      SDL_ScaleModeNearest);
 
     guMtxIdentity(mv);
-    if(screen_w == 854)
-    guMtxScaleApply(mv, mv, screen_w / 854.0f, screen_h / 480.0f, 1.0f);
-    else
     guMtxScaleApply(mv, mv, screen_w / 640.0f, screen_h / 480.0f, 1.0f);
 
     if (angle != 0.0f) {
@@ -212,7 +211,7 @@ void OGC_draw_cursor(_THIS)
     guMtxTransApply(mv, mv, mouse->x, mouse->y, 0);
     GX_LoadPosMtxImm(mv, GX_PNMTX1);
 
-    OGC_set_viewport(0, 0, screen_w, screen_h, screen_w);
+    OGC_set_viewport(0, 0, screen_w, screen_h, viewport_w);
 
     GX_ClearVtxDesc();
     GX_SetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -244,7 +243,8 @@ void OGC_draw_cursor(_THIS)
         SDL_Renderer *renderer = SDL_GetRenderer(_this->windows);
         if (renderer) {
             OGC_set_viewport(renderer->viewport.x, renderer->viewport.y,
-                             renderer->viewport.w, renderer->viewport.h);
+                             renderer->viewport.w, renderer->viewport.h,
+                             renderer->viewport.w);
         }
     }
 }

src/video/ogc/SDL_ogcvideo.c

@@ -309,11 +309,29 @@ int OGC_VideoInit(_THIS)
     VIDEO_Init();
 
     vmode = VIDEO_GetPreferredMode(NULL);
+    vmode->viWidth = 704;
+
+    // set Center point
+	if (&s_mode704 == &TVPal576IntDfScale || &s_mode704 == &TVPal576ProgScale) 
+	{
+		vmode->viXOrigin = (VI_MAX_WIDTH_PAL - vmode->viWidth) / 2;
+		vmode->viYOrigin = (VI_MAX_HEIGHT_PAL - vmode->viHeight) / 2;
+	} 
+	else 
+	{
+		vmode->viXOrigin = (VI_MAX_WIDTH_NTSC - vmode->viWidth) / 2;
+		vmode->viYOrigin = (VI_MAX_HEIGHT_NTSC - vmode->viHeight) / 2;
+	}
 
     videodata->gp_fifo = memalign(32, DEFAULT_FIFO_SIZE);
     memset(videodata->gp_fifo, 0, DEFAULT_FIFO_SIZE);
     GX_Init(videodata->gp_fifo, DEFAULT_FIFO_SIZE);
 
+    #ifdef __wii__
+    if(CONF_GetAspectRatio() == CONF_ASPECT_16_9)
+    setup_video_mode(_this, vmode, 854);
+    else
+    #endif    
     setup_video_mode(_this, vmode, vmode->fbWidth);
     GX_SetCopyClear(background, GX_MAX_Z24);