Removed #define for update interval

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 596d6a6..228c19b 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -382,6 +382,11 @@ keyboard_indicators(void)
 {
        Display *dpy = XOpenDisplay(NULL);
        XKeyboardState state;
 {
        Display *dpy = XOpenDisplay(NULL);
        XKeyboardState state;

+
+       if (dpy == NULL) {
+               warnx("XOpenDisplay failed");
+               return UNKNOWN_STR;
+       }

        XGetKeyboardControl(dpy, &state);
        XCloseDisplay(dpy);
 
        XGetKeyboardControl(dpy, &state);
        XCloseDisplay(dpy);
 


@@ -879,6 +884,10 @@ main(int argc, char *argv[])
 
        if (!sflag) {
                dpy = XOpenDisplay(NULL);
 
        if (!sflag) {
                dpy = XOpenDisplay(NULL);

+               if (!dpy) {
+                       fprintf(stderr, "slstatus: cannot open display");
+                       exit(1);
+               }

        }
 
        setlocale(LC_ALL, "");
        }
 
        setlocale(LC_ALL, "");


@@ -905,11 +914,11 @@ main(int argc, char *argv[])
                        XSync(dpy, False);
                }
 
                        XSync(dpy, False);
                }
 

-               if ((UPDATE_INTERVAL - delay) <= 0) {
+               if ((update_interval - delay) <= 0) {

                        delay = 0;
                        continue;
                } else {
                        delay = 0;
                        continue;
                } else {

-                       sleep(UPDATE_INTERVAL - delay);
+                       sleep(update_interval - delay);

                        delay = 0;
                }
        }
                        delay = 0;
                }
        }