From 3f78c77c1d274b1edf841e2f1573c839f323051f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 6 Jul 2007 13:45:10 +0000 Subject: [PATCH] Reverted mousewheel support in 1.2, since it breaks binary compatibility. --- include/SDL_compat.h | 2 -- src/SDL_compat.c | 47 ++++++++++++++++---------------------------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/include/SDL_compat.h b/include/SDL_compat.h index 2ee673b79..bac3ca225 100644 --- a/include/SDL_compat.h +++ b/include/SDL_compat.h @@ -63,8 +63,6 @@ extern "C" { #define SDL_BUTTON_WHEELUP 4 #define SDL_BUTTON_WHEELDOWN 5 -#define SDL_BUTTON_WHEELLEFT 6 -#define SDL_BUTTON_WHEELRIGHT 7 #define SDL_DEFAULT_REPEAT_DELAY 500 #define SDL_DEFAULT_REPEAT_INTERVAL 30 diff --git a/src/SDL_compat.c b/src/SDL_compat.c index 83838d205..4fd468642 100644 --- a/src/SDL_compat.c +++ b/src/SDL_compat.c @@ -252,46 +252,33 @@ SDL_CompatEventFilter(void *userdata, SDL_Event * event) int selected; int x, y; + if (event->wheel.y == 0) { + break; + } + selected = SDL_SelectMouse(event->wheel.which); SDL_GetMouseState(&x, &y); SDL_SelectMouse(selected); + if (event->wheel.y > 0) { + button = SDL_BUTTON_WHEELUP; + } else { + button = SDL_BUTTON_WHEELDOWN; + } + fake.button.which = event->wheel.windowID; + fake.button.button = button; fake.button.x = x; fake.button.y = y; fake.button.windowID = event->wheel.windowID; - if (event->wheel.y) { - if (event->wheel.y > 0) { - fake.button.button = SDL_BUTTON_WHEELUP; - } else { - fake.button.button = SDL_BUTTON_WHEELDOWN; - } - - fake.type = SDL_MOUSEBUTTONDOWN; - fake.button.state = SDL_PRESSED; - SDL_PushEvent(&fake); - - fake.type = SDL_MOUSEBUTTONUP; - fake.button.state = SDL_RELEASED; - SDL_PushEvent(&fake); - } - if (event->wheel.x) { - if (event->wheel.y > 0) { - fake.button.button = SDL_BUTTON_WHEELLEFT; - } else { - fake.button.button = SDL_BUTTON_WHEELRIGHT; - } - - fake.type = SDL_MOUSEBUTTONDOWN; - fake.button.state = SDL_PRESSED; - SDL_PushEvent(&fake); - - fake.type = SDL_MOUSEBUTTONUP; - fake.button.state = SDL_RELEASED; - SDL_PushEvent(&fake); - } + fake.type = SDL_MOUSEBUTTONDOWN; + fake.button.state = SDL_PRESSED; + SDL_PushEvent(&fake); + fake.type = SDL_MOUSEBUTTONUP; + fake.button.state = SDL_RELEASED; + SDL_PushEvent(&fake); break; }