The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-22 23:18:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add a hint watch callback for SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH.

Browse Source
This commit is contained in:
Ryan C. Gordon 2015-03-25 10:59:10 -04:00
parent 83a44680cb
commit 1270247ccd
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/video/android/SDL_androidtouch.c
View File

@ -50,11 +50,24 @@ static void Android_GetWindowCoordinates(float x, float y,
*window_y = (int)(y * window_h); *window_y = (int)(y * window_h);
} }
static volatile SDL_bool separate_mouse_and_touch = SDL_FALSE;
static void
SeparateEventsHintWatcher(void *userdata, const char *name,
const char *oldValue, const char *newValue)
{
separate_mouse_and_touch = (newValue && (SDL_strcmp(newValue, "1") == 0));
}
void Android_InitTouch(void) void Android_InitTouch(void)
{ {
int i; int i;
int* ids; int* ids;
int number = Android_JNI_GetTouchDeviceIds(&ids); const int number = Android_JNI_GetTouchDeviceIds(&ids);
SDL_AddHintCallback(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH,
SeparateEventsHintWatcher, NULL);
if (0 < number) { if (0 < number) {
for (i = 0; i < number; ++i) { for (i = 0; i < number; ++i) {
SDL_AddTouch((SDL_TouchID) ids[i], ""); /* no error handling */ SDL_AddTouch((SDL_TouchID) ids[i], ""); /* no error handling */
@ -63,12 +76,18 @@ void Android_InitTouch(void)
} }
} }
void Android_QuitTouch(void)
{
SDL_DelHintCallback(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH,
SeparateEventsHintWatcher, NULL);
separate_mouse_and_touch = SDL_FALSE;
}
void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p) void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p)
{ {
SDL_TouchID touchDeviceId = 0; SDL_TouchID touchDeviceId = 0;
SDL_FingerID fingerId = 0; SDL_FingerID fingerId = 0;
int window_x, window_y; int window_x, window_y;
const char * hint;
static SDL_FingerID pointerFingerID = 0; static SDL_FingerID pointerFingerID = 0;
if (!Android_Window) { if (!Android_Window) {
@ -81,12 +100,11 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
} }
fingerId = (SDL_FingerID)pointer_finger_id_in; fingerId = (SDL_FingerID)pointer_finger_id_in;
hint = SDL_GetHint("SDL_ANDROID_SEPARATE_MOUSE_AND_TOUCH");
switch (action) { switch (action) {
case ACTION_DOWN: case ACTION_DOWN:
/* Primary pointer down */ /* Primary pointer down */
Android_GetWindowCoordinates(x, y, &window_x, &window_y); Android_GetWindowCoordinates(x, y, &window_x, &window_y);
if ((!hint) || (hint && SDL_strcmp(hint, "1") != 0)) { if (!separate_mouse_and_touch) {
/* send moved event */ /* send moved event */
SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y); SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
/* send mouse down event */ /* send mouse down event */
@ -101,8 +119,7 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
case ACTION_MOVE: case ACTION_MOVE:
if (!pointerFingerID) { if (!pointerFingerID) {
Android_GetWindowCoordinates(x, y, &window_x, &window_y); Android_GetWindowCoordinates(x, y, &window_x, &window_y);
if (!separate_mouse_and_touch) {
if ((!hint) || (hint && SDL_strcmp(hint, "1") != 0)) {
/* send moved event */ /* send moved event */
SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y); SDL_SendMouseMotion(Android_Window, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
} }
@ -112,7 +129,7 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
case ACTION_UP: case ACTION_UP:
/* Primary pointer up */ /* Primary pointer up */
if ((!hint) || (hint && SDL_strcmp(hint, "1") != 0)) { if (!separate_mouse_and_touch) {
/* send mouse up */ /* send mouse up */
pointerFingerID = (SDL_FingerID) 0; pointerFingerID = (SDL_FingerID) 0;
SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT); SDL_SendMouseButton(Android_Window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);

1
src/video/android/SDL_androidtouch.h
View File

@ -23,6 +23,7 @@
#include "SDL_androidvideo.h" #include "SDL_androidvideo.h"
extern void Android_InitTouch(void); extern void Android_InitTouch(void);
extern void Android_QuitTouch(void);
extern void Android_OnTouch( int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p); extern void Android_OnTouch( int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p);
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */

1
src/video/android/SDL_androidvideo.c
View File

@ -188,6 +188,7 @@ Android_VideoInit(_THIS)
void void
Android_VideoQuit(_THIS) Android_VideoQuit(_THIS)
{ {
Android_QuitTouch();
} }
/* This function gets called before VideoInit() */ /* This function gets called before VideoInit() */