X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fmouse.cpp;h=1b41e3654517c2adb12d02e5cb10821df70a5764;hb=69aaca13ae0949acf12056e390cbd1009a8487b2;hp=476275f4a77bc75024d254903abc3cb6ba74140f;hpb=5d688fbf457b1f4d3bebde431a7f58c898be584c;p=libs%2Fgui.git

diff --git a/source/input/mouse.cpp b/source/input/mouse.cpp
index 476275f..1b41e36 100644
--- a/source/input/mouse.cpp
+++ b/source/input/mouse.cpp
@@ -1,6 +1,4 @@
 #include <msp/graphics/window.h>
-#include <msp/graphics/window_priv.h>
-#include <msp/strings/format.h>
 #include "mouse.h"
 
 namespace Msp {
@@ -32,7 +30,7 @@ std::string Mouse::get_button_name(unsigned btn) const
 	case 5:
 		return "Wheel Down";
 	default:
-		return format("Button %d", btn);
+		return Device::get_button_name(btn);
 	}
 }
 
@@ -45,53 +43,9 @@ std::string Mouse::get_axis_name(unsigned axis) const
 	case 1:
 		return "Y axis";
 	default:
-		return format("Axis %d", axis);
+		return Device::get_axis_name(axis);
 	};
 }
 
-void Mouse::input_event(const Graphics::Window::Event &event)
-{
-#ifdef WIN32
-	switch(event.msg)
-	{
-	case WM_LBUTTONDOWN:
-	case WM_LBUTTONUP:
-		set_button_state(1, event.msg==WM_LBUTTONDOWN, true);
-		break;
-	case WM_MBUTTONDOWN:
-	case WM_MBUTTONUP:
-		set_button_state(2, event.msg==WM_LBUTTONDOWN, true);
-		break;
-	case WM_RBUTTONDOWN:
-	case WM_RBUTTONUP:
-		set_button_state(3, event.msg==WM_LBUTTONDOWN, true);
-		break;
-	case WM_MOUSEWHEEL:
-		{
-			unsigned btn = (HIWORD(wp)&0x8000) ? 5 : 4;
-			set_button_state(btn, true, true);
-			set_button_state(btn, false, true);
-		}
-		break;
-	case WM_MOUSEMOVE:
-		set_axis_value(0, GET_X_LPARAM(event.lparam)*2.0/window.get_width()-1.0, true);
-		set_axis_value(1, 1.0-GET_Y_LPARAM(event.lparam)*2.0/window.get_height(), true);
-		break;
-	}
-#else
-	switch(event.xevent.type)
-	{
-	case ButtonPress:
-	case ButtonRelease:
-		set_button_state(event.xevent.xbutton.button, event.xevent.type==ButtonPress, true);
-		break;
-	case MotionNotify:
-		set_axis_value(0, event.xevent.xmotion.x*2.0/window.get_width()-1.0, true);
-		set_axis_value(1, 1.0-event.xevent.xmotion.y*2.0/window.get_height(), true);
-		break;
-	}
-#endif
-}
-
 } // namespace Input
 } // namespace Msp