From 7a3d2be8044bc205030dde5759f2aba5532819d4 Mon Sep 17 00:00:00 2001 From: Miku AuahDark Date: Tue, 6 Dec 2022 14:51:03 +0800 Subject: [PATCH] Remove touch coordinates normalization workaround in Linux. --- src/modules/event/sdl/Event.cpp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp index 7dfec19a4..322bd0d84 100644 --- a/src/modules/event/sdl/Event.cpp +++ b/src/modules/event/sdl/Event.cpp @@ -193,10 +193,6 @@ Message *Event::convert(const SDL_Event &e) love::touch::Touch::TouchInfo touchinfo; #endif -#ifdef LOVE_LINUX - static bool touchNormalizationBug = false; -#endif - switch (e.type) { case SDL_KEYDOWN: @@ -315,22 +311,9 @@ Message *Event::convert(const SDL_Event &e) touchinfo.dy = e.tfinger.dy; touchinfo.pressure = e.tfinger.pressure; -#ifdef LOVE_LINUX - // FIXME: hacky workaround for SDL not normalizing touch coordinates in - // its X11 backend: https://bugzilla.libsdl.org/show_bug.cgi?id=2307 - if (touchNormalizationBug || fabs(touchinfo.x) >= 1.5 || fabs(touchinfo.y) >= 1.5 || fabs(touchinfo.dx) >= 1.5 || fabs(touchinfo.dy) >= 1.5) - { - touchNormalizationBug = true; - windowToDPICoords(&touchinfo.x, &touchinfo.y); - windowToDPICoords(&touchinfo.dx, &touchinfo.dy); - } - else -#endif - { - // SDL's coords are normalized to [0, 1], but we want screen coords. - normalizedToDPICoords(&touchinfo.x, &touchinfo.y); - normalizedToDPICoords(&touchinfo.dx, &touchinfo.dy); - } + // SDL's coords are normalized to [0, 1], but we want screen coords. + normalizedToDPICoords(&touchinfo.x, &touchinfo.y); + normalizedToDPICoords(&touchinfo.dx, &touchinfo.dy); // We need to update the love.touch.sdl internal state from here. touchmodule = (touch::sdl::Touch *) Module::getInstance("love.touch.sdl");