Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/slim/trunk@212 7c53e7cc-98ea-0310-8f1f-a0b24da60408
@@ -332,6 +332,15 @@ void App::Run() {
Login();
}
+
+ // Set NumLock
+ string numlock = cfg->getOption("numlock");
+ if (numlock == "on") {
+ NumLock::setOn(Dpy);
+ } else if (numlock == "off") {
+ NumLock::setOff(Dpy);
+ }
// Start looping
int panelclosed = 1;
Panel::ActionType Action;
@@ -971,13 +980,6 @@ int App::StartServer() {
break;
- string numlock = cfg->getOption("numlock");
- if (numlock == "on") {
- NumLock::setOn(Dpy);
- } else if (numlock == "off") {
- NumLock::setOff(Dpy);
- }
-
delete args;
serverStarted = true;
@@ -68,9 +68,9 @@ void NumLock::control_numlock(Display *dpy, bool flag) {
return;
if( flag == true )
- XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
- else
XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
+ else
+ XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
void NumLock::setOn(Display *dpy) {