thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- proper init of virtual keyboard now implemented (involved added EventManager::init() which is called after screen has been initialised)

Browse source 
- changed HardwareKey / Action id field to an array of 4 chars instead of int32. Means that the keymap key/value pairs in config file are more readable.

svn-id: r33986
This commit is contained in:
Stephen Kennedy 2008-08-18 10:07:11 +00:00
parent 63c4a61032
commit d92909203b
13 changed files with 147 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backends/vkeybd/virtual-keyboard.cpp
View file

@ -44,7 +44,6 @@ VirtualKeyboard::VirtualKeyboard() : _currentMode(0) {
_kbdGUI = new VirtualKeyboardGUI(this);
_submitKeys = _loaded = false;
printf("\t\"%c\",\n",255);
}
VirtualKeyboard::~VirtualKeyboard() {
@ -75,6 +74,9 @@ void VirtualKeyboard::reset() {
}
bool VirtualKeyboard::loadKeyboardPack(Common::String packName) {
_kbdGUI->initSize(_system->getOverlayWidth(), _system->getOverlayHeight());
FilesystemNode *vkDir = 0;
if (ConfMan.hasKey("vkeybdpath")) {
vkDir = new FilesystemNode(ConfMan.get("vkeybdpath"));
@ -138,7 +140,7 @@ bool VirtualKeyboard::checkModeResolutions()
{
_parser->setParseMode(kParseCheckResolutions);
_loaded = _parser->parse();
_kbdGUI->initMode(_currentMode);
if (_currentMode) _kbdGUI->initMode(_currentMode);
return _loaded;
}
@ -215,7 +217,7 @@ void VirtualKeyboard::handleMouseUp(int16 x, int16 y) {
void VirtualKeyboard::show() {
if (_loaded) _kbdGUI->checkScreenChanged();
if (!_loaded) {
warning("Virtual keyboard not loaded!");
warning("Virtual keyboard not loaded");
return;
}