Ticket #8085: mousewheel.diff

scummvm/backends/sdl/sdl-common.cpp

@@ -586 +586 @@
                                 event->event_code = EVENT_LBUTTONDOWN;
                         else if (ev.button.button == SDL_BUTTON_RIGHT)
                                 event->event_code = EVENT_RBUTTONDOWN;
+#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN)
+                        else if (ev.button.button == SDL_BUTTON_WHEELUP)
+                                event->event_code = EVENT_WHEELUP;
+                        else if (ev.button.button == SDL_BUTTON_WHEELDOWN)
+                                event->event_code = EVENT_WHEELDOWN;
+#endif
                         else
                                 break;
                         km.x = event->mouse.x = ev.motion.x;

scummvm/common/system.h

@@ -54 +54 @@
                 EVENT_LBUTTONUP = 5,
                 EVENT_RBUTTONDOWN = 6,
                 EVENT_RBUTTONUP = 7,
+                EVENT_WHEELUP = 8,
+                EVENT_WHEELDOWN = 9,
         };
 
         enum {

scummvm/gui/ListWidget.cpp

@@ -85 +85 @@
         }
 }
 
+void ListWidget::handleMouseWheel(int x, int y, int direction)
+{
+        _scrollBar->handleMouseWheel(x, y, direction);
+}
+
 bool ListWidget::handleKeyDown(char key, int modifiers)
 {
         bool handled = true;

scummvm/gui/ListWidget.h

@@ -68 +68 @@
         
         virtual void handleMouseDown(int x, int y, int button, int clickCount);
         virtual void handleMouseUp(int x, int y, int button, int clickCount);
+        virtual void handleMouseWheel(int x, int y, int direction);
         virtual bool handleKeyDown(char key, int modifiers);
         virtual bool handleKeyUp(char key, int modifiers);
         virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);

scummvm/gui/ScrollBarWidget.cpp

@@ -31 +31 @@
  * - Allow for a horizontal scrollbar, too?
  * - If there are less items than fit on one pages, no scrolling can be done
  *   and we thus should not highlight the arrows/slider.
+ * - Allow the mouse wheel to scroll more than one line at a time
  */
 
 #define UP_DOWN_BOX_HEIGHT      10
@@ -104 +105 @@
         _draggingPart = kNoPart;
 }
 
+void ScrollBarWidget::handleMouseWheel(int x, int y, int direction)
+{
+        int old_pos = _currentPos;
+
+        if (_numEntries < _entriesPerPage)
+                return;
+
+        if (direction < 0) {
+                _currentPos--;
+        } else {
+                _currentPos++;
+        }
+
+        // Make sure that _currentPos is still inside the bounds
+        checkBounds(old_pos);
+}
+
 void ScrollBarWidget::handleMouseMoved(int x, int y, int button)
 {
         // Do nothing if there are less items than fit on one page

scummvm/gui/ScrollBarWidget.h

@@ -61 +61 @@
 
         void handleMouseDown(int x, int y, int button, int clickCount);
         void handleMouseUp(int x, int y, int button, int clickCount);
+        void handleMouseWheel(int x, int y, int direction);
         void handleMouseMoved(int x, int y, int button);
         void handleMouseEntered(int button)     { setFlags(WIDGET_HILITED); }
         void handleMouseLeft(int button)        { clearFlags(WIDGET_HILITED); _part = kNoPart; draw(); }

scummvm/gui/dialog.cpp

@@ -139 +139 @@
                 w->handleMouseUp(x - w->_x, y - w->_y, button, clickCount);
 }
 
+void Dialog::handleMouseWheel(int x, int y, int direction)
+{
+        Widget *w;
+
+        // This may look a bit backwards, but I think it makes more sense for
+        // the mouse wheel to primarily affect the widget the mouse is at than
+        // the widget that happens to be focused.
+
+        w = findWidget(x, y);
+        if (!w)
+                w = _focusedWidget;
+        if (w)
+                w->handleMouseWheel(x, y, direction);
+}
+
 void Dialog::handleKeyDown(char key, int modifiers)
 {
         if (_focusedWidget) {

scummvm/gui/dialog.h

@@ -58 +58 @@
         virtual void handleTickle(); // Called periodically (in every guiloop() )
         virtual void handleMouseDown(int x, int y, int button, int clickCount);
         virtual void handleMouseUp(int x, int y, int button, int clickCount);
+        virtual void handleMouseWheel(int x, int y, int direction);
         virtual void handleKeyDown(char key, int modifiers);
         virtual void handleKeyUp(char key, int modifiers);
         virtual void handleMouseMoved(int x, int y, int button);

scummvm/gui/newgui.cpp

@@ -174 +174 @@
                                 case OSystem::EVENT_RBUTTONUP:
                                         activeDialog->handleMouseUp(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 1, _lastClick.count);
                                         break;
+                                case OSystem::EVENT_WHEELUP:
+                                        activeDialog->handleMouseWheel(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, -1);
+                                        break;
+                                case OSystem::EVENT_WHEELDOWN:
+                                        activeDialog->handleMouseWheel(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 1);
+                                        break;
                         }
                 }
 

scummvm/gui/widget.h

@@ -96 +96 @@
         virtual void handleMouseEntered(int button) {}
         virtual void handleMouseLeft(int button) {}
         virtual void handleMouseMoved(int x, int y, int button) {}
+        virtual void handleMouseWheel(int x, int y, int direction) {}
         virtual bool handleKeyDown(char key, int modifiers) { return false; }   // Return true if the event was handled
         virtual bool handleKeyUp(char key, int modifiers) { return false; }     // Return true if the event was handled
         virtual void handleTickle() {}