[Scummvm-cvs-logs] SF.net SVN: scummvm:[40511] scummvm/trunk/backends/keymapper

sev at users.sourceforge.net sev at users.sourceforge.net
Tue May 12 22:40:16 CEST 2009


Revision: 40511
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40511&view=rev
Author:   sev
Date:     2009-05-12 20:40:15 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Allow ESC button also be assigned in keymapper.

Modified Paths:
--------------
    scummvm/trunk/backends/keymapper/remap-dialog.cpp
    scummvm/trunk/backends/keymapper/remap-dialog.h

Modified: scummvm/trunk/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/trunk/backends/keymapper/remap-dialog.cpp	2009-05-12 20:13:42 UTC (rev 40510)
+++ scummvm/trunk/backends/keymapper/remap-dialog.cpp	2009-05-12 20:40:15 UTC (rev 40511)
@@ -191,6 +191,8 @@
 }
 
 void RemapDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+	debug(0, "Command!");
+
 	if (cmd >= kRemapCmd && cmd < kRemapCmd + _keymapWidgets.size()) {
 		startRemapping(cmd - kRemapCmd);
 	} else if (cmd == GUI::kPopUpItemSelectedCmd) {
@@ -226,6 +228,13 @@
 	_keymapper->setEnabled(true);
 }
 
+void RemapDialog::handleKeyDown(Common::KeyState state) {
+	if (_activeRemapAction)
+		return;
+
+	GUI::Dialog::handleKeyDown(state);
+}
+
 void RemapDialog::handleKeyUp(Common::KeyState state) {
 	if (_activeRemapAction) {
 		const HardwareKey *hwkey = _keymapper->findHardwareKey(state);
@@ -239,7 +248,7 @@
 			stopRemapping();
 		}
 	} else {
-		GUI::Dialog::handleKeyDown(state);
+		GUI::Dialog::handleKeyUp(state);
 	}
 }
 

Modified: scummvm/trunk/backends/keymapper/remap-dialog.h
===================================================================
--- scummvm/trunk/backends/keymapper/remap-dialog.h	2009-05-12 20:13:42 UTC (rev 40510)
+++ scummvm/trunk/backends/keymapper/remap-dialog.h	2009-05-12 20:40:15 UTC (rev 40511)
@@ -47,6 +47,7 @@
 	virtual void close();
 	virtual void reflowLayout();
 	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+	virtual void handleKeyDown(Common::KeyState state);
 	virtual void handleKeyUp(Common::KeyState state);
 	virtual void handleMouseDown(int x, int y, int button, int clickCount);
 	virtual void handleTickle();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list