summaryrefslogtreecommitdiff
path: root/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c')
-rw-r--r--x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c270
1 files changed, 0 insertions, 270 deletions
diff --git a/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c b/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c
deleted file mode 100644
index 4d38a4c51a8f..000000000000
--- a/x11/lxpanel/files/patch-src__plugins__batt__batt_sys.c
+++ /dev/null
@@ -1,270 +0,0 @@
---- src/plugins/batt/batt_sys.c.orig 2010-02-08 07:37:52.000000000 +0100
-+++ src/plugins/batt/batt_sys.c 2010-10-16 19:34:55.616250250 +0200
-@@ -39,15 +39,6 @@
- static int battery_num = 1;
- battery * b = g_new0 ( battery, 1 );
- b->type_battery = TRUE;
-- b->capacity_unit = "mAh";
-- b->last_capacity_unit = -1;
-- b->last_capacity = -1;
-- b->voltage = -1;
-- b->design_capacity_unit = -1;
-- b->design_capacity = -1;
-- b->remaining_energy = -1;
-- b->remaining_capacity = -1;
-- b->present_rate = -1;
- b->state = NULL;
- b->battery_num = battery_num;
- battery_num++;
-@@ -76,7 +67,7 @@
- return n;
- }
-
--void battery_print(battery *b, int show_capacity)
-+void battery_print(battery *b)
- {
- if ( b->type_battery )
- {
-@@ -90,193 +81,61 @@
- b->seconds -= 3600 * b->hours;
- b->minutes = b->seconds / 60;
- b->seconds -= 60 * b->minutes;
-- printf(", %02d:%02d:%02d%s", b->hours, b->minutes, b->seconds, b->poststr);
-+ printf(", %02d:%02d:%02d", b->hours, b->minutes, b->seconds);
- } else if (b->poststr != NULL) {
- printf(", %s", b->poststr);
- }
-
--
- printf("\n");
--
-- if (show_capacity && b->design_capacity > 0) {
-- if (b->last_capacity <= 100) {
-- /* some broken systems just give a percentage here */
-- b->percentage = b->last_capacity;
-- b->last_capacity = b->percentage * b->design_capacity / 100;
-- } else {
-- b->percentage = b->last_capacity * 100 / b->design_capacity;
-- }
-- if (b->percentage > 100)
-- b->percentage = 100;
--
-- printf ("%s %d: design capacity %d %s, last full capacity %d %s = %d%%\n",
-- BATTERY_DESC, b->battery_num - 1, b->design_capacity, b->capacity_unit, b->last_capacity, b->capacity_unit, b->percentage);
-- }
- }
- }
- }
-
-
- void battery_update( battery *b ) {
-- int i = 0;
-- const gchar *sys_list[] = {
-- "current_now",
-- "charge_now",
-- "energy_now",
-- "voltage_now",
-- "voltage_min_design",
-- "charge_full",
-- "energy_full",
-- "charge_full_design",
-- "energy_full_design",
-- "online",
-- "status",
-- "type",
-- NULL
-- };
-- const gchar *sys_file;
-+ char sstmp[ 100 ];
-+ int c, state;
-+ size_t intlen = sizeof c;
-+
-+ snprintf(sstmp, sizeof(sstmp), "hw.acpi.battery.life");
-+ sysctlbyname(sstmp, &c, &intlen, NULL, 0);
-+ b->percentage = c;
-
-- while ( (sys_file = sys_list[i]) != NULL ) {
-+ snprintf(sstmp, sizeof(sstmp), "hw.acpi.battery.state");
-+ sysctlbyname(sstmp, &state, &intlen, NULL, 0);
-
-- gchar *file_content;
-- GString *filename = g_string_new( ACPI_PATH_SYS_POWER_SUPPY );
-- g_string_append_printf ( filename, "/%s/%s", b->path,
-- sys_file );
-- if ((file_content = parse_info_file(filename->str)) != NULL) {
--
-- if ( strcmp("charge_now", sys_file ) == 0 ) {
-- b->remaining_capacity = get_unit_value((gchar*) file_content) / 1000;
-- if (!b->state)
-- b->state = "available";
-- }
-- else if ( strcmp("energy_now", sys_file ) == 0 ) {
-- b->remaining_capacity = get_unit_value((gchar*) file_content) / 1000;
-- if (!b->state)
-- b->state = "available";
-- }
-- else if ( strcmp("current_now", sys_file ) == 0 ) {
-- b->present_rate = get_unit_value((gchar*) file_content) / 1000;
-- }
-- else if ( strcmp("charge_full", sys_file ) == 0 ) {
-- b->last_capacity = get_unit_value((gchar*) file_content) / 1000;
-- if (!b->state)
-- b->state = ("available");
-- }
-- else if ( strcmp("energy_full", sys_file ) == 0 ) {
-- b->last_capacity_unit = get_unit_value((gchar*) file_content) / 1000;
-- if (!b->state)
-- b->state = ("available");
-- }
-- else if ( strcmp("charge_full_design", sys_file ) == 0 ) {
-- b->design_capacity = get_unit_value((gchar*) file_content) / 1000;
-- }
-- else if ( strcmp("energy_full_design", sys_file ) == 0 ) {
-- b->design_capacity_unit = get_unit_value((gchar*) file_content) / 1000;
-- }
-- else if ( strcmp("type", sys_file ) == 0 ) {
-- b->type_battery = (strcasecmp(file_content, "battery") == 0 );
-- }
-- else if ( ( strcmp("status", sys_file ) == 0 ) || strcmp("state", sys_file ) == 0 )
-- b->state = file_content;
-- else if ( strcmp("voltage_now", sys_file ) == 0 ) {
-- b->voltage = get_unit_value((gchar*) file_content) / 1000;
-- }
--
-- g_string_free( filename, TRUE );
-- }
-- i++;
-- }
--
-- /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */
-- if (b->last_capacity_unit != -1 && b->last_capacity == -1) {
-- if (b->voltage != -1) {
-- b->last_capacity = b->last_capacity_unit * 1000 / b->voltage;
-- } else {
-- b->last_capacity = b->last_capacity_unit;
-- b->capacity_unit = "mWh";
-- }
-- }
-- if (b->design_capacity_unit != -1 && b->design_capacity == -1) {
-- if (b->voltage != -1) {
-- b->design_capacity = b->design_capacity_unit * 1000 / b->voltage;
-- } else {
-- b->design_capacity = b->design_capacity_unit;
-- b->capacity_unit = "mWh";
-- }
-- }
-- if (b->remaining_energy != -1 && b->remaining_capacity == -1) {
-- if (b->voltage != -1) {
-- b->remaining_capacity = b->remaining_energy * 1000 / b->voltage;
-- b->present_rate = b->present_rate * 1000 / b->voltage;
-- } else {
-- b->remaining_capacity = b->remaining_energy;
-- }
-- }
-- if (b->last_capacity < MIN_CAPACITY)
-- b->percentage = 0;
-- else
-- b->percentage = b->remaining_capacity * 100 / b->last_capacity;
--
-- if (b->percentage > 100)
-- b->percentage = 100;
--
--
--
-- if (b->present_rate == -1) {
-- b->poststr = "rate information unavailable";
-- b->seconds = -1;
-- } else if (!strcasecmp(b->state, "charging")) {
-- if (b->present_rate > MIN_PRESENT_RATE) {
-- b->seconds = 3600 * (b->last_capacity - b->remaining_capacity) / b->present_rate;
-- b->poststr = " until charged";
-- } else {
-- b->poststr = "charging at zero rate - will never fully charge.";
-- b->seconds = -1;
-- }
-- } else if (!strcasecmp(b->state, "discharging")) {
-- if (b->present_rate > MIN_PRESENT_RATE) {
-- b->seconds = 3600 * b->remaining_capacity / b->present_rate;
-- b->poststr = " remaining";
-- } else {
-- b->poststr = "discharging at zero rate - will never fully discharge.";
-- b->seconds = -1;
-- }
-- } else {
-- b->poststr = NULL;
-- b->seconds = -1;
-- }
--
--}
--
--static battery* acpi_sys_get_battery_from_dir (const gchar *device_name ) {
-- battery *b = battery_new();
-- b->path = g_strdup( device_name );
-- return b;
-+ switch(state) {
-+ case BATT_FULL:
-+ b->state = "Full";
-+ break;
-+ case BATT_DISCHARGING:
-+ b->state = "Discharging";
-+ break;
-+ case BATT_CHARGING:
-+ b->state = "Charging";
-+ break;
-+ case BATT_CRITICAL:
-+ b->state = "Critical";
-+ break;
-+ case BATT_NONE:
-+ b->state = "Unavailable";
-+ break;
-+ default:
-+ b->state = "Unknown";
-+ break;
-+
-+ }
-+
-+ snprintf(sstmp, sizeof(sstmp), "hw.acpi.battery.time");
-+ sysctlbyname(sstmp, &c, &intlen, NULL, 0);
-+ b->minutes = c;
-+ b->seconds = c * 60;
- }
-
- battery *battery_get() {
-- GError * error = NULL;
-- const gchar *entry;
-- GDir * dir = g_dir_open( ACPI_PATH_SYS_POWER_SUPPY, 0, &error );
- battery *b = NULL;
-- if ( dir == NULL )
-- {
-- g_warning( "NO ACPI/sysfs support in kernel: %s", error->message );
-- return NULL;
-- }
-- while ( ( entry = g_dir_read_name (dir) ) != NULL )
-- {
-- b = acpi_sys_get_battery_from_dir(entry);
-- battery_update ( b );
-- if ( b->type_battery == TRUE )
-- break;
-- /* ignore non-batteries */
-- else {
-- g_free(b);
-- b = NULL;
-- }
-- }
-- g_dir_close( dir );
-+ b = battery_new();
-+ battery_update(b);
- return b;
- }
-
-@@ -286,10 +145,3 @@
- strcasecmp( b->state, "Full" ) == 0
- || strcasecmp( b->state, "Charging" ) == 0 );
- }
--
--gint battery_get_remaining( battery *b )
--{
-- return b->seconds;
--}
--
--
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 16:16:36 +0000