Update 2022-12-12 07:51 OpenBSD/amd64

.bin/cbar.c

@@ -20,76 +20,170 @@
 #include <locale.h>
 
 
-static unsigned int battery_percent = 23;
+static char battery_percent[8];
-static unsigned int cpu_temp = 23;
+static char cpu_temp[24];
-static unsigned int fan_speed = 23;
+static char fan_speed[24];
-static unsigned int cpu_base_speed = 23;
+static char cpu_base_speed[24];
-static unsigned int cpu_avg_speed = 23;
+static char cpu_avg_speed[24];
-static unsigned int volume = 23;
+static char volume[24];
 
 void update_cpu_base_speed() {
-    size_t slen = sizeof(cpu_base_speed);
+    const wchar_t ico_freq = 0xE234; // 
+    int temp;
+    size_t slen = sizeof(temp);
+
     int mib[5] = { CTL_HW, HW_CPUSPEED }; // Lenovo x1g10
-    if (sysctl(mib, 2, &cpu_base_speed, &slen, NULL, 0) == -1) {
+    if (sysctl(mib, 2, &temp, &slen, NULL, 0) == -1)
-        cpu_base_speed = -1;
+        snprintf(cpu_base_speed,sizeof(cpu_base_speed), "%lc N/A", ico_freq);
-    }
+    else
+        snprintf(cpu_base_speed,sizeof(cpu_base_speed), "%lc %4dMhz", ico_freq, temp);
 }
 
 void update_cpu_avg_speed() {
     struct sensor sensor;
     size_t slen = sizeof(sensor);
+    uint temp = 0;
+
     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 );
+            temp += ( sensor.value / 1000000 / 1000000 );
         }
     }
-    cpu_avg_speed = cpu_avg_speed / i;
+    snprintf(cpu_avg_speed,sizeof(cpu_avg_speed), "%4dMhz", temp / i);
 }
 
 void update_fan_speed() {
     struct sensor sensor;
     size_t slen = sizeof(sensor);
+    const wchar_t ico_fan =  0xF70F; // 
+    int temp = -1;
+
     // 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) {
+    if (sysctl(mib, 5, &sensor, &slen, NULL, 0) != -1)
-        fan_speed = sensor.value;
+        temp = sensor.value;
-        return;
+    snprintf(fan_speed,sizeof(fan_speed), "%lc %dRPM", ico_fan, temp);
-    }
-    fan_speed = -1;
 }
 
 void update_cpu_temp() {
     struct sensor sensor;
     size_t slen = sizeof(sensor);
+    int temp = -1;
+
+    const wchar_t ico_low =  0xF2CB; // 
+    const wchar_t ico_25 =  0xF2CA; // 
+    const wchar_t ico_50 =  0xF2C9; // 
+    const wchar_t ico_75 =  0xF2C8; // 
+    const wchar_t ico_high =  0xF2C7; // 
+    wchar_t ico_temp = 0xF2C9;
+
+
     //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;
+        temp = (sensor.value  - 273150000) / 1000000.0;
-        return;
     }
