[Scummvm-cvs-logs] SF.net SVN: scummvm:[35959] scummvm/trunk/backends/vkeybd
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Jan 20 18:38:48 CET 2009
Revision: 35959
http://scummvm.svn.sourceforge.net/scummvm/?rev=35959&view=rev
Author: lordhoto
Date: 2009-01-20 17:38:48 +0000 (Tue, 20 Jan 2009)
Log Message:
-----------
Some formatting.
Modified Paths:
--------------
scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
scummvm/trunk/backends/vkeybd/virtual-keyboard.h
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp 2009-01-20 17:30:23 UTC (rev 35958)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp 2009-01-20 17:38:48 UTC (rev 35959)
@@ -64,7 +64,6 @@
}
bool VirtualKeyboardParser::parserCallback_keyboard(ParserNode *node) {
-
if (_kbdParsed)
return parserError("Only a single keyboard element is allowed");
@@ -98,7 +97,6 @@
}
bool VirtualKeyboardParser::parserCallback_mode(ParserNode *node) {
-
String name = node->values["name"];
if (_parseMode == kParseFull) {
@@ -168,7 +166,6 @@
}
bool VirtualKeyboardParser::parserCallback_event(ParserNode *node) {
-
// if just checking resolutions we're done
if (_parseMode == kParseCheckResolutions)
return true;
@@ -242,7 +239,6 @@
}
bool VirtualKeyboardParser::parserCallback_layout(ParserNode *node) {
-
assert(!_mode->resolution.empty());
String res = node->values["resolution"];
@@ -294,7 +290,6 @@
}
bool VirtualKeyboardParser::parserCallback_area(ParserNode *node) {
-
String& shape = node->values["shape"];
String& target = node->values["target"];
String& coords = node->values["coords"];
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-01-20 17:30:23 UTC (rev 35958)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2009-01-20 17:38:48 UTC (rev 35959)
@@ -78,21 +78,18 @@
}
bool VirtualKeyboard::loadKeyboardPack(String packName) {
-
_kbdGUI->initSize(_system->getOverlayWidth(), _system->getOverlayHeight());
FSNode vkDir;
- if (ConfMan.hasKey("vkeybdpath")) {
+ if (ConfMan.hasKey("vkeybdpath"))
vkDir = FSNode(ConfMan.get("vkeybdpath"));
- } else if (ConfMan.hasKey("extrapath")) {
+ else if (ConfMan.hasKey("extrapath"))
vkDir = FSNode(ConfMan.get("extrapath"));
- } else { // use current directory
+ else // use current directory
vkDir = FSNode(".");
- }
if (vkDir.getChild(packName + ".xml").exists()) {
// uncompressed keyboard pack
-
if (!_parser->loadFile(vkDir.getChild(packName + ".xml")))
return false;
@@ -124,11 +121,11 @@
return _loaded;
}
-bool VirtualKeyboard::checkModeResolutions()
-{
+bool VirtualKeyboard::checkModeResolutions() {
_parser->setParseMode(VirtualKeyboardParser::kParseCheckResolutions);
_loaded = _parser->parse();
- if (_currentMode) _kbdGUI->initMode(_currentMode);
+ if (_currentMode)
+ _kbdGUI->initMode(_currentMode);
return _loaded;
}
@@ -137,15 +134,16 @@
}
void VirtualKeyboard::processAreaClick(const String& area) {
- if (!_currentMode->events.contains(area)) return;
+ if (!_currentMode->events.contains(area))
+ return;
+
VKEvent *evt = _currentMode->events[area];
switch (evt->type) {
- case kVKEventKey: {
+ case kVKEventKey:
// add virtual keypress to queue
_keyQueue.insertKey(*(KeyState*)evt->data);
break;
- }
case kVKEventModifier:
_keyQueue.toggleFlags(*(byte*)(evt->data));
break;
@@ -183,9 +181,9 @@
void VirtualKeyboard::switchMode(const String& newMode) {
if (!_modes.contains(newMode)) {
warning("Keyboard mode '%s' unknown", newMode.c_str());
- return;
+ } else {
+ switchMode(&_modes[newMode]);
}
- switchMode(&_modes[newMode]);
}
void VirtualKeyboard::handleMouseDown(int16 x, int16 y) {
@@ -203,10 +201,11 @@
}
void VirtualKeyboard::show() {
- if (_loaded) _kbdGUI->checkScreenChanged();
if (!_loaded) {
warning("Virtual keyboard not loaded");
return;
+ } else {
+ _kbdGUI->checkScreenChanged();
}
switchMode(_initialMode);
@@ -356,13 +355,11 @@
_strChanged = true;
}
-bool VirtualKeyboard::KeyPressQueue::empty()
-{
+bool VirtualKeyboard::KeyPressQueue::empty() {
return _keys.empty();
}
-String VirtualKeyboard::KeyPressQueue::getString()
-{
+String VirtualKeyboard::KeyPressQueue::getString() {
if (_keysStr.empty())
return _flagsStr;
if (_flagsStr.empty())
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.h
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.h 2009-01-20 17:30:23 UTC (rev 35958)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.h 2009-01-20 17:38:48 UTC (rev 35959)
@@ -96,7 +96,8 @@
VKEvent() : data(0) {}
~VKEvent() {
- if (data) free(data);
+ if (data)
+ free(data);
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list