X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibreadline.so_src%2Fmain.c;h=5937c6bd3d25cb59edc3d827099f067684fea136;hb=8735311896d1bd38ae79f1aa604ed81712bd5d97;hp=e145bc0c2d25e7083a15cab572045f919f894c1c;hpb=6c5a509b5e14e097ca537c539bc9babe3b8f0c4c;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libreadline.so_src/main.c b/Usermode/Libraries/libreadline.so_src/main.c
index e145bc0c..5937c6bd 100644
--- a/Usermode/Libraries/libreadline.so_src/main.c
+++ b/Usermode/Libraries/libreadline.so_src/main.c
@@ -5,160 +5,358 @@
  * Text mode entry with history
  */
 #include <readline.h>
+#include <acess/sys.h>
+#include <acess/devices/pty.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#define STDIN_FD	0
+#define STDOUT_FD	1
+
+// Size of the read() buffer
+// - 32 should be pleanty
+#define READ_BUFFER_SIZE	32
+
+// === STRUCTURES ===
+struct sReadline
+{
+	 int	UseHistory;	// Boolean
+	
+	// TODO: Command Completion
+	
+	// History
+	 int	NumHistory;
+	char	**History;
+	
+	// Internal Flags
+	char	*OutputValue;	//!< Pointer (owned by history) to output value
+	
+	// Command Buffer
+	 int	BufferSize;	// Allocated size of the buffer
+	 int	BufferUsed; 	// Offset of first free byte in the buffer
+	 int	BufferWritePos;	// Cursor location
+	char	*CurBuffer;	// Current translated command (pointer to a entry in history)
+	
+	// 
+	 int	HistoryPos;
+	
+	// Read Buffer
+	char	ReadBuffer[READ_BUFFER_SIZE];	//!< Buffer for read()
+	 int	ReadBufferLen;
+};
+
+// === PROTOTYPES ===
+ int	SoMain();
+tReadline	*Readline_Init(int bUseHistory);
+ int	Readline_int_ParseCharacter(tReadline *Info, char *Input);
+char	*Readline_NonBlock(tReadline *Info);
+char	*Readline(tReadline *Info);
 
 // === GLOBALS ===
 
 // === CODE ===
