From b935d83ec9a750778f0caceb287cc4dd28dc9363 Mon Sep 17 00:00:00 2001
From: dborth <dborth@4b873856-2fda-11de-9cad-a3574e5575ef>
Date: Wed, 14 Oct 2009 06:22:27 +0000
Subject: [PATCH] rewrite mouse motion code, change vres when display size
 changes

---
 SDL/src/video/wii/SDL_wiievents.c | 24 +++++-------------------
 SDL/src/video/wii/SDL_wiivideo.c  |  7 ++++---
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/SDL/src/video/wii/SDL_wiievents.c b/SDL/src/video/wii/SDL_wiievents.c
index ba4f025..f68bfd2 100644
--- a/SDL/src/video/wii/SDL_wiievents.c
+++ b/SDL/src/video/wii/SDL_wiievents.c
@@ -33,8 +33,6 @@
 #include "SDL_wiivideo.h"
 #include "SDL_wiievents_c.h"
 
-static int lastX = 0;
-static int lastY = 0;
 static Uint8 lastButtonStateA = SDL_RELEASED;
 static Uint8 lastButtonStateB = SDL_RELEASED;
 
@@ -42,6 +40,7 @@ static SDLKey keymap[232];
 
 static s32 stat;
 static s32 mstat;
+static WPADData *wd;
 
 static keyboard_event ke;
 static mouse_event me;
@@ -56,25 +55,13 @@ void PumpEvents()
 #ifdef HW_RVL
 	if (TerminateRequested) Terminate();
 #endif
-	WPADData *wd = WPAD_Data(0);
-
+	wd = WPAD_Data(0);
 	stat = KEYBOARD_GetEvent(&ke);
 	mstat = MOUSE_GetEvent(&me);
-	int x, y;
-
-	SDL_GetMouseState(&x, &y);
 
 	if (wd->ir.valid)
 	{
-		x = wd->ir.x;
-		y = wd->ir.y;
-
-		if (lastX != x || lastY != y)
-		{
-			posted += SDL_PrivateMouseMotion(0, 0, x, y);
-			lastX = x;
-			lastY = y;
-		}
+		posted += SDL_PrivateMouseMotion(0, 0, (int)wd->ir.x, (int)wd->ir.y);
 
 		Uint8 stateA = SDL_RELEASED;
 		Uint8 stateB = SDL_RELEASED;
@@ -87,16 +74,15 @@ void PumpEvents()
 		{
 			stateB = SDL_PRESSED;
 		}
-
 		if (stateA != lastButtonStateA)
 		{
 			lastButtonStateA = stateA;
-			posted += SDL_PrivateMouseButton(stateA, SDL_BUTTON_LEFT, x, y);
+			posted += SDL_PrivateMouseButton(stateA, SDL_BUTTON_LEFT, 0, 0);
 		}
 		if (stateB != lastButtonStateB)
 		{
 			lastButtonStateB = stateB;
-			posted += SDL_PrivateMouseButton(stateB, SDL_BUTTON_RIGHT, x, y);
+			posted += SDL_PrivateMouseButton(stateB, SDL_BUTTON_RIGHT, 0, 0);
 		}
 	}
 
diff --git a/SDL/src/video/wii/SDL_wiivideo.c b/SDL/src/video/wii/SDL_wiivideo.c
index de46636..9b1588c 100644
--- a/SDL/src/video/wii/SDL_wiivideo.c
+++ b/SDL/src/video/wii/SDL_wiivideo.c
@@ -62,6 +62,7 @@ unsigned int *xfb[2] = { NULL, NULL }; // Double buffered
 int whichfb = 0; // Switch
 GXRModeObj* vmode = 0;
 u8 * screenTex = NULL; // screen capture
+static int quit_flip_thread = 0;
 static unsigned char texturemem[TEXTUREMEM_SIZE] __attribute__((aligned(32))); // GX texture
 static unsigned char textureconvert[TEXTUREMEM_SIZE] __attribute__((aligned(32))); // 565 mem
 
@@ -194,8 +195,7 @@ static void TakeScreenshot()
 	DCFlushRange(screenTex, texSize);
 }
 
-static int quit_flip_thread = 0;
-int flip_thread(void * arg)
+static void * flip_thread (void *arg)
 {
 	while(1)
 	{
@@ -232,7 +232,7 @@ int flip_thread(void * arg)
 		VIDEO_Flush();
 		VIDEO_WaitVSync();
 	}
-	return 0;
+	return NULL;
 }
 
 static void
@@ -435,6 +435,7 @@ SDL_Surface *WII_SetVideoMode(_THIS, SDL_Surface *current,
 	currentwidth = current->w;
 	currentheight = current->h;
 	currentbpp = bpp;
+	WPAD_SetVRes(WPAD_CHAN_ALL, currentwidth, currentheight);
 	draw_init();
 	StartVideoThread();
 	/* We're done */