head 1.3; access; symbols pkgsrc-2020Q3:1.2.0.28 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.24 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.4 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.26 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.22 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.20 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.18 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.16 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.14 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.12 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.10 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.8 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.6 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.2 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.1.1.1.0.92 pkgsrc-2017Q1-base:1.1.1.1 pkgsrc-2016Q4:1.1.1.1.0.90 pkgsrc-2016Q4-base:1.1.1.1 pkgsrc-2016Q3:1.1.1.1.0.88 pkgsrc-2016Q3-base:1.1.1.1 pkgsrc-2016Q2:1.1.1.1.0.86 pkgsrc-2016Q2-base:1.1.1.1 pkgsrc-2016Q1:1.1.1.1.0.84 pkgsrc-2016Q1-base:1.1.1.1 pkgsrc-2015Q4:1.1.1.1.0.82 pkgsrc-2015Q4-base:1.1.1.1 pkgsrc-2015Q3:1.1.1.1.0.80 pkgsrc-2015Q3-base:1.1.1.1 pkgsrc-2015Q2:1.1.1.1.0.78 pkgsrc-2015Q2-base:1.1.1.1 pkgsrc-2015Q1:1.1.1.1.0.76 pkgsrc-2015Q1-base:1.1.1.1 pkgsrc-2014Q4:1.1.1.1.0.74 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.72 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.70 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.68 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.66 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.64 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.62 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.60 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.58 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.56 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.54 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.52 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.50 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.48 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.46 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.44 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.42 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.40 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.38 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.36 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.34 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.32 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-2009Q2:1.1.1.1.0.30 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc-2009Q1:1.1.1.1.0.28 pkgsrc-2009Q1-base:1.1.1.1 pkgsrc-2008Q4:1.1.1.1.0.26 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-2008Q3:1.1.1.1.0.24 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.22 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.20 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.18 pkgsrc-2008Q1:1.1.1.1.0.16 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.14 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.12 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.10 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.8 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.6 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.4 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.2 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2020.11.21.13.01.23; author nia; state dead; branches; next 1.2; commitid UycIV5k1C0cTRKwC; 1.2 date 2017.06.23.19.02.07; author kamil; state Exp; branches; next 1.1; commitid PccE7NYGNxkOWwWz; 1.1 date 2006.03.29.21.42.55; author ghen; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.03.29.21.42.55; author ghen; state Exp; branches; next ; desc @@ 1.3 log @Remove torsmo, older version of sysutils/conky that seems to no longer work @ text @$NetBSD: patch-ab,v 1.2 2017/06/23 19:02:07 kamil Exp $ --- netbsd.c.orig 2004-08-25 17:55:57.000000000 +0000 +++ netbsd.c @@@@ -9,6 +9,7 @@@@ #include #include #include +#include #include #include @@@@ -18,7 +19,6 @@@@ #include #include #include -#include #include #include #include @@@@ -221,6 +221,33 @@@@ void update_net_stats() } } +static char *freq = NULL; +char * get_freq() +{ + size_t val_len; + u_int32_t val; + + if (freq == NULL) { + freq = malloc(10); + if (freq == NULL) { + return NULL; + } else { + freq[0] = '\0'; + } + } + + /* Laptops with enhanced speed step. */ + if (sysctlbyname("machdep.est.frequency.current", + NULL, &val_len, NULL, 0) == 0) { + sysctlbyname("machdep.est.frequency.current", &val, &val_len, NULL, 0); + sprintf(freq, "%d", val); + } else { + /* XXX: Parse out the clockspeed from machdep.cpu_brand */ + } + + return freq; +} + void update_total_processes() { /* It's easier to use kvm here than sysctl */ @@@@ -302,6 +329,7 @@@@ void update_cpu_usage() } double get_i2c_info(int fd, int div) { + (void) fd; (void) div; return -1; } @@@@ -315,27 +343,98 @@@@ void update_load_average() { } double get_acpi_temperature(int fd) { + (void) fd; return -1; } -void get_battery_stuff(char *buf, unsigned int n, const char *bat) { -} - int open_i2c_sensor(const char *dev, const char *type, int n, int *div) { + (void) dev; (void) type; (void) n; (void) div; return -1; } int open_acpi_temperature(const char *name) { + (void) name; return -1; } +static char acpi_ac_str[64] = "N/A"; char * get_acpi_ac_adapter(void) { - return "N/A"; + /* get_battery_stuff() actually populates this for us. */ + return acpi_ac_str; +} + +static char last_battery_str[64]; +static double last_battery_time; + +void get_battery_stuff(char *buf, unsigned int n, const char *bat) { + FILE *f; + char *foo; + char b[4096]; + char b_name[32]; + int bat_num; + int found_acpibat = 0; + int found_acpiacad = 0; + float bat_charge = 0.0; + + /* Don't update battery too often. */ + if (current_update_time - last_battery_time < 29.5) { + snprintf(buf, n, "%s", last_battery_str); + return; + } + last_battery_time = current_update_time; + + sscanf(bat, "BAT%d", &bat_num); + sprintf(b_name, "acpibat%d", bat_num); + + /* + * Using the envsys API is like pulling teeth without anesthetic. + * so just popen envstat and parse the output instead. + */ + f = popen("/usr/sbin/envstat -r", "r"); + if (f != NULL) { + while(!feof(f)) { + fgets(b, 4096, f); + + /* AC adapter state. */ + if (strstr(b, "acpiacad0")) { + if (strstr(b, "disconnected")) { + sprintf(acpi_ac_str, "disconnected"); + } else { + sprintf(acpi_ac_str, "connected"); + } + found_acpiacad = 1; + } + + if (bat && strstr(b, b_name)) { + if (strstr(b, "charge:")) { + foo = strstr(b, "%)"); + while (*foo != ' ' && *foo != '(') { + foo--; + } + foo = foo + 1; + sscanf(foo, "%f", &bat_charge); + found_acpibat = 1; + } + } + } + pclose(f); + } + + if (found_acpibat) { + snprintf(last_battery_str, 64, "%.2f%%", bat_charge); + snprintf(buf, n, "%s", last_battery_str); + } else { + /* XXX: If that failed, try to use APM. */ + } + + if (!found_acpiacad) { + sprintf(acpi_ac_str, "N/A"); + } + } char* get_acpi_fan() { return "N/A"; } - @ 1.2 log @Correct torsmo build failure on NetBSD 8.99.1 There is removal fallout. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1.1.1 2006/03/29 21:42:55 ghen Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- netbsd.c.orig 2004-08-25 19:55:57.000000000 +0200 d13 9 a21 1 @@@@ -221,6 +222,33 @@@@ void update_net_stats() d55 1 a55 1 @@@@ -302,6 +330,7 @@@@ void update_cpu_usage() d63 1 a63 1 @@@@ -315,24 +344,96 @@@@ void update_load_average() { d164 3 @ 1.1.1.1 log @Torsmo is a system monitor that sits in the corner of your desktop. It's very simple, customizable and it renders only text on the desktop (and percentagebars if you want it to ;) and the only lib it uses is Xlib. Torsmo can show various information about your system and it's peripherals, including: * Kernel version * Uptime * System time * Network interface information * Memory and swap usage * Hostname * Machine, i686 for example * System name, Linux for example * Temperatures from i2c-sensors * Temperature from ACPI * Battery capacity from ACPI/APM * Number of processes running or sleeping * Local mails (unread and all) * Filesystem stats @ text @@