|
Brian P. Hinz |
4a11567 |
diff -up fltk-1.3.x-r8732/src/Fl_win32.cxx.hwheel fltk-1.3.x-r8732/src/Fl_win32.cxx
|
|
Brian P. Hinz |
4a11567 |
--- fltk-1.3.x-r8732/src/Fl_win32.cxx.hwheel 2011-05-21 23:55:59.000000000 +0200
|
|
Brian P. Hinz |
4a11567 |
+++ fltk-1.3.x-r8732/src/Fl_win32.cxx 2011-05-24 13:37:31.109341034 +0200
|
|
Brian P. Hinz |
4a11567 |
@@ -1125,12 +1286,28 @@ static LRESULT CALLBACK WndProc(HWND hWn
|
|
Brian P. Hinz |
4a11567 |
case WM_MOUSEWHEEL: {
|
|
Brian P. Hinz |
4a11567 |
static int delta = 0; // running total of all motion
|
|
Brian P. Hinz |
4a11567 |
delta += (SHORT)(HIWORD(wParam));
|
|
Brian P. Hinz |
4a11567 |
+ Fl::e_dx = 0;
|
|
Brian P. Hinz |
4a11567 |
Fl::e_dy = -delta / WHEEL_DELTA;
|
|
Brian P. Hinz |
4a11567 |
delta += Fl::e_dy * WHEEL_DELTA;
|
|
Brian P. Hinz |
4a11567 |
if (Fl::e_dy) Fl::handle(FL_MOUSEWHEEL, window);
|
|
Brian P. Hinz |
4a11567 |
return 0;
|
|
Brian P. Hinz |
4a11567 |
}
|
|
Brian P. Hinz |
4a11567 |
|
|
Brian P. Hinz |
4a11567 |
+// This is only defined on Vista and upwards...
|
|
Brian P. Hinz |
4a11567 |
+#ifndef WM_MOUSEHWHEEL
|
|
Brian P. Hinz |
4a11567 |
+#define WM_MOUSEHWHEEL 0x020E
|
|
Brian P. Hinz |
4a11567 |
+#endif
|
|
Brian P. Hinz |
4a11567 |
+
|
|
Brian P. Hinz |
4a11567 |
+ case WM_MOUSEHWHEEL: {
|
|
Brian P. Hinz |
4a11567 |
+ static int delta = 0; // running total of all motion
|
|
Brian P. Hinz |
4a11567 |
+ delta += (SHORT)(HIWORD(wParam));
|
|
Brian P. Hinz |
4a11567 |
+ Fl::e_dy = 0;
|
|
Brian P. Hinz |
4a11567 |
+ Fl::e_dx = delta / WHEEL_DELTA;
|
|
Brian P. Hinz |
4a11567 |
+ delta -= Fl::e_dx * WHEEL_DELTA;
|
|
Brian P. Hinz |
4a11567 |
+ if (Fl::e_dx) Fl::handle(FL_MOUSEWHEEL, window);
|
|
Brian P. Hinz |
4a11567 |
+ return 0;
|
|
Brian P. Hinz |
4a11567 |
+ }
|
|
Brian P. Hinz |
4a11567 |
+
|
|
Brian P. Hinz |
4a11567 |
case WM_GETMINMAXINFO:
|
|
Brian P. Hinz |
4a11567 |
Fl_X::i(window)->set_minmax((LPMINMAXINFO)lParam);
|
|
Brian P. Hinz |
4a11567 |
break;
|
|
Brian P. Hinz |
4a11567 |
diff -up fltk-1.3.x-r8732/src/Fl_x.cxx.hwheel fltk-1.3.x-r8732/src/Fl_x.cxx
|
|
Brian P. Hinz |
4a11567 |
--- fltk-1.3.x-r8732/src/Fl_x.cxx.hwheel 2011-05-23 21:40:23.000000000 +0200
|
|
Brian P. Hinz |
4a11567 |
+++ fltk-1.3.x-r8732/src/Fl_x.cxx 2011-05-24 13:36:49.635113914 +0200
|
|
Brian P. Hinz |
4a11567 |
@@ -1441,12 +1608,19 @@ int fl_handle(const XEvent& thisevent)
|
|
Brian P. Hinz |
4a11567 |
case ButtonPress:
|
|
Brian P. Hinz |
4a11567 |
Fl::e_keysym = FL_Button + xevent.xbutton.button;
|
|
Brian P. Hinz |
4a11567 |
set_event_xy();
|
|
Brian P. Hinz |
4a11567 |
+ Fl::e_dx = Fl::e_dy = 0;
|
|
Brian P. Hinz |
4a11567 |
if (xevent.xbutton.button == Button4) {
|
|
Brian P. Hinz |
4a11567 |
Fl::e_dy = -1; // Up
|
|
Brian P. Hinz |
4a11567 |
event = FL_MOUSEWHEEL;
|
|
Brian P. Hinz |
4a11567 |
} else if (xevent.xbutton.button == Button5) {
|
|
Brian P. Hinz |
4a11567 |
Fl::e_dy = +1; // Down
|
|
Brian P. Hinz |
4a11567 |
event = FL_MOUSEWHEEL;
|
|
Brian P. Hinz |
4a11567 |
+ } else if (xevent.xbutton.button == 6) {
|
|
Brian P. Hinz |
4a11567 |
+ Fl::e_dx = -1; // Left
|
|
Brian P. Hinz |
4a11567 |
+ event = FL_MOUSEWHEEL;
|
|
Brian P. Hinz |
4a11567 |
+ } else if (xevent.xbutton.button == 7) {
|
|
Brian P. Hinz |
4a11567 |
+ Fl::e_dx = +1; // Right
|
|
Brian P. Hinz |
4a11567 |
+ event = FL_MOUSEWHEEL;
|
|
Brian P. Hinz |
4a11567 |
} else {
|
|
Brian P. Hinz |
4a11567 |
Fl::e_state |= (FL_BUTTON1 << (xevent.xbutton.button-1));
|
|
Brian P. Hinz |
4a11567 |
event = FL_PUSH;
|