From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 17 Nov 2022 09:54:28 +0000 (+0200)
Subject: Add a type enumeration for devices
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=75a3f0fd4152a71aefec72cb053846646071af03;p=libs%2Fgui.git

Add a type enumeration for devices

This will help in storing control bindings in a way that isn't tied to
a particular instance of a device.
---

diff --git a/source/input/device.cpp b/source/input/device.cpp
index 2283136..7dbe8ea 100644
--- a/source/input/device.cpp
+++ b/source/input/device.cpp
@@ -4,7 +4,8 @@
 namespace Msp {
 namespace Input {
 
-Device::Device()
+Device::Device(DeviceType t):
+	type(t)
 { }
 
 Device::~Device()
diff --git a/source/input/device.h b/source/input/device.h
index b42ed3f..be708e2 100644
--- a/source/input/device.h
+++ b/source/input/device.h
@@ -17,6 +17,16 @@ public:
 };
 
 
+enum DeviceType
+{
+	UNSPECIFIED,
+	KEYBOARD,
+	MOUSE,
+	TOUCH_SURFACE,
+	GAME_CONTROLLER
+};
+
+
 /**
 Base class for input devices.  Input devices have two types of controls:
 buttons and axes.  Buttons are either on or off.  Axes have a floating point
@@ -47,14 +57,16 @@ public:
 	sigc::signal<bool, unsigned, float, float>::accumulated<EventAccumulator> signal_axis_motion;
 
 protected:
+	DeviceType type;
 	std::string name;
 	std::vector<char> buttons;
 	std::vector<float> axes;
 
-	Device();
+	Device(DeviceType);
 public:
 	virtual ~Device();
 
+	DeviceType get_type() const { return type; }
 	const std::string &get_name() const { return name; }
 	bool get_button_state(unsigned) const;
 	float get_axis_value(unsigned) const;
diff --git a/source/input/generic/gamecontroller.cpp b/source/input/generic/gamecontroller.cpp
index 9ab6738..8f14e02 100644
--- a/source/input/generic/gamecontroller.cpp
+++ b/source/input/generic/gamecontroller.cpp
@@ -6,7 +6,8 @@ using namespace std;
 namespace Msp {
 namespace Input {
 
-GameController::GameController(unsigned)
+GameController::GameController(unsigned):
+	Device(GAME_CONTROLLER)
 {
 	throw device_not_available("GameController");
 }
diff --git a/source/input/gesturedetector.cpp b/source/input/gesturedetector.cpp
index 97e3d56..d53c07f 100644
--- a/source/input/gesturedetector.cpp
+++ b/source/input/gesturedetector.cpp
@@ -10,6 +10,7 @@ namespace Msp {
 namespace Input {
 
 GestureDetector::GestureDetector(Touchscreen &ts):
+	Device(UNSPECIFIED),
 	touchscreen(ts),
 	current_gesture(GESTURE_NONE),
 	pending_tap(GESTURE_NONE),
diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 635ea8a..b83d10d 100644
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -10,7 +10,8 @@ using namespace std;
 namespace Msp {
 namespace Input {
 
-Hub::Hub()
+Hub::Hub():
+	Device(UNSPECIFIED)
 {
 	name = "Hub";
 }
diff --git a/source/input/keyboard.cpp b/source/input/keyboard.cpp
index 0a690d1..30a6145 100644
--- a/source/input/keyboard.cpp
+++ b/source/input/keyboard.cpp
@@ -6,6 +6,7 @@ namespace Msp {
 namespace Input {
 
 Keyboard::Keyboard(Graphics::Window &w):
+	Device(KEYBOARD),
 	window(w)
 {
 	name = "Keyboard";
diff --git a/source/input/linux/gamecontroller.cpp b/source/input/linux/gamecontroller.cpp
index f0139e9..d0029e8 100644
--- a/source/input/linux/gamecontroller.cpp
+++ b/source/input/linux/gamecontroller.cpp
@@ -16,6 +16,7 @@ namespace Input {
 vector<string> GameController::Private::detected_controllers;
 
 GameController::GameController(unsigned index):
+	Device(GAME_CONTROLLER),
 	event_disp(0)
 {
 	if(!detect_done)
@@ -79,11 +80,11 @@ void GameController::tick()
 		unsigned count = len/sizeof(js_event);
 		for(unsigned i=0; i<count; ++i)
 		{
-			unsigned type = events[i].type&0x7F;
+			unsigned etype = events[i].type&0x7F;
 			bool init = events[i].type&JS_EVENT_INIT;
-			if(type==JS_EVENT_AXIS)
+			if(etype==JS_EVENT_AXIS)
 				set_axis_value(events[i].number, events[i].value/32768.0f, !init);
-			else if(type==JS_EVENT_BUTTON)
+			else if(etype==JS_EVENT_BUTTON)
 				set_button_state(events[i].number, events[i].value, !init);
 		}
 
diff --git a/source/input/mouse.cpp b/source/input/mouse.cpp
index 1b41e36..48d0f69 100644
--- a/source/input/mouse.cpp
+++ b/source/input/mouse.cpp
@@ -5,6 +5,7 @@ namespace Msp {
 namespace Input {
 
 Mouse::Mouse(Graphics::Window &w):
+	Device(MOUSE),
 	window(w)
 {
 	name = "Mouse";
diff --git a/source/input/touchscreen.cpp b/source/input/touchscreen.cpp
index c4de688..f2e06f6 100644
--- a/source/input/touchscreen.cpp
+++ b/source/input/touchscreen.cpp
@@ -6,6 +6,7 @@ namespace Msp {
 namespace Input {
 
 Touchscreen::Touchscreen(Graphics::Window &w):
+	Device(TOUCH_SURFACE),
 	window(w)
 {
 	if(!is_available())
diff --git a/source/input/windows/gamecontroller.cpp b/source/input/windows/gamecontroller.cpp
index 43a947b..1d06bfe 100644
--- a/source/input/windows/gamecontroller.cpp
+++ b/source/input/windows/gamecontroller.cpp
@@ -10,7 +10,8 @@ namespace Input {
 
 vector<unsigned> GameController::Private::detected_controllers;
 
-GameController::GameController(unsigned index)
+GameController::GameController(unsigned index):
+	Device(GAME_CONTROLLER)
 {
 	if(!detect_done)
 		detect();