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=5f31057ad171198ba5528c3c0ad9bb2f16db0e35;hpb=6397a743456a11e9c38b7e2cf46f41b2b7083365;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 5f31057a..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 @@ -34,11 +38,17 @@ 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; @@ -49,6 +59,7 @@ 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 === @@ -61,7 +72,8 @@ tWMRenderer gRenderer_RichText = { .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 } }; @@ -78,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; @@ -122,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; @@ -132,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; @@ -149,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; @@ -195,8 +209,8 @@ 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); } @@ -249,7 +263,7 @@ void Renderer_RichText_Redraw(tWindow *Window) ); // Formatted text out - Renderer_RichText_RenderText(Window, i, line->Data); + Renderer_RichText_RenderText(Window, i, line); _SysDebug("RichText: %p - Render %i '%.*s'", Window, line->Num, line->ByteLength, line->Data); line->bIsClean = 1; @@ -276,19 +290,16 @@ void Renderer_RichText_Redraw(tWindow *Window) // 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 ) { - 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 - ); - } + // 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 + ); } } @@ -308,6 +319,20 @@ tRichText_Line *Renderer_RichText_int_GetLine(tWindow *Window, int LineNum, tRic return line; } +void Renderer_RichText_int_UpdateCursorOfs(tRichText_Window *Info) +{ + tRichText_Line *line = Info->CursorLine; + size_t ofs = 0; + if( line ) + { + for( int i = 0; i < Info->CursorCol && ofs < line->ByteLength; i ++ ) + { + ofs += ReadUTF8(line->Data + ofs, NULL); + } + } + Info->CursorBytePos = ofs; +} + int Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void *Data) { tRichText_Window *info = Window->RendererInfo; @@ -337,6 +362,8 @@ int Renderer_RichText_HandleIPC_SetAttr(tWindow *Window, size_t Len, const void } info->CursorRow = newRow; info->CursorCol = newCol; + info->CursorLine = line; + Renderer_RichText_int_UpdateCursorOfs(info); WM_Invalidate(Window, 1); break; } case _ATTR_SCROLL: @@ -359,48 +386,208 @@ int Renderer_RichText_HandleIPC_WriteLine(tWindow *Window, size_t Len, const voi tRichText_Line *prev = NULL; 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 = 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)); - line->bIsClean = 0; -// WM_Invalidate(Window, 1); + info->bNeedsFullRedraw = 1; 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) { tRichText_Window *info = Target->RendererInfo; @@ -412,9 +599,16 @@ int Renderer_RichText_HandleMessage(tWindow *Target, int Msg, int Len, const voi 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;