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 7ed709985b05ff1c4d25fcaa0e310afcd8e57346..b2b75b41e7768433cd7eb04d85f76bfd294a46b2 100644 (file)
--- 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 4f239599d0583b461935b906040bcf5a2b49381a..233e252585186efa842286f83e4d8f4a0556ecf8 100644 (file)
--- 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 (file)
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 75debe54a9295a7d6a564f3191e0e76ee0b88b13..58e935a8a454b6c707b768fa8d4993eb97dbd615 100644 (file)
--- 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 6112e7e04e82ce4d40a7b6bd3ea4df8a9836befc..079a8db63aa4e719a88c5cc367751b2770f7e806 100644 (file)
--- 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 f55c0eba96d0360c64534c21dedd5e3711316ee7..b474f887f2eecb29dfccb27ba96110bdcb875720 100644 (file)
--- 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))