Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-12-02 16:06:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

logout works

Browse Source
This commit is contained in:
Eduardo Bart
2011-08-29 00:44:02 -03:00
parent 1bb89e053a
commit 9de3bfb8b0
7 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/framework/const.h
View File

@@ -157,7 +157,17 @@ namespace Fw
KeyF9 = 137,
KeyF10 = 138,
KeyF11 = 139,
KeyF12 = 140
KeyF12 = 140,
KeyNumpad0 = 141,
KeyNumpad1 = 142,
KeyNumpad2 = 143,
KeyNumpad3 = 144,
KeyNumpad4 = 145,
KeyNumpad5 = 146,
KeyNumpad6 = 147,
KeyNumpad7 = 148,
KeyNumpad8 = 149,
KeyNumpad9 = 150
};
enum LogLevel {

6
src/framework/core/modulemanager.cpp
View File

@@ -40,8 +40,10 @@ void ModuleManager::discoverAndLoadModules()
// auto load modules
for(const ModulePtr& module : m_modules) {
if(!module->isLoaded() && module->autoLoad())
module->load();
if(!module->isLoaded() && module->autoLoad()) {
if(!module->load())
logFatal("cannot continue to run");
}
}
}

14
src/framework/platform/x11platform.cpp
View File

@@ -202,6 +202,19 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
x11.keyMap[XK_KP_Enter] = Fw::KeyEnter;
// keypad with numlock off
x11.keyMap[XK_KP_Insert] = Fw::KeyNumpad0;
x11.keyMap[XK_KP_End] = Fw::KeyNumpad1;
x11.keyMap[XK_KP_Down] = Fw::KeyNumpad2;
x11.keyMap[XK_KP_Page_Down] = Fw::KeyNumpad3;
x11.keyMap[XK_KP_Left] = Fw::KeyNumpad4;
x11.keyMap[XK_KP_Begin] = Fw::KeyNumpad5;
x11.keyMap[XK_KP_Right] = Fw::KeyNumpad6;
x11.keyMap[XK_KP_Home] = Fw::KeyNumpad7;
x11.keyMap[XK_KP_Up] = Fw::KeyNumpad8;
x11.keyMap[XK_KP_Page_Up] = Fw::KeyNumpad9;
x11.keyMap[XK_KP_Delete] = Fw::KeyDelete;
/*
x11.keyMap[XK_KP_Up] = Fw::KeyUp;
x11.keyMap[XK_KP_Down] = Fw::KeyDown;
x11.keyMap[XK_KP_Left] = Fw::KeyLeft;
@@ -212,6 +225,7 @@ void Platform::init(PlatformListener* platformListener, const char *appName)
x11.keyMap[XK_KP_End] = Fw::KeyEnd;
x11.keyMap[XK_KP_Insert] = Fw::KeyInsert;
x11.keyMap[XK_KP_Delete] = Fw::KeyDelete;
*/
// keypad with numlock on
x11.keyMap[XK_KP_0] = Fw::Key0;