X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Frenderers%2Frichtext.c;h=edf3c7dea1ca9c2303471c543e00f19268cc2877;hb=16a06e033161374724932f90ebd8be420b4c4b91;hp=c62dd7f525822dabdc1ff5c5e5272bb639c91368;hpb=be5123fe1f4aa66b76ce8ef589362ad21b6bbf72;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 c62dd7f5..edf3c7de 100644 --- a/Usermode/Applications/axwin3_src/WM/renderers/richtext.c +++ b/Usermode/Applications/axwin3_src/WM/renderers/richtext.c @@ -11,8 +11,12 @@ #include #include // sscanf #include // memcpy +#include // ReadUTF8 +#include +#include #define LINES_PER_BLOCK 30 +#define LINE_SPACE_UNIT 32 // Must be a power of two // === TYPES === typedef struct sRichText_Line @@ -20,6 +24,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; @@ -33,9 +38,16 @@ typedef struct sRichText_Window int CursorRow, CursorCol; tRichText_Line *FirstLine; tRichText_Line *FirstVisLine; + tColour DefaultFG; tColour DefaultBG; tFont *Font; + int Flags; + + char bNeedsFullRedraw; + + tRichText_Line *CursorLine; + int CursorBytePos; // Recalculated on cursor update short LineHeight; } tRichText_Window; @@ -43,21 +55,25 @@ 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); + int Renderer_RichText_HandleIPC_ScrollRange(tWindow *Window, size_t Len, const void *Data); int Renderer_RichText_HandleMessage(tWindow *Target, int Msg, int Len, const void *Data); // === GLOBALS === 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, .IPCHandlers = { [IPC_RICHTEXT_SETATTR] = Renderer_RichText_HandleIPC_SetAttr, - [IPC_RICHTEXT_WRITELINE] = Renderer_RichText_HandleIPC_WriteLine + [IPC_RICHTEXT_WRITELINE] = Renderer_RichText_HandleIPC_WriteLine, + [IPC_RICHTEXT_SCROLLRANGE] = Renderer_RichText_HandleIPC_ScrollRange } }; @@ -74,6 +90,7 @@ tWindow *Renderer_RichText_Create(int Flags) tWindow *ret = WM_CreateWindowStruct( sizeof(*info) ); if(!ret) return NULL; info = ret->RendererInfo; + info->Flags = Flags; // Initialise font (get an idea of dimensions) int h; @@ -83,6 +100,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; @@ -101,8 +135,9 @@ static inline int Renderer_RichText_RenderText_Act(tWindow *Window, tRichText_Wi return rwidth; } -void Renderer_RichText_RenderText(tWindow *Window, int Line, const char *Text) +void Renderer_RichText_RenderText(tWindow *Window, int LineNum, tRichText_Line *Line) { + const char *Text = Line->Data; tRichText_Window *info = Window->RendererInfo; tColour fg = info->DefaultFG; tColour bg = info->DefaultBG; @@ -111,7 +146,7 @@ void Renderer_RichText_RenderText(tWindow *Window, int Line, const char *Text) int curx = 0; const char *oldtext = Text; - for( int i = 0; curx < Window->W; i ++ ) + for( int i = 0; curx < Window->W && Text < oldtext + Line->ByteLength; i ++ ) { char ch, flags; int len; @@ -128,7 +163,7 @@ void Renderer_RichText_RenderText(tWindow *Window, int Line, const char *Text) if( bRender ) { // Render previous characters - curx += Renderer_RichText_RenderText_Act(Window, info, curx, Line, + curx += Renderer_RichText_RenderText_Act(Window, info, curx, LineNum, oldtext, Text - oldtext - 1, fg, bg, flagset); if( curx >= Window->W ) break; @@ -174,15 +209,14 @@ void Renderer_RichText_RenderText(tWindow *Window, int Line, const char *Text) } } curx += Renderer_RichText_RenderText_Act(Window, info, curx, - Line, oldtext, Text - oldtext + 1, fg, bg, flagset); - WM_Render_DrawRect(Window, curx, Line * info->LineHeight, + LineNum, oldtext, Text - oldtext, fg, bg, flagset); + WM_Render_DrawRect(Window, curx, LineNum * info->LineHeight, Window->W - curx, info->LineHeight, info->DefaultBG); } void Renderer_RichText_Redraw(tWindow *Window) { tRichText_Window *info = Window->RendererInfo; - int i; tRichText_Line *line = info->FirstVisLine; if( !line ) { @@ -194,57 +228,109 @@ 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); + _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); - - line = line->Next; } - // 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 - ); + info->bNeedsFullRedraw = 0; - // HACK! + // HACK: Hardcoded text width of 8 info->DispCols = Window->W / 8; - // TODO: Text cursor + // 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->CursorRow >= info->FirstVisRow && info->CursorRow < info->FirstVisRow + info->DispLines + && 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 + ); + } +} + +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; +} + +void Renderer_RichText_int_UpdateCursorOfs(tRichText_Window *Info) +{ + tRichText_Line *line = Info->CursorLine; + size_t ofs = 0; + if( line ) { - if( info->CursorCol >= info->FirstVisCol && info->CursorCol < info->FirstVisCol + info->DispCols ) + for( int i = 0; i < Info->CursorCol && ofs < line->ByteLength; i ++ ) { - // 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 - ); + ofs += ReadUTF8(line->Data + ofs, NULL); } } + Info->CursorBytePos = ofs; } int Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void *Data) @@ -262,10 +348,24 @@ int Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void case _ATTR_DEFFG: info->DefaultFG = msg->Value; break; - case _ATTR_CURSORPOS: - info->CursorRow = msg->Value >> 12; - info->CursorCol = msg->Value & 0xFFF; - 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; + info->CursorLine = line; + Renderer_RichText_int_UpdateCursorOfs(info); + WM_Invalidate(Window, 1); + break; } case _ATTR_SCROLL: // TODO: Set scroll flag break; @@ -284,49 +384,208 @@ 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); + size_t data_bytes = Len - sizeof(*msg); + int reqspace = (data_bytes + LINE_SPACE_UNIT-1) & ~(LINE_SPACE_UNIT-1); + tRichText_Line *new = NULL; + 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 = malloc(sizeof(*line) + reqspace); + new->Next = (prev ? prev->Next : NULL); new->Prev = prev; new->Num = msg->Line; - new->Space = space; - if(new->Prev) new->Prev->Next = new; - else info->FirstLine = new; - if(new->Next) new->Next->Prev = new; - line = new; } - else if( line->Space < Len - sizeof(*msg) ) + else if( line->Space < reqspace ) { // Need to allocate more space - int space = ((Len - sizeof(*msg)) + 32-1) & ~(32-1); - tRichText_Line *new = realloc(line, space); + new = realloc(line, sizeof(*line) + reqspace); + } + else + { + // It fits :) + } + if( new ) + { // TODO: Bookkeeping on how much memory each window uses - new->Space = space; - + new->Space = reqspace; if(new->Prev) new->Prev->Next = new; else info->FirstLine = new; if(new->Next) new->Next->Prev = new; line = new; } + line->ByteLength = data_bytes - 1; + memcpy(line->Data, msg->LineData, data_bytes); + line->bIsClean = 0; + + _SysDebug("RichText: %p - Write %i %i'%.*s'", Window, line->Num, line->ByteLength, + line->ByteLength, line->Data); + + if( line->Num == info->CursorRow ) { + info->CursorLine = line; + info->CursorBytePos = MIN(info->CursorBytePos, line->ByteLength); + } + +// WM_Invalidate(Window, 1); + + return 0; +} + +int Renderer_RichText_HandleIPC_ScrollRange(tWindow *Window, size_t Len, const void *Data) +{ + tRichText_Window *info = Window->RendererInfo; + const struct sRichTextIPC_ScrollRange *msg = Data; + if( Len < sizeof(*msg) ) return -1; + + if( msg->First >= info->nLines ) + return 1; // Bad start + if( msg->Count > info->nLines - msg->First ) + return 1; // Bad count + if( msg->Count == 0 ) { + // No-op + return 0; + } + + // Find the range start + tRichText_Line *line = info->FirstLine; + tRichText_Line *prev = NULL; + while( line && line->Num < msg->First ) { + prev = line; + line = line->Next; + } + if( !line ) { + _SysDebug("RichText ScrollRange: Search for %i ran off end, nlines=%i", + msg->First, info->nLines); + } + + if( msg->Count < 0 ) + { + _SysDebug("TODO: RichText ScrollRange -ve"); + } else { - // It fits :) + if( msg->First <= info->FirstVisRow && info->FirstVisRow < msg->First+msg->Range ) + info->FirstVisLine = NULL; + + // Remove 'msg->Count' lines from beginning of the range, ... + while( line && line->Num < msg->First + msg->Count ) + { + tRichText_Line *next = line->Next; + _SysDebug("- RichText ScrollRange: Remove %i '%.*s'", + line->Num, line->ByteLength, line->Data); + free(line); + line = next; + } + // Fix up list + if( prev ) + prev->Next = line; + else + info->FirstLine = line; + if(line) + line->Prev = prev; + // ... and shift ->Num down for the rest + for( ; line && line->Num < msg->First + msg->Range; line = line->Next ) + { + line->Num -= msg->Count; + if( line->Num >= info->FirstVisRow && !info->FirstVisLine ) + info->FirstVisLine = line; + } + + info->nLines -= msg->Count; } - line->ByteLength = Len - sizeof(*msg); - memcpy(line->Data, msg->LineData, Len - sizeof(*msg)); - WM_Invalidate( Window ); + info->bNeedsFullRedraw = 1; - return 0; + return 0; +} + +void Renderer_RichText_HandleKeyFire(tWindow *Window, tRichText_Window *Info, const struct sWndMsg_KeyAction *Msg) +{ + tRichText_Line *line = Info->CursorLine; + size_t len = WriteUTF8(NULL, Msg->UCS32); + switch(Msg->UCS32) + { + case 0: + switch(Msg->KeySym) + { + case KEYSYM_RIGHTARROW: + if( Info->CursorBytePos == line->ByteLength ) + break; + Info->CursorBytePos += ReadUTF8(line->Data + Info->CursorBytePos, NULL); + Info->CursorCol ++; + break; + case KEYSYM_LEFTARROW: + if( Info->CursorBytePos == 0 ) + break; + Info->CursorBytePos -= ReadUTF8Rev(line->Data, Info->CursorBytePos, NULL); + Info->CursorCol --; + break; + case KEYSYM_UPARROW: + _SysDebug("TODO: RichText edit up line"); + break; + case KEYSYM_DOWNARROW: + _SysDebug("TODO: RichText edit down line"); + break; + default: + // No effect + return ; + } + break; + case '\n': // Newline + _SysDebug("TODO: RichText edit newline"); + break; + case '\b': // Backspace + if( Info->CursorBytePos == 0 ) + return ; + len = ReadUTF8Rev(line->Data, Info->CursorBytePos, NULL); + Info->CursorBytePos -= len; + Info->CursorCol --; + if(0) + case '\x7f': // Delete + len = ReadUTF8(line->Data + Info->CursorBytePos, NULL); + if( Info->CursorBytePos == line->ByteLength ) + return ; + memmove(line->Data + Info->CursorBytePos, line->Data + Info->CursorBytePos + len, + line->ByteLength - Info->CursorBytePos - len); + line->ByteLength -= len; + _SysDebug("RichText: %p Backspace/Delete '%.*s'", Window, + line->ByteLength, line->Data); + break; + default: + // Increase buffer size + if( line->ByteLength + len > line->Space ) { + line->Space += LINE_SPACE_UNIT; + tRichText_Line *nl = realloc(line, sizeof(*line) + line->Space); + if( nl == NULL ) + return ; + if( nl != line ) { + *(line->Prev ? &line->Prev->Next : &Info->FirstLine) = nl; + if(line->Next) + line->Next->Prev = nl; + if(Info->FirstVisLine == line) + Info->FirstVisLine = nl; + Info->CursorLine = nl; + line = nl; + } + } + // Shift data + memmove(line->Data + Info->CursorBytePos + len, line->Data + Info->CursorBytePos, + line->ByteLength - Info->CursorBytePos); + // Encode + WriteUTF8(line->Data + Info->CursorBytePos, Msg->UCS32); + Info->CursorBytePos += len; + Info->CursorCol ++; + line->ByteLength += len; + + _SysDebug("RichText: %p Appended %X '%.*s' to line %i", Window, + Msg->UCS32, len, line->Data + Info->CursorBytePos - len, + line->Num); + break; + } + // Invalidate line + line->bIsClean = 0; + WM_Invalidate(Window, 1); } int Renderer_RichText_HandleMessage(tWindow *Target, int Msg, int Len, const void *Data) @@ -338,10 +597,18 @@ 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_KEYFIRE: + if( Len < sizeof(struct sWndMsg_KeyAction) ) + return -1; + if( !(info->Flags & AXWIN3_RICHTEXT_READONLY) ) + { + Renderer_RichText_HandleKeyFire(Target, info, Data); + } + return 1; case WNDMSG_KEYDOWN: case WNDMSG_KEYUP: - case WNDMSG_KEYFIRE: return 1; } return 0;