[Scummvm-cvs-logs] scummvm master -> cb596113a784e4894b5a34787b80144d2d3561e2

digitall dgturner at iee.org
Sat Jun 28 16:00:21 CEST 2014


This automated email contains information about 32 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f37ecf3861 VKEYBD: Remove noisy warnings and clarify messages.
5e6d05c816 VKEYBD: Add code to open virtual keyboard on middle mouse button.
e07a224a9a VKEYBD: Modify code to open vkeybd on long press of middle mouse button.
23c2481d10 VKEYBD: Add small keyboard pack for virtual keyboard.
1448bbc77e README: Add trigger hotkeys for virtual keyboard and keymapper.
8cf41943f6 VKEYBD: Switch hotkey from F7 to CTRL-F7 to reduce game conflicts.
b7192731b9 KEYMAPPER: Change hotkey from F8 to CTRL-F8 to reduce game conflicts.
dc0c7bce4c DINGUX: Use virtual keyboard event directly, rather than using keycode.
3ae0908967 GPH: Use virtual keyboard event directly, rather than using keycode.
4ebbdaa59b LINUXMOTO: Use virtual keyboard event directly, rather than using keycode.
1544feb02c MAEMO: Use virtual keyboard event directly, rather than using keycode.
dd92fa45b4 PS3: Use virtual keyboard event directly, rather than using keycode.
aafc17ed1e SAMSUNGTV: Use virtual keyboard event directly, rather than using keycode.
8472835963 TIZEN: Use virtual keyboard event directly, rather than using keycode.
7042de2aa9 WII: Fix correct keycode for virtual keyboard trigger.
37c46fecbf ANDROID: Fix correct keycode in keymapper for virtual keyboard trigger.
e07819fb12 README: Remove Keymapper trigger key note, add Vkeybd mouse button note.
834d04b76c MAEMO: Add "small" virtual keyboard pack to port packaging.
b8cce3a16d WII: Add "small" virtual keyboard pack to port packaging.
27d25f6b76 N64: Add "small" virtual keyboard pack to port packaging.
9c4e6d2194 LINUXMOTO: Add "small" virtual keyboard pack to port packaging.
532dd85906 DINGUX: Add "small" virtual keyboard pack to port packaging.
5f2306e329 GPH: Add "small" virtual keyboard pack to CAANOO port packaging.
32a403eb5e GPH: Add "small" virtual keyboard pack to GP2X port packaging.
b3946359ea GPH: Add "small" virtual keyboard pack to GP2XWIZ port packaging.
ae8d290986 GPH: Add "small" virtual keyboard pack to CAANOO debug port packaging.
1aabc3e1ff GPH: Add "small" virtual keyboard pack to GP2X debug port packaging.
68490bee45 GPH: Add "small" virtual keyboard pack to GP2XWIZ debug port packaging.
c8fc6cad58 PS3: Add "small" virtual keyboard pack to port packaging.
536203b352 DEVTOOLS: Add "small" vkeybd pack to create_project postbuild script.
ad07da959d SYMBIAN: Add "small" vkeybd pack to port packaging.
cb596113a7 Merge pull request #461 from digitall/vkeybdFix


Commit: f37ecf3861f35aec8c7747b3623309e927360ef3
    https://github.com/scummvm/scummvm/commit/f37ecf3861f35aec8c7747b3623309e927360ef3
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-22T05:25:39+01:00

Commit Message:
VKEYBD: Remove noisy warnings and clarify messages.

Changed paths:
    backends/vkeybd/virtual-keyboard.cpp



diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index 678c751..ce19e9d 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -98,7 +98,7 @@ bool VirtualKeyboard::openPack(const String &packName, const FSNode &node) {
 				return false;
 			}
 		} else {
-			warning("Could not find %s.xml file in %s.zip keyboard pack", packName.c_str(), packName.c_str());
+			warning("Could not find %s.xml file in %s.zip virtual keyboard pack", packName.c_str(), packName.c_str());
 			delete _fileArchive;
 			_fileArchive = 0;
 			return false;
@@ -132,15 +132,15 @@ bool VirtualKeyboard::loadKeyboardPack(const String &packName) {
 		_loaded = _parser->parse();
 
 		if (_loaded) {
-			debug("Keyboard pack '%s' loaded successfully", packName.c_str());
+			debug("Virtual keyboard pack '%s' loaded successfully", packName.c_str());
 		} else {
-			warning("Error parsing the keyboard pack '%s'", packName.c_str());
+			warning("Error parsing the virtual keyboard pack '%s'", packName.c_str());
 
 			delete _fileArchive;
 			_fileArchive = 0;
 		}
 	} else {
-		warning("Keyboard pack not found");
+		warning("Virtual keyboard disabled due to missing pack file");
 	}
 
 	return _loaded;
@@ -205,7 +205,7 @@ void VirtualKeyboard::switchMode(Mode *newMode) {
 
 void VirtualKeyboard::switchMode(const String &newMode) {
 	if (!_modes.contains(newMode)) {
-		warning("Keyboard mode '%s' unknown", newMode.c_str());
+		warning("Virtual keyboard mode '%s' unknown", newMode.c_str());
 	} else {
 		switchMode(&_modes[newMode]);
 	}
@@ -227,7 +227,7 @@ void VirtualKeyboard::handleMouseUp(int16 x, int16 y) {
 
 void VirtualKeyboard::show() {
 	if (!_loaded) {
-		warning("Virtual keyboard not loaded");
+		debug(1, "VirtualKeyboard::show() - Virtual keyboard not loaded");
 		return;
 	} else {
 		_kbdGUI->checkScreenChanged();


Commit: 5e6d05c816ce5dce1f9d4273f53cfd1369a908e3
    https://github.com/scummvm/scummvm/commit/5e6d05c816ce5dce1f9d4273f53cfd1369a908e3
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-22T05:29:54+01:00

Commit Message:
VKEYBD: Add code to open virtual keyboard on middle mouse button.

This removes the need for a hardware keyboard to trigger the use
of the virtual keyboard via F7 if using the default event mapper.

As middle button is rarely used by games, this should not cause any
conflicts. Though to avoid this possibility, the event is passed to
the engine.

Changed paths:
    common/EventMapper.cpp



diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index 30896d7..de1907d 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -30,6 +30,15 @@ namespace Common {
 List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 	List<Event> events;
 	Event mappedEvent;
+#ifdef ENABLE_VKEYBD
+	if (ev.type == EVENT_MBUTTONUP) {
+		mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
+		
+		// Avoid blocking event from engine.
+		addDelayedEvent(100, ev);
+	}
+#endif
+
 	if (ev.type == EVENT_KEYDOWN) {
 		if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F5) {
 			mappedEvent.type = EVENT_MAINMENU;


Commit: e07a224a9a899055dc2b95b23e7740e250a748a1
    https://github.com/scummvm/scummvm/commit/e07a224a9a899055dc2b95b23e7740e250a748a1
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-22T05:29:54+01:00

Commit Message:
VKEYBD: Modify code to open vkeybd on long press of middle mouse button.

This should massively reduce any chance of a conflict with mouse usage
in games and is still easy for a person with mobility issues to perform.

Changed paths:
    common/EventMapper.cpp



diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index de1907d..36feedf 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -31,11 +31,24 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 	List<Event> events;
 	Event mappedEvent;
 #ifdef ENABLE_VKEYBD
+	// Trigger virtual keyboard on long press of more than 1 second
+	// of middle mouse button.
+	const uint32 vkeybdTime = 1000;
+
+	static bool vkeybd = false;
+	static uint32 vkeybdThen = 0;
+
+	if (ev.type == EVENT_MBUTTONDOWN) {
+		vkeybdThen = g_system->getMillis();
+	}
+
 	if (ev.type == EVENT_MBUTTONUP) {
-		mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
+		if ((g_system->getMillis() - vkeybdThen) >= vkeybdTime) {
+			mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
 		
-		// Avoid blocking event from engine.
-		addDelayedEvent(100, ev);
+			// Avoid blocking event from engine.
+			addDelayedEvent(100, ev);
+		}
 	}
 #endif
 


Commit: 23c2481d10cb7ee3f5284de00d888306f2a1c30d
    https://github.com/scummvm/scummvm/commit/23c2481d10cb7ee3f5284de00d888306f2a1c30d
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-27T03:51:19+01:00

Commit Message:
VKEYBD: Add small keyboard pack for virtual keyboard.

This pack contains just the 320x240 layout.

This is a quick way to achieve the result of a smaller keyboard
when running on 640x480 and larger games as requested bu a user.

To use this, the pack zip file, vkeybd_small.zip should be placed
in the extrapath in the same way as vkeybd_default.zip.

However, it is also necessary to set this as the active virtual
keyboard layout by adding the following linein the global [scummvm]
section of the configuration file i.e. scummvm.ini:
vkeybd_pack_name=vkeybd_small

This should be added to the GUI as a misc option, in future.

Currently, the closest layout size to the overlay size is chosen
automatically by the code in the method:
bool VirtualKeyboardParser::parserCallback_mode(ParserNode *node)

This should probably also be made configurable in future to allow
smaller keyboard sizes to be chosen.

Changed paths:
  A backends/vkeybd/packs/vkeybd_small.zip
  A backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml



diff --git a/backends/vkeybd/packs/vkeybd_small.zip b/backends/vkeybd/packs/vkeybd_small.zip
new file mode 100644
index 0000000..d1c7fc7
Binary files /dev/null and b/backends/vkeybd/packs/vkeybd_small.zip differ
diff --git a/backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp
new file mode 100644
index 0000000..08d40a0
Binary files /dev/null and b/backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp differ
diff --git a/backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp b/backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp
new file mode 100644
index 0000000..2557923
Binary files /dev/null and b/backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp differ
diff --git a/backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp
new file mode 100644
index 0000000..76a7f51
Binary files /dev/null and b/backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp differ
diff --git a/backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp b/backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp
new file mode 100644
index 0000000..96ce1ad
Binary files /dev/null and b/backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp differ
diff --git a/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml b/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
new file mode 100644
index 0000000..20e91fe
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<keyboard initial_mode="lowercase" v_align="bottom" h_align="center">
+<!-- coords key = "start x, start y, end x, end y" -->
+  <!-- Lowercase -->
+  <mode name="lowercase" resolutions="320x240">
+    <layout resolution="320x240" bitmap="lowercase320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="q" />
+        <area shape="rect" coords="57,68,75,86" target="w" />
+        <area shape="rect" coords="78,67,94,85" target="e" />
+        <area shape="rect" coords="98,67,115,85" target="r" />
+        <area shape="rect" coords="119,67,136,85" target="t" />
+        <area shape="rect" coords="141,68,158,86" target="y" />
+        <area shape="rect" coords="161,67,179,86" target="u" />
+        <area shape="rect" coords="182,67,199,86" target="i" />
+        <area shape="rect" coords="202,67,220,85" target="o" />
+        <area shape="rect" coords="223,68,240,86" target="p" />
+        <area shape="rect" coords="44,88,63,107" target="a" />
+        <area shape="rect" coords="65,88,84,106" target="s" />
+        <area shape="rect" coords="86,89,104,107" target="d" />
+        <area shape="rect" coords="107,89,124,107" target="f" />
+        <area shape="rect" coords="128,89,145,107" target="g" />
+        <area shape="rect" coords="149,88,165,107" target="h" />
+        <area shape="rect" coords="169,89,186,107" target="j" />
+        <area shape="rect" coords="189,89,207,107" target="k" />
+        <area shape="rect" coords="210,89,228,107" target="l" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="8,47,26,64" target="|" />
+        <area shape="rect" coords="28,47,45,64" target="1" />
+        <area shape="rect" coords="50,47,67,65" target="2" />
+        <area shape="rect" coords="70,46,87,65" target="3" />
+        <area shape="rect" coords="91,46,108,64" target="4" />
+        <area shape="rect" coords="111,46,129,65" target="5" />
+        <area shape="rect" coords="132,47,149,65" target="6" />
+        <area shape="rect" coords="152,47,170,64" target="7" />
+        <area shape="rect" coords="174,46,191,63" target="8" />
+        <area shape="rect" coords="194,47,211,65" target="9" />
+        <area shape="rect" coords="215,46,232,64" target="0" />
+        <area shape="rect" coords="235,47,252,65" target="-" />
+        <area shape="rect" coords="255,46,272,65" target="=" />
+        <area shape="rect" coords="244,68,261,86" target="[" />
+        <area shape="rect" coords="264,67,282,86" target="]" />
+        <area shape="rect" coords="284,68,309,86" target="#" />
+        <area shape="rect" coords="231,88,249,106" target=";" />
+        <area shape="rect" coords="251,89,269,107" target="’" />
+        <area shape="rect" coords="202,110,219,128" target="," />
+        <area shape="rect" coords="223,110,241,128" target="." />
+        <area shape="rect" coords="243,110,261,128" target="/" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="caps" type="switch_mode" mode="uppercase" />
+    <event name="symbols" type="switch_mode" mode="lowercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="|" type="key" code="124" ascii="124" modifiers="" />
+    <event name="-" type="key" code="45" ascii="45" modifiers="" />
+    <event name="=" type="key" code="61" ascii="61" modifiers="" />
+    <event name="[" type="key" code="91" ascii="91" modifiers="" />
+    <event name="]" type="key" code="93" ascii="93" modifiers="" />
+    <event name="#" type="key" code="35" ascii="35" modifiers="" />
+    <event name=";" type="key" code="59" ascii="59" modifiers="" />
+    <event name="'" type="key" code="39" ascii="39" modifiers="" />
+    <event name="," type="key" code="44" ascii="44" modifiers="" />
+    <event name="." type="key" code="46" ascii="46" modifiers="" />
+    <event name="/" type="key" code="47" ascii="47" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="a" type="key" code="97" ascii="97" modifiers="" />
+    <event name="b" type="key" code="98" ascii="98" modifiers="" />
+    <event name="c" type="key" code="99" ascii="99" modifiers="" />
+    <event name="d" type="key" code="100" ascii="100" modifiers="" />
+    <event name="e" type="key" code="101" ascii="101" modifiers="" />
+    <event name="f" type="key" code="102" ascii="102" modifiers="" />
+    <event name="g" type="key" code="103" ascii="103" modifiers="" />
+    <event name="h" type="key" code="104" ascii="104" modifiers="" />
+    <event name="i" type="key" code="105" ascii="105" modifiers="" />
+    <event name="j" type="key" code="106" ascii="106" modifiers="" />
+    <event name="k" type="key" code="107" ascii="107" modifiers="" />
+    <event name="l" type="key" code="108" ascii="108" modifiers="" />
+    <event name="m" type="key" code="109" ascii="109" modifiers="" />
+    <event name="n" type="key" code="110" ascii="110" modifiers="" />
+    <event name="o" type="key" code="111" ascii="111" modifiers="" />
+    <event name="p" type="key" code="112" ascii="112" modifiers="" />
+    <event name="q" type="key" code="113" ascii="113" modifiers="" />
+    <event name="r" type="key" code="114" ascii="114" modifiers="" />
+    <event name="s" type="key" code="115" ascii="115" modifiers="" />
+    <event name="t" type="key" code="116" ascii="116" modifiers="" />
+    <event name="u" type="key" code="117" ascii="117" modifiers="" />
+    <event name="v" type="key" code="118" ascii="118" modifiers="" />
+    <event name="w" type="key" code="119" ascii="119" modifiers="" />
+    <event name="x" type="key" code="120" ascii="120" modifiers="" />
+    <event name="y" type="key" code="121" ascii="121" modifiers="" />
+    <event name="z" type="key" code="122" ascii="122" modifiers="" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+
+  <!-- Uppercase -->
+  <mode name="uppercase" resolutions="320x240">
+    <layout resolution="320x240" bitmap="uppercase320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="Q" />
+        <area shape="rect" coords="57,68,75,86" target="W" />
+        <area shape="rect" coords="78,67,94,85" target="E" />
+        <area shape="rect" coords="98,67,115,85" target="R" />
+        <area shape="rect" coords="119,67,136,85" target="T" />
+        <area shape="rect" coords="141,68,158,86" target="Y" />
+        <area shape="rect" coords="161,67,179,86" target="U" />
+        <area shape="rect" coords="182,67,199,86" target="I" />
+        <area shape="rect" coords="202,67,220,85" target="O" />
+        <area shape="rect" coords="223,68,240,86" target="P" />
+        <area shape="rect" coords="44,88,63,107" target="A" />
+        <area shape="rect" coords="65,88,84,106" target="S" />
+        <area shape="rect" coords="86,89,104,107" target="D" />
+        <area shape="rect" coords="107,89,124,107" target="F" />
+        <area shape="rect" coords="128,89,145,107" target="G" />
+        <area shape="rect" coords="149,88,165,107" target="H" />
+        <area shape="rect" coords="169,89,186,107" target="J" />
+        <area shape="rect" coords="189,89,207,107" target="K" />
+        <area shape="rect" coords="210,89,228,107" target="L" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="58,110,75,128" target="Z" />
+        <area shape="rect" coords="79,110,96,128" target="X" />
+        <area shape="rect" coords="99,109,116,127" target="C" />
+        <area shape="rect" coords="120,110,138,128" target="V" />
+        <area shape="rect" coords="141,109,157,127" target="B" />
+        <area shape="rect" coords="162,110,179,128" target="N" />
+        <area shape="rect" coords="182,110,199,128" target="M" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="8,47,26,64" target="|" />
+        <area shape="rect" coords="28,47,45,64" target="1" />
+        <area shape="rect" coords="50,47,67,65" target="2" />
+        <area shape="rect" coords="70,46,87,65" target="3" />
+        <area shape="rect" coords="91,46,108,64" target="4" />
+        <area shape="rect" coords="111,46,129,65" target="5" />
+        <area shape="rect" coords="132,47,149,65" target="6" />
+        <area shape="rect" coords="152,47,170,64" target="7" />
+        <area shape="rect" coords="174,46,191,63" target="8" />
+        <area shape="rect" coords="194,47,211,65" target="9" />
+        <area shape="rect" coords="215,46,232,64" target="0" />
+        <area shape="rect" coords="235,47,252,65" target="-" />
+        <area shape="rect" coords="255,46,272,65" target="=" />
+        <area shape="rect" coords="244,68,261,86" target="[" />
+        <area shape="rect" coords="264,67,282,86" target="]" />
+        <area shape="rect" coords="284,68,309,86" target="#" />
+        <area shape="rect" coords="231,88,249,106" target=";" />
+        <area shape="rect" coords="251,89,269,107" target="’" />
+        <area shape="rect" coords="202,110,219,128" target="," />
+        <area shape="rect" coords="223,110,241,128" target="." />
+        <area shape="rect" coords="243,110,261,128" target="/" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="caps" type="switch_mode" mode="lowercase" />
+    <event name="symbols" type="switch_mode" mode="uppercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="|" type="key" code="124" ascii="124" modifiers="" />
+    <event name="-" type="key" code="45" ascii="45" modifiers="" />
+    <event name="=" type="key" code="61" ascii="61" modifiers="" />
+    <event name="[" type="key" code="91" ascii="91" modifiers="" />
+    <event name="]" type="key" code="93" ascii="93" modifiers="" />
+    <event name="#" type="key" code="35" ascii="35" modifiers="" />
+    <event name=";" type="key" code="59" ascii="59" modifiers="" />
+    <event name="'" type="key" code="39" ascii="39" modifiers="" />
+    <event name="," type="key" code="44" ascii="44" modifiers="" />
+    <event name="." type="key" code="46" ascii="46" modifiers="" />
+    <event name="/" type="key" code="47" ascii="47" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+    <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+    <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+    <event name="D" type="key" code="100" ascii="68" modifiers="shift" />
+    <event name="E" type="key" code="101" ascii="69" modifiers="shift" />
+    <event name="F" type="key" code="102" ascii="70" modifiers="shift" />
+    <event name="G" type="key" code="103" ascii="71" modifiers="shift" />
+    <event name="H" type="key" code="104" ascii="72" modifiers="shift" />
+    <event name="I" type="key" code="105" ascii="73" modifiers="shift" />
+    <event name="J" type="key" code="106" ascii="74" modifiers="shift" />
+    <event name="K" type="key" code="107" ascii="75" modifiers="shift" />
+    <event name="L" type="key" code="108" ascii="76" modifiers="shift" />
+    <event name="M" type="key" code="109" ascii="77" modifiers="shift" />
+    <event name="N" type="key" code="110" ascii="78" modifiers="shift" />
+    <event name="O" type="key" code="111" ascii="79" modifiers="shift" />
+    <event name="P" type="key" code="112" ascii="80" modifiers="shift" />
+    <event name="Q" type="key" code="113" ascii="81" modifiers="shift" />
+    <event name="R" type="key" code="114" ascii="82" modifiers="shift" />
+    <event name="S" type="key" code="115" ascii="83" modifiers="shift" />
+    <event name="T" type="key" code="116" ascii="84" modifiers="shift" />
+    <event name="U" type="key" code="117" ascii="85" modifiers="shift" />
+    <event name="V" type="key" code="118" ascii="86" modifiers="shift" />
+    <event name="W" type="key" code="119" ascii="87" modifiers="shift" />
+    <event name="X" type="key" code="120" ascii="88" modifiers="shift" />
+    <event name="Y" type="key" code="121" ascii="89" modifiers="shift" />
+    <event name="Z" type="key" code="122" ascii="90" modifiers="shift" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+
+  <!-- Lowercase Symbols -->
+  <mode name="lowercasesymbols" resolutions="320x240">
+    <layout resolution="320x240" bitmap="lowercase-symbols320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="8,47,26,64" target="¬" />
+        <area shape="rect" coords="28,47,45,64" target="!" />
+        <area shape="rect" coords="50,47,67,65" target="quote" />
+        <area shape="rect" coords="70,46,87,65" target="£" />
+        <area shape="rect" coords="91,46,108,64" target="$" />
+        <area shape="rect" coords="111,46,129,65" target="%" />
+        <area shape="rect" coords="132,47,149,65" target="^" />
+        <area shape="rect" coords="152,47,170,64" target="&" />
+        <area shape="rect" coords="174,46,191,63" target="*" />
+        <area shape="rect" coords="194,47,211,65" target="(" />
+        <area shape="rect" coords="215,46,232,64" target=")" />
+        <area shape="rect" coords="235,47,252,65" target="_" />
+        <area shape="rect" coords="255,46,272,65" target="+" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="q" />
+        <area shape="rect" coords="57,68,75,86" target="w" />
+        <area shape="rect" coords="78,67,94,85" target="e" />
+        <area shape="rect" coords="98,67,115,85" target="r" />
+        <area shape="rect" coords="119,67,136,85" target="t" />
+        <area shape="rect" coords="141,68,158,86" target="y" />
+        <area shape="rect" coords="161,67,179,86" target="u" />
+        <area shape="rect" coords="182,67,199,86" target="i" />
+        <area shape="rect" coords="202,67,220,85" target="o" />
+        <area shape="rect" coords="223,68,240,86" target="p" />
+        <area shape="rect" coords="244,68,261,86" target="{" />
+        <area shape="rect" coords="264,67,282,86" target="}" />
+        <area shape="rect" coords="284,68,309,86" target="~" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="44,88,63,107" target="a" />
+        <area shape="rect" coords="65,88,84,106" target="s" />
+        <area shape="rect" coords="86,89,104,107" target="d" />
+        <area shape="rect" coords="107,89,124,107" target="f" />
+        <area shape="rect" coords="128,89,145,107" target="g" />
+        <area shape="rect" coords="149,88,165,107" target="h" />
+        <area shape="rect" coords="169,89,186,107" target="j" />
+        <area shape="rect" coords="189,89,207,107" target="k" />
+        <area shape="rect" coords="210,89,228,107" target="l" />
+        <area shape="rect" coords="231,88,249,106" target=":" />
+        <area shape="rect" coords="251,89,269,107" target="@" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="202,110,219,128" target="<" />
+        <area shape="rect" coords="223,110,241,128" target=">" />
+        <area shape="rect" coords="243,110,261,128" target="?" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="symbols" type="switch_mode" mode="lowercase" />
+    <event name="caps" type="switch_mode" mode="uppercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="quote" type="key" code="34" ascii="34" modifiers="" />
+    <event name="£" type="key" code="163" ascii="163" modifiers="" />
+    <event name="$" type="key" code="36" ascii="36" modifiers="" />
+    <event name="%" type="key" code="37" ascii="37" modifiers="" />
+    <event name="^" type="key" code="94" ascii="94" modifiers="" />
+    <event name="&" type="key" code="38" ascii="38" modifiers="" />
+    <event name="*" type="key" code="42" ascii="42" modifiers="" />
+    <event name="(" type="key" code="40" ascii="40" modifiers="" />
+    <event name=")" type="key" code="41" ascii="41" modifiers="" />
+    <event name="_" type="key" code="95" ascii="95" modifiers="" />
+    <event name="+" type="key" code="43" ascii="43" modifiers="" />
+    <event name="¬" type="key" code="172" ascii="172" modifiers="" />
+    <event name="!" type="key" code="33" ascii="33" modifiers="" />
+    <event name="{" type="key" code="123" ascii="123" modifiers="" />
+    <event name="}" type="key" code="125" ascii="125" modifiers="" />
+    <event name="~" type="key" code="126" ascii="126" modifiers="" />
+    <event name=":" type="key" code="58" ascii="58" modifiers="" />
+    <event name="@" type="key" code="64" ascii="64" modifiers="" />
+    <event name="<" type="key" code="60" ascii="60" modifiers="" />
+    <event name=">" type="key" code="62" ascii="62" modifiers="" />
+    <event name="?" type="key" code="63" ascii="63" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="a" type="key" code="97" ascii="97" modifiers="" />
+    <event name="b" type="key" code="98" ascii="98" modifiers="" />
+    <event name="c" type="key" code="99" ascii="99" modifiers="" />
+    <event name="d" type="key" code="100" ascii="100" modifiers="" />
+    <event name="e" type="key" code="101" ascii="101" modifiers="" />
+    <event name="f" type="key" code="102" ascii="102" modifiers="" />
+    <event name="g" type="key" code="103" ascii="103" modifiers="" />
+    <event name="h" type="key" code="104" ascii="104" modifiers="" />
+    <event name="i" type="key" code="105" ascii="105" modifiers="" />
+    <event name="j" type="key" code="106" ascii="106" modifiers="" />
+    <event name="k" type="key" code="107" ascii="107" modifiers="" />
+    <event name="l" type="key" code="108" ascii="108" modifiers="" />
+    <event name="m" type="key" code="109" ascii="109" modifiers="" />
+    <event name="n" type="key" code="110" ascii="110" modifiers="" />
+    <event name="o" type="key" code="111" ascii="111" modifiers="" />
+    <event name="p" type="key" code="112" ascii="112" modifiers="" />
+    <event name="q" type="key" code="113" ascii="113" modifiers="" />
+    <event name="r" type="key" code="114" ascii="114" modifiers="" />
+    <event name="s" type="key" code="115" ascii="115" modifiers="" />
+    <event name="t" type="key" code="116" ascii="116" modifiers="" />
+    <event name="u" type="key" code="117" ascii="117" modifiers="" />
+    <event name="v" type="key" code="118" ascii="118" modifiers="" />
+    <event name="w" type="key" code="119" ascii="119" modifiers="" />
+    <event name="x" type="key" code="120" ascii="120" modifiers="" />
+    <event name="y" type="key" code="121" ascii="121" modifiers="" />
+    <event name="z" type="key" code="122" ascii="122" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+
+  <!-- Uppercase Symbols -->
+  <mode name="uppercasesymbols" resolutions="320x240">
+    <layout resolution="320x240" bitmap="uppercase-symbols320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="8,47,26,64" target="¬" />
+        <area shape="rect" coords="28,47,45,64" target="!" />
+        <area shape="rect" coords="50,47,67,65" target="quote" />
+        <area shape="rect" coords="70,46,87,65" target="£" />
+        <area shape="rect" coords="91,46,108,64" target="$" />
+        <area shape="rect" coords="111,46,129,65" target="%" />
+        <area shape="rect" coords="132,47,149,65" target="^" />
+        <area shape="rect" coords="152,47,170,64" target="&" />
+        <area shape="rect" coords="174,46,191,63" target="*" />
+        <area shape="rect" coords="194,47,211,65" target="(" />
+        <area shape="rect" coords="215,46,232,64" target=")" />
+        <area shape="rect" coords="235,47,252,65" target="_" />
+        <area shape="rect" coords="255,46,272,65" target="+" />
+        <area shape="rect" coords="276,46,299,65" target="delete" />
+        <area shape="rect" coords="300,46,311,65" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="Q" />
+        <area shape="rect" coords="57,68,75,86" target="W" />
+        <area shape="rect" coords="78,67,94,85" target="E" />
+        <area shape="rect" coords="98,67,115,85" target="R" />
+        <area shape="rect" coords="119,67,136,85" target="T" />
+        <area shape="rect" coords="141,68,158,86" target="Y" />
+        <area shape="rect" coords="161,67,179,86" target="U" />
+        <area shape="rect" coords="182,67,199,86" target="I" />
+        <area shape="rect" coords="202,67,220,85" target="O" />
+        <area shape="rect" coords="223,68,240,86" target="P" />
+        <area shape="rect" coords="244,68,261,86" target="{" />
+        <area shape="rect" coords="264,67,282,86" target="}" />
+        <area shape="rect" coords="284,68,309,86" target="~" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="44,88,63,107" target="A" />
+        <area shape="rect" coords="65,88,84,106" target="S" />
+        <area shape="rect" coords="86,89,104,107" target="D" />
+        <area shape="rect" coords="107,89,124,107" target="F" />
+        <area shape="rect" coords="128,89,145,107" target="G" />
+        <area shape="rect" coords="149,88,165,107" target="H" />
+        <area shape="rect" coords="169,89,186,107" target="J" />
+        <area shape="rect" coords="189,89,207,107" target="K" />
+        <area shape="rect" coords="210,89,228,107" target="L" />
+        <area shape="rect" coords="231,88,249,106" target=":" />
+        <area shape="rect" coords="251,89,269,107" target="@" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="202,110,219,128" target="<" />
+        <area shape="rect" coords="223,110,241,128" target=">" />
+        <area shape="rect" coords="243,110,261,128" target="?" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="269,131,288,150" target="ok" />
+        <area shape="rect" coords="292,131,311,150" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="switch_mode" mode="shiftlowercase" />
+    <event name="caps" type="switch_mode" mode="lowercasesymbols" />
+    <event name="symbols" type="switch_mode" mode="uppercase" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="quote" type="key" code="34" ascii="34" modifiers="" />
+    <event name="£" type="key" code="163" ascii="163" modifiers="" />
+    <event name="$" type="key" code="36" ascii="36" modifiers="" />
+    <event name="%" type="key" code="37" ascii="37" modifiers="" />
+    <event name="^" type="key" code="94" ascii="94" modifiers="" />
+    <event name="&" type="key" code="38" ascii="38" modifiers="" />
+    <event name="*" type="key" code="42" ascii="42" modifiers="" />
+    <event name="(" type="key" code="40" ascii="40" modifiers="" />
+    <event name=")" type="key" code="41" ascii="41" modifiers="" />
+    <event name="_" type="key" code="95" ascii="95" modifiers="" />
+    <event name="+" type="key" code="43" ascii="43" modifiers="" />
+    <event name="¬" type="key" code="172" ascii="172" modifiers="" />
+    <event name="!" type="key" code="33" ascii="33" modifiers="" />
+    <event name="{" type="key" code="123" ascii="123" modifiers="" />
+    <event name="}" type="key" code="125" ascii="125" modifiers="" />
+    <event name="~" type="key" code="126" ascii="126" modifiers="" />
+    <event name=":" type="key" code="58" ascii="58" modifiers="" />
+    <event name="@" type="key" code="64" ascii="64" modifiers="" />
+    <event name="<" type="key" code="60" ascii="60" modifiers="" />
+    <event name=">" type="key" code="62" ascii="62" modifiers="" />
+    <event name="?" type="key" code="63" ascii="63" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+    <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+    <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+    <event name="D" type="key" code="100" ascii="68" modifiers="shift" />
+    <event name="E" type="key" code="101" ascii="69" modifiers="shift" />
+    <event name="F" type="key" code="102" ascii="70" modifiers="shift" />
+    <event name="G" type="key" code="103" ascii="71" modifiers="shift" />
+    <event name="H" type="key" code="104" ascii="72" modifiers="shift" />
+    <event name="I" type="key" code="105" ascii="73" modifiers="shift" />
+    <event name="J" type="key" code="106" ascii="74" modifiers="shift" />
+    <event name="K" type="key" code="107" ascii="75" modifiers="shift" />
+    <event name="L" type="key" code="108" ascii="76" modifiers="shift" />
+    <event name="M" type="key" code="109" ascii="77" modifiers="shift" />
+    <event name="N" type="key" code="110" ascii="78" modifiers="shift" />
+    <event name="O" type="key" code="111" ascii="79" modifiers="shift" />
+    <event name="P" type="key" code="112" ascii="80" modifiers="shift" />
+    <event name="Q" type="key" code="113" ascii="81" modifiers="shift" />
+    <event name="R" type="key" code="114" ascii="82" modifiers="shift" />
+    <event name="S" type="key" code="115" ascii="83" modifiers="shift" />
+    <event name="T" type="key" code="116" ascii="84" modifiers="shift" />
+    <event name="U" type="key" code="117" ascii="85" modifiers="shift" />
+    <event name="V" type="key" code="118" ascii="86" modifiers="shift" />
+    <event name="W" type="key" code="119" ascii="87" modifiers="shift" />
+    <event name="X" type="key" code="120" ascii="88" modifiers="shift" />
+    <event name="Y" type="key" code="121" ascii="89" modifiers="shift" />
+    <event name="Z" type="key" code="122" ascii="90" modifiers="shift" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+    <event name="delete" type="delete" />
+  </mode>
+</keyboard>


Commit: 1448bbc77e9ff3adc10fba5c269e8d23cc8ef50d
    https://github.com/scummvm/scummvm/commit/1448bbc77e9ff3adc10fba5c269e8d23cc8ef50d
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-27T03:59:33+01:00

Commit Message:
README: Add trigger hotkeys for virtual keyboard and keymapper.

Changed paths:
    README



diff --git a/README b/README
index a6070e4..c22f092 100644
--- a/README
+++ b/README
@@ -1268,6 +1268,8 @@ other games.
                              instead, or a multiple thereof
     Alt-Enter              - Toggles full screen/windowed
     Alt-s                  - Make a screenshot (SDL backend only)
+    F7                     - Open virtual keyboard (if enabled)
+    F8                     - Open key remapper dialog (if enabled)
 
   SCUMM:
     Ctrl 0-9 and Alt 0-9   - Load and save game state


Commit: 8cf41943f66113c9efbadc4baf17b9a72dce7323
    https://github.com/scummvm/scummvm/commit/8cf41943f66113c9efbadc4baf17b9a72dce7323
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-27T04:18:39+01:00

Commit Message:
VKEYBD: Switch hotkey from F7 to CTRL-F7 to reduce game conflicts.

Although this is harder for physically disabled users to trigger, they
can now use the long middle mouse button press instead to trigger.

Changed paths:
    README
    common/EventMapper.cpp



diff --git a/README b/README
index c22f092..5670dd3 100644
--- a/README
+++ b/README
@@ -1268,7 +1268,7 @@ other games.
                              instead, or a multiple thereof
     Alt-Enter              - Toggles full screen/windowed
     Alt-s                  - Make a screenshot (SDL backend only)
-    F7                     - Open virtual keyboard (if enabled)
+    Ctrl-F7                - Open virtual keyboard (if enabled)
     F8                     - Open key remapper dialog (if enabled)
 
   SCUMM:
diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index 36feedf..6a3a7e5 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -57,10 +57,10 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 			mappedEvent.type = EVENT_MAINMENU;
 		}
 #ifdef ENABLE_VKEYBD
-		else if (ev.kbd.keycode == KEYCODE_F7 && ev.kbd.hasFlags(0)) {
+		else if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F7) {
 			mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
 			
-			// Avoid blocking F7 events from engine.
+			// Avoid blocking CTRL-F7 events from engine.
 			addDelayedEvent(100, ev);
 		}
 #endif


Commit: b7192731b9e65292fd2998162db63a4e3d76b8dd
    https://github.com/scummvm/scummvm/commit/b7192731b9e65292fd2998162db63a4e3d76b8dd
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-27T04:18:47+01:00

Commit Message:
KEYMAPPER: Change hotkey from F8 to CTRL-F8 to reduce game conflicts.

Changed paths:
    README
    common/EventMapper.cpp



diff --git a/README b/README
index 5670dd3..743b577 100644
--- a/README
+++ b/README
@@ -1269,7 +1269,7 @@ other games.
     Alt-Enter              - Toggles full screen/windowed
     Alt-s                  - Make a screenshot (SDL backend only)
     Ctrl-F7                - Open virtual keyboard (if enabled)
-    F8                     - Open key remapper dialog (if enabled)
+    Ctrl-F8                - Open key remapper dialog (if enabled)
 
   SCUMM:
     Ctrl 0-9 and Alt 0-9   - Load and save game state
diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index 6a3a7e5..b92116c 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -65,10 +65,10 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 		}
 #endif
 #ifdef ENABLE_KEYMAPPER
-		else if (ev.kbd.keycode == KEYCODE_F8 && ev.kbd.hasFlags(0)) {
+		else if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F8) {
 			mappedEvent.type = EVENT_KEYMAPPER_REMAP;
 			
-			// Avoid blocking F8 events from engine.
+			// Avoid blocking CTRL-F8 events from engine.
 			addDelayedEvent(100, ev);
 		}
 #endif


Commit: dc0c7bce4cfddc109775285798e9cadbf20f6253
    https://github.com/scummvm/scummvm/commit/dc0c7bce4cfddc109775285798e9cadbf20f6253
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:13:49+01:00

Commit Message:
DINGUX: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/events/dinguxsdl/dinguxsdl-events.cpp



diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp
index 46089a4..6f9f2a7 100644
--- a/backends/events/dinguxsdl/dinguxsdl-events.cpp
+++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp
@@ -144,8 +144,9 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 
 		return true;
 	} else if (ev.key.keysym.sym == BUT_SELECT) { // virtual keyboard
-		ev.key.keysym.sym = SDLK_F7;
-
+#ifdef ENABLE_VKEYBD
+		event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+#endif
 	} else if (ev.key.keysym.sym == BUT_START) { // F5, menu in some games
 		ev.key.keysym.sym = SDLK_F5;
 


Commit: 3ae0908967a3c5d526e139bb1a5da82da4793776
    https://github.com/scummvm/scummvm/commit/3ae0908967a3c5d526e139bb1a5da82da4793776
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:21:46+01:00

Commit Message:
GPH: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/events/gph/gph-events.cpp



diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 90b6a2a..88fc97d 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -348,8 +348,7 @@ bool GPHEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
 		event.type = Common::EVENT_KEYDOWN;
 		if (BUTTON_STATE_L == true) {
 #ifdef ENABLE_VKEYBD
-			event.kbd.keycode = Common::KEYCODE_F7;
-			event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+			event.type = Common::EVENT_VIRTUAL_KEYBOARD;
 #else
 			event.kbd.keycode = Common::KEYCODE_0;
 			event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);


Commit: 4ebbdaa59ba446d1ad69be083dad73b54691920a
    https://github.com/scummvm/scummvm/commit/4ebbdaa59ba446d1ad69be083dad73b54691920a
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:22:54+01:00

Commit Message:
LINUXMOTO: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/events/linuxmotosdl/linuxmotosdl-events.cpp



diff --git a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
index ce34662..b0d443f 100644
--- a/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
+++ b/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
@@ -73,7 +73,10 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	}
 	// VirtualKeyboard - Camera key
 	else if (ev.key.keysym.sym == SDLK_PAUSE) {
-		ev.key.keysym.sym = SDLK_F7;
+#ifdef ENABLE_VKEYBD
+                event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+                return true;
+#endif
 	}
 	// Enter - mod+fire key
 	else if (ev.key.keysym.sym == SDLK_b) {
@@ -117,7 +120,10 @@ bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	}
 	// VirtualKeyboard - Right Soft key
 	else if (ev.key.keysym.sym == SDLK_F11) {
-		ev.key.keysym.sym = SDLK_F7;
+#ifdef ENABLE_VKEYBD
+                event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+                return true;
+#endif
 	}
 #endif
 


Commit: 1544feb02cb72c1d63f2d5da743412b4b887ab14
    https://github.com/scummvm/scummvm/commit/1544feb02cb72c1d63f2d5da743412b4b887ab14
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:24:47+01:00

Commit Message:
MAEMO: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/events/maemosdl/maemosdl-events.cpp



diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp
index 5045363..8b75140 100644
--- a/backends/events/maemosdl/maemosdl-events.cpp
+++ b/backends/events/maemosdl/maemosdl-events.cpp
@@ -86,12 +86,11 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F6) {
 				if (!model.hasHwKeyboard) {
-					event.type = Common::EVENT_KEYDOWN;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 down (virtual keyboard)");
+#ifdef ENABLE_VKEYBD
+					event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+					debug(9, "remapping to virtual keyboard trigger");
 					return true;
+#endif
 				} else {
 					// handled in keyup
 				}
@@ -102,12 +101,11 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F8) {
 				if (ev.key.keysym.mod & KMOD_CTRL) {
-					event.type = Common::EVENT_KEYDOWN;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 down (virtual keyboard)");
+#ifdef ENABLE_VKEYBD
+					event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+					debug(9, "remapping to virtual keyboard trigger");
 					return true;
+#endif
 				} else {
 					// handled in keyup
 					return true;
@@ -125,12 +123,7 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F6) {
 				if (!model.hasHwKeyboard) {
-					event.type = Common::EVENT_KEYUP;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 down (virtual keyboard)");
-					return true;
+					// handled in keydown
 				} else {
 					bool currentState = ((OSystem_SDL *)g_system)->getGraphicsManager()->getFeatureState(OSystem::kFeatureFullscreenMode);
 					g_system->beginGFXTransaction();
@@ -146,12 +139,7 @@ bool MaemoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F8) {
 				if (ev.key.keysym.mod & KMOD_CTRL) {
-					event.type = Common::EVENT_KEYUP;
-					event.kbd.keycode = Common::KEYCODE_F7;
-					event.kbd.ascii = Common::ASCII_F7;
-					event.kbd.flags = 0;
-					debug(9, "remapping to F7 up (virtual keyboard)");
-					return true;
+					// handled in key down
 				} else {
 					toggleClickMode();
 					debug(9, "remapping to click toggle");


Commit: dd92fa45b4740ffdf818d362a6fb7e3e76fab687
    https://github.com/scummvm/scummvm/commit/dd92fa45b4740ffdf818d362a6fb7e3e76fab687
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:26:35+01:00

Commit Message:
PS3: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/events/ps3sdl/ps3sdl-events.cpp



diff --git a/backends/events/ps3sdl/ps3sdl-events.cpp b/backends/events/ps3sdl/ps3sdl-events.cpp
index 1a85443..0f6e018 100644
--- a/backends/events/ps3sdl/ps3sdl-events.cpp
+++ b/backends/events/ps3sdl/ps3sdl-events.cpp
@@ -72,9 +72,9 @@ bool PS3SdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event)
 		event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
 		break;
 	case BTN_SELECT: // Virtual keyboard
-		event.type = Common::EVENT_KEYDOWN;
-		event.kbd.keycode = Common::KEYCODE_F7;
-		event.kbd.ascii = mapKey(SDLK_F7, (SDLMod) ev.key.keysym.mod, 0);
+#ifdef ENABLE_VKEYBD
+		event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+#endif
 		break;
 	case BTN_SQUARE: // Escape
 		event.type = Common::EVENT_KEYDOWN;
@@ -110,9 +110,7 @@ bool PS3SdlEventSource::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) {
 		event.kbd.ascii = mapKey(SDLK_F5, (SDLMod) ev.key.keysym.mod, 0);
 		break;
 	case BTN_SELECT: // Virtual keyboard
-		event.type = Common::EVENT_KEYUP;
-		event.kbd.keycode = Common::KEYCODE_F7;
-		event.kbd.ascii = mapKey(SDLK_F7, (SDLMod) ev.key.keysym.mod, 0);
+		// Handled in key down
 		break;
 	case BTN_SQUARE: // Escape
 		event.type = Common::EVENT_KEYUP;


Commit: aafc17ed1e2e3ff13d43d024e00c1628b1f365a4
    https://github.com/scummvm/scummvm/commit/aafc17ed1e2e3ff13d43d024e00c1628b1f365a4
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:27:56+01:00

Commit Message:
SAMSUNGTV: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/events/samsungtvsdl/samsungtvsdl-events.cpp



diff --git a/backends/events/samsungtvsdl/samsungtvsdl-events.cpp b/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
index f5b919a..61499b5 100644
--- a/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
+++ b/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
@@ -38,10 +38,10 @@ bool SamsungTVSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				event.kbd.ascii = Common::ASCII_F5;
 				return true;
 			} else if (ev.key.keysym.sym == SDLK_F2 && ev.key.keysym.scancode == 21) {
-				event.type = Common::EVENT_KEYDOWN;
-				event.kbd.keycode = Common::KEYCODE_F7;
-				event.kbd.ascii = Common::ASCII_F7;
+#ifdef ENABLE_VKEYBD
+				event.type = Common::EVENT_VIRTUAL_KEYBOARD;
 				return true;
+#endif
 			}
 			break;
 		}
@@ -54,11 +54,6 @@ bool SamsungTVSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 				event.kbd.keycode = Common::KEYCODE_F5;
 				event.kbd.ascii = Common::ASCII_F5;
 				return true;
-			} else if (ev.key.keysym.sym == SDLK_F2 && ev.key.keysym.scancode == 21) {
-				event.type = Common::EVENT_KEYUP;
-				event.kbd.keycode = Common::KEYCODE_F7;
-				event.kbd.ascii = Common::ASCII_F7;
-				return true;
 			}
 			break;
 		}


Commit: 8472835963b72e28d95df470f4bf847df4bc7f29
    https://github.com/scummvm/scummvm/commit/8472835963b72e28d95df470f4bf847df4bc7f29
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-29T00:34:17+01:00

Commit Message:
TIZEN: Use virtual keyboard event directly, rather than using keycode.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

Rather than just adding the CTRL modifier, this code changes the
backend to directly generate the virtual keyboard trigger event
directly. This avoids any future breakage if the key combination is
changed again.

Changed paths:
    backends/platform/tizen/form.cpp



diff --git a/backends/platform/tizen/form.cpp b/backends/platform/tizen/form.cpp
index 3f7b918..568829d 100644
--- a/backends/platform/tizen/form.cpp
+++ b/backends/platform/tizen/form.cpp
@@ -338,7 +338,14 @@ void TizenAppForm::showKeypad() {
 	// display the soft keyboard
 	if (_state == kActiveState) {
 		_buttonState = kLeftButton;
-		pushKey(Common::KEYCODE_F7);
+		
+		Common::Event e;
+		e.type = Common::EVENT_VIRTUAL_KEYBOARD;
+		if (_eventQueueLock) {
+			_eventQueueLock->Acquire();
+			_eventQueue.push(e);
+			_eventQueueLock->Release();
+		}
 	}
 }
 


Commit: 7042de2aa9ce75b5b16837bf23c229572b464ce8
    https://github.com/scummvm/scummvm/commit/7042de2aa9ce75b5b16837bf23c229572b464ce8
Author: D G Turner (digitall at scummvm.org)
Date: 2014-05-05T05:18:51+01:00

Commit Message:
WII: Fix correct keycode for virtual keyboard trigger.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

However, due to the complexity of this code, directly calling the
virtual keyboard trigger event could have side effects, so have instead
just added the CTRL modifier to fix this.

This should be fixed if possible to use EVENT_VIRTUAL_KEYBOARD.

Changed paths:
    backends/platform/wii/osystem_events.cpp



diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp
index 2da1d80..0563639 100644
--- a/backends/platform/wii/osystem_events.cpp
+++ b/backends/platform/wii/osystem_events.cpp
@@ -357,8 +357,8 @@ bool OSystem_Wii::pollEvent(Common::Event &event) {
 		PAD_EVENT(PADS_Y, Common::KEYCODE_PERIOD, '.', flags);
 		PAD_EVENT(PADS_START, Common::KEYCODE_F5, Common::ASCII_F5, flags);
 		PAD_EVENT(PADS_UP, Common::KEYCODE_LSHIFT, 0, flags);
-		PAD_EVENT(PADS_DOWN, Common::KEYCODE_F7, Common::ASCII_F7, flags);
-		//PAD_EVENT(PADS_LEFT, Common::KEYCODE_F8, Common::ASCII_F8, 0);
+		PAD_EVENT(PADS_DOWN, Common::KEYCODE_F7, Common::ASCII_F7, Common::KBD_CTRL);
+		//PAD_EVENT(PADS_LEFT, Common::KEYCODE_F8, Common::ASCII_F8, Common::KBD_CTRL);
 
 		if ((bd | bu) & (PADS_A | PADS_B)) {
 			if (bd & PADS_A)


Commit: 37c46fecbfa12e85595e202d5635a8ce82386590
    https://github.com/scummvm/scummvm/commit/37c46fecbfa12e85595e202d5635a8ce82386590
Author: D G Turner (digitall at scummvm.org)
Date: 2014-05-05T05:21:23+01:00

Commit Message:
ANDROID: Fix correct keycode in keymapper for virtual keyboard trigger.

As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

However, due to the complexity of this code, directly calling the
virtual keyboard trigger event could have side effects, so have instead
just added the CTRL modifier to fix this.

This should be fixed if possible to use EVENT_VIRTUAL_KEYBOARD.

Changed paths:
    backends/platform/android/events.cpp



diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index c60626e..8039981 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -263,7 +263,7 @@ void OSystem_Android::setupKeymapper() {
 	Action *act;
 
 	act = new Action(globalMap, "VIRT", "Display keyboard");
-	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, KBD_CTRL));
 
 	mapper->addGlobalKeymap(globalMap);
 


Commit: e07819fb12dd88f247d9fede9b9a1718db0baa87
    https://github.com/scummvm/scummvm/commit/e07819fb12dd88f247d9fede9b9a1718db0baa87
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T19:45:44+01:00

Commit Message:
README: Remove Keymapper trigger key note, add Vkeybd mouse button note.

As the keymapper is still WIP/unstable, this should be omitted from user
documentation. Added note on mouse button trigger for virtual keyboard
as this was not noted in any user documentation.

Changed paths:
    README



diff --git a/README b/README
index 743b577..3d52483 100644
--- a/README
+++ b/README
@@ -1269,7 +1269,8 @@ other games.
     Alt-Enter              - Toggles full screen/windowed
     Alt-s                  - Make a screenshot (SDL backend only)
     Ctrl-F7                - Open virtual keyboard (if enabled)
-    Ctrl-F8                - Open key remapper dialog (if enabled)
+                             This can also be triggered by a long press
+                             of the middle mouse button or wheel.
 
   SCUMM:
     Ctrl 0-9 and Alt 0-9   - Load and save game state


Commit: 834d04b76c99d14c79e5cab53ee017a0044f2cda
    https://github.com/scummvm/scummvm/commit/834d04b76c99d14c79e5cab53ee017a0044f2cda
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T19:53:55+01:00

Commit Message:
MAEMO: Add "small" virtual keyboard pack to port packaging.

Changed paths:
    backends/platform/maemo/debian/rules



diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index c713403..2aa7f33 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -46,6 +46,7 @@ install: build
 	install -m0644 dists/pred.dic debian/scummvm/opt/scummvm/share
 	install -m0644 gui/themes/scummclassic.zip  gui/themes/scummmodern.zip debian/scummvm/opt/scummvm/share
 	install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
+	install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share
 # for optified version we can also add engine datafiles
 	install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/tony.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
 


Commit: b8cce3a16da224140d16d436223fd670f8e580b2
    https://github.com/scummvm/scummvm/commit/b8cce3a16da224140d16d436223fd670f8e580b2
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T19:55:57+01:00

Commit Message:
WII: Add "small" virtual keyboard pack to port packaging.

Changed paths:
    backends/platform/wii/wii.mk



diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index 99ef463..62a8900 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -43,6 +43,7 @@ ifneq ($(DIST_FILES_ENGINEDATA),)
 	$(CP) $(DIST_FILES_ENGINEDATA) wiidist/scummvm/
 endif
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip wiidist/scummvm/
 
 wiiloaddist: wiidist
 	cd wiidist && zip -9r scummvm.zip scummvm/


Commit: 27d25f6b76f3257f43643e09500577b419f18fa6
    https://github.com/scummvm/scummvm/commit/27d25f6b76f3257f43643e09500577b419f18fa6
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T19:57:20+01:00

Commit Message:
N64: Add "small" virtual keyboard pack to port packaging.

Changed paths:
    backends/platform/n64/n64.mk



diff --git a/backends/platform/n64/n64.mk b/backends/platform/n64/n64.mk
index 83ad405..3198170 100644
--- a/backends/platform/n64/n64.mk
+++ b/backends/platform/n64/n64.mk
@@ -20,6 +20,7 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(CP) $(DIST_FILES_DOCS) $(bundle_name)/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/romfs
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/romfs
 	genromfs -f $(bundle_name)/romfs.img -d $(bundle_name)/romfs -V scummvmn64
 	mips64-objcopy $(EXECUTABLE) $(bundle_name)/scummvm.elf -O binary
 	cat $(N64SDK)/hkz-libn64/bootcode $(bundle_name)/scummvm.elf $(bundle_name)/romfs.img > scummvm.v64


Commit: 9c4e6d219432e52b9e8a60064a7ea168c3b16fcf
    https://github.com/scummvm/scummvm/commit/9c4e6d219432e52b9e8a60064a7ea168c3b16fcf
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T19:59:33+01:00

Commit Message:
LINUXMOTO: Add "small" virtual keyboard pack to port packaging.

Changed paths:
    backends/platform/linuxmoto/linuxmoto.mk



diff --git a/backends/platform/linuxmoto/linuxmoto.mk b/backends/platform/linuxmoto/linuxmoto.mk
index f64fadb..937fb4e 100644
--- a/backends/platform/linuxmoto/linuxmoto.mk
+++ b/backends/platform/linuxmoto/linuxmoto.mk
@@ -5,6 +5,7 @@ motoezx: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motoezx/* release/scummvm/
 	tar -C release -cvzf release/ScummVM-motoezx.pkg scummvm
 	$(RM) -r release/scummvm
@@ -16,6 +17,7 @@ motomagx-mpkg: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motomagx/mpkg/* release/scummvm/
 	tar -C release -cvzf release/ScummVM-motomagx.mpkg scummvm
 	$(RM) -r release/scummvm
@@ -26,6 +28,7 @@ motomagx-mgx: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/scummvm/
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/scummvm/
 	$(CP) $(srcdir)/dists/motomagx/mgx/* release/scummvm/
 	tar -C release -cvf release/ScummVM-motomagx.mgx scummvm
 	$(RM) -r release/scummvm
@@ -38,6 +41,7 @@ motomagx-pep: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) release/pep/app
 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS)  release/pep/app
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip release/pep/app
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip release/pep/app
 	tar -C release/pep -czvf release/ScummVM-motomagx.pep app description.ini  scummvm_big_usr.png  scummvm_small_usr.png
 	$(RM) -r release/pep
 


Commit: 532dd85906a414b4329cc31feac84a46fb3fda46
    https://github.com/scummvm/scummvm/commit/532dd85906a414b4329cc31feac84a46fb3fda46
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:01:06+01:00

Commit Message:
DINGUX: Add "small" virtual keyboard pack to port packaging.

Changed paths:
    backends/platform/dingux/dingux.mk



diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index e0aca42..48a9347 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -26,6 +26,7 @@ ifdef DYNAMIC_MODULES
 		$(STRIP) $(bundle_name)/plugins/*
 endif
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
 	$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/


Commit: 5f2306e32918a9503c1761ed5eef33e9be515c82
    https://github.com/scummvm/scummvm/commit/5f2306e32918a9503c1761ed5eef33e9be515c82
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:02:25+01:00

Commit Message:
GPH: Add "small" virtual keyboard pack to CAANOO port packaging.

Changed paths:
    backends/platform/gph/caanoo-bundle.mk



diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index 2cf8e62..24a8d91 100644
--- a/backends/platform/gph/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -24,6 +24,7 @@ caanoo-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
 


Commit: 32a403eb5ea3f069cdafb2ba30293778c7eb60d4
    https://github.com/scummvm/scummvm/commit/32a403eb5ea3f069cdafb2ba30293778c7eb60d4
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:03:41+01:00

Commit Message:
GPH: Add "small" virtual keyboard pack to GP2X port packaging.

Changed paths:
    backends/platform/gph/gp2x-bundle.mk



diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index 9fcb379..9ca1c46 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -21,6 +21,7 @@ gp2x-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/$(EXECUTABLE)
 


Commit: b3946359ead92d5b80edda3f7a6c77a84eeb67ff
    https://github.com/scummvm/scummvm/commit/b3946359ead92d5b80edda3f7a6c77a84eeb67ff
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:04:48+01:00

Commit Message:
GPH: Add "small" virtual keyboard pack to GP2XWIZ port packaging.

Changed paths:
    backends/platform/gph/gp2xwiz-bundle.mk



diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index 4f49850..2ea8797 100644
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -23,6 +23,7 @@ gp2xwiz-bundle: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
 


Commit: ae8d29098623bbfda37537b4eb93ba7ed0c604d6
    https://github.com/scummvm/scummvm/commit/ae8d29098623bbfda37537b4eb93ba7ed0c604d6
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:08:21+01:00

Commit Message:
GPH: Add "small" virtual keyboard pack to CAANOO debug port packaging.

Changed paths:
    backends/platform/gph/caanoo-bundle.mk



diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index 24a8d91..9362dae 100644
--- a/backends/platform/gph/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -56,6 +56,7 @@ caanoo-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
 


Commit: 1aabc3e1ff8f2d4dc5d0f763013242c3f5b215ab
    https://github.com/scummvm/scummvm/commit/1aabc3e1ff8f2d4dc5d0f763013242c3f5b215ab
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:10:40+01:00

Commit Message:
GPH: Add "small" virtual keyboard pack to GP2X debug port packaging.

Changed paths:
    backends/platform/gph/gp2x-bundle.mk



diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index 9ca1c46..d430ae6 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -53,6 +53,7 @@ gp2x-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/$(EXECUTABLE)
 


Commit: 68490bee45d1abdeaf6b92a3dd3b3a34cce2e4ae
    https://github.com/scummvm/scummvm/commit/68490bee45d1abdeaf6b92a3dd3b3a34cce2e4ae
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:11:06+01:00

Commit Message:
GPH: Add "small" virtual keyboard pack to GP2XWIZ debug port packaging.

Changed paths:
    backends/platform/gph/gp2xwiz-bundle.mk



diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index 2ea8797..36a720a 100644
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -58,6 +58,7 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
 	$(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip $(bundle_name)/scummvm/
 
 	$(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
 


Commit: c8fc6cad58e64865e647ed7c057110d1786ea92d
    https://github.com/scummvm/scummvm/commit/c8fc6cad58e64865e647ed7c057110d1786ea92d
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:13:01+01:00

Commit Message:
PS3: Add "small" virtual keyboard pack to port packaging.

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index 306e0f0..184a06c 100644
--- a/ports.mk
+++ b/ports.mk
@@ -366,6 +366,7 @@ endif
 	cp $(DIST_FILES_DOCS) ps3pkg/USRDIR/doc/
 	cp $(srcdir)/dists/ps3/readme-ps3.md ps3pkg/USRDIR/doc/
 	cp $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip ps3pkg/USRDIR/data/
+	cp $(srcdir)/backends/vkeybd/packs/vkeybd_small.zip ps3pkg/USRDIR/data/
 	cp $(srcdir)/dists/ps3/ICON0.PNG ps3pkg/
 	cp $(srcdir)/dists/ps3/PIC1.PNG ps3pkg/
 	sfo.py -f $(srcdir)/dists/ps3/sfo.xml ps3pkg/PARAM.SFO


Commit: 536203b352f66d326e1c6e93942cf0a1adba8e99
    https://github.com/scummvm/scummvm/commit/536203b352f66d326e1c6e93942cf0a1adba8e99
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:14:17+01:00

Commit Message:
DEVTOOLS: Add "small" vkeybd pack to create_project postbuild script.

Changed paths:
    devtools/create_project/scripts/postbuild.cmd



diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd
index 8b70ec3..fcbd8c5 100644
--- a/devtools/create_project/scripts/postbuild.cmd
+++ b/devtools/create_project/scripts/postbuild.cmd
@@ -26,7 +26,8 @@ echo.
 xcopy /F /Y "%~4/lib/%~3/SDL.dll"                          "%~2" 1>NUL 2>&1

 xcopy /F /Y "%~4/lib/%~3/freetype6.dll"                    "%~2" 1>NUL 2>&1

 xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1

-xcopy /F /Y "%~1/gui/themes/translations.dat"               "%~2" 1>NUL 2>&1

+xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_small.zip"   "%~2" 1>NUL 2>&1

+xcopy /F /Y "%~1/gui/themes/translations.dat"              "%~2" 1>NUL 2>&1

 

 

 if "%~5"=="0" goto done



Commit: ad07da959dca9580d5a832ee69303d19fd21b578
    https://github.com/scummvm/scummvm/commit/ad07da959dca9580d5a832ee69303d19fd21b578
Author: D G Turner (digitall at scummvm.org)
Date: 2014-06-25T20:19:06+01:00

Commit Message:
SYMBIAN: Add "small" vkeybd pack to port packaging.

Changed paths:
    backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
    backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
    backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
    backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg



diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index c04b7f6..bf4f0a9 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -74,6 +74,7 @@
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
 "..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
 "..\..\..\..\gui\themes\fonts\Arial.bdf"-"c:\data\scummvm\Arial.bdf"
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
index 2500763..9a19291 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
@@ -82,6 +82,7 @@
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
 "..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
 "..\..\..\..\gui\themes\fonts\Arial.bdf"-"c:\data\scummvm\Arial.bdf"
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index b4f1cfd..5db65e8 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -64,6 +64,7 @@
 "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat"
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\shared\scummvm\toon.dat"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\shared\scummvm\scummmodern.zip"
 
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
index 722e23a..d783bd5 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
@@ -72,6 +72,7 @@
 "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat"
 "..\..\..\..\dists\engine-data\toon.dat"-"c:\shared\scummvm\toon.dat"
 "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip"
+"..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip"
 "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat"
 "..\..\..\..\gui\themes\scummmodern.zip"-"c:\shared\scummvm\scummmodern.zip"
 


Commit: cb596113a784e4894b5a34787b80144d2d3561e2
    https://github.com/scummvm/scummvm/commit/cb596113a784e4894b5a34787b80144d2d3561e2
Author: David Turner (dgturner at iee.org)
Date: 2014-06-28T14:59:08+01:00

Commit Message:
Merge pull request #461 from digitall/vkeybdFix

Add trigger for Virtual Keyboard on long press of Middle Mouse Button

Changed paths:
  A backends/vkeybd/packs/vkeybd_small.zip
  A backends/vkeybd/packs/vkeybd_small/lowercase-symbols320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/lowercase320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/uppercase-symbols320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/uppercase320x240.bmp
  A backends/vkeybd/packs/vkeybd_small/vkeybd_small.xml
    README
    backends/events/dinguxsdl/dinguxsdl-events.cpp
    backends/events/gph/gph-events.cpp
    backends/events/linuxmotosdl/linuxmotosdl-events.cpp
    backends/events/maemosdl/maemosdl-events.cpp
    backends/events/ps3sdl/ps3sdl-events.cpp
    backends/events/samsungtvsdl/samsungtvsdl-events.cpp
    backends/platform/android/events.cpp
    backends/platform/dingux/dingux.mk
    backends/platform/gph/caanoo-bundle.mk
    backends/platform/gph/gp2x-bundle.mk
    backends/platform/gph/gp2xwiz-bundle.mk
    backends/platform/linuxmoto/linuxmoto.mk
    backends/platform/maemo/debian/rules
    backends/platform/n64/n64.mk
    backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
    backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
    backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
    backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg
    backends/platform/tizen/form.cpp
    backends/platform/wii/osystem_events.cpp
    backends/platform/wii/wii.mk
    backends/vkeybd/virtual-keyboard.cpp
    common/EventMapper.cpp
    devtools/create_project/scripts/postbuild.cmd
    ports.mk



diff --cc backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 5f74bee,bf4f0a9..2ba65c4
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@@ -74,8 -74,34 +74,9 @@@
  "..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
  "..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
  "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+ "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
  "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
  "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
 -"..\..\..\..\gui\themes\fonts\Arial.bdf"-"c:\data\scummvm\Arial.bdf"
 -"..\..\..\..\gui\themes\fonts\Arial12.bdf"-"c:\data\scummvm\Arial12.bdf"
 -"..\..\..\..\gui\themes\fonts\ArialBold.bdf"-"c:\data\scummvm\ArialBold.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-1.bdf"-"c:\data\scummvm\clR6x12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-2.bdf"-"c:\data\scummvm\clR6x12-iso-8859-2.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-5.bdf"-"c:\data\scummvm\clR6x12-iso-8859-5.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-7.bdf"-"c:\data\scummvm\clR6x12-iso-8859-7.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12.bdf"-"c:\data\scummvm\clR6x12.bdf"
 -"..\..\..\..\gui\themes\fonts\courr12-iso-8859-1.bdf"-"c:\data\scummvm\courr12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8-iso-8859-1.bdf"-"c:\data\scummvm\fixed5x8-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8-iso-8859-5.bdf"-"c:\data\scummvm\fixed5x8-iso-8859-5.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8-iso-8859-7.bdf"-"c:\data\scummvm\fixed5x8-iso-8859-7.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8.bdf"-"c:\data\scummvm\fixed5x8.bdf"
 -"..\..\..\..\gui\themes\fonts\FreeMonoBold.ttf"-"c:\data\scummvm\FreeMonoBold.ttf"
 -"..\..\..\..\gui\themes\fonts\FreeSans.ttf"-"c:\data\scummvm\FreeSans.ttf"
 -"..\..\..\..\gui\themes\fonts\FreeSansBold.ttf"-"c:\data\scummvm\FreeSansBold.ttf"
 -"..\..\..\..\gui\themes\fonts\helvB12-iso-8859-1.bdf"-"c:\data\scummvm\helvB12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\helvB12-iso-8859-2.bdf"-"c:\data\scummvm\helvB12-iso-8859-2.bdf"
 -"..\..\..\..\gui\themes\fonts\helvB12-iso-8859-5.bdf"-"c:\data\scummvm\helvB12-iso-8859-5.bdf"
 -"..\..\..\..\gui\themes\fonts\helvB12.bdf"-"c:\data\scummvm\helvB12.bdf"
 -"..\..\..\..\gui\themes\fonts\helvBO12-iso-8859-1.bdf"-"c:\data\scummvm\helvBO12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\helvBO12.bdf"-"c:\data\scummvm\helvBO12.bdf"
 -"..\..\..\..\gui\themes\fonts\helvR12-iso-8859-1.bdf"-"c:\data\scummvm\helvR12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\helvR12.bdf"-"c:\data\scummvm\helvR12.bdf"
 -;"..\..\..\..\gui\themes\"-"c:\data\scummvm\"
  
  ; Config/log files: 'empty' will automagically be removed on uninstall
  ""-"c:\data\scummvm\scummvm.ini",FILENULL
diff --cc backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
index 4ef085d,9a19291..2d2edf2
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg
@@@ -82,8 -82,34 +82,9 @@@
  "..\..\..\..\dists\engine-data\toon.dat"-"c:\data\scummvm\toon.dat"
  "..\..\..\..\dists\engine-data\wintermute.zip"-"c:\data\scummvm\wintermute.zip"
  "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\data\scummvm\vkeybd_default.zip"
+ "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\data\scummvm\vkeybd_small.zip"
  "..\..\..\..\gui\themes\translations.dat"-"c:\data\scummvm\translations.dat"
  "..\..\..\..\gui\themes\scummmodern.zip"-"c:\data\scummvm\scummmodern.zip"
 -"..\..\..\..\gui\themes\fonts\Arial.bdf"-"c:\data\scummvm\Arial.bdf"
 -"..\..\..\..\gui\themes\fonts\Arial12.bdf"-"c:\data\scummvm\Arial12.bdf"
 -"..\..\..\..\gui\themes\fonts\ArialBold.bdf"-"c:\data\scummvm\ArialBold.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-1.bdf"-"c:\data\scummvm\clR6x12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-2.bdf"-"c:\data\scummvm\clR6x12-iso-8859-2.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-5.bdf"-"c:\data\scummvm\clR6x12-iso-8859-5.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12-iso-8859-7.bdf"-"c:\data\scummvm\clR6x12-iso-8859-7.bdf"
 -"..\..\..\..\gui\themes\fonts\clR6x12.bdf"-"c:\data\scummvm\clR6x12.bdf"
 -"..\..\..\..\gui\themes\fonts\courr12-iso-8859-1.bdf"-"c:\data\scummvm\courr12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8-iso-8859-1.bdf"-"c:\data\scummvm\fixed5x8-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8-iso-8859-5.bdf"-"c:\data\scummvm\fixed5x8-iso-8859-5.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8-iso-8859-7.bdf"-"c:\data\scummvm\fixed5x8-iso-8859-7.bdf"
 -"..\..\..\..\gui\themes\fonts\fixed5x8.bdf"-"c:\data\scummvm\fixed5x8.bdf"
 -"..\..\..\..\gui\themes\fonts\FreeMonoBold.ttf"-"c:\data\scummvm\FreeMonoBold.ttf"
 -"..\..\..\..\gui\themes\fonts\FreeSans.ttf"-"c:\data\scummvm\FreeSans.ttf"
 -"..\..\..\..\gui\themes\fonts\FreeSansBold.ttf"-"c:\data\scummvm\FreeSansBold.ttf"
 -"..\..\..\..\gui\themes\fonts\helvB12-iso-8859-1.bdf"-"c:\data\scummvm\helvB12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\helvB12-iso-8859-2.bdf"-"c:\data\scummvm\helvB12-iso-8859-2.bdf"
 -"..\..\..\..\gui\themes\fonts\helvB12-iso-8859-5.bdf"-"c:\data\scummvm\helvB12-iso-8859-5.bdf"
 -"..\..\..\..\gui\themes\fonts\helvB12.bdf"-"c:\data\scummvm\helvB12.bdf"
 -"..\..\..\..\gui\themes\fonts\helvBO12-iso-8859-1.bdf"-"c:\data\scummvm\helvBO12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\helvBO12.bdf"-"c:\data\scummvm\helvBO12.bdf"
 -"..\..\..\..\gui\themes\fonts\helvR12-iso-8859-1.bdf"-"c:\data\scummvm\helvR12-iso-8859-1.bdf"
 -"..\..\..\..\gui\themes\fonts\helvR12.bdf"-"c:\data\scummvm\helvR12.bdf"
 -;"..\..\..\..\gui\themes\"-"c:\data\scummvm\"
  
  ; Config/log files: 'empty' will automagically be removed on uninstall
  ""-"c:\data\scummvm\scummvm.ini",FILENULL






More information about the Scummvm-git-logs mailing list