Fix numlock control (Closes: #12094, #16850, #18522)

Signed-off-by: Nobuhiro Iwamatsu <[email protected]>
axs-gentoo · Apr 16, 2012 · e9aedf4 · e9aedf4
1 parent f766d18
commit e9aedf4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/app.cpp b/app.cpp
@@ -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;

diff --git a/numlock.cpp b/numlock.cpp
@@ -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) {