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

Changed indentation everywhere

Browse Source
This commit is contained in:
o9000
2017-04-13 14:07:23 +02:00
parent c1e5a7b172
commit affac4cfa6
68 changed files with 23280 additions and 22941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/battery/openbsd.c
View File

@@ -31,78 +31,78 @@ int apm_fd = -1;
gboolean battery_os_init()
{
if (apm_fd > 0)
close(apm_fd);
if (apm_fd > 0)
close(apm_fd);
apm_fd = open("/dev/apm", O_RDONLY);
apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd < 0) {
warn("ERROR: battery applet cannot open /dev/apm.");
return FALSE;
} else {
return TRUE;
}
if (apm_fd < 0) {
warn("ERROR: battery applet cannot open /dev/apm.");
return FALSE;
} else {
return TRUE;
}
}
void battery_os_free()
{
if ((apm_fd != -1) && (close(apm_fd) == -1))
warn("cannot close /dev/apm");
apm_fd = -1;
if ((apm_fd != -1) && (close(apm_fd) == -1))
warn("cannot close /dev/apm");
apm_fd = -1;
}
int battery_os_update(BatteryState *state)
{
struct apm_power_info info;
struct apm_power_info info;
if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
// best attempt at mapping to Linux battery states
switch (info.battery_state) {
case APM_BATT_CHARGING:
state->state = BATTERY_CHARGING;
break;
default:
state->state = BATTERY_DISCHARGING;
break;
}
if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
// best attempt at mapping to Linux battery states
switch (info.battery_state) {
case APM_BATT_CHARGING:
state->state = BATTERY_CHARGING;
break;
default:
state->state = BATTERY_DISCHARGING;
break;
}
if (info.battery_life > 100)
info.battery_life = 100;
if (info.battery_life == 100)
state->state = BATTERY_FULL;
if (info.battery_life > 100)
info.battery_life = 100;
if (info.battery_life == 100)
state->state = BATTERY_FULL;
state->percentage = info.battery_life;
if (info.minutes_left != -1)
battery_state_set_time(state, info.minutes_left * 60);
state->percentage = info.battery_life;
if (info.minutes_left != -1)
battery_state_set_time(state, info.minutes_left * 60);
state->ac_connected = info.ac_state == APM_AC_ON;
} else {
warn("power update: APM_IOC_GETPOWER");
return -1;
}
state->ac_connected = info.ac_state == APM_AC_ON;
} else {
warn("power update: APM_IOC_GETPOWER");
return -1;
}
return 0;
return 0;
}
char *battery_os_tooltip()
{
GString *tooltip = g_string_new("");
gchar *result;
GString *tooltip = g_string_new("");
gchar *result;
g_string_append_printf(tooltip, "Battery\n");
g_string_append_printf(tooltip, "Battery\n");
gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
g_string_append_c(tooltip, '\n');
g_string_append_printf(tooltip, "AC\n");
g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
g_string_append_c(tooltip, '\n');
g_string_append_printf(tooltip, "AC\n");
g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
result = tooltip->str;
g_string_free(tooltip, FALSE);
result = tooltip->str;
g_string_free(tooltip, FALSE);
return result;
return result;
}
#endif