Fixed XCloseDisplay() which is not reached in keyboard_indicators()

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 2775788..53e1946 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -25,10 +25,7 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
-#undef strlcat
-
-#include "extern/arg.h"
-#include "extern/strlcat.h"
+#include "arg.h"
 
 struct arg {
        char *(*func)();
@@ -50,6 +47,7 @@ static char *gid(void);
 static char *hostname(void);
 static char *ip(const char *iface);
 static char *kernel_release(void);
+static char *keyboard_indicators(void);
 static char *load_avg(void);
 static char *ram_free(void);
 static char *ram_perc(void);
@@ -325,6 +323,29 @@ kernel_release(void)
        return smprintf("%s", udata.release);
 }
 
+static char *
+keyboard_indicators(void)
+{
+       Display *dpy = XOpenDisplay(NULL);
+       XKeyboardState state;
+       XGetKeyboardControl(dpy, &state);
+       XCloseDisplay(dpy);
+
+       switch (state.led_mask) {
+               case 1:
+                       return smprintf("c");
+                       break;
+               case 2:
+                       return smprintf("n");
+                       break;
+               case 3:
+                       return smprintf("cn");
+                       break;
+               default:
+                       return smprintf("");
+       }
+}
+
 static char *
 load_avg(void)
 {
@@ -661,9 +682,7 @@ vol_perc(const char *card)
        }
 
        close(afd);
-       if (v == 0) {
-               return smprintf("mute");
-       }
+
        return smprintf("%d%%", v & 0xff);
 }
 
@@ -811,9 +830,7 @@ main(int argc, char *argv[])
                                element = smprintf("%s", UNKNOWN_STR);
                                warnx("Failed to format output");
                        }
-                       if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string)) {
-                               warnx("Output too long");
-                       }
+                       strncat(status_string, element, sizeof(status_string) - strlen(status_string) - 1);
                        free(res);
                        free(element);
                }