Assorted Fixes

Fix 4:3
Make mouse actually unstreched on 16:9
Fix SDL_DisplayMode 16:9 width (for real this time)

Author: Fancy2209

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.wog2": "json",
+        "xutility": "c"
+    }
+}

src/render/ogc/SDL_render_ogc.c

@@ -427,8 +427,14 @@ static int OGC_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL
 static int OGC_RenderSetViewPort(SDL_Renderer *renderer, SDL_RenderCommand *cmd)
 {
     const SDL_Rect *viewport = &cmd->data.viewport.rect;
-    OGC_set_viewport(viewport->x, viewport->y, viewport->w, viewport->h, 
-                     viewport->w==640 ? (viewport->h*16.0f/9.0f)+1 : viewport->w);
+    #ifdef __wii__
+    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
+        OGC_set_viewport(viewport->x, viewport->y, viewport->w, viewport->h, 
+                         viewport->w==640 ? (viewport->h*16.0f/9.0f)+1 : viewport->w);
+    else
+    #endif
+    OGC_set_viewport(viewport->x, viewport->y, viewport->w, viewport->h, viewport->w);
+    
     return 0;
 }
 

src/video/ogc/SDL_ogcgxcommon.c

@@ -54,11 +54,11 @@ static const f32 tex_pos[] __attribute__((aligned(32))) = {
  * and the image ends up distorted, an example of this is VVVVVV. */
 void OGC_set_viewport(int x, int y, int w, int h, int widthAdjustedForWidescreen)
 {
+    SDL_Log("OGC_set_viewport: %d %d %d %d %d", x, y, w, h, widthAdjustedForWidescreen);
     Mtx44 proj;
 
-    // Since the SDL 
-    GX_SetViewport(x, y, w > 640 ? 640 : w, h, 0, 1);
-    GX_SetScissor(x, y, w > 640 ? 640 : w, h);
+    GX_SetViewport(x, y, (w > 640) ? 640 : w, h, 0, 1);
+    GX_SetScissor(x, y, (w > 640) ? 640 : w, h);
 
     // matrix, t, b, l, r, n, f
     guOrtho(proj, 0, h, 0, widthAdjustedForWidescreen, 0, 1);

src/video/ogc/SDL_ogcmouse.c

@@ -176,7 +176,7 @@ void OGC_draw_cursor(_THIS)
     SDL_Mouse *mouse = SDL_GetMouse();
     OGC_CursorData *curdata;
     Mtx mv;
-    int viewport_w, screen_h, screen_w;
+    int screen_w, screen_h;
     float angle = 0.0f;
 
     if (!mouse || !mouse->cursor_shown ||
@@ -193,15 +193,19 @@ void OGC_draw_cursor(_THIS)
     }
 
     screen_w = _this->displays[0].current_mode.w;
-    viewport_w = (screen_w == 854) ? 640 : _this->displays[0].current_mode.w;
     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);
-    guMtxScaleApply(mv, mv, viewport_w / 640.0f, screen_h / 480.0f, 1.0f);
+#ifdef __wii__
+    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
+        guMtxScaleApply(mv, mv, screen_w / 854.0f, screen_h / 480.0f, 1.0f);
+    else
+#endif
+        guMtxScaleApply(mv, mv, screen_w / 640.0f, screen_h / 480.0f, 1.0f);
 
     if (angle != 0.0f) {
         Mtx rot;
@@ -211,7 +215,7 @@ void OGC_draw_cursor(_THIS)
     guMtxTransApply(mv, mv, mouse->x, mouse->y, 0);
     GX_LoadPosMtxImm(mv, GX_PNMTX1);
 
-    OGC_set_viewport(0, 0, viewport_w, screen_h, screen_w);
+    OGC_set_viewport(0, 0, screen_w, screen_h, screen_w);
 
     GX_ClearVtxDesc();
     GX_SetVtxDesc(GX_VA_POS, GX_DIRECT);

src/video/ogc/SDL_ogcvideo.c

@@ -95,9 +95,11 @@ static void init_display_mode(SDL_DisplayMode *mode, const GXRModeObj *vmode)
     SDL_zero(*mode);
     mode->format = SDL_PIXELFORMAT_ARGB8888;
 
-    if (vmode->viWidth == 704)
-        mode->w = ((int)(vmode->fbWidth * 16.0f / 9.0f) + 1);
+    #ifdef __wii__
+    if (CONF_GetAspectRatio() == CONF_ASPECT_16_9)
+        mode->w = ((int)(vmode->fbWidth * 16.0f / 9.0f)) + 1;
     else
+    #endif
         mode->w = vmode->fbWidth;
     mode->h = vmode->efbHeight;
     switch (format) {