X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Firc_src%2Fmain.c;h=09e116417afa36b877b97f865b51be6bea3dc043;hb=45ff232a1db704623e0c4baed011d12cbd44b06e;hp=901e8ac1853ee5f6a8c0e1cd8be2879e526d6799;hpb=385aa5c4b5e509d298b3341dcd27ca26c3ce2358;p=tpg%2Facess2.git diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c index 901e8ac1..09e11641 100644 --- a/Usermode/Applications/irc_src/main.c +++ b/Usermode/Applications/irc_src/main.c @@ -7,6 +7,7 @@ #include #include #include +#include // === TYPES === typedef struct sServer { @@ -64,7 +65,7 @@ void Redraw_Screen(void); int ProcessIncoming(tServer *Server); // --- Helpers - int SetCursorPos(int Row, int Col); +void SetCursorPos(int Row, int Col); int writef(int FD, const char *Format, ...); int OpenTCP(const char *AddressString, short PortNumber); char *GetValue(char *Str, int *Ofs); @@ -78,7 +79,7 @@ char *gsNickname = "acess"; tServer *gpServers; tWindow gWindow_Status = { NULL, NULL, NULL, // No next, empty list, no server - 0, "" // No activity, empty name (rendered as status) + 0, {""} // No activity, empty name (rendered as status) }; tWindow *gpWindows = &gWindow_Status; tWindow *gpCurrentWindow = &gWindow_Status; @@ -102,8 +103,27 @@ int main(int argc, const char *argv[], const char *envp[]) atexit(ExitHandler); - giTerminal_Width = ioctl(1, 5, NULL); // getset_width - giTerminal_Height = ioctl(1, 6, NULL); // getset_height +<<<<<<< HEAD + if( _SysIOCtl(1, DRV_IOCTL_TYPE, NULL) != DRV_TYPE_TERMINAL ) { + printf(stderr, "note: assuming 80x25, can't get terminal dimensions\n"); + giTerminal_Width = 80; + giTerminal_Height = 25; + } + else { + struct ptydims dims; + _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims); +======= + { + struct ptydims dims; + if( _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims) ) { + perror("Can't get terminal dimensions"); + return 1; + } + +>>>>>>> e7a76b0d8a0cc6aa77966509780973a6f8216ef7 + giTerminal_Width = dims.W; + giTerminal_Height = dims.H; + } printf("\x1B[?1047h"); printf("\x1B[%i;%ir", 0, giTerminal_Height-1); @@ -125,6 +145,7 @@ int main(int argc, const char *argv[], const char *envp[]) SetCursorPos(giTerminal_Height-1, 0); printf("[(status)] "); + fflush(stdout); readline_info = Readline_Init(1); for( ;; ) @@ -146,7 +167,7 @@ int main(int argc, const char *argv[], const char *envp[]) maxFD = srv->FD; } - rv = select(maxFD+1, &readfds, 0, &errorfds, NULL); + rv = _SysSelect(maxFD+1, &readfds, 0, &errorfds, NULL, 0); if( rv == -1 ) break; if(FD_ISSET(0, &readfds)) @@ -167,6 +188,7 @@ int main(int argc, const char *argv[], const char *envp[]) printf("[%s:%s] ", gpCurrentWindow->Server->Name, gpCurrentWindow->Name); else printf("[(status)] "); + fflush(stdout); } } @@ -194,7 +216,7 @@ int main(int argc, const char *argv[], const char *envp[]) { tServer *srv; for( srv = gpServers; srv; srv = srv->Next ) - close(srv->FD); + _SysClose(srv->FD); } return 0; } @@ -207,6 +229,79 @@ int ParseArguments(int argc, const char *argv[]) return 0; } + +void Cmd_join(char *ArgString) +{ + int pos=0; + char *channel_name = GetValue(ArgString, &pos); + + if( gpCurrentWindow->Server ) + { + writef(gpCurrentWindow->Server->FD, "JOIN :%s\n", channel_name); + } +} + +void Cmd_quit(char *ArgString) +{ + const char *quit_message = ArgString; + if( quit_message == NULL || quit_message[0] == '\0' ) + quit_message = "/quit - Acess2 IRC Client"; + + for( tServer *srv = gpServers; srv; srv = srv->Next ) + { + writef(srv->FD, "QUIT :%s\n", quit_message); + } + + exit(0); +} + +void Cmd_window(char *ArgString) +{ + int pos = 0; + char *window_id = GetValue(ArgString, &pos); + int window_num = atoi(window_id); + + if( window_num > 0 ) + { + tWindow *win; + window_num --; // Move to base 0 + // Get `window_num`th window + for( win = gpWindows; win && window_num--; win = win->Next ); + if( win ) { + gpCurrentWindow = win; + Redraw_Screen(); + } + // Otherwise, silently ignore + } + else + { + window_num = 1; + for( tWindow *win = gpWindows; win; win = win->Next, window_num ++ ) + { + if( win->Name[0] ) { + Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "", + "%i: %s/%s", window_num, win->Server->Name, win->Name); + } + else { + Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "", + "%i: (status)", window_num); + } + } + } +} + +const struct { + const char *Name; + void (*Fcn)(char *ArgString); +} caCommands[] = { + {"join", Cmd_join}, + {"quit", Cmd_quit}, + {"window", Cmd_window}, + {"win", Cmd_window}, + {"w", Cmd_window}, +}; +const int ciNumCommands = sizeof(caCommands)/sizeof(caCommands[0]); + /** * \brief Handle a line from the prompt */ @@ -217,65 +312,19 @@ int ParseUserCommand(char *String) char *command; int pos = 0; - command = GetValue(String, &pos); - - if( strcmp(command, "/join") == 0 ) - { - char *channel_name = GetValue(String, &pos); - - if( gpCurrentWindow->Server ) - { - writef(gpCurrentWindow->Server->FD, "JOIN :%s\n", channel_name); - } - } - else if( strcmp(command, "/quit") == 0 ) + command = GetValue(String, &pos)+1; + + // TODO: Prefix matches + int cmdIdx = -1; + for( int i = 0; i < ciNumCommands; i ++ ) { - char *quit_message = String + pos; - tServer *srv; - - if( quit_message == NULL || quit_message[0] == '\0' ) - quit_message = "/quit - Acess2 IRC Client"; - - for( srv = gpServers; srv; srv = srv->Next ) - { - writef(srv->FD, "QUIT :%s\n", quit_message); + if( strcmp(command, caCommands[i].Name) == 0 ) { + cmdIdx = i; + break; } - - exit(0); } - else if( strcmp(command, "/window") == 0 || strcmp(command, "/win") == 0 || strcmp(command, "/w") == 0 ) - { - char *window_id = GetValue(String, &pos); - int window_num = atoi(window_id); - - if( window_num > 0 ) - { - tWindow *win; - window_num --; // Move to base 0 - // Get `window_num`th window - for( win = gpWindows; win && window_num--; win = win->Next ); - if( win ) { - gpCurrentWindow = win; - Redraw_Screen(); - } - // Otherwise, silently ignore - } - else - { - tWindow *win; - window_num = 1; - for( win = gpWindows; win; win = win->Next, window_num ++ ) - { - if( win->Name[0] ) { - Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "", - "%i: %s/%s", window_num, win->Server->Name, win->Name); - } - else { - Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "", - "%i: (status)", window_num); - } - } - } + if( cmdIdx != -1 ) { + caCommands[cmdIdx].Fcn(String+pos); } else { @@ -340,7 +389,7 @@ tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const c va_list args; int len; va_start(args, Message); - len = vsnprintf(NULL, 1000, Message, args); + len = vsnprintf(NULL, 0, Message, args); { char buf[len+1]; vsnprintf(buf, len+1, Message, args); @@ -350,16 +399,15 @@ tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const c tMessage *Message_Append(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message) { - tMessage *ret; tWindow *win = NULL; int msgLen = strlen(Message); - // NULL servers are internal messages + // Server==NULL indicates an internal message if( Server == NULL || Source[0] == '\0' ) { win = &gWindow_Status; } - // Determine if it's a channel or PM message + // Determine if it's a channel or PM else if( Dest[0] == '#' || Dest[0] == '&' ) // TODO: Better determining here { for(win = gpWindows; win; win = win->Next) @@ -411,7 +459,10 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch win = Window_Create(Server, Dest); } } - + + // Create message cache + _SysDebug("Win (%s) msg: <%s> %s", win->Name, Source, Message); + tMessage *ret; ret = malloc( sizeof(tMessage) + msgLen + 1 + strlen(Source) + 1 ); ret->Source = ret->Data + msgLen + 1; strcpy(ret->Source, Source); @@ -419,29 +470,28 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch ret->Type = Type; ret->Server = Server; - // TODO: Append to window message list + // Append to window message list ret->Next = win->Messages; win->Messages = ret; - //TODO: Set location - + // Print now if current window + if( win == gpCurrentWindow ) { - int pos = SetCursorPos(giTerminal_Height-2, 0); - if( win == gpCurrentWindow ) { - int prefixlen = strlen(Source) + 3; - int avail = giTerminal_Width - prefixlen; - int msglen = strlen(Message); - printf("\x1B[T"); // Scroll down 1 (free space below) - 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); - } + printf("\x1b[s"); + SetCursorPos(giTerminal_Height-2, 0); + int prefixlen = strlen(Source) + 3; + int avail = giTerminal_Width - prefixlen; + int msglen = strlen(Message); + printf("\x1B[T"); // Scroll down 1 (free space below) + 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); } - SetCursorPos(-1, pos); + printf("\x1b[u"); } return ret; @@ -524,7 +574,7 @@ void ParseServerLine(tServer *Server, char *Line) int pos = 0; char *ident, *cmd; - _SysDebug("[%s] %s", Server->Name, Line); +// _SysDebug("[%s] %s", Server->Name, Line); // Message? if( *Line == ':' ) @@ -578,6 +628,7 @@ void ParseServerLine(tServer *Server, char *Line) Message_Append(Server, MSG_TYPE_SERVER, user, user, message); break; case 372: // MOTD Data + case 375: // MOTD Start case 376: // MOTD End default: @@ -601,6 +652,10 @@ void ParseServerLine(tServer *Server, char *Line) } //printf("[%s] NOTICE %s: %s\n", Server->Name, ident, message); + char *ident_bang = strchr(ident, '!'); + if( ident_bang ) { + *ident_bang = '\0'; + } Message_Append(Server, MSG_TYPE_NOTICE, ident, "", message); } else if( strcmp(cmd, "PRIVMSG") == 0 ) @@ -618,7 +673,10 @@ void ParseServerLine(tServer *Server, char *Line) // TODO: Catch when the privmsg is addressed to the user // Cmd_PRIVMSG(Server, dest, ident, message); - *strchr(ident, '!') = '\0'; // Hello SIGSEGV + char *ident_bang = strchr(ident, '!'); + if( ident_bang ) { + *ident_bang = '\0'; + } Message_Append(Server, MSG_TYPE_STANDARD, ident, dest, message); } else if( strcmp(cmd, "JOIN" ) == 0 ) @@ -659,11 +717,11 @@ int ProcessIncoming(tServer *Server) // ioctl#8 on a TCP client gets the number of bytes in the recieve buffer // - Used to avoid blocking #if NON_BLOCK_READ - while( (len = ioctl(Server->FD, 8, NULL)) > 0 ) + while( (len = _SysIOCtl(Server->FD, 8, NULL)) > 0 ) { #endif // Read data - len = read(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos); + len = _SysRead(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos); if( len == -1 ) { return -1; } @@ -708,7 +766,7 @@ int writef(int FD, const char *Format, ...) int len; va_start(args, Format); - len = vsnprintf(NULL, 1000, Format, args); + len = vsnprintf(NULL, 0, Format, args); va_end(args); { @@ -717,7 +775,7 @@ int writef(int FD, const char *Format, ...) vsnprintf(buf, len+1, Format, args); va_end(args); - return write(FD, buf, len); + return _SysWrite(FD, buf, len); } } @@ -747,12 +805,12 @@ int OpenTCP(const char *AddressString, short PortNumber) // Set remote port and address // printf("Setting port and remote address\n"); - ioctl(fd, 5, &PortNumber); - ioctl(fd, 6, addrBuffer); + _SysIOCtl(fd, 5, &PortNumber); + _SysIOCtl(fd, 6, addrBuffer); // Connect // printf("Initiating connection\n"); - if( ioctl(fd, 7, NULL) == 0 ) { + if( _SysIOCtl(fd, 7, NULL) == 0 ) { // Shouldn't happen :( fprintf(stderr, "Unable to start connection\n"); return -1; @@ -790,16 +848,9 @@ char *GetValue(char *Src, int *Ofs) return ret; } -int SetCursorPos(int Row, int Col) +void SetCursorPos(int Row, int Col) { - int rv; - if( Row == -1 ) { - Row = Col / giTerminal_Width; - Col = Col % giTerminal_Width; - } - rv = ioctl(1, 9, NULL); // Ugh, constants printf("\x1B[%i;%iH", Col, Row); - return rv; } static inline int isdigit(int ch)