Author: manolo
Date: 2012-06-21 09:36:38 -0700 (Thu, 21 Jun 2012)
New Revision: 9625
Log:
Fixed STR #2644: support horizontal wheel movement under X11 and MSWindows.
Modified:
branches/branch-3.0/src/fltk3/win32.cxx
branches/branch-3.0/src/fltk3/x11.cxx
Modified: branches/branch-3.0/src/fltk3/win32.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/win32.cxx 2012-06-21 08:52:29 UTC (rev
9624)
+++ branches/branch-3.0/src/fltk3/win32.cxx 2012-06-21 16:36:38 UTC (rev
9625)
@@ -209,6 +209,11 @@
# define WM_MOUSEWHEEL 0x020a
#endif
+// This is only defined on Vista and upwards...
+#ifndef WM_MOUSEHWHEEL
+#define WM_MOUSEHWHEEL 0x020E
+#endif
+
#ifndef WHEEL_DELTA
# define WHEEL_DELTA 120 // according to MSDN.
#endif
@@ -1125,12 +1130,23 @@
case WM_MOUSEWHEEL: {
static int delta = 0; // running total of all motion
delta += (SHORT)(HIWORD(wParam));
+ fltk3::e_dx = 0;
fltk3::e_dy = -delta / WHEEL_DELTA;
delta += fltk3::e_dy * WHEEL_DELTA;
if (fltk3::e_dy) fltk3::handle(fltk3::MOUSEWHEEL, window);
return 0;
}
+ case WM_MOUSEHWHEEL: {
+ static int delta = 0; // running total of all motion
+ delta += (SHORT)(HIWORD(wParam));
+ fltk3::e_dy = 0;
+ fltk3::e_dx = delta / WHEEL_DELTA;
+ delta -= fltk3::e_dx * WHEEL_DELTA;
+ if (fltk3::e_dx) Fl::handle(fltk3::MOUSEWHEEL, window);
+ return 0;
+ }
+
case WM_GETMINMAXINFO:
Fl_X::i(window)->set_minmax((LPMINMAXINFO)lParam);
break;
Modified: branches/branch-3.0/src/fltk3/x11.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/x11.cxx 2012-06-21 08:52:29 UTC (rev
9624)
+++ branches/branch-3.0/src/fltk3/x11.cxx 2012-06-21 16:36:38 UTC (rev
9625)
@@ -1515,12 +1515,19 @@
case ButtonPress:
fltk3::e_keysym = fltk3::MouseButton + xevent.xbutton.button;
set_event_xy();
+ fltk3::e_dx = fltk3::e_dy = 0;
if (xevent.xbutton.button == Button4) {
fltk3::e_dy = -1; // Up
event = fltk3::MOUSEWHEEL;
} else if (xevent.xbutton.button == Button5) {
fltk3::e_dy = +1; // Down
event = fltk3::MOUSEWHEEL;
+ } else if (xevent.xbutton.button == 6) {
+ fltk3::e_dx = -1; // Left
+ event = fltk3::MOUSEWHEEL;
+ } else if (xevent.xbutton.button == 7) {
+ fltk3::e_dx = +1; // Right
+ event = fltk3::MOUSEWHEEL;
} else {
fltk3::e_state |= (fltk3::BUTTON1 << (xevent.xbutton.button-1));
event = fltk3::PUSH;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
