From: Aaron Marcher <me@drkhsh.at>
Date: Sun, 27 May 2018 14:46:03 +0000 (+0200)
Subject: Revert "Add basic backlight percentage support"
X-Git-Url: https://git.xinqibao.xyz/slstatus.git/commitdiff_plain/c28643ce5bc8c7fd825e4eabbd915bad2b91dbd0

Revert "Add basic backlight percentage support"

On OpenBSD the backlight percentage cannot be retrieved in a simple way.
The only two solutions we are aware of for now are:

 - reading from /dev/ttyC0: which isn't possible without changing
 permissions or running slstatus as root
 - linking against xcb-xrandr: which is bloat and does not work in every
 case appearently

This reverts commit 37724ac2c3f496f4736223d0d8e5d8fecb933590 for now.
---

diff --git a/Makefile b/Makefile
index 7ed7099..b2b75b4 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ include config.mk
 
 REQ = util
 COM =\
-	components/backlight\
 	components/battery\
 	components/cpu\
 	components/datetime\
diff --git a/README b/README
index 4f23959..233e252 100644
--- a/README
+++ b/README
@@ -6,7 +6,6 @@ slstatus is a suckless status monitor for window managers that use WM_NAME
 
 Features
 --------
-- Backlight percentage
 - Battery percentage/state/time left
 - CPU usage
 - CPU frequency
diff --git a/components/backlight.c b/components/backlight.c
deleted file mode 100644
index f9c4096..0000000
--- a/components/backlight.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include "../util.h"
-
-#if defined(__linux__)
-	#include <limits.h>
-
-	#define BRIGHTNESS_MAX "/sys/class/backlight/%s/max_brightness"
-	#define BRIGHTNESS_CUR "/sys/class/backlight/%s/brightness"
-
-	const char *
-	backlight_perc(const char *card)
-	{
-		char path[PATH_MAX];
-		int max, cur;
-
-		if (esnprintf(path, sizeof (path), BRIGHTNESS_MAX, card) < 0 ||
-			pscanf(path, "%d", &max) != 1) {
-			return NULL;
-		}
-
-		if (esnprintf(path, sizeof (path), BRIGHTNESS_CUR, card) < 0 ||
-			pscanf(path, "%d", &cur) != 1) {
-			return NULL;
-		}
-
-		if (max == 0) {
-			return NULL;
-		}
-
-		return bprintf("%d", cur * 100 / max);
-	}
-#endif
diff --git a/config.def.h b/config.def.h
index 75debe5..58e935a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -12,8 +12,6 @@ static const char unknown_str[] = "n/a";
 /*
  * function             description                     argument (example)
  *
- * backlight_perc       backlight percentage            device name
- *                                                      (intel_backlight)
  * battery_perc         battery percentage              battery name (BAT0)
  *                                                      NULL on OpenBSD
  * battery_state        battery charging state          battery name (BAT0)
diff --git a/slstatus.h b/slstatus.h
index 6112e7e..079a8db 100644
--- a/slstatus.h
+++ b/slstatus.h
@@ -1,8 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 
-/* backlight */
-const char *backlight_perc(const char *);
-
 /* battery */
 const char *battery_perc(const char *);
 const char *battery_state(const char *);
diff --git a/util.h b/util.h
index f55c0eb..b474f88 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <stddef.h>
-
 extern char buf[1024];
 
 #define LEN(x) (sizeof (x) / sizeof *(x))