X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Firc_src%2Fmain.c;h=20223bbf78bdebd845d7327b721a31854178f96a;hb=ad39285c100ee2c5e5a34a9c1010d10fcea77067;hp=a08553a03844bfd4ff491247b610e9b4eb49e515;hpb=0f137ffed95af2eee3b9ecd2e277e5134e15ac69;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c
index a08553a0..20223bbf 100644
--- a/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@ -115,8 +115,8 @@ int main(int argc, const char *argv[], const char *envp[])
 	
 	// HACK: Static server entry
 	// UCC (University [of Western Australia] Computer Club) IRC Server
-	gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );
-//	gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );
+//	gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );
+	gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );
 //	gWindow_Status.Server = Server_Connect( "Host", "10.0.2.2", 6667 );
 //	gWindow_Status.Server = Server_Connect( "BitlBee", "192.168.1.34", 6667 );
 	
@@ -425,7 +425,6 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
 	
 	{
 		int pos = SetCursorPos(giTerminal_Height-2, 0);
-		#if 1
 		if( win == gpCurrentWindow ) {
 			 int	prefixlen = strlen(Source) + 3;
 			 int	avail = giTerminal_Width - prefixlen;
@@ -434,17 +433,12 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
 			printf("[%s] %.*s\n", Source, avail, Message);
 			while( msglen > avail ) {
 				msglen -= avail;
+				Message += avail;
 				printf("\x1B[T");
 				SetCursorPos(giTerminal_Height-2, prefixlen);
 				printf("%.*s\n", avail, Message);
 			}
 		}
-		#else
-		if(win->Name[0])
-			printf("%s/%s [%s] %s\n", win->Server->Name, win->Name, Source, Message);
-		else
-			printf("(status) [%s] %s\n", Source, Message);
-		#endif
 		SetCursorPos(-1, pos);
 	}
 	
@@ -578,10 +572,6 @@ void ParseServerLine(tServer *Server, char *Line)
 				break;
 			}
 		}
-		else if( strcmp(cmd, "PING") == 0 )
-		{
-			writef(Server->FD, "PONG %s\n", gsHostname);
-		}
 		else if( strcmp(cmd, "NOTICE") == 0 )
 		{
 			char	*class, *message;
@@ -623,10 +613,17 @@ void ParseServerLine(tServer *Server, char *Line)
 			Message_AppendF(Server, MSG_TYPE_SERVER, "", "", "Unknown message %s (%s)\n", cmd, Line+pos);
 		}
 	}
-	else {
+	else {		
+		cmd = GetValue(Line, &pos);
 		
-		// Command to client
-		Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);
+		if( strcmp(cmd, "PING") == 0 ) {
+			writef(Server->FD, "PONG %s\n", gsHostname);
+			
+		}
+		else {
+			// Command to client
+			Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);
+		}
 	}
 }