X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/9750a3d731cd381e832bcacf1d03e48ddb46cc16..ea2e2bd00403e02bee6298cfbb78eaa45869c851:/components/battery.c

diff --git a/components/battery.c b/components/battery.c
index 04dfa47..a63b9d0 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -16,20 +16,7 @@
 
 		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
 		         bat, "/capacity");
-		return (pscanf(path, "%i", &perc) == 1) ?
-		       bprintf("%d", perc) : NULL;
-	}
-
-	const char *
-	battery_power(const char *bat)
-	{
-		int watts;
-		char path[PATH_MAX];
-
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-		         bat, "/power_now");
-		return (pscanf(path, "%i", &watts) == 1) ?
-		       bprintf("%d", (watts + 500000) / 1000000) : NULL;
+		return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
 	}
 
 	const char *
@@ -41,8 +28,6 @@
 		} map[] = {
 			{ "Charging",    "+" },
 			{ "Discharging", "-" },
-			{ "Full",        "=" },
-			{ "Unknown",     "/" },
 		};
 		size_t i;
 		char path[PATH_MAX], state[12];
@@ -88,4 +73,40 @@
 
 		return bprintf("%d", apm_info.battery_life);
 	}
+
+	const char *
+	battery_state(const char *bat)
+	{
+		int fd;
+		size_t i;
+		struct apm_power_info apm_info;
+		struct {
+			unsigned int state;
+			char *symbol;
+		} map[] = {
+			{ APM_AC_ON,      "+" },
+			{ APM_AC_OFF,     "-" },
+		};
+
+		fd = open("/dev/apm", O_RDONLY);
+		if (fd < 0) {
+			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
+			return NULL;
+		}
+
+		if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
+			fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
+			        strerror(errno));
+			close(fd);
+			return NULL;
+		}
+		close(fd);
+
+		for (i = 0; i < LEN(map); i++) {
+			if (map[i].state == apm_info.ac_state) {
+				break;
+			}
+		}
+		return (i == LEN(map)) ? "?" : map[i].symbol;
+	}
 #endif