navigating between editors now supported, ctrl c, v and x no longer working

Author: vision-05

src/Core/datatypes.cpp

@@ -10,7 +10,7 @@ better::Text better::updateText(better::Text textEdit, char newChar) {
     bool endOfLine {textEdit.cursor.column == textEdit.textEdit[textEdit.cursor.row].size()};
     bool endOfScreen {textEdit.cursor.column + 1 >= textEdit.topColumnNumber + textWidth};
     immer::flex_vector<char> line {endOfLine ? textEdit.textEdit[textEdit.cursor.row].push_back(newChar) : textEdit.textEdit[textEdit.cursor.row].insert(textEdit.cursor.column, newChar)}; //add the character to the line (change to insert unless the cursor is at the end of the line)
-    better::Text tempText {textEdit.textEdit.set(textEdit.cursor.row,line),{textEdit.cursor.row, textEdit.cursor.column + 1}, {{false,false,false,false},textEdit.data.isShift,textEdit.data.isCaps,textEdit.data.isScroll,textEdit.data.isCtrl,textEdit.data.clearHistory,-1,textEdit.data.menu,textEdit.data.filename,textEdit.data.textHeight,textEdit.data.textWidth}, textEdit.topLineNumber, endOfScreen ? textEdit.topColumnNumber + 1 : textEdit.topColumnNumber, textEdit.highlightStart, textEdit.highlightEnd};
+    better::Text tempText {textEdit.textEdit.set(textEdit.cursor.row,line),{textEdit.cursor.row, textEdit.cursor.column + 1}, {{false,false,false,false},textEdit.data.isShift,textEdit.data.isCaps,textEdit.data.isScroll,textEdit.data.isCtrl,textEdit.data.clearHistory,textEdit.data.switchEditor,-1,textEdit.data.menu,textEdit.data.filename,textEdit.data.textHeight,textEdit.data.textWidth}, textEdit.topLineNumber, endOfScreen ? textEdit.topColumnNumber + 1 : textEdit.topColumnNumber, textEdit.highlightStart, textEdit.highlightEnd};
     return tempText;
 }
 
@@ -38,12 +38,12 @@ better::Text better::backspace(better::Text text) { //couple of bugs with backsp
                 topColumnNo = colNo - textWidth;
             }
             newLine = text.textEdit[text.cursor.row - 1] + text.textEdit[text.cursor.row];
-            return {text.textEdit.erase(text.cursor.row).set(text.cursor.row - 1, newLine), {text.cursor.row - 1, colNo}, {{false,false,false,false},text.data.isShift,text.data.isCaps,text.data.isScroll,text.data.isCtrl,text.data.clearHistory,-1,text.data.menu,text.data.filename,text.data.textHeight,text.data.textWidth}, text.cursor.row >= text.textEdit.size() - 1 ? text.topLineNumber - 1 : text.topLineNumber, topColumnNo, text.highlightStart, text.highlightEnd};
+            return {text.textEdit.erase(text.cursor.row).set(text.cursor.row - 1, newLine), {text.cursor.row - 1, colNo}, {{false,false,false,false},text.data.isShift,text.data.isCaps,text.data.isScroll,text.data.isCtrl,text.data.clearHistory,text.data.switchEditor,-1,text.data.menu,text.data.filename,text.data.textHeight,text.data.textWidth}, text.cursor.row >= text.textEdit.size() - 1 ? text.topLineNumber - 1 : text.topLineNumber, topColumnNo, text.highlightStart, text.highlightEnd};
         }
-        return {text.textEdit.erase(text.cursor.row), {text.cursor.row - 1, static_cast<int>(text.textEdit[text.cursor.row - 1].size())}, {{false,false,false,false},text.data.isShift,text.data.isCaps,text.data.isScroll,text.data.isCtrl,text.data.clearHistory,-1,text.data.menu,text.data.filename,text.data.textHeight,text.data.textWidth}, text.cursor.row >= text.textEdit.size() - 1 ? text.topLineNumber - 1 : text.topLineNumber, text.topColumnNumber, text.highlightStart, text.highlightEnd};
+        return {text.textEdit.erase(text.cursor.row), {text.cursor.row - 1, static_cast<int>(text.textEdit[text.cursor.row - 1].size())}, {{false,false,false,false},text.data.isShift,text.data.isCaps,text.data.isScroll,text.data.isCtrl,text.data.clearHistory,text.data.switchEditor,-1,text.data.menu,text.data.filename,text.data.textHeight,text.data.textWidth}, text.cursor.row >= text.textEdit.size() - 1 ? text.topLineNumber - 1 : text.topLineNumber, text.topColumnNumber, text.highlightStart, text.highlightEnd};
     }
 
