From 14267ef1e005277c2dedca23e840852040abc433 Mon Sep 17 00:00:00 2001 From: c0dev0id Date: Wed, 7 Dec 2022 23:28:01 +0100 Subject: [PATCH] Update 2022-12-07 23:28 OpenBSD/amd64 --- .config/spectrwm/cbar.c | 96 ++++++++++++++---------------- .config/spectrwm/spectrwm_map.conf | 3 +- .vim/.netrwhist | 12 ---- 3 files changed, 47 insertions(+), 64 deletions(-) delete mode 100644 .vim/.netrwhist diff --git a/.config/spectrwm/cbar.c b/.config/spectrwm/cbar.c index cf830dc..3010635 100644 --- a/.config/spectrwm/cbar.c +++ b/.config/spectrwm/cbar.c @@ -11,72 +11,61 @@ #include #include -#include -#include -#include +#include + #include #include #include -static int battery_percent = 50; -static int cpu_temp = 46; -static int fan_speed = 3392; -static int cpu_base_speed = 2501; -static int cpu_avg_speed = 468; -static int volume = 50; +static int battery_percent = 23; +static int cpu_temp = 23; +static int fan_speed = 23; +static int cpu_base_speed = 23; +static int cpu_avg_speed = 23; +static int volume = 23; -void update_volume() { - static int cls = -1, fd, v; - static struct mixer_devinfo mdi; - static struct mixer_ctrl mc; + void update_volume(void *arg, unsigned addr, unsigned val) { +// printf("volume update\n"); +// +// } +// +// void register_volume_callback() { +// struct sioctl_hdl *hdl; +// +// hdl = sioctl_open(SIO_DEVANY, SIOCTL_READ, 0); +// sioctl_onval(hdl, update_volume, NULL); +// sioctl_close(hdl); +// } - if ((fd = open("/dev/mixer", O_RDONLY)) == -1) { - volume = -1; +void update_cpu_base_speed() { + size_t slen = sizeof(cpu_base_speed); + int mib[5] = { CTL_HW, HW_CPUSPEED }; // Lenovo x1g10 + if (sysctl(mib, 2, &cpu_base_speed, &slen, NULL, 0) == -1) { + cpu_base_speed = -1; } +} - for (mdi.index = 0; cls == -1; ++mdi.index) { - if (ioctl(fd, AUDIO_MIXER_DEVINFO, &mdi) == -1) - goto fail; - if (mdi.type == AUDIO_MIXER_CLASS && - strcmp(mdi.label.name, AudioCoutputs) == 0) - cls = mdi.index; - } - for (mdi.index = 0, v = -1; v == -1; ++mdi.index) { - if (ioctl(fd, AUDIO_MIXER_DEVINFO, &mdi) == -1) - goto fail; - if (mdi.type == AUDIO_MIXER_VALUE && - mdi.prev == AUDIO_MIXER_LAST && - mdi.mixer_class == cls && - strcmp(mdi.label.name, AudioNmaster) == 0) { - mc.dev = mdi.index; - if (ioctl(fd, AUDIO_MIXER_READ, &mc) == -1) - goto fail; - v = MAX(mc.un.value.level[AUDIO_MIXER_LEVEL_MONO], - mc.un.value.level[AUDIO_MIXER_LEVEL_RIGHT]); +void update_cpu_avg_speed() { + struct sensor sensor; + size_t slen = sizeof(sensor); + int i; + for (i = 0; i < 12; i++) { + int mib[5] = { CTL_HW, HW_SENSORS, 0, SENSOR_FREQ, 0 }; // Lenovo x1g10 + if (sysctl(mib, 5, &sensor, &slen, NULL, 0) != -1) { + cpu_avg_speed += ( sensor.value / 1000000 / 1000000 ); } } - - if (v == -1 || close(fd) == -1) { - volume = -1; - return; - } - - volume = v * 100 / 255; - -fail: - (void)close(fd); - volume = -1; - return; + cpu_avg_speed = cpu_avg_speed / i; } void update_fan_speed() { struct sensor sensor; size_t slen = sizeof(sensor); - // XXX hw.sensors.acpithinkpad0.fan0 - int mib[5] = { CTL_HW, HW_SENSORS, 5, SENSOR_FANRPM, 0 }; // Lenovo x230 + // int mib[5] = { CTL_HW, HW_SENSORS, 5, SENSOR_FANRPM, 0 }; // Lenovo x230 + int mib[5] = { CTL_HW, HW_SENSORS, 12, SENSOR_FANRPM, 0 }; // Lenovo x1g10 if (sysctl(mib, 5, &sensor, &slen, NULL, 0) != -1) { fan_speed = sensor.value; return; @@ -87,7 +76,8 @@ void update_fan_speed() { void update_cpu_temp() { struct sensor sensor; size_t slen = sizeof(sensor); - int mib[5] = { CTL_HW, HW_SENSORS, 0, SENSOR_TEMP, 0 }; + //int mib[5] = { CTL_HW, HW_SENSORS, 0, SENSOR_TEMP, 0 }; // cpu0.temp0 (x230) + int mib[5] = { CTL_HW, HW_SENSORS, 12, SENSOR_TEMP, 0 }; // acpitz0.temp0 (x1) if (sysctl(mib, 5, &sensor, &slen, NULL, 0) != -1) { cpu_temp = (sensor.value - 273150000) / 1000000.0; return; @@ -118,19 +108,23 @@ void update_battery() { int main(int argc, const char *argv[]) { + //register_volume_callback(); + while(1) { // XXX can update at different intervals update_battery(); update_cpu_temp(); + update_cpu_avg_speed(); + update_cpu_base_speed(); update_fan_speed(); - update_volume(); - wprintf(L"%s %d%% %s %dC %s %4dRPM %s %4dMhz (~%4dMhz) %s\n", + wprintf(L"%s %d%% %s %dC %s %4dRPM %s %4dMhz (~%4dMhz) %s %d %s\n", "", battery_percent, " ", cpu_temp, " ", fan_speed, " ", cpu_base_speed, cpu_avg_speed, + " ", volume, " "); sleep(1); } diff --git a/.config/spectrwm/spectrwm_map.conf b/.config/spectrwm/spectrwm_map.conf index 7b8d3c8..81f3a62 100644 --- a/.config/spectrwm/spectrwm_map.conf +++ b/.config/spectrwm/spectrwm_map.conf @@ -10,7 +10,7 @@ bind[float_toggle] = MOD+space # FOCUS bind[focus_main] = MOD+m bind[focus_next] = MOD+Down -bind[focus_next] = MOD+Tab +# bind[focus_next] = MOD+Tab bind[focus_prev] = MOD+Up bind[focus_prev] = MOD+Shift+Tab bind[focus_urgent] = MOD+u @@ -42,6 +42,7 @@ bind[ws_9] = MOD+9 bind[ws_10] = MOD+0 bind[ws_next_all] = MOD+Page_Down bind[ws_prev_all] = MOD+Page_Up +bind[ws_prior] = MOD+Tab # MOVE WINDOW TO OTHER WS bind[mvrg_1] = MOD+Shift+KP_End diff --git a/.vim/.netrwhist b/.vim/.netrwhist deleted file mode 100644 index 6bb82bf..0000000 --- a/.vim/.netrwhist +++ /dev/null @@ -1,12 +0,0 @@ -let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =4 -let g:netrw_dirhist_4='/home/sdk/.bin' -let g:netrw_dirhist_3='/home/sdk' -let g:netrw_dirhist_2='/home/sdk/.vim' -let g:netrw_dirhist_1='sftp://sdk@gopher.codevoid.de/../www/htdocs/gopher/' -let g:netrw_dirhist_0='/home/sdk/code/bcbackup' -let g:netrw_dirhist_9='/home/sdk/code' -let g:netrw_dirhist_8='/home/sdk/code/bar' -let g:netrw_dirhist_7='/home/sdk/code/drist' -let g:netrw_dirhist_6='/home/sdk/code' -let g:netrw_dirhist_5='/home/sdk/.FontForge'