SettingsDialog: simplify code using InputManager::waitForPressedButton().

Replaced MenuSetting::manageInput() by handleButtonPress(), because we will
only pass pressed buttons to it, not the entire input event.

src/menusetting.h

@@ -47,7 +47,7 @@ public:
 	virtual void draw(int y);
 	virtual void handleTS();
 
-	virtual bool manageInput(InputManager::ButtonEvent *event) = 0;
+	virtual bool handleButtonPress(InputManager::Button button) = 0;
 	virtual void adjustInput();
 	virtual void drawSelected(int y);
 	virtual bool edited() = 0;

src/menusettingbool.cpp

@@ -64,14 +64,14 @@ void MenuSettingBool::draw(int y)
 	gmenu2x->s->write( gmenu2x->font, strvalue, 155, y, ASFont::HAlignLeft, ASFont::VAlignTop );
 }
 
-bool MenuSettingBool::manageInput(InputManager::ButtonEvent *event)
+bool MenuSettingBool::handleButtonPress(InputManager::Button button)
 {
-	if (event->button == InputManager::ACCEPT
+	if (button == InputManager::ACCEPT) {
-			&& event->state == InputManager::PRESSED) {
 		toggle();
 		return true;
+	} else {
+		return false;
 	}
-	return false;
 }
 
 void MenuSettingBool::toggle()

src/menusettingbool.h

@@ -45,7 +45,7 @@ public:
 	virtual ~MenuSettingBool() {}
 
 	virtual void draw(int y);
-	virtual bool manageInput(InputManager::ButtonEvent *event);
+	virtual bool handleButtonPress(InputManager::Button button);
 	virtual bool edited();
 
 	void setValue(int value);

src/menusettingint.cpp

@@ -66,24 +66,24 @@ void MenuSettingInt::draw(int y)
 	gmenu2x->s->write( gmenu2x->font, strvalue, 155, y, ASFont::HAlignLeft, ASFont::VAlignTop );
 }
 
-bool MenuSettingInt::manageInput(InputManager::ButtonEvent *event)
+bool MenuSettingInt::handleButtonPress(InputManager::Button button)
 {
-    switch (event->button) {
+	switch (button) {
-        case InputManager::LEFT:
+		case InputManager::LEFT:
-            dec();
+			dec();
-            break;
+			break;
-        case InputManager::RIGHT:
+		case InputManager::RIGHT:
-            inc();
+			inc();
-            break;
+			break;
-        case InputManager::ALTLEFT:
+		case InputManager::ALTLEFT:
-            setValue(value() - 10 * increment);
+			setValue(value() - 10 * increment);
-            break;
+			break;
-        case InputManager::ALTRIGHT:
+		case InputManager::ALTRIGHT:
-            setValue(value() + 10 * increment);
+			setValue(value() + 10 * increment);
-            break;
+			break;
-        default:
+		default:
 			return false;
-    }
+	}
 	return true;
 }
 

src/menusettingint.h

@@ -41,7 +41,7 @@ public:
 			int increment = 1);
 	virtual ~MenuSettingInt() {}
 
-	virtual bool manageInput(InputManager::ButtonEvent *event);
+	virtual bool handleButtonPress(InputManager::Button button);
 	virtual void adjustInput();
 	virtual void draw(int);
 	virtual bool edited();

src/menusettingmultistring.cpp

@@ -49,18 +49,18 @@ MenuSettingMultiString::MenuSettingMultiString(
 	buttonBox.add(btn);
 }
 
-bool MenuSettingMultiString::manageInput(InputManager::ButtonEvent *event)
+bool MenuSettingMultiString::handleButtonPress(InputManager::Button button)
 {
-    switch(event->button) {
+	switch (button) {
-        case InputManager::LEFT:
+		case InputManager::LEFT:
-            decSel();
+			decSel();
-            break;
+			break;
-        case InputManager::RIGHT:
+		case InputManager::RIGHT:
-            incSel();
+			incSel();
-            break;
+			break;
-        default:
+		default:
 			return false;
-    }
+	}
 	return true;
 }
 

src/menusettingmultistring.h

@@ -28,7 +28,7 @@
 class MenuSettingMultiString : public MenuSettingStringBase {
 private:
 	virtual void edit() {
-		/* never called because manageInput() is overridden */
+		/* never called because handleButtonPress() is overridden */
 	}
 
 	const std::vector<std::string> *choices;
@@ -45,7 +45,7 @@ public:
 			const std::vector<std::string> *choices);
 	virtual ~MenuSettingMultiString() {};
 
-	virtual bool manageInput(InputManager::ButtonEvent *event);
+	virtual bool handleButtonPress(InputManager::Button button);
 };
 
 #endif

src/menusettingrgba.cpp

@@ -68,9 +68,10 @@ void MenuSettingRGBA::handleTS() {
 	MenuSetting::handleTS();
 }
 
-bool MenuSettingRGBA::manageInput(InputManager::ButtonEvent *event) {
+bool MenuSettingRGBA::handleButtonPress(InputManager::Button button)
+ {
 	if (edit) {
-		switch(event->button) {
+		switch (button) {
 			case InputManager::LEFT:
 				dec();
 				break;
@@ -93,7 +94,7 @@ bool MenuSettingRGBA::manageInput(InputManager::ButtonEvent *event) {
 				return false;
 		}
 	} else {
-		switch(event->button) {
+		switch (button) {
 			case InputManager::LEFT:
 				leftComponent();
 				break;

src/menusettingrgba.h

@@ -51,7 +51,7 @@ public:
 
 	virtual void draw(int y);
 	virtual void handleTS();
-	virtual bool manageInput(InputManager::ButtonEvent *event);
+	virtual bool handleButtonPress(InputManager::Button button);
 	virtual void adjustInput();
 	virtual void drawSelected(int y);
 	virtual bool edited();

src/menusettingstringbase.cpp

@@ -42,9 +42,9 @@ void MenuSettingStringBase::draw(int y)
 			ASFont::HAlignLeft, ASFont::VAlignTop);
 }
 
-bool MenuSettingStringBase::manageInput(InputManager::ButtonEvent *event)
+bool MenuSettingStringBase::handleButtonPress(InputManager::Button button)
 {
-	switch (event->button) {
+	switch (button) {
 		case InputManager::CANCEL:
 			clear();
 			break;

src/menusettingstringbase.h

@@ -38,7 +38,7 @@ public:
 	virtual ~MenuSettingStringBase();
 
 	virtual void draw(int y);
-	virtual bool manageInput(InputManager::ButtonEvent *event);
+	virtual bool handleButtonPress(InputManager::Button button);
 	virtual bool edited();
 
 	void setValue(const std::string &value) { *_value = value; }

src/settingsdialog.cpp

@@ -105,13 +105,9 @@ bool SettingsDialog::exec() {
 		gmenu2x->s->flip();
 		voices[sel]->handleTS();
 
-		InputManager::ButtonEvent event;
+		InputManager::Button button = inputMgr.waitForPressedButton();
-		do {
+		if (!voices[sel]->handleButtonPress(button)) {
-			inputMgr.waitForEvent(&event);
+			switch (button) {
-		} while (event.state != InputManager::PRESSED);
-
-		if (voices[sel]->manageInput(&event) == false) {
-			switch (event.button) {
 				case InputManager::SETTINGS:
 					close = true;
 					break;