X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fhub.cpp;h=13c88d63b18b32cb064c6feb5ef3b94ab4f43ab9;hb=2d8e49766252749ef586ffd988c9858666c01995;hp=cbf9f78a689e083d79057945ba84eb218aba3685;hpb=7d2b4349289578b8e7f322186a1f251684ddeb01;p=libs%2Fgui.git

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index cbf9f78..13c88d6 100644
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -1,5 +1,8 @@
 #include <stdexcept>
 #include <sigc++/bind.h>
+#include <sigc++/bind_return.h>
+#include <msp/core/hash.h>
+#include <msp/core/maputils.h>
 #include "hub.h"
 
 using namespace std;
@@ -12,49 +15,43 @@ Hub::Hub()
 	name = "Hub";
 }
 
-unsigned Hub::attach(Device &dev)
+void Hub::attach(Device &dev)
 {
-	unsigned index = devices.size();
-	devices.push_back(&dev);
-	dev.signal_button_press.connect(sigc::bind(sigc::mem_fun(this, &Hub::button_press), index));
-	dev.signal_button_release.connect(sigc::bind(sigc::mem_fun(this, &Hub::button_release), index));
-	dev.signal_axis_motion.connect(sigc::bind(sigc::mem_fun(this, &Hub::axis_motion), index));
-	return index;
+	unsigned tag = hash32(dev.get_name(), 20);
+	while(devices.count(tag))
+		++tag;
+
+	devices[tag] = &dev;
+	dev.signal_button_press.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::button_press), tag), false));
+	dev.signal_button_release.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::button_release), tag), false));
+	dev.signal_axis_motion.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::axis_motion), tag), false));
 }
 
 std::string Hub::get_button_name(unsigned btn) const
 {
-	unsigned dev_index = btn>>12;
-	if(dev_index>=devices.size())
-		throw invalid_argument("Hub::get_button_name");
-
-	const Device &dev = *devices[dev_index];
+	const Device &dev = *get_item(devices, btn>>12);
 	return dev.get_name()+": "+dev.get_button_name(btn&0xFFF);
 }
 
 std::string Hub::get_axis_name(unsigned axis) const
 {
-	unsigned dev_index = axis>>12;
-	if(dev_index>=devices.size())
-		throw invalid_argument("Hub::get_axis_name");
-
-	const Device &dev = *devices[dev_index];
+	const Device &dev = *get_item(devices, axis>>12);
 	return dev.get_name()+": "+dev.get_axis_name(axis&0xFFF);
 }
 
-void Hub::button_press(unsigned btn, unsigned index)
+void Hub::button_press(unsigned btn, unsigned tag)
 {
-	set_button_state((index<<12) | (btn&0xFFF), true, true);
+	set_button_state((tag<<12) | (btn&0xFFF), true, true);
 }
 
-void Hub::button_release(unsigned btn, unsigned index)
+void Hub::button_release(unsigned btn, unsigned tag)
 {
-	set_button_state((index<<12) | (btn&0xFFF), false, true);
+	set_button_state((tag<<12) | (btn&0xFFF), false, true);
 }
 
-void Hub::axis_motion(unsigned axis, float value, float, unsigned index)
+void Hub::axis_motion(unsigned axis, float value, float, unsigned tag)
 {
-	set_axis_value((index<<12) | (axis&0xFFF), value, true);
+	set_axis_value((tag<<12) | (axis&0xFFF), value, true);
 }
 
 } // namespace Input