Wii U: Added SDL_Window to touch events, so they can be mapped to mouse events. (#92)

* Added SDL_Window to touch events, so they can mapped to mouse events.

--HG--
branch : finger-window-hg

* Added an extra check, in case there's no video device.

--HG--
branch : finger-window-hg

* Update src/joystick/wiiu/SDL_wiiujoystick.c

Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>

---------

Co-authored-by: Daniel K. O. (dkosmari) <none@none>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>

Author: 3 people

src/joystick/wiiu/SDL_wiiujoystick.c

@@ -39,6 +39,7 @@
 #include "SDL_events.h"
 
 #include "SDL_wiiujoystick.h"
+#include "../../video/SDL_sysvideo.h"
 
 //index with device_index, get WIIU_DEVICE*
 static int deviceMap[MAX_CONTROLLERS];
@@ -67,6 +68,7 @@ static void WIIU_JoystickUpdate(SDL_Joystick *joystick);
 static void WIIU_JoystickClose(SDL_Joystick *joystick);
 static void WIIU_JoystickQuit(void);
 static SDL_bool WIIU_JoystickGetGamepadMapping(int device_index, SDL_GamepadMapping * out);
+static SDL_Window *WIIU_GetGamepadWindow(void);
 
 static int WIIU_GetDeviceForIndex(int device_index) {
 	return deviceMap[device_index];
@@ -112,6 +114,18 @@ static void WIIU_RemoveDevice(int wiiu_device) {
 	}
 }
 
+static SDL_Window *WIIU_GetGamepadWindow(void) {
+	// Find first visible window that is not TV-exclusive.
+	SDL_VideoDevice *dev = SDL_GetVideoDevice();
+	if (!dev)
+		return NULL;
+	for (SDL_Window *win = dev->windows; win; win = win->next) {
+		if ((win->flags & SDL_WINDOW_SHOWN) && !(win->flags & SDL_WINDOW_WIIU_TV_ONLY))
+			return win;
+	}
+	return NULL;
+}
+
 /* Function to scan the system for joysticks.
  * Joystick 0 should be the system default joystick.
  * This function should return 0, or -1 on an unrecoverable error.
@@ -472,15 +486,16 @@ static void WIIU_JoystickUpdate(SDL_Joystick *joystick)
 		/* touchscreen */
 		VPADGetTPCalibratedPoint(VPAD_CHAN_0, &tpdata, &vpad.tpNormal);
 		if (tpdata.touched) {
+			SDL_Window *window = WIIU_GetGamepadWindow();
 			if (!last_touched) {
 				/* Send an initial touch */
-				SDL_SendTouch(0, 0, NULL, SDL_TRUE,
+				SDL_SendTouch(0, 0, window, SDL_TRUE,
 						(float) tpdata.x / 1280.0f,
 						(float) tpdata.y / 720.0f, 1);
 			}
 
 			/* Always send the motion */
-			SDL_SendTouchMotion(0, 0, NULL,
+			SDL_SendTouchMotion(0, 0, window,
 					(float) tpdata.x / 1280.0f,
 					(float) tpdata.y / 720.0f, 1);
 
@@ -489,8 +504,9 @@ static void WIIU_JoystickUpdate(SDL_Joystick *joystick)
 			last_touch_y = tpdata.y;
 			last_touched = 1;
 		} else if (last_touched) {
+			SDL_Window *window = WIIU_GetGamepadWindow();
 			/* Finger released from screen */
-			SDL_SendTouch(0, 0, NULL, SDL_FALSE,
+			SDL_SendTouch(0, 0, window, SDL_FALSE,
 					(float) last_touch_x / 1280.0f,
 					(float) last_touch_y / 720.0f, 1);
 			last_touched = 0;

src/video/wiiu/SDL_wiiuvideo.h

@@ -51,8 +51,8 @@ struct WIIU_VideoData
 	void *drcScanBuffer;
 	uint32_t drcScanBufferSize;
 
-   // did the keyboard code initialize properly?
-   int kbd_init;
+	// did the keyboard code initialize properly?
+	int kbd_init;
 };
 
 #endif /* SDL_VIDEO_DRIVER_WIIU */