Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out Linux battery implementation and support multiple batteries

Browse Source 
Some notebooks, like the ThinkPad X240 and X250 have two batteries
installed. So far only one of the batteries have been checked by
the tint2 widget making it more or less useless on those systems.

After this patch tint2 will aggregate the data from all batteries
instead.
This commit is contained in:
Sebastian Reichel
2015-08-05 00:17:32 +02:00
parent 84f9f6d0cd
commit ae375ae526
4 changed files with 300 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
src/battery/battery.c
View File

@@ -61,10 +61,6 @@ char *battery_mclick_command;
char *battery_rclick_command;
char *battery_uwheel_command;
char *battery_dwheel_command;
gchar *path_energy_now;
gchar *path_energy_full;
gchar *path_current_now;
gchar *path_status;
int battery_found;
#if defined(__OpenBSD__) || defined(__NetBSD__)
@@ -151,10 +147,6 @@ void default_battery()
battery_rclick_command = NULL;
battery_uwheel_command = NULL;
battery_dwheel_command = NULL;
path_energy_now = NULL;
path_energy_full = NULL;
path_current_now = NULL;
path_status = NULL;
battery_state.percentage = 0;
battery_state.time.hours = 0;
battery_state.time.minutes = 0;
@@ -171,14 +163,6 @@ void cleanup_battery()
bat1_font_desc = NULL;
pango_font_description_free(bat2_font_desc);
bat2_font_desc = NULL;
g_free(path_energy_now);
path_energy_now = NULL;
g_free(path_energy_full);
path_energy_full = NULL;
g_free(path_current_now);
path_current_now = NULL;
g_free(path_status);
path_status = NULL;
free(battery_low_cmd);
battery_low_cmd = NULL;
free(battery_lclick_command);
@@ -199,6 +183,8 @@ void cleanup_battery()
if ((apm_fd != -1) && (close(apm_fd) == -1))
warn("cannot close /dev/apm");
apm_fd = -1;
#elif defined(__linux)
free_linux_batteries();
#endif
}
@@ -224,89 +210,8 @@ void init_battery()
battery_found = (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
(sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
#else // Linux
GDir *directory = 0;
GError *error = NULL;
const char *entryname;
gchar *battery_dir = 0;
directory = g_dir_open("/sys/class/power_supply", 0, &error);
if (error) {
g_error_free(error);
} else {
while ((entryname = g_dir_read_name(directory))) {
if (strncmp(entryname, "AC", 2) == 0)
continue;
gchar *path1 = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
if (g_file_test(path1, G_FILE_TEST_EXISTS)) {
g_free(path1);
battery_dir = g_build_filename("/sys/class/power_supply", entryname, NULL);
break;
}
g_free(path1);
}
}
if (directory)
g_dir_close(directory);
if (!battery_dir) {
fprintf(stderr, "ERROR: battery applet cannot find any battery\n");
battery_found = 0;
} else {
battery_found = 1;
g_free(path_energy_now);
path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
if (!g_file_test(path_energy_now, G_FILE_TEST_EXISTS)) {
g_free(path_energy_now);
path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
}
if (!g_file_test(path_energy_now, G_FILE_TEST_EXISTS)) {
fprintf(stderr, "ERROR: battery applet cannot find energy_now nor charge_now\n");
g_free(path_energy_now);
path_energy_now = NULL;
}
g_free(path_energy_full);
path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
if (!g_file_test(path_energy_full, G_FILE_TEST_EXISTS)) {
g_free(path_energy_full);
path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
}
if (!g_file_test(path_energy_full, G_FILE_TEST_EXISTS)) {
fprintf(stderr, "ERROR: battery applet cannot find energy_now nor charge_now\n");
g_free(path_energy_full);
path_energy_full = NULL;
}
g_free(path_current_now);
path_current_now = g_build_filename(battery_dir, "power_now", NULL);
if (!g_file_test(path_current_now, G_FILE_TEST_EXISTS)) {
g_free(path_current_now);
path_current_now = g_build_filename(battery_dir, "current_now", NULL);
}
if (!g_file_test(path_current_now, G_FILE_TEST_EXISTS)) {
fprintf(stderr, "ERROR: battery applet cannot find power_now nor current_now\n");
g_free(path_current_now);
path_current_now = NULL;
}
g_free(path_status);
path_status = g_build_filename(battery_dir, "status", NULL);
if (!g_file_test(path_status, G_FILE_TEST_EXISTS)) {
fprintf(stderr, "ERROR: battery applet cannot find battery status\n");
g_free(path_status);
path_status = NULL;
}
g_free(battery_dir);
battery_dir = NULL;
}
if (!path_status) {
battery_found = 0;
fprintf(stderr, "ERROR: battery applet cannot find any batteries\n");
}
#elif defined(__linux)
battery_found = init_linux_batteries();
#endif
if (!battery_timeout)
@@ -420,82 +325,7 @@ int update_battery() {
else
new_percentage = sysctl_out;
#else
FILE *fp = NULL;
char tmp[25] = "";
int64_t current_now = 0;
if (path_status) {
fp = fopen(path_status, "r");
if (fp != NULL) {
if (fgets(tmp, sizeof(tmp), fp)) {
if (strcasecmp(tmp, "Charging\n") == 0)
battery_state.state = BATTERY_CHARGING;
if (strcasecmp(tmp, "Discharging\n") == 0)
battery_state.state = BATTERY_DISCHARGING;
if (strcasecmp(tmp, "Full\n") == 0)
battery_state.state = BATTERY_FULL;
}
fclose(fp);
} else {
errors = 1;
}
} else {
errors = 1;
}
if (path_energy_now) {
fp = fopen(path_energy_now, "r");
if (fp != NULL) {
if (fgets(tmp, sizeof tmp, fp))
energy_now = atoi(tmp);
fclose(fp);
} else {
errors = 1;
}
} else {
errors = 1;
}
if (path_energy_full) {
fp = fopen(path_energy_full, "r");
if (fp != NULL) {
if (fgets(tmp, sizeof tmp, fp))
energy_full = atoi(tmp);
fclose(fp);
} else {
errors = 1;
}
} else {
errors = 1;
}
if (path_current_now) {
fp = fopen(path_current_now, "r");
if (fp != NULL) {
if (fgets(tmp, sizeof tmp, fp))
current_now = atoi(tmp);
fclose(fp);
} else {
errors = 1;
}
} else {
errors = 1;
}
if (current_now > 0) {
switch (battery_state.state) {
case BATTERY_CHARGING:
seconds = 3600 * (energy_full - energy_now) / current_now;
break;
case BATTERY_DISCHARGING:
seconds = 3600 * energy_now / current_now;
break;
default:
seconds = 0;
break;
}
} else {
seconds = 0;
}
update_linux_batteries(&battery_state.state, &energy_now, &energy_full, &seconds);
#endif
battery_state.time.hours = seconds / 3600;
@@ -616,4 +446,4 @@ void battery_action(int button)
break;
}
tint_exec(command);
}
}