Avoid 'unknown event' spam when testing with touchpad. #87

This commit is contained in:
Radegast 2014-05-19 15:52:33 +01:00
parent 0ae98f62c4
commit 764b067825
3 changed files with 13 additions and 8 deletions

View file

@ -260,6 +260,8 @@ __________________________________________
- Win64 support
- OS X support
- OpenAL Soft sound backend primarily developed for Linux but works on Windows as well
- Bink video support through FFmpeg

View file

@ -102,7 +102,7 @@ If you have questions concerning this license or the applicable additional terms
#endif
#else // not WIN32
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__)
#if defined(__i386__)
#define CPUSTRING "x86"
@ -110,14 +110,12 @@ If you have questions concerning this license or the applicable additional terms
#define CPUSTRING "x86_86"
#endif
#ifdef __FreeBSD__
#if defined(__FreeBSD__)
#define BUILD_STRING "freebsd-" CPUSTRING
#elif __linux__
#elif defined(__linux__)
#define BUILD_STRING "linux-" CPUSTRING
#elif __APPLE__
#elif defined(__APPLE__)
#define BUILD_STRING "osx-" CPUSTRING
#else // unknown OS
#define BUILD_STRING "unknown-" CPUSTRING
#endif
#define _alloca alloca

View file

@ -935,7 +935,7 @@ sysEvent_t Sys_GetEvent()
return res_none;
#endif
case SDL_MOUSEMOTION:
// DG: return event with absolute mouse-coordinates when in menu
// to fix cursor problems in windowed mode
@ -955,10 +955,15 @@ sysEvent_t Sys_GetEvent()
mouse_polls.Append( mouse_poll_t( M_DELTAX, ev.motion.xrel ) );
mouse_polls.Append( mouse_poll_t( M_DELTAY, ev.motion.yrel ) );
return res;
#if SDL_VERSION_ATLEAST(2, 0, 0)
case SDL_FINGERDOWN:
case SDL_FINGERUP:
case SDL_FINGERMOTION:
return res_none; // Avoid 'unknown event' spam when testing with touchpad
case SDL_MOUSEWHEEL:
res.evType = SE_KEY;