Reverted mousewheel support in 1.2, since it breaks binary compatibil…

…ity.
libsdl-org · Jul 6, 2007 · 3f78c77 · 3f78c77
1 parent 0b869de
commit 3f78c77
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 32 deletions.
diff --git 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
@@ -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;
         }