[Scummvm-cvs-logs] SF.net SVN: scummvm:[33913] scummvm/branches/gsoc2008-vkeybd/backends/ vkeybd

kenny-d at users.sourceforge.net kenny-d at users.sourceforge.net
Fri Aug 15 21:41:35 CEST 2008


Revision: 33913
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33913&view=rev
Author:   kenny-d
Date:     2008-08-15 19:41:34 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Added clear event to virtual keyboard

Modified Paths:
--------------
    scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp
    scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp
    scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h

Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp	2008-08-15 19:15:48 UTC (rev 33912)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard-parser.cpp	2008-08-15 19:41:34 UTC (rev 33913)
@@ -270,19 +270,16 @@
 		evt->data = str;
 	} else if (type == "submit") {
 		evt->type = VirtualKeyboard::kEventSubmit;
-		evt->data = 0;
 	} else if (type == "cancel") {
 		evt->type = VirtualKeyboard::kEventCancel;
-		evt->data = 0;
+	} else if (type == "clear") {
+		evt->type = VirtualKeyboard::kEventClear;
 	} else if (type == "delete") {
 		evt->type = VirtualKeyboard::kEventDelete;
-		evt->data = 0;
 	} else if (type == "move_left") {
 		evt->type = VirtualKeyboard::kEventMoveLeft;
-		evt->data = 0;
 	} else if (type == "move_right") {
 		evt->type = VirtualKeyboard::kEventMoveRight;
-		evt->data = 0;
 	} else {
 		delete evt;
 		return parserError("Event type '%s' not known", type.c_str());

Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp	2008-08-15 19:15:48 UTC (rev 33912)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.cpp	2008-08-15 19:41:34 UTC (rev 33913)
@@ -154,6 +154,9 @@
 	case kEventCancel:
 		close(false);
 		break;
+	case kEventClear:
+		_keyQueue.clear();
+		break;
 	case kEventDelete:
 		_keyQueue.deleteKey();
 		break;
@@ -343,6 +346,7 @@
 	_keysStr.clear();
 	_strPos = 0;
 	_flags = 0;
+	_strChanged = true;
 }
 
 bool VirtualKeyboard::KeyPressQueue::empty()

Modified: scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h	2008-08-15 19:15:48 UTC (rev 33912)
+++ scummvm/branches/gsoc2008-vkeybd/backends/vkeybd/virtual-keyboard.h	2008-08-15 19:41:34 UTC (rev 33913)
@@ -49,6 +49,7 @@
 		kEventSwitchMode,
 		kEventSubmit,
 		kEventCancel,
+		kEventClear,
 		kEventDelete,
 		kEventMoveLeft,
 		kEventMoveRight
@@ -161,11 +162,6 @@
 	void close(bool submit);
 
 	/**
-	 * Hides the keyboard, submiting any key presses to the event manager
-	 */
-	void submit();
-
-	/**
 	 * Returns true if the keyboard is currently being shown
 	 */
 	bool isDisplaying();


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