From 28101f649ae597ecc25400f0ae58f5e8c79c1e55 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Sun, 19 Dec 2004 15:19:07 +0000
Subject: [PATCH] added patches by M.Dolze: - patch_server_widget_command -
 patch_client_load - patch_client_mem (using speed 12 instead of 8) -
 patch_client_mode

---
 clients/lcdproc/load.c            |  2 +-
 clients/lcdproc/mem.c             |  2 +-
 clients/lcdproc/mode.c            |  3 ++-
 server/commands/widget_commands.c | 15 ++++++---------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/clients/lcdproc/load.c b/clients/lcdproc/load.c
index 8a3b1d0..45d9387 100644
--- a/clients/lcdproc/load.c
+++ b/clients/lcdproc/load.c
@@ -49,7 +49,7 @@ xload_screen (int rep, int display)
 		} else {
 			sock_send_string (sock, "widget_add X title string\n");
 			sock_send_string (sock, "widget_set X title 1 1 {LOAD}\n");
-			sock_send_string (sock, "widget_del X heartbeat\n");
+			sock_send_string (sock, "screen_set X -heartbeat off\n");
 		}
 		sock_send_string (sock, "widget_add X zero string\n");
 		sock_send_string (sock, "widget_add X top string\n");
diff --git a/clients/lcdproc/mem.c b/clients/lcdproc/mem.c
index 73f13da..9447aa3 100644
--- a/clients/lcdproc/mem.c
+++ b/clients/lcdproc/mem.c
@@ -218,7 +218,7 @@ mem_top_screen (int rep, int display)
 		if (lcd_hgt >= 4)
 			sock_send_string (sock, "widget_set S f 1 2 20 4 20 5 v 8\n");
 		else
-			sock_send_string (sock, "widget_set S f 1 2 20 2 20 5 v 16\n");
+			sock_send_string (sock, "widget_set S f 1 2 20 2 20 5 v 12\n");
 		for (i = 1; i <= 5; i++) {
 			sprintf (buffer, "widget_add S %i string -in f\n", i);
 			sock_send_string (sock, buffer);
diff --git a/clients/lcdproc/mode.c b/clients/lcdproc/mode.c
index bdda57e..3431766 100644
--- a/clients/lcdproc/mode.c
+++ b/clients/lcdproc/mode.c
@@ -185,7 +185,8 @@ credit_screen(int rep, int display)
 		else
 		{
 			sock_send_string(sock, "widget_add A text scroller\n");
-			sock_send_string(sock, "widget_set A text 1 2 20 2 v 8 { for Linux & *BSD by William Ferrell, Scott Scriven}\n");
+			sprintf(buffer, "widget_set A text 1 2 %d 2 h 8 { for Linux & *BSD by William Ferrell, Scott Scriven}\n", lcd_wid);
+			sock_send_string(sock, buffer);
 		}
 	}
 
diff --git a/server/commands/widget_commands.c b/server/commands/widget_commands.c
index 62c815a..ee21e98 100644
--- a/server/commands/widget_commands.c
+++ b/server/commands/widget_commands.c
@@ -84,8 +84,8 @@ widget_add_func (Client * c, int argc, char **argv)
 			p++;
 
 		/* Handle the "in" flag to place widgets in a container...*/
-		if (strcmp (p, "in")) {
-			char * frame_name;
+		if (strcmp (p, "in")==0) {
+			Widget * frame;
 
 			if (argc < 6) {
 				sock_send_string (c->sock, "huh?  Specify a frame to place widget in\n");
@@ -96,16 +96,13 @@ widget_add_func (Client * c, int argc, char **argv)
 			 * This way it will not be plaed in the normal screen
 			 * but in the framescreen.
 			 */
-			frame_name = malloc (strlen("frame_") + strlen(argv[5]) + 1);
-			strcpy (frame_name, "frame_");
-			strcat (frame_name, argv[5]);
-			s = screen_create (frame_name, c);
-			if (!s) {
-				report(RPT_WARNING, "widget_add_func: Error creating framescreen");
+			frame = screen_find_widget(s, argv[5]);
+			if (!frame) {
+				report(RPT_WARNING, "widget_add_func: Error finding frame ");
 				sock_send_string(c->sock, "huh?  Failed\n");
 				return 0;
 			}
-			free (frame_name);
+			s = frame->frame_screen;
 		}
 	}