X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Frichtext.c;h=5f31057ad171198ba5528c3c0ad9bb2f16db0e35;hb=6397a743456a11e9c38b7e2cf46f41b2b7083365;hp=28be1aeb8917d3dc2b5c2fe8ab738ba86003c471;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/renderers/richtext.c b/Usermode/Applications/axwin3_src/WM/renderers/richtext.c
index 28be1aeb..5f31057a 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/richtext.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/richtext.c
@@ -20,6 +20,7 @@ typedef struct sRichText_Line
 	struct sRichText_Line	*Next;
 	struct sRichText_Line	*Prev;
 	 int	Num;
+	char	bIsClean;
 	// TODO: Pre-rendered cache?
 	short	ByteLength;
 	short	Space;
@@ -36,6 +37,7 @@ typedef struct sRichText_Window
 	tColour	DefaultFG;
 	tColour	DefaultBG;
 	tFont	*Font;
+	char	bNeedsFullRedraw;
 	
 	short	LineHeight;
 } tRichText_Window;
@@ -43,6 +45,7 @@ typedef struct sRichText_Window
 // === PROTOTYPES ===
  int	Renderer_RichText_Init(void);
 tWindow	*Renderer_RichText_Create(int Flags);
+void	Renderer_RichText_Destroy(tWindow *Window);
 void	Renderer_RichText_Redraw(tWindow *Window);
  int	Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void *Data);
  int	Renderer_RichText_HandleIPC_WriteLine(tWindow *Window, size_t Len, const void *Data);
@@ -52,6 +55,7 @@ void	Renderer_RichText_Redraw(tWindow *Window);
 tWMRenderer	gRenderer_RichText = {
 	.Name = "RichText",
 	.CreateWindow	= Renderer_RichText_Create,
+	.DestroyWindow  = Renderer_RichText_Destroy,
 	.Redraw 	= Renderer_RichText_Redraw,
 	.HandleMessage	= Renderer_RichText_HandleMessage,
 	.nIPCHandlers = N_IPC_RICHTEXT,
@@ -83,6 +87,23 @@ tWindow *Renderer_RichText_Create(int Flags)
 	return ret;
 }
 
