Updated lcdproc:
* Fixed visual bug that appeared in systems without swap: percentage was reported as "nan" (Not-A-Number): now reports "n/a"...
This commit is contained in:
@@ -267,10 +267,16 @@ mem_screen (int rep, int display)
|
|||||||
sock_send_string (sock, tmp);
|
sock_send_string (sock, tmp);
|
||||||
|
|
||||||
// Free swap graph
|
// Free swap graph
|
||||||
|
if (mem[1].total == 0) {
|
||||||
|
value = 0;
|
||||||
|
sprintf(tmp, "widget_set M swapgauge 8 2 0\n");
|
||||||
|
} else {
|
||||||
value = ((float) mem[1].free / (float) mem[1].total);
|
value = ((float) mem[1].free / (float) mem[1].total);
|
||||||
value = 1.0 - value;
|
value = 1.0 - value;
|
||||||
n = (int) ((lcd_cellwid * (float) (lcd_wid - 13)) * (value));
|
n = (int) ((lcd_cellwid * (float) (lcd_wid - 13)) * (value));
|
||||||
sprintf(tmp, "widget_set M swapgauge 8 2 %i\n", n);
|
sprintf(tmp, "widget_set M swapgauge 8 2 %i\n", n);
|
||||||
|
}
|
||||||
|
|
||||||
if (display)
|
if (display)
|
||||||
sock_send_string (sock, tmp);
|
sock_send_string (sock, tmp);
|
||||||
|
|
||||||
@@ -278,8 +284,12 @@ mem_screen (int rep, int display)
|
|||||||
if (value >= 99.9) {
|
if (value >= 99.9) {
|
||||||
sprintf (buffer, "100%%");
|
sprintf (buffer, "100%%");
|
||||||
} else {
|
} else {
|
||||||
|
if (mem[1].total == 0)
|
||||||
|
sprintf (buffer, " n/a");
|
||||||
|
else
|
||||||
sprintf (buffer, "%4.1f%%", value);
|
sprintf (buffer, "%4.1f%%", value);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf (tmp, "widget_set M swap%% %i 2 {%s}\n", lcd_wid - 4, buffer);
|
sprintf (tmp, "widget_set M swap%% %i 2 {%s}\n", lcd_wid - 4, buffer);
|
||||||
if (display)
|
if (display)
|
||||||
sock_send_string (sock, tmp);
|
sock_send_string (sock, tmp);
|
||||||
|
|||||||
Reference in New Issue
Block a user