X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/1d43e2f2b2a31caa48f16d0042d56e57545b2b48..dd5bfc3e518a705aba95569537e785bb0d6d7005:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 9884aaa..64da5cb 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,742 +1,141 @@
 /* See LICENSE file for copyright and license details. */
-
-/* global libraries */
-#include <alsa/asoundlib.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <ifaddrs.h>
-#include <limits.h>
-#include <linux/wireless.h>
-#include <locale.h>
-#include <netdb.h>
-#include <pwd.h>
-#include <stdarg.h>
+#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/statvfs.h>
-#include <sys/socket.h>
-#include <sys/types.h>
 #include <time.h>
-#include <unistd.h>
 #include <X11/Xlib.h>
 
-/* local headers */
+#include "arg.h"
 #include "slstatus.h"
-#include "config.h"
-
-/* set statusbar */
-void
-setstatus(const char *str)
-{
-	/* set WM_NAME via X11 */
-	XStoreName(dpy, DefaultRootWindow(dpy), str);
-	XSync(dpy, False);
-}
-
-/* smprintf function */
-char *
-smprintf(const char *fmt, ...)
-{
-	va_list fmtargs;
-	char *ret = NULL;
-
-	va_start(fmtargs, fmt);
-	if (vasprintf(&ret, fmt, fmtargs) < 0) {
-		return NULL;
-	}
-	va_end(fmtargs);
-
-	return ret;
-}
-
-/* battery percentage */
-char *
-battery_perc(const char *battery)
-{
-	int now, full, perc;
-	char batterynowfile[64] = "";
-	char batteryfullfile[64] = "";
-	FILE *fp;
-
-	/* generate battery nowfile path */
-	strcat(batterynowfile, batterypath);
-	strcat(batterynowfile, battery);
-	strcat(batterynowfile, "/");
-	strcat(batterynowfile, batterynow);
-
-	/* generate battery fullfile path */
-	strcat(batteryfullfile, batterypath);
-	strcat(batteryfullfile, battery);
-	strcat(batteryfullfile, "/");
-	strcat(batteryfullfile, batteryfull);
-
-	/* open battery now file */
-	if (!(fp = fopen(batterynowfile, "r"))) {
-		fprintf(stderr, "Error opening battery file: %s.\n", batterynowfile);
-		return smprintf(unknowntext);
-	}
-
-	/* read value */
-	fscanf(fp, "%i", &now);
-
-	/* close battery now file */
-	fclose(fp);
-
-	/* open battery full file */
-	if (!(fp = fopen(batteryfullfile, "r"))) {
-		fprintf(stderr, "Error opening battery file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read value */
-	fscanf(fp, "%i", &full);
-
-	/* close battery full file */
-	fclose(fp);
-
-	/* calculate percent */
-	perc = now / (full / 100);
-
-	/* return perc as string */
-	return smprintf("%d%%", perc);
-}
+#include "util.h"
 
-/* cpu percentage */
-char *
-cpu_perc(const char *null)
-{
-	int perc;
-	long double a[4], b[4];
-	FILE *fp;
-
-	/* open stat file */
-	if (!(fp = fopen("/proc/stat","r"))) {
-		fprintf(stderr, "Error opening stat file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read values */
-	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
-
-	/* close stat file */
-	fclose(fp);
-
-	/* wait a second (for avg values) */
-	sleep(1);
-
-	/* open stat file */
-	if (!(fp = fopen("/proc/stat","r"))) {
-		fprintf(stderr, "Error opening stat file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read values */
-	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
-
-	/* close stat file */
-	fclose(fp);
-
-	/* calculate avg in this second */
-	perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
-
-	/* return perc as string */
-	return smprintf("%d%%", perc);
-}
+struct arg {
+	const char *(*func)();
+	const char *fmt;
+	const char *args;
+};
 
-/* date and time */
-char *
-datetime(const char *timeformat)
-{
-	time_t tm;
-	size_t bufsize = 64;
-	char *buf = malloc(bufsize);
-	if (buf == NULL) {
-		fprintf(stderr, "Failed to get date/time.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* get time in format */
-	time(&tm);
-	setlocale(LC_TIME, "");
-	if (!strftime(buf, bufsize, timeformat, localtime(&tm))) {
-		setlocale(LC_TIME, "C");
-		free(buf);
-		fprintf(stderr, "Strftime failed.\n");
-		return smprintf(unknowntext);
-	}
+char buf[1024];
+static volatile sig_atomic_t done;
+static Display *dpy;
 
-	setlocale(LC_TIME, "C");
-	/* return time */
-	char *ret = smprintf("%s", buf);
-	free(buf);
-	return ret;
-}
-
-/* disk free */
-char *
-disk_free(const char *mountpoint)
-{
-	struct statvfs fs;
-
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* return free */
-	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
-}
-
-/* disk usage percentage */
-char *
-disk_perc(const char *mountpoint)
-{
-	int perc = 0;
-	struct statvfs fs;
-
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* calculate percent */
-	perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
-
-	/* return perc */
-	return smprintf("%d%%", perc);
-}
+#include "config.h"
 
-/* disk total */
-char *
-disk_total(const char *mountpoint)
+static void
+terminate(const int signo)
 {
-	struct statvfs fs;
-
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* return total */
-	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+	if (signo != SIGUSR1)
+		done = 1;
 }
 
-/* disk used */
-char *
-disk_used(const char *mountpoint)
+static void
+difftimespec(struct timespec *res, struct timespec *a, struct timespec *b)
 {
-	struct statvfs fs;
-
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* return used */
-	return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+	res->tv_sec = a->tv_sec - b->tv_sec - (a->tv_nsec < b->tv_nsec);
+	res->tv_nsec = a->tv_nsec - b->tv_nsec +
+	               (a->tv_nsec < b->tv_nsec) * 1E9;
 }
 
-/* entropy available */
-char *
-entropy(const char *null)
+static void
+usage(void)
 {
-	int entropy = 0;
-	FILE *fp;
-
-	/* open entropy file */
-	if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
-		fprintf(stderr, "Could not open entropy file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* extract entropy */
-	fscanf(fp, "%d", &entropy);
-
-	/* close entropy file */
-	fclose(fp);
-
-	/* return entropy */
-	return smprintf("%d", entropy);
+	die("usage: %s [-s] [-1]", argv0);
 }
 
-/* gid */
-char *
-gid(const char *null)
-{
-	gid_t gid;
+int
+main(int argc, char *argv[])
+{
+	struct sigaction act;
+	struct timespec start, current, diff, intspec, wait;
+	size_t i, len;
+	int sflag, ret;
+	char status[MAXLEN];
+	const char *res;
+
+	sflag = 0;
+	ARGBEGIN {
+		case '1':
+			done = 1;
+			/* fallthrough */
+		case 's':
+			sflag = 1;
+			break;
+		default:
+			usage();
+	} ARGEND
 
-	if ((gid = getgid()) < 0) {
-		fprintf(stderr, "Could no get gid.\n");
-		return smprintf(unknowntext);
-	} else {
-		return smprintf("%d", gid);
+	if (argc) {
+		usage();
 	}
 
-	return smprintf(unknowntext);
-}
-
-/* hostname */
-char *
-hostname(const char *null)
-{
-	char hostname[HOST_NAME_MAX];
-	FILE *fp;
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = terminate;
+	sigaction(SIGINT,  &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
+	act.sa_flags |= SA_RESTART;
+	sigaction(SIGUSR1, &act, NULL);
 
-	/* open hostname file */
-	if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
-		fprintf(stderr, "Could not open hostname file.\n");
-		return smprintf(unknowntext);
+	if (!sflag && !(dpy = XOpenDisplay(NULL))) {
+		die("XOpenDisplay: Failed to open display");
 	}
 
-	/* extract hostname */
-	fscanf(fp, "%s\n", hostname);
-
-	/* close hostname file */
-	fclose(fp);
-
-	/* return entropy */
-	return smprintf("%s", hostname);
-}
-
-/* ip address */
-char *
-ip(const char *interface)
-{
-	struct ifaddrs *ifaddr, *ifa;
-	int s;
-	char host[NI_MAXHOST];
-
-	/* check if getting ip address works */
-	if (getifaddrs(&ifaddr) == -1) {
-		fprintf(stderr, "Error getting IP address.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* get the ip address */
-	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL) {
-			continue;
+	do {
+		if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) {
+			die("clock_gettime:");
 		}
 
-		s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
-
-		if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
-			if (s != 0) {
-				fprintf(stderr, "Error getting IP address.\n");
-				return smprintf(unknowntext);
+		status[0] = '\0';
+		for (i = len = 0; i < LEN(args); i++) {
+			if (!(res = args[i].func(args[i].args))) {
+				res = unknown_str;
+			}
+			if ((ret = esnprintf(status + len, sizeof(status) - len,
+			                    args[i].fmt, res)) < 0) {
+				break;
 			}
-			return smprintf("%s", host);
+			len += ret;
 		}
-	}
-
-	/* free the address */
-	freeifaddrs(ifaddr);
-
-	return smprintf(unknowntext);
-}
-
-/* ram free */
-char *
-ram_free(const char *null)
-{
-	long free;
-	FILE *fp;
-
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read the values */
-	fscanf(fp, "MemFree: %ld kB\n", &free);
-
-	/* close meminfo file */
-	fclose(fp);
-
-	/* return free ram as string */
-	return smprintf("%f", (float)free / 1024 / 1024);
-}
-
-/* ram percentage */
-char *
-ram_perc(const char *null)
-{
-	int perc;
-	long total, free, buffers, cached;
-	FILE *fp;
-
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read the values */
-	fscanf(fp, "MemTotal: %ld kB\n", &total);
-	fscanf(fp, "MemFree: %ld kB\n", &free);
-	fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
-	fscanf(fp, "Cached: %ld kB\n", &cached);
-
-	/* close meminfo file */
-	fclose(fp);
 
-	/* calculate percentage */
-	perc = 100 * ((total - free) - (buffers + cached)) / total;
-
-	/* return perc as string */
-	return smprintf("%d%%", perc);
-}
-
-/* ram total */
-char *
-ram_total(const char *null)
-{
-	long total;
-	FILE *fp;
-
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read the values */
-	fscanf(fp, "MemTotal: %ld kB\n", &total);
-
-	/* close meminfo file */
-	fclose(fp);
-
-	/* return total ram as string */
-	return smprintf("%f", (float)total / 1024 / 1024);
-}
-
-/* ram used */
-char *
-ram_used(const char *null)
-{
-	long free, total, buffers, cached, used;
-	FILE *fp;
-
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read the values */
-	fscanf(fp, "MemTotal: %ld kB\n", &total);
-	fscanf(fp, "MemFree: %ld kB\n", &free);
-	fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
-	fscanf(fp, "Cached: %ld kB\n", &cached);
-
-	/* close meminfo file */
-	fclose(fp);
-
-	/* calculate used */
-	used = total - free - buffers - cached;
-
-	/* return used ram as string */
-	return smprintf("%f", (float)used / 1024 / 1024);
-}
-
-/* custom shell command */
-char *
-run_command(const char* command)
-{
-	int good;
-	FILE *fp;
-	char buffer[64];
-
-	/* try to open the command output */
-	if (!(fp = popen(command, "r"))) {
-		fprintf(stderr, "Could not get command output for: %s.\n", command);
-		return smprintf(unknowntext);
-	}
-
-	/* get command output text, save it to buffer */
-	fgets(buffer, sizeof(buffer) - 1, fp);
-
-	/* close it again */
-	pclose(fp);
-
-	/* add nullchar at the end */
-	for (int i = 0 ; i != sizeof(buffer); i++) {
-		if (buffer[i] == '\0') {
-			good = 1;
-			break;
+		if (sflag) {
+			puts(status);
+			fflush(stdout);
+			if (ferror(stdout))
+				die("puts:");
+		} else {
+			if (XStoreName(dpy, DefaultRootWindow(dpy), status)
+                            < 0) {
+				die("XStoreName: Allocation failed");
+			}
+			XFlush(dpy);
 		}
-	}
-	if (good) {
-		buffer[strlen(buffer) - 1] = '\0';
-	}
-
-	/* return the output */
-	return smprintf("%s", buffer);
-}
-
-/* temperature */
-char *
-temp(const char *file)
-{
-	int temperature;
-	FILE *fp;
-
-	/* open temperature file */
-	if (!(fp = fopen(file, "r"))) {
-		fprintf(stderr, "Could not open temperature file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* extract temperature */
-	fscanf(fp, "%d", &temperature);
-
-	/* close temperature file */
-	fclose(fp);
-
-	/* return temperature in degrees */
-	return smprintf("%d°C", temperature / 1000);
-}
-
-/* username */
-char *
-username(const char *null)
-{
-	register struct passwd *pw;
-	register uid_t uid;
-
-	/* get the values */
-	uid = geteuid();
-	pw = getpwuid(uid);
-
-	/* if it worked, return */
-	if (pw) {
-		return smprintf("%s", pw->pw_name);
-	} else {
-		fprintf(stderr, "Could not get username.\n");
-		return smprintf(unknowntext);
-	}
-
-	return smprintf(unknowntext);
-}
-
-/* uid */
-char *
-uid(const char *null)
-{
-	register uid_t uid;
-
-	/* get the values */
-	uid = geteuid();
-
-	/* if it worked, return */
-	if (uid) {
-		return smprintf("%d", uid);
-	} else {
-		fprintf(stderr, "Could not get uid.\n");
-		return smprintf(unknowntext);
-	}
-
-	return smprintf(unknowntext);
-}
-
-
-/* alsa volume percentage */
-char *
-vol_perc(const char *soundcard)
-{
-	int mute = 0;
-	long vol = 0, max = 0, min = 0;
-	snd_mixer_t *handle;
-	snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-	snd_mixer_selem_id_t *vol_info, *mute_info;
-
-	/* open everything */
-	snd_mixer_open(&handle, 0);
-	snd_mixer_attach(handle, soundcard);
-	snd_mixer_selem_register(handle, NULL, NULL);
-	snd_mixer_load(handle);
-
-	/* prepare everything */
-	snd_mixer_selem_id_malloc(&vol_info);
-	snd_mixer_selem_id_malloc(&mute_info);
-	/* check */
-	if (vol_info == NULL || mute_info == NULL) {
-		fprintf(stderr, "Could not get alsa volume.\n");
-		return smprintf(unknowntext);
-	}
-	snd_mixer_selem_id_set_name(vol_info, channel);
-	snd_mixer_selem_id_set_name(mute_info, channel);
-	pcm_mixer = snd_mixer_find_selem(handle, vol_info);
-	mas_mixer = snd_mixer_find_selem(handle, mute_info);
-
-	/* get the info */
-	snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
-	snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
-	snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
-
-	/* clean up */
-	if (vol_info) {
-		snd_mixer_selem_id_free(vol_info);
-	}
-	if (mute_info) {
-		snd_mixer_selem_id_free(mute_info);
-	}
-	if (handle) {
-		snd_mixer_close(handle);
-	}
-
-	/* return the string (mute) */
-	if (!mute) {
-		return smprintf("mute");
-	} else {
-		return smprintf("%d%%", (vol * 100) / max);
-	}
-}
-
-/* wifi percentage */
-char *
-wifi_perc(const char *wificard)
-{
-	int bufsize = 255;
-	int strength;
-	char buf[bufsize];
-	char *datastart;
-	char path[64];
-	char status[5];
-	char needle[sizeof wificard + 1];
-	FILE *fp;
-
-	/* generate the path name */
-	memset(path, 0, sizeof path);
-	strcat(path, "/sys/class/net/");
-	strcat(path, wificard);
-	strcat(path, "/operstate");
-
-	/* open wifi file */
-	if(!(fp = fopen(path, "r"))) {
-		fprintf(stderr, "Error opening wifi operstate file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* read the status */
-	fgets(status, 5, fp);
-
-	/* close wifi file */
-	fclose(fp);
-
-	/* check if interface down */
-	if(strcmp(status, "up\n") != 0) {
-		return smprintf(unknowntext);
-	}
 
-	/* open wifi file */
-	if (!(fp = fopen("/proc/net/wireless", "r"))) {
-		fprintf(stderr, "Error opening wireless file.\n");
-		return smprintf(unknowntext);
-	}
-
-	/* extract the signal strength */
-	strcpy(needle, wificard);
-	strcat(needle, ":");
-	fgets(buf, bufsize, fp);
-	fgets(buf, bufsize, fp);
-	fgets(buf, bufsize, fp);
-	if ((datastart = strstr(buf, needle)) != NULL) {
-		datastart = strstr(buf, ":");
-		sscanf(datastart + 1, " %*d   %d  %*d  %*d		  %*d	   %*d		%*d		 %*d	  %*d		 %*d", &strength);
-	}
-
-	/* close wifi file */
-	fclose(fp);
-
-	/* return strength in percent */
-	return smprintf("%d%%", strength);
-}
-
-/* wifi essid */
-char *
-wifi_essid(const char *wificard)
-{
-	char id[IW_ESSID_MAX_SIZE+1];
-	int sockfd;
-	struct iwreq wreq;
-
-	/* prepare */
-	memset(&wreq, 0, sizeof(struct iwreq));
-	wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
-
-	/* set the interface */
-	sprintf(wreq.ifr_name, wificard);
-
-	/* check */
-	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
-		fprintf(stderr, "Cannot open socket for interface: %s\n", wificard);
-		return smprintf(unknowntext);
-	}
-	wreq.u.essid.pointer = id;
-	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
-		fprintf(stderr, "Get ESSID ioctl failed for interface %s\n", wificard);
-		return smprintf(unknowntext);
-	}
-
-	/* return the essid */
-	if (strcmp((char *)wreq.u.essid.pointer, "") == 0) {
-		return smprintf(unknowntext);
-	} else {
-		return smprintf("%s", (char *)wreq.u.essid.pointer);
-	}
-}
-
-/* main function */
-int
-main(void)
-{
-	char status_string[1024];
-	struct arg argument;
-
-	/* try to open display */
-	if (!(dpy = XOpenDisplay(0x0))) {
-		fprintf(stderr, "Cannot open display!\n");
-		exit(1);
-	}
+		if (!done) {
+			if (clock_gettime(CLOCK_MONOTONIC, &current) < 0) {
+				die("clock_gettime:");
+			}
+			difftimespec(&diff, &current, &start);
 
-	/* return status every interval */
-	for (;;) {
-		/* clear the string */
-		memset(status_string, 0, sizeof(status_string));
+			intspec.tv_sec = interval / 1000;
+			intspec.tv_nsec = (interval % 1000) * 1E6;
+			difftimespec(&wait, &intspec, &diff);
 
-		/* generate status_string */
-		for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
-			argument = args[i];
-			char *res = argument.func(argument.args);
-			char *element = smprintf(argument.format, res);
-			if (element == NULL) {
-				element = smprintf(unknowntext);
-				fprintf(stderr, "Failed to format output.\n");
+			if (wait.tv_sec >= 0) {
+				if (nanosleep(&wait, NULL) < 0 &&
+				    errno != EINTR) {
+					die("nanosleep:");
+				}
 			}
-			strcat(status_string, element);
-			free(res);
-			free(element);
 		}
+	} while (!done);
 
-		/* return the statusbar */
-		setstatus(status_string);
-
-		/* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
-		sleep(update_interval -1);
+	if (!sflag) {
+		XStoreName(dpy, DefaultRootWindow(dpy), NULL);
+		if (XCloseDisplay(dpy) < 0) {
+			die("XCloseDisplay: Failed to close display");
+		}
 	}
 
-	/* close display */
-	XCloseDisplay(dpy);
-
-	/* exit successfully */
 	return 0;
 }