X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=204a61e0afb653e8f3a889b9fce64384c8bbbc95;hb=aab09714f5780d2d7eeb7f1f94a624e0535bdb22;hp=83c66e27cba02db724b19c983d9038b2033d2d2c;hpb=950aea956b32f7c63c6f31c60aaf57dbe9bc1a80;p=tpg%2Fopendispense2.git

diff --git a/src/client/main.c b/src/client/main.c
index 83c66e2..204a61e 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -146,6 +146,11 @@ void ShowUsage(void)
 			"    dispense iteminfo <itemid>\n"
 			"        Get the name and price for an item\n"
 			);
+//	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "enumitems") == 0 )
+//		printf(
+//			"    dispense enumitems\n"
+//			"        List avaliable items\n"
+//			);
 	if( giTextArgc == 0 )
 		printf("  == Coke members == \n");
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
@@ -1029,7 +1034,6 @@ int ShowNCursesUI(void)
  */
 int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 {
-	 int	_x, _y, times;
 	char	*name = NULL;
 	 int	price = 0;
 	 int	status = -1;
@@ -1107,6 +1111,13 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 				break;
 			}
 			
+			if( price > 100*100 ) {
+				nameWidth --;
+			}
+			if( price > 1000*100 ) {
+				nameWidth --;
+			}
+			
 			printw("%-*.*s", nameWidth, nameWidth, name);
 		
 //			getyx(stdscr, _y, _x);
@@ -1114,15 +1125,13 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 //			times = Width - 5 - (_x - Col);	// TODO: Better handling for large prices
 //			while(times--)	addch(' ');
 			
+			// 999.99 should be enough
 			printw(" %4i", price);
 		}
 		else
 		{
-			printw("-- %s", name);
-			getyx(stdscr, _y, _x);
-			times = Width - 4 - (_x - Col);
-			while(times--)	addch(' ');
-			printw("    ");
+//			 int	_x, _y, times;
+			printw("-- %-*.*s ", Width-4, Width-4, name);
 		}
 	}
 	
@@ -2214,7 +2223,7 @@ char *ReadLine(int Socket)
 		}
 		else {
 			len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
-			if( len < 0 ) {
+			if( len <= 0 ) {
 				free(ret);
 				return strdup("599 Client Connection Error\n");
 			}