Added PROTOCOL_VERSION define,

Started to change to new client-server protocol 0.2,
Added "slash" heartbeat mode...
This commit is contained in:
toykeeper
2000-01-05 00:03:25 +00:00
parent 14df3acb82
commit e2401e4a72
17 changed files with 101 additions and 43 deletions
+1 -1
View File
@@ -83,7 +83,7 @@ int battery_screen(int rep, int display)
{
first = 0;
sprintf(buffer, "screen_set B name {APM stats: %s}\n", host);
sprintf(buffer, "screen_set B -name {APM stats: %s}\n", host);
sock_send_string(sock, buffer);
sock_send_string(sock, "widget_add B title title\n");
sprintf(tmp, "widget_set B title {LCDPROC %s}\n", version);
+4 -4
View File
@@ -162,7 +162,7 @@ int time_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add T\n");
sprintf(buffer, "screen_set T name {Time Screen: %s}\n", host);
sprintf(buffer, "screen_set T -name {Time Screen: %s}\n", host);
sock_send_string(sock, buffer);
sock_send_string(sock, "widget_add T title title\n");
sock_send_string(sock, "widget_set T title {Time Screen}\n");
@@ -324,7 +324,7 @@ int clock_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add O\n");
sprintf(buffer, "screen_set O name {Clock Screen: %s}\n", host);
sprintf(buffer, "screen_set O -name {Clock Screen: %s}\n", host);
sock_send_string(sock, buffer);
sock_send_string(sock, "widget_add O title title\n");
sock_send_string(sock, "widget_add O one string\n");
@@ -435,7 +435,7 @@ int uptime_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add U\n");
sprintf(buffer, "screen_set U name {Uptime Screen: %s}\n", host);
sprintf(buffer, "screen_set U -name {Uptime Screen: %s}\n", host);
sock_send_string(sock, buffer);
sock_send_string(sock, "widget_add U title title\n");
if(lcd_hgt >= 4)
@@ -519,7 +519,7 @@ int big_clock_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add K\n");
sock_send_string(sock, "screen_set K name {Big Clock Screen}\n");
sock_send_string(sock, "screen_set K -name {Big Clock Screen}\n");
sock_send_string(sock, "widget_del K heartbeat\n");
sock_send_string(sock, "widget_add K d0 num\n");
sock_send_string(sock, "widget_add K d1 num\n");
+2 -2
View File
@@ -85,7 +85,7 @@ int cpu_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add C\n");
sprintf(buffer, "screen_set C name {CPU Use: %s}\n", host);
sprintf(buffer, "screen_set C -name {CPU Use: %s}\n", host);
sock_send_string(sock, buffer);
if(lcd_hgt >= 4)
{
@@ -272,7 +272,7 @@ int cpu_graph_screen(int rep, int display)
{
first = 0;
sock_send_string(sock, "screen_add G\n");
sprintf(buffer, "screen_set G name {CPU Graph: %s}\n", host);
sprintf(buffer, "screen_set G -name {CPU Graph: %s}\n", host);
sock_send_string(sock, buffer);
if(lcd_hgt >= 4)
{
+2 -1
View File
@@ -27,6 +27,7 @@
#include <sys/statfs.h>
#endif
#include "../../shared/sockets.h"
#include "main.h"
@@ -150,7 +151,7 @@ int disk_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add D\n");
sprintf(buffer, "screen_set D name {Disk Use: %s}\n", host);
sprintf(buffer, "screen_set D -name {Disk Use: %s}\n", host);
sock_send_string(sock, buffer);
sock_send_string(sock, "widget_add D title title\n");
sprintf(buffer, "widget_set D title {DISKS: %s}\n", host);
+1 -1
View File
@@ -62,7 +62,7 @@ int xload_screen(int rep, int display)
memset(loads, 0, sizeof(float)*LCD_MAX_WIDTH);
sock_send_string(sock, "screen_add X\n");
sprintf(buffer, "screen_set X name {X-Load: %s}\n", host);
sprintf(buffer, "screen_set X -name {X-Load: %s}\n", host);
sock_send_string(sock, buffer);
// Add the vbars...
for(i=1; i<lcd_wid; i++)
+1
View File
@@ -309,6 +309,7 @@ void main_loop(mode *sequence)
else if(0 == strcmp(argv[a], "cellhgt"))
lcd_cellhgt = atoi(argv[++a]);
}
sock_send_string(sock, "client_set -name LCDproc\n");
}
else if(0 == strcmp(argv[0], "bye"))
{
+2 -2
View File
@@ -73,7 +73,7 @@ int mem_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add M\n");
sprintf(buffer, "screen_set M name {Memory & Swap: %s}\n", host);
sprintf(buffer, "screen_set M -name {Memory & Swap: %s}\n", host);
sock_send_string(sock, buffer);
if(lcd_hgt >= 4)
@@ -289,7 +289,7 @@ int mem_top_screen(int rep, int display)
first = 0;
sock_send_string(sock, "screen_add S\n");
sprintf(buffer, "screen_set S name {Top Memory Use: %s}\n", host);
sprintf(buffer, "screen_set S -name {Top Memory Use: %s}\n", host);
sock_send_string(sock, buffer);
sock_send_string(sock, "widget_add S title title\n");
sprintf(buffer, "widget_set S title {TOP MEM: %s}\n", host);
+1 -1
View File
@@ -249,7 +249,7 @@ int credit_screen(int rep, int display)
sock_send_string(sock, "screen_add A\n");
sock_send_string(sock,
"screen_set A name {Credits for LCDproc}\n");
"screen_set A -name {Credits for LCDproc}\n");
sock_send_string(sock, "widget_add A title title\n");
sprintf(tmp, "widget_set A title {LCDPROC %s}\n", version);
sock_send_string(sock, tmp);