+void Renderer_RichText_Destroy(tWindow *Window)
+{
+	tRichText_Window	*info = Window->RendererInfo;
+
+	// TODO: Is locking needed? WM_Destroy should have taken us off the render tree
+	while( info->FirstLine )
+	{
+		tRichText_Line *line = info->FirstLine;
+		info->FirstLine = line->Next;
+
+		free(line);
+	}
+
+	if( info->Font )
+		_SysDebug("RichText_Destroy - TODO: Free font");
+}
+
 static inline int Renderer_RichText_RenderText_Act(tWindow *Window, tRichText_Window *info, int X, int Row, const char *Text, int Bytes, tColour FG, tColour BG, int Flags)
 {
 	 int	rwidth;
@@ -182,7 +203,6 @@ void Renderer_RichText_RenderText(tWindow *Window, int Line, const char *Text)
 void Renderer_RichText_Redraw(tWindow *Window)
 {
 	tRichText_Window	*info = Window->RendererInfo;
-	 int	i;
 	tRichText_Line	*line = info->FirstVisLine;
 	
 	if( !line ) {
@@ -194,36 +214,98 @@ void Renderer_RichText_Redraw(tWindow *Window)
 	while( line && line->Prev && line->Prev->Num > info->FirstVisRow )
 		line = line->Prev;
 
+	 int	i;
 	for( i = 0; i < info->DispLines && line; i ++ )
 	{
 		if( i >= info->nLines - info->FirstVisRow )
 			break;
-		// TODO: Dirty rectangles?
+		// Empty line is noted by a discontinuity
+		if( line->Num > info->FirstVisRow + i ) {
+			// Clear line if window needs full redraw
+			if( info->bNeedsFullRedraw ) {
+				WM_Render_FillRect(Window,
+					0, i*info->LineHeight,
+					Window->W, info->LineHeight,
+					info->DefaultBG
+					);
+			}
+			else {
+				// Hack to clear cursor on NULL lines
+				WM_Render_FillRect(Window,
+					0, i*info->LineHeight,
+					1, info->LineHeight,
+					info->DefaultBG
+					);
+			}
+			continue ;
+		}
+
+		if( info->bNeedsFullRedraw || !line->bIsClean )
+		{
+			WM_Render_FillRect(Window,
+				0, i*info->LineHeight,
+				Window->W, info->LineHeight,
+				info->DefaultBG
+				);
+			
+			// Formatted text out
+			Renderer_RichText_RenderText(Window, i, line->Data);
+			_SysDebug("RichText: %p - Render %i '%.*s'", Window,
+				line->Num, line->ByteLength, line->Data);
+			line->bIsClean = 1;
+		}
+
+		line = line->Next;
+	}
+	// Clear out lines i to info->DispLines-1
+	if( info->bNeedsFullRedraw )
+	{
+		_SysDebug("RichText: %p - Clear %i px lines with %06x starting at %i",
+			Window, (info->DispLines-i)*info->LineHeight, info->DefaultBG, i*info->LineHeight);
 		WM_Render_FillRect(Window,
 			0, i*info->LineHeight,
-			Window->W, info->LineHeight,
+			Window->W, (info->DispLines-i)*info->LineHeight,
 			info->DefaultBG
 			);
-		if( line->Num > info->FirstVisRow + i )
-			continue ;
-		// TODO: Horizontal scrolling?
-		// TODO: Formatting
-		
-		// Formatted text out
-		Renderer_RichText_RenderText(Window, i, line->Data);
-		_SysDebug("RichText: %p - Render %i '%.*s'", Window,
-			line->Num, line->ByteLength, line->Data);
+	}
+	info->bNeedsFullRedraw = 0;
 
-		line = line->Next;
+	// HACK: Hardcoded text width of 8
+	info->DispCols = Window->W / 8;	
+
+	// Text cursor
+	_SysDebug("Cursor at %i,%i", info->CursorCol, info->CursorRow);
+	_SysDebug(" Range [%i+%i],[%i+%i]", info->FirstVisRow, info->DispLines, info->FirstVisCol, info->DispCols);
+	if( info->CursorRow >= info->FirstVisRow && info->CursorRow < info->FirstVisRow + info->DispLines )
+	{
+		if( info->CursorCol >= info->FirstVisCol && info->CursorCol < info->FirstVisCol + info->DispCols )
+		{
+			// TODO: Kill hardcoded 8 with cached text distance
+			WM_Render_FillRect(Window,
+				(info->CursorCol - info->FirstVisCol) * 8,
+				(info->CursorRow - info->FirstVisRow) * info->LineHeight,
+				1,
+				info->LineHeight,
+				info->DefaultFG
+				);
+		}
 	}
-	// Clear out i -- info->DispLines
-	_SysDebug("RichText: %p - Clear %i px lines with %06x starting at %i",
-		Window, (info->DispLines-i)*info->LineHeight, info->DefaultBG, i*info->LineHeight);
-	WM_Render_FillRect(Window,
-		0, i*info->LineHeight,
-		Window->W, (info->DispLines-i)*info->LineHeight,
-		info->DefaultBG
-		);
+}
+
+tRichText_Line *Renderer_RichText_int_GetLine(tWindow *Window, int LineNum, tRichText_Line **Prev)
+{
+	tRichText_Window	*info = Window->RendererInfo;
+	tRichText_Line	*line = info->FirstLine;
+	tRichText_Line	*prev = NULL;
+	while(line && line->Num < LineNum)
+		prev = line, line = line->Next;
+	
+	if( Prev )
+		*Prev = prev;
+	
+	if( !line || line->Num > LineNum )
+		return NULL;
+	return line;
 }
 
 int Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void *Data)
@@ -241,6 +323,22 @@ int Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void
 	case _ATTR_DEFFG:
 		info->DefaultFG = msg->Value;
 		break;
+	case _ATTR_CURSORPOS: {
+		 int	newRow = msg->Value >> 12;
+		 int	newCol = msg->Value & 0xFFF;
+		// Force redraw of old and new row
+		tRichText_Line	*line = Renderer_RichText_int_GetLine(Window, info->CursorRow, NULL);
+		if( line )
+			line->bIsClean = 0;
+		if( newRow != info->CursorRow ) {
+			line = Renderer_RichText_int_GetLine(Window, newRow, NULL);
+			if(line)
+				line->bIsClean = 0;
+		}
+		info->CursorRow = newRow;
+		info->CursorCol = newCol;
+		WM_Invalidate(Window, 1);
+		break; }
 	case _ATTR_SCROLL:
 		// TODO: Set scroll flag
 		break;
@@ -259,18 +357,16 @@ int Renderer_RichText_HandleIPC_WriteLine(tWindow *Window, size_t Len, const voi
 	if( Len < sizeof(*msg) )	return -1;
 	if( msg->Line >= info->nLines )	return 1;	// Bad count
 
-	tRichText_Line	*line = info->FirstLine;
 	tRichText_Line	*prev = NULL;
-	while(line && line->Num < msg->Line)
-		prev = line, line = line->Next;
-	if( !line || line->Num > msg->Line )
+	tRichText_Line	*line = Renderer_RichText_int_GetLine(Window, msg->Line, &prev);
+	if( !line )
 	{
 		// New line!
 		// Round up to 32
 		 int	space = ((Len - sizeof(*msg)) + 32-1) & ~(32-1);
 		tRichText_Line	*new = malloc(sizeof(*line) + space);
 		// TODO: Bookkeeping on how much memory each window uses
-		new->Next = line;
+		new->Next = (prev ? prev->Next : NULL);
 		new->Prev = prev;
 		new->Num = msg->Line;
 		new->Space = space;
@@ -298,8 +394,11 @@ int Renderer_RichText_HandleIPC_WriteLine(tWindow *Window, size_t Len, const voi
 	}
 	line->ByteLength = Len - sizeof(*msg);
 	memcpy(line->Data, msg->LineData, Len - sizeof(*msg));
-	
-	return  0;
+	line->bIsClean = 0;
+
+//	WM_Invalidate(Window, 1);
+
+	return 0;
 }
 
 int Renderer_RichText_HandleMessage(tWindow *Target, int Msg, int Len, const void *Data)
@@ -311,7 +410,12 @@ int Renderer_RichText_HandleMessage(tWindow *Target, int Msg, int Len, const voi
 		const struct sWndMsg_Resize *msg = Data;
 		if(Len < sizeof(*msg))	return -1;
 		info->DispLines = msg->H / info->LineHeight;
+		info->bNeedsFullRedraw = 1;	// force full rerender
 		return 1; }
+	case WNDMSG_KEYDOWN:
+	case WNDMSG_KEYUP:
+	case WNDMSG_KEYFIRE:
+		return 1;
 	}
 	return 0;
 }