From ac7200c6307b43a5035db24ab0c288060726aba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sun, 17 Jan 2021 19:10:49 +0100
Subject: [PATCH] simplify xorg condition.

---
 internal/desktop/xorg/xorg.c | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/internal/desktop/xorg/xorg.c b/internal/desktop/xorg/xorg.c
index ef8b8001..aded68c8 100644
--- a/internal/desktop/xorg/xorg.c
+++ b/internal/desktop/xorg/xorg.c
@@ -52,33 +52,33 @@ void XScroll(int x, int y) {
 }
 
 void XButton(unsigned int button, int down) {
-  if (button != 0) {
-    Display *display = getXDisplay();
-    XTestFakeButtonEvent(display, button, down, CurrentTime);
-    XSync(display, 0);
-  }
+  if (button == 0) return;
+
+  Display *display = getXDisplay();
+  XTestFakeButtonEvent(display, button, down, CurrentTime);
+  XSync(display, 0);
 }
 
 void XKey(unsigned long key, int down) {
-  if (key != 0) {
-    Display *display = getXDisplay();
-    KeyCode code = XKeysymToKeycode(display, key);
+  if (key == 0) return;
 
-    // Map non-existing keysyms to new keycodes
-    if (code == 0) {
-      int min, max, numcodes;
-      XDisplayKeycodes(display, &min, &max);
-      XGetKeyboardMapping(display, min, max-min, &numcodes);
+  Display *display = getXDisplay();
+  KeyCode code = XKeysymToKeycode(display, key);
 
-      code = (max-min+1)*numcodes;
-      KeySym keysym_list[numcodes];
-      for(int i=0;i<numcodes;i++) keysym_list[i] = key;
-      XChangeKeyboardMapping(display, code, numcodes, keysym_list, 1);
-    }
+  // Map non-existing keysyms to new keycodes
+  if (code == 0) {
+    int min, max, numcodes;
+    XDisplayKeycodes(display, &min, &max);
+    XGetKeyboardMapping(display, min, max-min, &numcodes);
 
-    XTestFakeKeyEvent(display, code, down, CurrentTime);
-    XSync(display, 0);
+    code = (max-min+1)*numcodes;
+    KeySym keysym_list[numcodes];
+    for(int i=0;i<numcodes;i++) keysym_list[i] = key;
+    XChangeKeyboardMapping(display, code, numcodes, keysym_list, 1);
   }
+
+  XTestFakeKeyEvent(display, code, down, CurrentTime);
+  XSync(display, 0);
 }
 
 void XGetScreenConfigurations() {