#include <net.h>\r
#include <readline.h>\r
\r
-#define BUFSIZ 1023\r
-\r
// === TYPES ===\r
typedef struct sServer {\r
struct sServer *Next;\r
tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message, ...);\r
tMessage *Message_Append(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message);\r
tWindow *Window_Create(tServer *Server, const char *Name);\r
+void Redraw_Screen(void);\r
\r
int ProcessIncoming(tServer *Server);\r
// --- Helpers\r
\r
// HACK: Static server entry\r
// UCC (University [of Western Australia] Computer Club) IRC Server\r
- gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );\r
+// gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );\r
+ gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );\r
+// gWindow_Status.Server = Server_Connect( "Host", "10.0.2.2", 6667 );\r
+// gWindow_Status.Server = Server_Connect( "BitlBee", "192.168.1.34", 6667 );\r
\r
if( !gWindow_Status.Server )\r
return -1;\r
for( win = gpWindows; win && window_num--; win = win->Next );\r
if( win ) {\r
gpCurrentWindow = win;\r
+ Redraw_Screen();\r
}\r
// Otherwise, silently ignore\r
}\r
// Determine if it's a channel or PM message\r
else if( Dest[0] == '#' || Dest[0] == '&' ) // TODO: Better determining here\r
{\r
- tWindow *prev = NULL;\r
- for(win = gpWindows; win; prev = win, win = win->Next)\r
+ for(win = gpWindows; win; win = win->Next)\r
{\r
if( win->Server == Server && strcmp(win->Name, Dest) == 0 )\r
{\r
\r
{\r
int pos = SetCursorPos(giTerminal_Height-2, 0);\r
- #if 1\r
if( win == gpCurrentWindow ) {\r
+ int prefixlen = strlen(Source) + 3;\r
+ int avail = giTerminal_Width - prefixlen;\r
+ int msglen = strlen(Message);\r
printf("\x1B[T"); // Scroll down 1 (free space below)\r
- printf("[%s] %s\n", Source, Message);\r
+ printf("[%s] %.*s\n", Source, avail, Message);\r
+ while( msglen > avail ) {\r
+ msglen -= avail;\r
+ Message += avail;\r
+ printf("\x1B[T");\r
+ SetCursorPos(giTerminal_Height-2, prefixlen);\r
+ printf("%.*s\n", avail, Message);\r
+ }\r
}\r
- #else\r
- if(win->Name[0])\r
- printf("%s/%s [%s] %s\n", win->Server->Name, win->Name, Source, Message);\r
- else\r
- printf("(status) [%s] %s\n", Source, Message);\r
- #endif\r
SetCursorPos(-1, pos);\r
}\r
\r
return ret;\r
}\r
\r
+void Redraw_Screen(void)\r
+{\r
+ int y = 0;\r
+ tMessage *msg;\r
+\r
+ printf("\x1B[2J"); // Clear screen\r
+ printf("\x1B[0;0H"); // Reset cursor\r
+\r
+ msg = gpCurrentWindow->Messages;\r
+ \r
+ // TODO: Title bar?\r
+\r
+ // Note: This renders from the bottom up\r
+ for( y = giTerminal_Height - 1; y -- && msg; msg = msg->Next)\r
+ {\r
+ int msglen = strlen(msg->Data);\r
+ int prefix_len = 3 + strlen(msg->Source);\r
+ int line_avail = giTerminal_Width - prefix_len;\r
+ int i = 0, done = 0;\r
+ \r
+ y -= msglen / line_avail; // Extra lines (y-- above handles the 1 line case)\r
+ SetCursorPos(y, 0);\r
+ printf("[%s] ", msg->Source);\r
+ \r
+ while(done < msglen) {\r
+ done += printf("%.*s", line_avail, msg->Data+done);\r
+ i ++;\r
+ SetCursorPos(y+i, prefix_len);\r
+ }\r
+ }\r
+\r
+ // Bottom line is rendered by the prompt\r
+}\r
+\r
void Cmd_PRIVMSG(tServer *Server, const char *Dest, const char *Src, const char *Message)\r
{\r
Message_Append(Server, MSG_TYPE_STANDARD, Dest, Src, Message);\r
{\r
int pos = 0;\r
char *ident, *cmd;\r
+\r
+ _SysDebug("Server %s: Line = %s", Server->Name, Line); \r
\r
// Message?\r
if( *Line == ':' )\r
\r
switch(num)\r
{\r
+ case 353: // /NAMES list\r
+ // <user> = <channel> :list\r
+// GetValue(Line, &pos); // '='\r
+ user = GetValue(Line, &pos); // Actually channel\r
+ message = Line + pos + 1; // List\r
+ Message_AppendF(Server, MSG_TYPE_SERVER, user, "", "Names: %s", message);\r
+ break;\r
+ case 366: // end of /NAMES list\r
+ // <user> <channel> :msg\r
+ user = message;\r
+ message = Line + pos + 1;\r
+ Message_Append(Server, MSG_TYPE_SERVER, user, "", message);\r
+ break;\r
+ case 372: // MOTD Data\r
+ case 376: // MOTD End\r
+ \r
default:\r
//printf("[%s] %i %s\n", Server->Name, num, message);\r
Message_Append(Server, MSG_TYPE_SERVER, ident, user, message);\r
char *class, *message;\r
\r
class = GetValue(Line, &pos);\r
+ _SysDebug("NOTICE class='%s'", class);\r
\r
if( Line[pos] == ':' ) {\r
message = Line + pos + 1;\r
else {\r
message = GetValue(Line, &pos);\r
}\r
- Cmd_PRIVMSG(Server, dest, ident, message);\r
+// Cmd_PRIVMSG(Server, dest, ident, message);\r
Message_Append(Server, MSG_TYPE_STANDARD, ident, dest, message);\r
}\r
else if( strcmp(cmd, "JOIN" ) == 0 )\r
Message_AppendF(Server, MSG_TYPE_SERVER, "", "", "Unknown message %s (%s)\n", cmd, Line+pos);\r
}\r
}\r
- else {\r
+ else { \r
+ cmd = GetValue(Line, &pos);\r
\r
- // Command to client\r
- printf("Client Command: %s", Line);\r
+ if( strcmp(cmd, "PING") == 0 ) {\r
+ writef(Server->FD, "PONG %s\n", gsHostname);\r
+ \r
+ }\r
+ else {\r
+ // Command to client\r
+ Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);\r
+ }\r
}\r
}\r
\r
{\r
#endif\r
// Read data\r
- len = read(Server->FD, BUFSIZ - Server->ReadPos, &Server->InBuf[Server->ReadPos]);\r
+ len = read(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);\r
if( len == -1 ) {\r
return -1;\r
}\r
vsnprintf(buf, len+1, Format, args);\r
va_end(args);\r
\r
- return write(FD, len, buf);\r
+ return write(FD, buf, len);\r
}\r
}\r
\r
int OpenTCP(const char *AddressString, short PortNumber)\r
{\r
int fd, addrType;\r
- char *iface;\r
char addrBuffer[8];\r
\r
// Parse IP Address\r
addrType = Net_ParseAddress(AddressString, addrBuffer);\r
if( addrType == 0 ) {\r
fprintf(stderr, "Unable to parse '%s' as an IP address\n", AddressString);\r
+ _SysDebug("Unable to parse '%s' as an IP address\n", AddressString);\r
return -1;\r
}\r
\r
// Finds the interface for the destination address\r
- iface = Net_GetInterface(addrType, addrBuffer);\r
- if( iface == NULL ) {\r
- fprintf(stderr, "Unable to find a route to '%s'\n", AddressString);\r
- return -1;\r
- }\r
- \r
- printf("iface = '%s'\n", iface);\r
- \r
- // Open client socket\r
- // TODO: Move this out to libnet?\r
- {\r
- int len = snprintf(NULL, 100, "/Devices/ip/%s/tcpc", iface);\r
- char path[len+1];\r
- snprintf(path, 100, "/Devices/ip/%s/tcpc", iface);\r
- fd = open(path, OPENFLAG_READ|OPENFLAG_WRITE);\r
- }\r
- \r
- free(iface);\r
- \r
+ fd = Net_OpenSocket(addrType, addrBuffer, "tcpc");\r
if( fd == -1 ) {\r
- fprintf(stderr, "Unable to open TCP Client for reading\n");\r
+ fprintf(stderr, "Unable to open TCP Client to '%s'\n", AddressString);\r
+ _SysDebug("Unable to open TCP client to '%s'\n", AddressString);\r
return -1;\r
}\r
\r
// Set remote port and address\r
- printf("Setting port and remote address\n");\r
+// printf("Setting port and remote address\n");\r
ioctl(fd, 5, &PortNumber);\r
ioctl(fd, 6, addrBuffer);\r
\r
// Connect\r
- printf("Initiating connection\n");\r
+// printf("Initiating connection\n");\r
if( ioctl(fd, 7, NULL) == 0 ) {\r
// Shouldn't happen :(\r
fprintf(stderr, "Unable to start connection\n");\r
\r
int SetCursorPos(int Row, int Col)\r
{\r
+ int rv;\r
if( Row == -1 ) {\r
Row = Col / giTerminal_Width;\r
Col = Col % giTerminal_Width;\r
}\r
+ rv = ioctl(1, 9, NULL); // Ugh, constants\r
printf("\x1B[%i;%iH", Col, Row);\r
- return ioctl(1, 9, NULL); // Ugh, constants\r
+ return rv;\r
}\r
\r
static inline int isdigit(int ch)\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au