commit 60832b7b71764044af3c349b8c8b6b93e448d098
author Sylvain Becker <sylvain.becker@gmail.com> Wed Apr 10 10:59:53 2019 +0200
committer Sylvain Becker <sylvain.becker@gmail.com> Wed Apr 10 10:59:53 2019 +0200
tree 1cfecc2910b849c2c747ca5e9f4b34ea799304b2
parent 98eeaf9bc5df99d9494084d37bb9009b82b63bf3

Fixed bug 4581 - generate synthetic mouse events at window boundaries
when real touch events are actually outside the window.

src/events/SDL_touch.c

diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
index a5278d4..caf5e56 100644
--- a/src/events/SDL_touch.c
+++ b/src/events/SDL_touch.c
@@ -257,18 +257,16 @@
                         if (finger_touching == SDL_FALSE) {
                             int pos_x = (int)(x * (float)window->w);
                             int pos_y = (int)(y * (float)window->h);
-                            if (pos_x >= 0 && pos_y >= 0 && pos_x < window->w && pos_y < window->h) {
-                                SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
-                                SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
-                            }
+                            if (pos_x < 0) pos_x = 0;
+                            if (pos_x > window->w - 1) pos_x = window->w - 1;
+                            if (pos_y < 0) pos_y = 0;
+                            if (pos_y > window->h - 1) pos_y = window->h - 1;
+                            SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
+                            SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
                         }
                     } else {
                         if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) {
-                            int pos_x = (int)(x * (float)window->w);
-                            int pos_y = (int)(y * (float)window->h);
-                            if (pos_x >= 0 && pos_y >= 0 && pos_x < window->w && pos_y < window->h) {
-                                SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
-                            }
+                            SDL_SendMouseButton(window, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
                         }
                     }
                 }
@@ -361,9 +359,11 @@
                     if (finger_touching == SDL_TRUE && track_touchid == id && track_fingerid == fingerid) {
                         int pos_x = (int)(x * (float)window->w);
                         int pos_y = (int)(y * (float)window->h);
-                        if (pos_x >= 0 && pos_y >= 0 && pos_x < window->w && pos_y < window->h) {
-                            SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
-                        }
+                        if (pos_x < 0) pos_x = 0;
+                        if (pos_x > window->w - 1) pos_x = window->w - 1;
+                        if (pos_y < 0) pos_y = 0;
+                        if (pos_y > window->h - 1) pos_y = window->h - 1;
+                        SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
                     }
                 }
             }