berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

textbox: fix insertion bug

This commit is contained in:
nakst 2022-02-11 00:01:47 +00:00
parent 6ebaf3ac82
commit 2f4adc3436
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/api_tests.cpp
View File

@ -496,6 +496,14 @@ bool TextboxEditOperations() {
EsRandomSeed(10); EsRandomSeed(10);
EsTextboxSetUndoManager(textbox, textbox->instance->undoManager); EsTextboxSetUndoManager(textbox, textbox->instance->undoManager);
CHECK(Insert(0, EsLiteral("hello\n\t\t\ttest\n\t\t\tworld")));
CHECK(Insert(13, EsLiteral("\n")));
CHECK(Insert(14, EsLiteral("\t\t\t")));
CHECK(Insert(26, EsLiteral("\n")));
CHECK(Insert(27, EsLiteral("\t\t\t")));
CHECK(Insert(30, EsLiteral("\n")));
CHECK(Insert(31, EsLiteral("\t\t\t")));
char *initialText = (char *) EsHeapAllocate(100000, false); char *initialText = (char *) EsHeapAllocate(100000, false);
for (uintptr_t i = 0; i < 100000; i++) initialText[i] = EsRandomU8() < 0x40 ? '\n' : ((EsRandomU8() % 26) + 'a'); for (uintptr_t i = 0; i < 100000; i++) initialText[i] = EsRandomU8() < 0x40 ? '\n' : ((EsRandomU8() % 26) + 'a');
CHECK(Insert(0, initialText, 100000)); CHECK(Insert(0, initialText, 100000));

15
desktop/textbox.cpp
View File

@ -843,10 +843,10 @@ void TextboxUndoItemCallback(const void *item, EsUndoManager *manager, EsMessage
void EsTextboxInsert(EsTextbox *textbox, const char *string, ptrdiff_t stringBytes, bool sendUpdatedMessage) { void EsTextboxInsert(EsTextbox *textbox, const char *string, ptrdiff_t stringBytes, bool sendUpdatedMessage) {
EsMessageMutexCheck(); EsMessageMutexCheck();
// EsPrint("EsTextboxInsert \"%s\" at %d:%d->%d:%d.\n",
// stringBytes, string, textbox->carets[0].line, textbox->carets[0].byte, textbox->carets[1].line, textbox->carets[1].byte);
#if 0 #if 0
EsPrint("EsTextboxInsert \"%s\" at %d:%d->%d:%d.\n",
stringBytes, string, textbox->carets[0].line, textbox->carets[0].byte, textbox->carets[1].line, textbox->carets[1].byte);
for (uintptr_t i = 0; i < textbox->lines.Length(); i++) { for (uintptr_t i = 0; i < textbox->lines.Length(); i++) {
EsPrint("line %d %d '%s'\n", i, textbox->lines[i].lengthBytes, textbox->lines[i].lengthBytes, GET_BUFFER(&textbox->lines[i])); EsPrint("line %d %d '%s'\n", i, textbox->lines[i].lengthBytes, textbox->lines[i].lengthBytes, GET_BUFFER(&textbox->lines[i]));
} }
@ -992,9 +992,6 @@ void EsTextboxInsert(EsTextbox *textbox, const char *string, ptrdiff_t stringByt
TextboxCaret insertionPoint = textbox->carets[0]; TextboxCaret insertionPoint = textbox->carets[0];
DocumentLine *line = &textbox->lines[insertionPoint.line]; DocumentLine *line = &textbox->lines[insertionPoint.line];
int32_t lineByteOffset = line->offset,
offsetIntoLine = insertionPoint.byte,
byteOffset = offsetIntoLine + lineByteOffset;
// Step 1: Count the number of newlines in the input string. // Step 1: Count the number of newlines in the input string.
@ -1024,6 +1021,7 @@ void EsTextboxInsert(EsTextbox *textbox, const char *string, ptrdiff_t stringByt
// Step 2: Update the active line buffer. // Step 2: Update the active line buffer.
TextboxSetActiveLine(textbox, insertionPoint.line); TextboxSetActiveLine(textbox, insertionPoint.line);
int32_t offsetIntoLine = insertionPoint.byte;
TextboxBufferResize((void **) &textbox->activeLine, &textbox->activeLineAllocated, (textbox->activeLineBytes += bytesToInsert), 1); TextboxBufferResize((void **) &textbox->activeLine, &textbox->activeLineAllocated, (textbox->activeLineBytes += bytesToInsert), 1);
EsMemoryMove(textbox->activeLine + offsetIntoLine, textbox->activeLine + line->lengthBytes, bytesToInsert, false); EsMemoryMove(textbox->activeLine + offsetIntoLine, textbox->activeLine + line->lengthBytes, bytesToInsert, false);
@ -1061,6 +1059,11 @@ void EsTextboxInsert(EsTextbox *textbox, const char *string, ptrdiff_t stringByt
// Step 2: Make room in the buffer for the contents of the string. // Step 2: Make room in the buffer for the contents of the string.
TextboxSetActiveLine(textbox, -1); TextboxSetActiveLine(textbox, -1);
int32_t lineByteOffset = line->offset,
offsetIntoLine = insertionPoint.byte,
byteOffset = offsetIntoLine + lineByteOffset;
TextboxBufferResize((void **) &textbox->data, &textbox->dataAllocated, textbox->dataBytes + bytesToInsert, 1); TextboxBufferResize((void **) &textbox->data, &textbox->dataAllocated, textbox->dataBytes + bytesToInsert, 1);
EsMemoryMove(textbox->data + byteOffset, textbox->data + textbox->dataBytes, bytesToInsert, false); EsMemoryMove(textbox->data + byteOffset, textbox->data + textbox->dataBytes, bytesToInsert, false);
textbox->dataBytes += bytesToInsert; textbox->dataBytes += bytesToInsert;