From 6f4bbeb4520094e4916a97d8f8078408682a7ed7 Mon Sep 17 00:00:00 2001
From: m1k1o <sedivy.miro@gmail.com>
Date: Sun, 21 Jun 2020 03:01:59 +0200
Subject: [PATCH] change lock modifiers

---
 server/internal/xorg/xorg.c | 34 +++++++++++-----------------------
 server/internal/xorg/xorg.h |  1 -
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/server/internal/xorg/xorg.c b/server/internal/xorg/xorg.c
index e287952..9c45c9b 100644
--- a/server/internal/xorg/xorg.c
+++ b/server/internal/xorg/xorg.c
@@ -175,33 +175,21 @@ void SetKeyboard(char *layout) {
 
 void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock) {
   Display *display = getXDisplay();
-  Bool state;
-  Atom atom;
 
-  // set num lock
-  atom = XInternAtom(display, "Num Lock", 0);
-  XkbGetNamedIndicator(display, atom, NULL, &state, NULL, NULL);
-  //printf("Num Lock is %s\n", state ? "on" : "off");
-  if(num_lock != -1 && state != num_lock) {
-    XKey(XK_Num_Lock, 1);
-    XKey(XK_Num_Lock, 0);
+  if (num_lock != -1) {
+    XkbLockModifiers(display, XkbUseCoreKbd, 16, num_lock * 16);
   }
 
-  // set caps lock
-  atom = XInternAtom(display, "Caps Lock", 0);
-  XkbGetNamedIndicator(display, atom, NULL, &state, NULL, NULL);
-  //printf("Caps Lock is %s\n", state ? "on" : "off");
-  if(caps_lock != -1 && state != caps_lock) {
-    XKey(XK_Caps_Lock, 1);
-    XKey(XK_Caps_Lock, 0);
+  if (caps_lock != -1) {
+    XkbLockModifiers(display, XkbUseCoreKbd, 2, caps_lock * 2);
   }
 
-  // set scroll lock
-  atom = XInternAtom(display, "Scroll Lock", 0);
-  XkbGetNamedIndicator(display, atom, NULL, &state, NULL, NULL);
-  //printf("Scroll Lock is %s\n", state ? "on" : "off");
-  if(scroll_lock != -1 && state != scroll_lock) {
-    XKey(XK_Scroll_Lock, 1);
-    XKey(XK_Scroll_Lock, 0);
+  if (scroll_lock != -1) {
+    XKeyboardControl values;
+    values.led_mode = scroll_lock ? LedModeOn : LedModeOff;
+    values.led = 3;
+    XChangeKeyboardControl(display, KBLedMode, &values);
   }
+
+  XFlush(display);
 }
diff --git a/server/internal/xorg/xorg.h b/server/internal/xorg/xorg.h
index e5e7c2a..d0a3021 100644
--- a/server/internal/xorg/xorg.h
+++ b/server/internal/xorg/xorg.h
@@ -5,7 +5,6 @@
 
   #include <X11/Xlib.h>
   #include <X11/XKBlib.h>
-  #include <X11/keysym.h>
   #include <X11/extensions/Xrandr.h>
   #include <X11/extensions/XTest.h>
   #include <libclipboard.h>