#include <string.h>\r
#include <net.h>\r
#include <readline.h>\r
+#include <acess/devices/pty.h>\r
\r
// === TYPES ===\r
typedef struct sServer {\r
\r
int ProcessIncoming(tServer *Server);\r
// --- Helpers\r
- int SetCursorPos(int Row, int Col);\r
+void SetCursorPos(int Row, int Col);\r
int writef(int FD, const char *Format, ...);\r
int OpenTCP(const char *AddressString, short PortNumber);\r
char *GetValue(char *Str, int *Ofs);\r
\r
atexit(ExitHandler);\r
\r
- giTerminal_Width = _SysIOCtl(1, 5, NULL); // getset_width\r
- giTerminal_Height = _SysIOCtl(1, 6, NULL); // getset_height\r
+<<<<<<< HEAD
+ if( _SysIOCtl(1, DRV_IOCTL_TYPE, NULL) != DRV_TYPE_TERMINAL ) {\r
+ printf(stderr, "note: assuming 80x25, can't get terminal dimensions\n");\r
+ giTerminal_Width = 80;\r
+ giTerminal_Height = 25;\r
+ }\r
+ else {\r
+ struct ptydims dims;\r
+ _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims);\r
+=======
+ {\r
+ struct ptydims dims;\r
+ if( _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims) ) {\r
+ perror("Can't get terminal dimensions");\r
+ return 1;\r
+ }\r
+ \r
+>>>>>>> e7a76b0d8a0cc6aa77966509780973a6f8216ef7
+ giTerminal_Width = dims.W;\r
+ giTerminal_Height = dims.H;\r
+ }\r
\r
printf("\x1B[?1047h");\r
printf("\x1B[%i;%ir", 0, giTerminal_Height-1);\r
\r
SetCursorPos(giTerminal_Height-1, 0);\r
printf("[(status)] ");\r
+ fflush(stdout);\r
readline_info = Readline_Init(1);\r
\r
for( ;; )\r
maxFD = srv->FD;\r
}\r
\r
- rv = select(maxFD+1, &readfds, 0, &errorfds, NULL);\r
+ rv = _SysSelect(maxFD+1, &readfds, 0, &errorfds, NULL, 0);\r
if( rv == -1 ) break;\r
\r
if(FD_ISSET(0, &readfds))\r
printf("[%s:%s] ", gpCurrentWindow->Server->Name, gpCurrentWindow->Name);\r
else\r
printf("[(status)] ");\r
+ fflush(stdout);\r
}\r
}\r
\r
return 0;\r
}\r
\r
+\r
+void Cmd_join(char *ArgString)\r
+{\r
+ int pos=0;\r
+ char *channel_name = GetValue(ArgString, &pos);\r
+ \r
+ if( gpCurrentWindow->Server )\r
+ {\r
+ writef(gpCurrentWindow->Server->FD, "JOIN :%s\n", channel_name);\r
+ }\r
+}\r
+\r
+void Cmd_quit(char *ArgString)\r
+{\r
+ const char *quit_message = ArgString;\r
+ if( quit_message == NULL || quit_message[0] == '\0' )\r
+ quit_message = "/quit - Acess2 IRC Client";\r
+ \r
+ for( tServer *srv = gpServers; srv; srv = srv->Next )\r
+ {\r
+ writef(srv->FD, "QUIT :%s\n", quit_message);\r
+ }\r
+ \r
+ exit(0);\r
+}\r
+\r
+void Cmd_window(char *ArgString)\r
+{\r
+ int pos = 0;\r
+ char *window_id = GetValue(ArgString, &pos);\r
+ int window_num = atoi(window_id);\r
+ \r
+ if( window_num > 0 )\r
+ {\r
+ tWindow *win;\r
+ window_num --; // Move to base 0\r
+ // Get `window_num`th window\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
+ else\r
+ {\r
+ window_num = 1;\r
+ for( tWindow *win = gpWindows; win; win = win->Next, window_num ++ )\r
+ {\r
+ if( win->Name[0] ) {\r
+ Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "",\r
+ "%i: %s/%s", window_num, win->Server->Name, win->Name);\r
+ }\r
+ else {\r
+ Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "",\r
+ "%i: (status)", window_num);\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+const struct {\r
+ const char *Name;\r
+ void (*Fcn)(char *ArgString);\r
+} caCommands[] = {\r
+ {"join", Cmd_join},\r
+ {"quit", Cmd_quit},\r
+ {"window", Cmd_window},\r
+ {"win", Cmd_window},\r
+ {"w", Cmd_window},\r
+};\r
+const int ciNumCommands = sizeof(caCommands)/sizeof(caCommands[0]);\r
+\r
/**\r
* \brief Handle a line from the prompt\r
*/\r
char *command;\r
int pos = 0;\r
\r
- command = GetValue(String, &pos);\r
- \r
- if( strcmp(command, "/join") == 0 )\r
+ command = GetValue(String, &pos)+1;\r
+\r
+ // TODO: Prefix matches\r
+ int cmdIdx = -1;\r
+ for( int i = 0; i < ciNumCommands; i ++ )\r
{\r
- char *channel_name = GetValue(String, &pos);\r
- \r
- if( gpCurrentWindow->Server )\r
- {\r
- writef(gpCurrentWindow->Server->FD, "JOIN :%s\n", channel_name);\r
+ if( strcmp(command, caCommands[i].Name) == 0 ) {\r
+ cmdIdx = i;\r
+ break;\r
}\r
}\r
- else if( strcmp(command, "/quit") == 0 )\r
- {\r
- char *quit_message = String + pos;\r
- tServer *srv;\r
- \r
- if( quit_message == NULL || quit_message[0] == '\0' )\r
- quit_message = "/quit - Acess2 IRC Client";\r
- \r
- for( srv = gpServers; srv; srv = srv->Next )\r
- {\r
- writef(srv->FD, "QUIT :%s\n", quit_message);\r
- }\r
- \r
- exit(0);\r
- }\r
- else if( strcmp(command, "/window") == 0 || strcmp(command, "/win") == 0 || strcmp(command, "/w") == 0 )\r
- {\r
- char *window_id = GetValue(String, &pos);\r
- int window_num = atoi(window_id);\r
- \r
- if( window_num > 0 )\r
- {\r
- tWindow *win;\r
- window_num --; // Move to base 0\r
- // Get `window_num`th window\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
- else\r
- {\r
- tWindow *win;\r
- window_num = 1;\r
- for( win = gpWindows; win; win = win->Next, window_num ++ )\r
- {\r
- if( win->Name[0] ) {\r
- Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "",\r
- "%i: %s/%s", window_num, win->Server->Name, win->Name);\r
- }\r
- else {\r
- Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "",\r
- "%i: (status)", window_num);\r
- }\r
- }\r
- }\r
+ if( cmdIdx != -1 ) {\r
+ caCommands[cmdIdx].Fcn(String+pos);\r
}\r
else\r
{\r
\r
tMessage *Message_Append(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message)\r
{\r
- tMessage *ret;\r
tWindow *win = NULL;\r
int msgLen = strlen(Message);\r
\r
- // NULL servers are internal messages\r
+ // Server==NULL indicates an internal message\r
if( Server == NULL || Source[0] == '\0' )\r
{\r
win = &gWindow_Status;\r
}\r
- // Determine if it's a channel or PM message\r
+ // Determine if it's a channel or PM\r
else if( Dest[0] == '#' || Dest[0] == '&' ) // TODO: Better determining here\r
{\r
for(win = gpWindows; win; win = win->Next)\r
win = Window_Create(Server, Dest);\r
}\r
}\r
- \r
+\r
+ // Create message cache \r
+ _SysDebug("Win (%s) msg: <%s> %s", win->Name, Source, Message);\r
+ tMessage *ret;\r
ret = malloc( sizeof(tMessage) + msgLen + 1 + strlen(Source) + 1 );\r
ret->Source = ret->Data + msgLen + 1;\r
strcpy(ret->Source, Source);\r
ret->Type = Type;\r
ret->Server = Server;\r
\r
- // TODO: Append to window message list\r
+ // Append to window message list\r
ret->Next = win->Messages;\r
win->Messages = ret;\r
\r
- //TODO: Set location\r
- \r
+ // Print now if current window\r
+ if( win == gpCurrentWindow )\r
{\r
- int pos = SetCursorPos(giTerminal_Height-2, 0);\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, 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
+ printf("\x1b[s");\r
+ SetCursorPos(giTerminal_Height-2, 0);\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, 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
- SetCursorPos(-1, pos);\r
+ printf("\x1b[u");\r
}\r
\r
return ret;\r
int pos = 0;\r
char *ident, *cmd;\r
\r
- _SysDebug("[%s] %s", Server->Name, Line); \r
+// _SysDebug("[%s] %s", Server->Name, Line); \r
\r
// Message?\r
if( *Line == ':' )\r
return ret;\r
}\r
\r
-int SetCursorPos(int Row, int Col)\r
+void 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 = _SysIOCtl(1, 9, NULL); // Ugh, constants\r
printf("\x1B[%i;%iH", Col, Row);\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