-    return {text.textEdit.set(text.cursor.row,newLine), {text.cursor.row, text.cursor.column - 1}, {{false,false,false,false},text.data.isShift,text.data.isCaps,text.data.isScroll,text.data.isCtrl,text.data.clearHistory,-1,text.data.menu,text.data.filename,text.data.textHeight,text.data.textWidth}, text.topLineNumber, text.topColumnNumber, text.highlightStart, text.highlightEnd};
+    return {text.textEdit.set(text.cursor.row,newLine), {text.cursor.row, text.cursor.column - 1}, {{false,false,false,false},text.data.isShift,text.data.isCaps,text.data.isScroll,text.data.isCtrl,text.data.clearHistory,text.data.switchEditor,-1,text.data.menu,text.data.filename,text.data.textHeight,text.data.textWidth}, text.topLineNumber, text.topColumnNumber, text.highlightStart, text.highlightEnd};
 }
 
 better::Text better::newLine(better::Text textEdit) { //create cases for the following: newline at start of line, newline at end of line, newline in middle of line, newline at end of text
@@ -55,7 +55,7 @@ better::Text better::newLine(better::Text textEdit) { //create cases for the fol
     bool endOfText {textEdit.cursor.row == textEdit.textEdit.size() - 1 ? true : false};
     bool textSizeRightSize {textEdit.textEdit.size() > (textHeight - 1) ? true : false}; //if end of text make sure to not just append a new row
 
-    better::Text newText {endOfText ? textEdit.textEdit.set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)).push_back(textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)) : textEdit.textEdit.insert(textEdit.cursor.row + 1, textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)).set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)), {textEdit.cursor.row + 1, 0}, {{false,false,false,false},textEdit.data.isShift,textEdit.data.isCaps,textEdit.data.isScroll,textEdit.data.isCtrl,textEdit.data.clearHistory,-1,textEdit.data.menu,textEdit.data.filename,textEdit.data.textHeight,textEdit.data.textWidth}, endOfText ? (textSizeRightSize ? textEdit.topLineNumber + 1 : 0) : textEdit.topLineNumber, 0, textEdit.highlightStart, textEdit.highlightEnd}; //insert newline unless at bottom
+    better::Text newText {endOfText ? textEdit.textEdit.set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)).push_back(textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)) : textEdit.textEdit.insert(textEdit.cursor.row + 1, textEdit.textEdit[textEdit.cursor.row].drop(textEdit.cursor.column)).set(textEdit.cursor.row, textEdit.textEdit[textEdit.cursor.row].take(textEdit.cursor.column)), {textEdit.cursor.row + 1, 0}, {{false,false,false,false},textEdit.data.isShift,textEdit.data.isCaps,textEdit.data.isScroll,textEdit.data.isCtrl,textEdit.data.clearHistory,textEdit.data.switchEditor,-1,textEdit.data.menu,textEdit.data.filename,textEdit.data.textHeight,textEdit.data.textWidth}, endOfText ? (textSizeRightSize ? textEdit.topLineNumber + 1 : 0) : textEdit.topLineNumber, 0, textEdit.highlightStart, textEdit.highlightEnd}; //insert newline unless at bottom
     int prevIndent {better::getPreviousIndentLevel(textEdit, textEdit.cursor.row)};
     texts.push_back(newText);
     for(int i{}; i < prevIndent; ++i) {
@@ -73,10 +73,10 @@ better::charMapArr better::makeCharMapArr(::Uint8 charArray[16]) {
     return tempArr;
 }
 
-better::Cursor better::findCursorPos(int topLine, int topColumn, SDL_Event event) { //make sure to fix for screen bigger than size of lines
+better::Cursor better::findCursorPos(int topLine, int topColumn, SDL_Event event, int columnOffset) { //change this to switch between different editors in splitscreen
     int relativeColumn {static_cast<int>(event.button.x / 8)};
     int relativeRow {static_cast<int>(event.button.y / 16) - 1};
-    return better::Cursor {relativeRow + topLine, relativeColumn + topColumn};
+    return better::Cursor {relativeRow + topLine, relativeColumn + topColumn - static_cast<int>(columnOffset / 8)};
 }
 
 Uint8 better::getRed(Uint32 color) {

src/Core/datatypes.hpp

@@ -16,7 +16,7 @@ struct Cursor { //store the line number and column number of the cursor
     int column;
 };
 
-better::Cursor findCursorPos(int topLine, int topColumn, SDL_Event event);
+better::Cursor findCursorPos(int topLine, int topColumn, SDL_Event event, int columnOffset);
 
 struct editorData {
     bool menusToDraw[4] = {false, false, false, false};
@@ -25,6 +25,7 @@ struct editorData {
     bool isScroll {false};
     bool isCtrl {false};
     bool clearHistory {false};
+    int switchEditor {0};
     int index {-1};
     std::vector<std::string> menu;
     std::string filename;

src/Core/fileUtils.cpp

@@ -87,8 +87,8 @@ std::filesystem::path better::fileDialog() {
     text.data.textWidth = 100;
 
     SDL_FillRect(surface, NULL, SDL_MapRGBA(surface->format, 0x22, 0x22, 0x22, 0xFF));
-    better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF);
-    better::drawMenuBar(surface, menu, 0xDDDDDDFF, 0x666666FF, 800);
+    better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF, 0);
+    better::drawMenuBar(surface, menu, 0xDDDDDDFF, 0x666666FF, 800, 0);
     SDL_UpdateWindowSurface(window);
     SDL_FillRect(surface, &screen, SDL_MapRGBA(surface->format, 0x22, 0x22, 0x22, 0xFF));
 
@@ -103,12 +103,12 @@ std::filesystem::path better::fileDialog() {
                 text.topLineNumber = newText.topLineNumber;
                 text.topColumnNumber = newText.topColumnNumber;
                 text.data.isScroll = true;
-                better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF);
+                better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF, 0);
                 SDL_UpdateWindowSurface(window);
                 SDL_FillRect(surface, &screen, SDL_MapRGBA(surface->format, 0x22, 0x22, 0x22, 0xFF));
             }
             else if(event.type == SDL_MOUSEBUTTONDOWN) {
-                text.cursor = better::findCursorPos(text.topLineNumber, text.topColumnNumber, event);
+                text.cursor = better::findCursorPos(text.topLineNumber, text.topColumnNumber, event, 0);
                 if((text.cursor.row > text.textEdit.size() - 1) && text.cursor.row > -1) {
                     continue;
                 }
@@ -144,7 +144,7 @@ std::filesystem::path better::fileDialog() {
                         text.topColumnNumber = 0;
                         text.topLineNumber = 0;
 
-                        better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF);
+                        better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF, 0);
                         SDL_UpdateWindowSurface(window);
                         SDL_FillRect(surface, &screen, SDL_MapRGBA(surface->format, 0x22, 0x22, 0x22, 0xFF));
                         continue;
@@ -180,7 +180,7 @@ std::filesystem::path better::fileDialog() {
                     text.topColumnNumber = 0;
                     text.topLineNumber = 0;
 
-                    better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF);
+                    better::renderText(surface, text.textEdit, text.topLineNumber, text.topColumnNumber, 35, 100, text.highlightStart, text.highlightEnd, 0x222222FF, 0x5588AAFF, 0x222222FF, 0x5588AAFF, 0x5588AAFF, 0);
                     SDL_UpdateWindowSurface(window);
                     SDL_FillRect(surface, &screen, SDL_MapRGBA(surface->format, 0x22, 0x22, 0x22, 0xFF));
                 }