X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fgui_shell_src%2Fmain.c;h=3f9a656c808263547626c4e575cde38a82ed8bcd;hb=3bcb134d0523071a59375fdda3ab3e9ef8076dfb;hp=1c748b32ef9e462a6349af402c6664b63ef2a07d;hpb=8ca18a718af411a8391be8629e1201983044a88f;p=tpg%2Facess2.git diff --git a/Usermode/Applications/gui_shell_src/main.c b/Usermode/Applications/gui_shell_src/main.c index 1c748b32..3f9a656c 100644 --- a/Usermode/Applications/gui_shell_src/main.c +++ b/Usermode/Applications/gui_shell_src/main.c @@ -15,6 +15,8 @@ #include "include/vt100.h" #include #include +#include +#include // === PROTOTYPES === int main(int argc, char *argv[], const char **envp); @@ -25,8 +27,7 @@ void Term_HandleOutput(int Len, const char *Buf); // === GLOBALS === tHWND gMainWindow; tHWND gMenuWindow; - int giChildStdin; - int giChildStdout; + int giPTYHandle; // === CODE === int main(int argc, char *argv[], const char **envp) @@ -34,7 +35,7 @@ int main(int argc, char *argv[], const char **envp) AxWin3_Connect(NULL); // --- Build up window - gMainWindow = AxWin3_RichText_CreateWindow(NULL, 0); + gMainWindow = AxWin3_RichText_CreateWindow(NULL, AXWIN3_RICHTEXT_READONLY); AxWin3_SetWindowTitle(gMainWindow, "Terminal"); // TODO: Update title with other info gMenuWindow = AxWin3_Menu_Create(gMainWindow); @@ -54,33 +55,37 @@ int main(int argc, char *argv[], const char **envp) AxWin3_RichText_SetCursorType (gMainWindow, AXWIN3_RICHTEXT_CURSOR_INV); AxWin3_RichText_SetCursorBlink (gMainWindow, 1); - // - AxWin3_RichText_SetLineCount(gMainWindow, 3); - AxWin3_RichText_SendLine(gMainWindow, 0, "First line!"); - AxWin3_RichText_SendLine(gMainWindow, 2, "Third line! \1ff0000A red"); - // - Display_Init(80, 25, 100); AxWin3_ResizeWindow(gMainWindow, 80*8, 25*16); AxWin3_MoveWindow(gMainWindow, 20, 50); AxWin3_ShowWindow(gMainWindow, 1); AxWin3_FocusWindow(gMainWindow); - // Spawn shell - giChildStdin = _SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE); - giChildStdout = _SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE); - if( giChildStdout == -1 || giChildStdin == -1 ) { - perror("Oh, fsck"); - _SysDebug("out,in = %i,%i", giChildStdout, giChildStdin); + // Create PTY + giPTYHandle = _SysOpen("/Devices/pts/ptmx", OPENFLAG_READ|OPENFLAG_WRITE); + if( giPTYHandle < 0 ) { + perror("Unable to create/open PTY"); + _SysDebug("Unable to create/open PTY: %s", strerror(errno)); return -1; } + // - Initialise + { + _SysIOCtl(giPTYHandle, PTY_IOCTL_SETID, "gui0"); + struct ptymode mode = {.InputMode = PTYIMODE_CANON|PTYIMODE_ECHO, .OutputMode=0}; + struct ptydims dims = {.W = 80, .H = 25}; + _SysIOCtl(giPTYHandle, PTY_IOCTL_SETMODE, &mode); + _SysIOCtl(giPTYHandle, PTY_IOCTL_SETDIMS, &dims); + } + // Spawn shell { - int fds[] = {giChildStdin, giChildStdout, giChildStdout}; + int fd = _SysOpen("/Devices/pts/gui0", OPENFLAG_READ|OPENFLAG_WRITE); + int fds[] = {fd, fd, fd}; const char *argv[] = {"CLIShell", NULL}; int pid = _SysSpawn("/Acess/Bin/CLIShell", argv, envp, 3, fds, NULL); if( pid < 0 ) - _SysDebug("ERROR: Shell spawn failed"); + _SysDebug("ERROR: Shell spawn failed: %s", strerror(errno)); + _SysClose(fd); } // Main loop @@ -89,15 +94,15 @@ int main(int argc, char *argv[], const char **envp) fd_set fds; FD_ZERO(&fds); - FD_SET(giChildStdout, &fds); - AxWin3_MessageSelect(giChildStdout + 1, &fds); + FD_SET(giPTYHandle, &fds); + AxWin3_MessageSelect(giPTYHandle + 1, &fds); - if( FD_ISSET(giChildStdout, &fds) ) + if( FD_ISSET(giPTYHandle, &fds) ) { _SysDebug("Activity on child stdout"); // Read and update screen - char buf[32]; - int len = _SysRead(giChildStdout, buf, sizeof(buf)); + char buf[128]; + int len = _SysRead(giPTYHandle, buf, sizeof(buf)); if( len <= 0 ) break; Term_HandleOutput(len, buf); @@ -112,14 +117,14 @@ int Term_KeyHandler(tHWND Window, int bPress, uint32_t KeySym, uint32_t Translat static int ctrl_state = 0; // Handle modifiers - #define _bitset(var,bit,set) do{if(set)var|=1<<(bit);else var&=1<<(bit);}while(0) + #define _bitset(var,bit,set) do{if(set)var|=1<<(bit);else var&=~(1<<(bit));}while(0) switch(KeySym) { case KEYSYM_LEFTCTRL: - _bitset(ctrl_state, 0, bPress); + _bitset(ctrl_state, 0, bPress!=0); return 0; case KEYSYM_RIGHTCTRL: - _bitset(ctrl_state, 0, bPress); + _bitset(ctrl_state, 1, bPress!=0); return 0; } #undef _bitset @@ -129,32 +134,47 @@ int Term_KeyHandler(tHWND Window, int bPress, uint32_t KeySym, uint32_t Translat if( ctrl_state && KeySym >= KEYSYM_a && KeySym <= KEYSYM_z ) { Translated = KeySym - KEYSYM_a + 1; + _SysDebug("Ctrl-%c: KS %x => Trans %x", 'A'+(KeySym-KEYSYM_a), KeySym, Translated); } - if( Translated ) + // == 2 :: FIRE + if( bPress == 2 ) { - char buf[6]; - int len; - - // Encode and send - len = WriteUTF8(buf, Translated); - - _SysWrite(giChildStdin, buf, len); + if( Translated ) + { + char buf[6]; + int len; + + // Encode and send + len = WriteUTF8(buf, Translated); + + _SysDebug("Keystroke %x:%x translated to '%.*s'", KeySym, Translated, len, buf); + _SysWrite(giPTYHandle, buf, len); + + return 0; + } - return 0; - } - - // No translation, look for escape sequences to send - const char *str = NULL; - switch(KeySym) - { - case KEYSYM_LEFTARROW: - str = "\x1b[D"; - break; - } - if( str ) - { - _SysWrite(giChildStdin, str, strlen(str)); + // No translation, look for escape sequences to send + const char *str = NULL; + switch(KeySym) + { + case KEYSYM_LEFTARROW: + str = "\x1b[D"; + break; + case KEYSYM_RIGHTARROW: + str = "\x1b[C"; + break; + case KEYSYM_UPARROW: + str = "\x1b[A"; + break; + case KEYSYM_DOWNARROW: + str = "\x1b[B"; + break; + } + if( str ) + { + _SysWrite(giPTYHandle, str, strlen(str)); + } } return 0; } @@ -179,7 +199,7 @@ void Term_HandleOutput(int Len, const char *Buf) esc_len = -esc_len; } ofs += esc_len; - _SysDebug("Len = %i, ofs = %i", Len, ofs); + //_SysDebug("Len = %i, ofs = %i", Len, ofs); } Display_Flush();