mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapted load.c to work with longer (>4 line) displays.

Browse Source
This commit is contained in:
robijn
2001-11-15 00:00:36 +00:00
parent 6f686358d9
commit a2ffbde152
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/lcdproc/load.c
+5 -8
View File
@@ -97,7 +97,7 @@ xload_screen (int rep, int display)
sock_send_string (sock, tmp); sock_send_string (sock, tmp);
} }
// And add a title... // And add a title...
if (lcd_hgt >= 4) { if (lcd_hgt > 2) {
sock_send_string (sock, "widget_add X title title\n"); sock_send_string (sock, "widget_add X title title\n");
sock_send_string (sock, "widget_set X title {LOAD }\n"); sock_send_string (sock, "widget_set X title {LOAD }\n");
} else { } else {
@@ -109,7 +109,7 @@ xload_screen (int rep, int display)
sock_send_string (sock, "widget_add X top string\n"); sock_send_string (sock, "widget_add X top string\n");
sprintf (tmp, "widget_set X zero %i %i 0\n", lcd_wid, lcd_hgt); sprintf (tmp, "widget_set X zero %i %i 0\n", lcd_wid, lcd_hgt);
sock_send_string (sock, tmp); sock_send_string (sock, tmp);
sprintf (tmp, "widget_set X top %i %i 1\n", lcd_wid, (lcd_hgt == 2) ? 1 : 2); sprintf (tmp, "widget_set X top %i %i 1\n", lcd_wid, (lcd_hgt <= 2) ? 1 : 2);
sock_send_string (sock, tmp); sock_send_string (sock, tmp);
} }
@@ -125,14 +125,11 @@ xload_screen (int rep, int display)
if ((float) n < loadmax) { if ((float) n < loadmax) {
n++; n++;
} }
sprintf (tmp, "widget_set X top %i %i %i\n", lcd_wid, (lcd_hgt == 2) ? 1 : 2, n); sprintf (tmp, "widget_set X top %i %i %i\n", lcd_wid, (lcd_hgt <= 2) ? 1 : 2, n);
//if(display) sock_send_string(sock, tmp); //if(display) sock_send_string(sock, tmp);
sock_send_string (sock, tmp); sock_send_string (sock, tmp);
if (loadmax < 1.0) factor = (float) (lcd_cellhgt) * ((lcd_hgt <= 2) ? 2.0 : 1.0 * (lcd_hgt-1)) / (float) n;
factor = (float) (lcd_cellhgt) * ((lcd_hgt == 2) ? 2.0 : 3.0);
else
factor = (float) (lcd_cellhgt) * ((lcd_hgt == 2) ? 2.0 : 3.0) / (float) n;
for (n = 0; n < lcd_wid - 1; n++) { for (n = 0; n < lcd_wid - 1; n++) {
x = (loads[n] * factor); x = (loads[n] * factor);
@@ -152,7 +149,7 @@ xload_screen (int rep, int display)
status = BLINK_ON; status = BLINK_ON;
} }
// And now the title... // And now the title...
if (lcd_hgt >= 4) if (lcd_hgt > 2)
sprintf (tmp, "widget_set X title {LOAD %2.2f: %s}\n", loads[lcd_wid - 2], host); sprintf (tmp, "widget_set X title {LOAD %2.2f: %s}\n", loads[lcd_wid - 2], host);
else else
sprintf (tmp, "widget_set X title 1 1 {%s %2.2f}\n", host, loads[lcd_wid - 2]); sprintf (tmp, "widget_set X title 1 1 {%s %2.2f}\n", host, loads[lcd_wid - 2]);