+int SoMain()
+{
+	return 0;
+}
+
+tReadline *Readline_Init(int bUseHistory)
+{
+	tReadline	*ret = calloc( 1, sizeof(tReadline) );
+	ret->UseHistory = bUseHistory;
+	ret->BufferSize = 0;
+	
+	ret->History = malloc( 1 * sizeof(*ret->History) );
+	ret->History[0] = NULL;
+	ret->NumHistory = 1;
+	
+	return ret;
+}
+
+/**
+ */
+char *Readline_NonBlock(tReadline *Info)
+{
+	 int	len, i;
+	
+	// Read as much as possible (appending to remaining data)
+	len = _SysRead(STDIN_FD, Info->ReadBuffer, READ_BUFFER_SIZE - 1 - Info->ReadBufferLen);
+	if( len <= 0 )	return NULL;
+	Info->ReadBuffer[Info->ReadBufferLen + len] = '\0';
+	
+	// Parse the data we have
+	for( i = 0; i < len; )
+	{
+		int size = Readline_int_ParseCharacter(Info, Info->ReadBuffer+i);
+		if( size <= 0 )	break;	// Error, skip the rest?
+		i += size;
+	}
+	
+	// Move the unused data to the start of the buffer
+	memcpy(Info->ReadBuffer, &Info->ReadBuffer[Info->ReadBufferLen + i], len - i);
+	Info->ReadBufferLen = len - i;
+	
+	// Is the command finished?
+	if( Info->OutputValue ) {
+		char	*ret = Info->OutputValue;
+		Info->OutputValue = NULL;	// Mark as no command pending
+		return ret;	// Return the string (now the caller's responsibility)
+	}
+	
+	// Return NULL when command is still being edited
+	errno = EAGAIN;
+	return NULL;
+}
+
 char *Readline(tReadline *Info)
 {
 	char	*ret;
-	 int	len, pos, space = 1023;
+
+	// stty -echo,canon
+	struct ptymode	mode = {.InputMode = 0, .OutputMode = 0};
+	_SysIOCtl(STDIN_FD, PTY_IOCTL_SETMODE, &mode);
+	
+	while( NULL == (ret = Readline_NonBlock(Info)) && errno == EAGAIN );
+
+	// stty +echo,canon
+	mode.InputMode = PTYIMODE_CANON|PTYIMODE_ECHO;
+	_SysIOCtl(STDIN_FD, PTY_IOCTL_SETMODE, &mode);
+
+	return ret;
+}
+
+int Readline_int_AddToHistory(tReadline *Info, const char *String)
+{
+	void	*tmp;
+	
+	// History[#-1] = CurBuffer (always)
+	if( !Info->History ) {
+		// Realy shouldn't happen, but just in case
+		Info->History = malloc( sizeof(char*) );
+		Info->NumHistory = 1;
+	}
+	
+	// Don't add duplicates
+	if( Info->NumHistory >= 2 && strcmp( Info->History[ Info->NumHistory-2 ], String ) == 0 )
+	{
+		return 0;
+	}
+	
+	// Duplicate over the current
+	Info->History[ Info->NumHistory-1 ] = strdup(String);
+	
+	Info->NumHistory ++;
+	
+	tmp = realloc( Info->History, Info->NumHistory * sizeof(char*) );
+	if( tmp == NULL )	return -1;
+	Info->History = tmp;
+				
+	// Zero the new current
+	Info->History[ Info->NumHistory-1 ] = NULL;
+	
+	return 0;
+}
+
+int Readline_int_ParseCharacter(tReadline *Info, char *Input)
+{
+	 int	ofs = 0;
 	char	ch;
-	 int	scrollbackPos = Info->NumHistory;
-	 
-	// Preset Variables
-	ret = malloc( space+1 );
-	if(!ret)	return NULL;
-	len = 0;	pos = 0;
-		
+	
+	if( Input[ofs] == 0 )	return 0;
+	
 	// Read In Command Line
-	do {
-		read(_stdin, 1, &ch);	// Read Character from stdin (read is a blocking call)
+	ch = Input[ofs++];
+	
+	if(ch == '\n')
+	{
+//		printf("\n");
+		if(Info->CurBuffer)
+		{	
+			// Cap String
+			Info->CurBuffer[Info->BufferUsed] = '\0';
+			
+			if( Info->UseHistory )
+				Readline_int_AddToHistory(Info, Info->CurBuffer);
+			Info->OutputValue = strdup(Info->CurBuffer);
+		}
+		else
+			Info->OutputValue = strdup("");
 		
-		if(ch == '\n')	break;
+		// Save and reset
+		Info->BufferSize = 0;
+		Info->BufferUsed = 0;
+		Info->BufferWritePos = 0;
+		Info->CurBuffer = 0;
+		Info->HistoryPos = Info->NumHistory - 1;
 		
+		return 1;
+	}
+	
+	switch(ch)
+	{
+	// Control characters
+	case '\x1B':
+		ch = Input[ofs++];	// Read control character
 		switch(ch)
 		{
-		// Control characters
-		case '\x1B':
-			read(_stdin, 1, &ch);	// Read control character
+		//case 'D':	if(pos)	pos--;	break;
+		//case 'C':	if(pos<len)	pos++;	break;
+		case '[':
+			ch = Input[ofs++];	// Read control character
 			switch(ch)
 			{
-			//case 'D':	if(pos)	pos--;	break;
-			//case 'C':	if(pos<len)	pos++;	break;
-			case '[':
-				read(_stdin, 1, &ch);	// Read control character
-				switch(ch)
+			case 'A':	// Up
 				{
-				case 'A':	// Up
-					{
-						 int	oldLen = len;
-						if( scrollbackPos <= 0 )	break;
-						
-						free(ret);
-						ret = strdup( Info->History[--scrollbackPos] );
-						
-						len = strlen(ret);
-						while(pos--)	write(_stdout, 3, "\x1B[D");
-						write(_stdout, len, ret);	pos = len;
-						while(pos++ < oldLen)	write(_stdout, 1, " ");
+					 int	oldLen = Info->BufferUsed;
+					 int	pos;
+					if( Info->HistoryPos <= 0 )	break;
+					
+					// Move to the beginning of the line
+					pos = oldLen;
+					while(pos--)	_SysWrite(STDOUT_FD, "\x1B[D", 3);
+					
+					// Update state
+					Info->CurBuffer = Info->History[--Info->HistoryPos];
+					Info->BufferSize = Info->BufferUsed = strlen(Info->CurBuffer);
+					
+					_SysWrite(STDOUT_FD, Info->CurBuffer, Info->BufferUsed);
+					Info->BufferWritePos = Info->BufferUsed;
+					
+					// Clear old characters (if needed)
+					if( oldLen > Info->BufferWritePos ) {
+						pos = oldLen - Info->BufferWritePos;
+						while(pos--)	_SysWrite(STDOUT_FD, " ", 1);
+						pos = oldLen - Info->BufferWritePos;
+						while(pos--)	_SysWrite(STDOUT_FD, "\x1B[D", 3);
 					}
-					break;
-				case 'B':	// Down
-					{
-						 int	oldLen = len;
-						if( scrollbackPos >= Info->NumHistory )	break;
-						
-						free(ret);
-						ret = strdup( Info->History[scrollbackPos++] );
-						
-						len = strlen(ret);
-						while(pos--)	write(_stdout, 3, "\x1B[D");
-						write(_stdout, len, ret);	pos = len;
-						while(pos++ < oldLen)	write(_stdout, 1, " ");
+				}
+				break;
+			case 'B':	// Down
+				{
+					 int	oldLen = Info->BufferUsed;
+					 int	pos;
+					if( Info->HistoryPos >= Info->NumHistory - 1 )	break;
+					
+					// Move to the beginning of the line
+					pos = oldLen;
+					while(pos--)	_SysWrite(STDOUT_FD, "\x1B[D", 3);
+					
+					// Update state
+					Info->CurBuffer = Info->History[Info->HistoryPos++];
+					Info->BufferSize = Info->BufferUsed = strlen(Info->CurBuffer);
+					
+					// Write new line
+					_SysWrite(STDOUT_FD, Info->CurBuffer, Info->BufferUsed);
+					Info->BufferWritePos = Info->BufferUsed;
+					
+					// Clear old characters (if needed)
+					if( oldLen > Info->BufferWritePos ) {
+						pos = oldLen - Info->BufferWritePos;
+						while(pos--)	_SysWrite(STDOUT_FD, " ", 1);
+						pos = oldLen - Info->BufferWritePos;
+						while(pos--)	_SysWrite(STDOUT_FD, "\x1B[D", 3);
 					}
-					break;
-				case 'D':	// Left
-					if(pos == 0)	break;
-					pos --;
-					write(_stdout, 3, "\x1B[D");
-					break;
-				case 'C':	// Right
-					if(pos == len)	break;
-					pos++;
-					write(_stdout, 3, "\x1B[C");
-					break;
 				}
+				break;
+			case 'D':	// Left
+				if(Info->BufferWritePos == 0)	break;
+				Info->BufferWritePos --;
+				_SysWrite(STDOUT_FD, "\x1B[D", 3);
+				break;
+			case 'C':	// Right
+				if(Info->BufferWritePos == Info->BufferUsed)	break;
+				Info->BufferWritePos ++;
+				_SysWrite(STDOUT_FD, "\x1B[C", 3);
+				break;
 			}
 			break;
-		
-		// Backspace
-		case '\b':
-			if(len <= 0)		break;	// Protect against underflows
-			write(_stdout, 1, &ch);
-			if(pos == len) {	// Simple case of end of string
-				len --;
-				pos--;
-			}
-			else {
-				char	buf[7] = "\x1B[000D";
-				buf[2] += ((len-pos+1)/100) % 10;
-				buf[3] += ((len-pos+1)/10) % 10;
-				buf[4] += (len-pos+1) % 10;
-				write(_stdout, len-pos, &ret[pos]);	// Move Text
-				ch = ' ';	write(_stdout, 1, &ch);	ch = '\b';	// Clear deleted character
-				write(_stdout, 7, buf);	// Update Cursor
-				// Alter Buffer
-				memmove(&ret[pos-1], &ret[pos], len-pos);
-				pos --;
-				len --;
-			}
-			break;
-		
-		// Tab
-		case '\t':
-			//TODO: Implement Tab-Completion
-			//Currently just ignore tabs
-			break;
-		
-		default:		
-			// Expand Buffer
-			if(len+1 > space) {
-				space += 256;
-				ret = realloc(ret, space+1);
-				if(!ret)	return NULL;
-			}
-			
-			// Editing inside the buffer
-			if(pos != len) {
-				char	buf[7] = "\x1B[000D";
-				buf[2] += ((len-pos)/100) % 10;
-				buf[3] += ((len-pos)/10) % 10;
-				buf[4] += (len-pos) % 10;
-				write(_stdout, 1, &ch);	// Print new character
-				write(_stdout, len-pos, &ret[pos]);	// Move Text
-				write(_stdout, 7, buf);	// Update Cursor
-				memmove( &ret[pos+1], &ret[pos], len-pos );
-			}
-			else {
-				write(_stdout, 1, &ch);
-			}
-			ret[pos++] = ch;
-			len ++;
+		case '\0':
+			ofs --;
 			break;
 		}
-	} while(ch != '\n');
+		break;
 	
-	// Cap String
-	ret[len] = '\0';
-	printf("\n");
+	// Backspace
+	case '\b':
+		if(Info->BufferWritePos <= 0)	break;	// Protect against underflows
+		// Write the backsapce
+		_SysWrite(STDOUT_FD, "\b \b", 3);
+		if(Info->BufferWritePos == Info->BufferUsed)	// Simple case: End of string
+		{
+			Info->BufferUsed --;
+			Info->BufferWritePos --;
+		}
+		else
+		{
+			// Have to delete the character, and reposition the text
+			char	buf[7] = "\x1B[000D";
+			 int	delta = Info->BufferUsed - Info->BufferWritePos + 1;
+			buf[2] += (delta/100) % 10;
+			buf[3] += (delta/10) % 10;
+			buf[4] += (delta) % 10;
+			// Write everything save for the deleted character
+			_SysWrite(STDOUT_FD,
+				&Info->CurBuffer[Info->BufferWritePos],
+				Info->BufferUsed - Info->BufferWritePos
+				);
+			ch = ' ';	_SysWrite(STDOUT_FD, &ch, 1);	ch = '\b';	// Clear old last character
+			_SysWrite(STDOUT_FD, buf, 7);	// Update Cursor
+			// Alter Buffer
+			memmove(&Info->CurBuffer[Info->BufferWritePos-1],
+				&Info->CurBuffer[Info->BufferWritePos],
+				Info->BufferUsed-Info->BufferWritePos
+				);
+			Info->BufferWritePos --;
+			Info->BufferUsed --;
+		}
+		break;
 	
-	// Return length
-	//if(Length)	*Length = len;
+	// Tab
+	case '\t':
+		//TODO: Implement Tab-Completion
+		//Currently just ignore tabs
+		break;
 	
-	// Add to history
-	if( strcmp( Info->History[ Info->NumHistory-1 ], ret) != 0 )
-	{
-		void	*tmp;
-		Info->NumHistory ++;
-		tmp = realloc( Info->History, Info->NumHistory * sizeof(char*) );
-		if(tmp != NULL)
+	default:		
+		// Expand Buffer
+		if(Info->BufferUsed + 1 > Info->BufferSize)
 		{
-			Info->History = tmp;
-			Info->History[ Info->NumHistory-1 ] = strdup(ret);
+			Info->BufferSize += 256;
+			Info->CurBuffer = Info->History[Info->HistoryPos]
+				= realloc(Info->CurBuffer, Info->BufferSize);
+			if(!Info->CurBuffer)	return 0;
+		}
+		
+		// Editing inside the buffer
+		if(Info->BufferWritePos < Info->BufferUsed) {
+			char	buf[7] = "\x1B[000D";
+			 int	delta = Info->BufferUsed - Info->BufferWritePos;
+			buf[2] += (delta/100) % 10;
+			buf[3] += (delta/10) % 10;
+			buf[4] += (delta) % 10;
+			_SysWrite(STDOUT_FD, &ch, 1);	// Print new character
+			_SysWrite(STDOUT_FD,
+				&Info->CurBuffer[Info->BufferWritePos],
+				Info->BufferUsed - Info->BufferWritePos
+				);
+			_SysWrite(STDOUT_FD, buf, 7);	// Update Cursor
+			// Move buffer right
+			memmove(
+				&Info->CurBuffer[Info->BufferWritePos+1],
+				&Info->CurBuffer[Info->BufferWritePos],
+				Info->BufferUsed - Info->BufferWritePos
+				);
 		}
+		// Simple append
+		else {
+			_SysWrite(STDOUT_FD, &ch, 1);
+		}
+		Info->CurBuffer[ Info->BufferWritePos ++ ] = ch;
+		Info->BufferUsed ++;
+		break;
 	}
 	
-	return ret;
+	return ofs;
 }