From 1017cfd600cac605d73614382f9d46cd5df03d7f Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Thu, 22 Feb 2018 13:57:45 -0500
Subject: [PATCH] Send numlock keypress when disabling the numpad layer.

This avoids the OS being stuck with Numlock on, which leaves the LED on
if other keyboard are attached, and breaks FVWM.

See keyboardio/Model01-Firmware#42
---
 src/Kaleidoscope-NumPad.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Kaleidoscope-NumPad.cpp b/src/Kaleidoscope-NumPad.cpp
index ca7794aa..c98d7776 100644
--- a/src/Kaleidoscope-NumPad.cpp
+++ b/src/Kaleidoscope-NumPad.cpp
@@ -12,6 +12,13 @@ void NumPad_::begin(void) {
   Kaleidoscope.useLoopHook(loopHook);
 }
 
+static void syncNumlock(bool state) {
+  bool numState = !!(kaleidoscope::hid::getKeyboardLEDs() & LED_NUM_LOCK);
+  if (numState != state) {
+    kaleidoscope::hid::pressKey(Key_KeypadNumLock);
+  }
+}
+
 void NumPad_::loopHook(bool postClear) {
   if (!postClear)
     return;
@@ -19,16 +26,14 @@ void NumPad_::loopHook(bool postClear) {
   if (!Layer.isOn(numPadLayer)) {
     if (!cleanupDone) {
       LEDControl.set_mode(LEDControl.get_mode_index());
+      syncNumlock(false);
       cleanupDone = true;
     }
     return;
   }
 
   cleanupDone = false;
-  bool numState = !!(kaleidoscope::hid::getKeyboardLEDs() & LED_NUM_LOCK);
-  if (!numState) {
-    kaleidoscope::hid::pressKey(Key_KeypadNumLock);
-  }
+  syncNumlock(true);
 
   LEDControl.set_mode(LEDControl.get_mode_index());