-    cpu_temp = -1;
+    if(temp > 80)
+        ico_temp = ico_high;
+    else if (temp > 72)
+        ico_temp = ico_75;
+    else if (temp > 62)
+        ico_temp = ico_50;
+    else if (temp > 42)
+        ico_temp = ico_25;
+    else
+        ico_temp = ico_low;
+    snprintf(cpu_temp,sizeof(battery_percent),
+            "%lc %dC", ico_temp, temp);
 }
 
 void update_battery() {
     int fd;
     struct apm_power_info pi;
 
+    const wchar_t ico_empty =  0xF583; // 
+    const wchar_t ico_10 =  0xF579; // 
+    const wchar_t ico_20 =  0xF57A; // 
+    const wchar_t ico_30 =  0xF57B; // 
+    const wchar_t ico_40 =  0xF57C; // 
+    const wchar_t ico_50 =  0xF57D; // 
+    const wchar_t ico_60 =  0xF57E; // 
+    const wchar_t ico_70 =  0xF57F; // 
+    const wchar_t ico_80 =  0xF580; // 
+    const wchar_t ico_90 =  0xF581; // 
+    const wchar_t ico_full =  0xF578; // 
+
+    const wchar_t ico_chr_empty = 0xF58D; // 
+    const wchar_t ico_chr_10 =  0xF585; // 
+    const wchar_t ico_chr_25 =  0xF586; // 
+    const wchar_t ico_chr_50 =  0xF587; // 
+    const wchar_t ico_chr_65 =  0xF588; // 
+    const wchar_t ico_chr_80 =  0xF589; // 
+    const wchar_t ico_chr_90 =  0xF58A; // 
+    const wchar_t ico_chr_full =  0xF583; // 
+
+    const wchar_t ico_unknown = 0xF590; // 
+
+    wchar_t ico_buf = ico_unknown;
+
     if ((fd = open("/dev/apm", O_RDONLY)) == -1 ||
             ioctl(fd, APM_IOC_GETPOWER, &pi) == -1 ||
             close(fd) == -1) {
-        battery_percent = -1;
+        strlcpy(battery_percent, "N/A", sizeof(battery_percent));
         return;
     }
 
     if (pi.battery_state == APM_BATT_UNKNOWN ||
             pi.battery_state == APM_BATTERY_ABSENT) {
-        battery_percent = -1;
+        strlcpy(battery_percent, "N/A", sizeof(battery_percent));
         return;
     }
-
+    if(pi.ac_state == APM_AC_ON) {
-    battery_percent = pi.battery_life;
+        if(pi.battery_life > 97)
+            ico_buf = ico_chr_full;
+        else if(pi.battery_life > 90)
+            ico_buf = ico_chr_90;
+        else if(pi.battery_life > 80)
+            ico_buf = ico_chr_80;
+        else if(pi.battery_life > 65)
+            ico_buf = ico_chr_65;
+        else if(pi.battery_life > 50)
+            ico_buf = ico_chr_50;
+        else if(pi.battery_life > 25)
+            ico_buf = ico_chr_25;
+        else if(pi.battery_life > 10)
+            ico_buf = ico_chr_10;
+        else
+            ico_buf = ico_chr_empty;
+    } else {
+        if(pi.battery_life > 98)
+            ico_buf = ico_full;
+        else if(pi.battery_life > 90)
+          ico_buf = ico_90;
+        else if(pi.battery_life > 80)
+          ico_buf = ico_80;
+        else if(pi.battery_life > 70)
+          ico_buf = ico_70;
+        else if(pi.battery_life > 60)
+          ico_buf = ico_60;
+        else if(pi.battery_life > 50)
+          ico_buf = ico_50;
+        else if(pi.battery_life > 40)
+          ico_buf = ico_40;
+        else if(pi.battery_life > 30)
+          ico_buf = ico_30;
+        else if(pi.battery_life > 20)
+          ico_buf = ico_20;
+        else if(pi.battery_life > 10)
+          ico_buf = ico_10;
+        else
+          ico_buf = ico_empty;
+    }
+    snprintf(battery_percent,sizeof(battery_percent),
+            "%lc %d%%", ico_buf, pi.battery_life);
 }
 
 int main(int argc, const char *argv[])
@@ -98,10 +192,6 @@ int main(int argc, const char *argv[])
     setlocale(LC_ALL, "en_US.UTF-8");
 
     const wchar_t sep =  0xE621; // 
-    const wchar_t bat =  0xF583; // 
-    const wchar_t tmp =  0xF2C9; // 
-    const wchar_t fan =  0xF70F; // 
-    const wchar_t freq = 0xE234; // 
     const wchar_t time = 0xE383; // 
 
     while(1) {
@@ -112,12 +202,17 @@ int main(int argc, const char *argv[])
         update_cpu_base_speed();
         update_fan_speed();
 
-        printf("%lc %d%% %lc %lc %dC %lc %lc %4dRPM %lc %lc %4dMhz (~%4dMhz) %lc %lc\n",
+        printf("%s", battery_percent);
-                  bat, battery_percent,
+        printf(" %lc ", sep);
-             sep, tmp, cpu_temp,
+        printf("%s", cpu_temp);
-             sep, fan, fan_speed,
+        printf(" %lc ", sep);
-             sep, freq, cpu_base_speed, cpu_avg_speed,
+        printf("%s (~%s)", cpu_base_speed, cpu_avg_speed);
-             sep, time);
+        printf(" %lc ", sep);
+        printf("%s", fan_speed);
+        printf(" %lc ", sep);
+        printf("%lc ", time);
+        printf("\n");
+
         fflush(stdout);
         sleep(2);
     }

.vim/vimrc

@@ -223,6 +223,7 @@ nmap ga <Plug>(EasyAlign)
 nnoremap mm :call MyMake()<CR>
 nnoremap mr :!%:p:r<CR>
 function MyMake()
+    :silent !clear
     if filereadable("Makefile")
         :w! | !make
     else