insertion working better

Author: OverPoweredDev

editor/Content.cpp

@@ -1,10 +1,30 @@
 #include "Content.h"
 
+//constructor
 Content::Content(Document *doc, Cursor *cur) {
     this->document = doc;
     this->cursor = cur;
 }
 
+//renderDocument
+void Content::renderDocument(TTF_Font *font, SDL_Color color, SDL_Renderer *renderer) {
+    char *line;
+    int height = TTF_FontHeight(font);
+    for (int i = 0; i < document->getLineCount(); i++) {
+        line = document->getLine(i);
+        int texW = 0;
+        int texH = 0;
+        SDL_Surface *surface = TTF_RenderText_Solid(font, line, color);
+        SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
+
+        SDL_QueryTexture(texture, NULL, NULL, &texW, &texH);
+        SDL_Rect rect = {OFFSET_X, i * height, texW, texH};
+
+        SDL_RenderCopy(renderer, texture, NULL, &rect);
+    }
+}
+
+//shift Cursor
 void Content::shiftLeft() {
     if (cursor->x > OFFSET_X) {
         cursor->x -= cursor->charWidth;

editor/Content.h

@@ -13,6 +13,9 @@ class Content {
 public:
     Content(Document *doc, Cursor *cur);
 
+    //rendering
+    void renderDocument(TTF_Font *font, SDL_Color color, SDL_Renderer *renderer);
+
     //cursor shifting
     void shiftUp();
     void shiftDown();

editor/Document.cpp

@@ -16,8 +16,8 @@ void Document::init(string filename) {
     lineBuffer = (char **) malloc(lineCount * sizeof(char *));
 
     for (int i = 0; i < lineCount; i++) {
-        lineBuffer[i] = (char *) malloc(80 * sizeof(char));
-        memset(lineBuffer[i], ' ', 80 * sizeof(char));
+        lineBuffer[i] = (char *) malloc(LINE_LIMIT * sizeof(char));
+        memset(lineBuffer[i], ' ', LINE_LIMIT * sizeof(char));
     }
 
     //reset cursor
@@ -69,8 +69,8 @@ void Document::createLine(int lineNum, int numLines) {
 
     //allocate memory for empty lines
     for (int i = prevCount; i < lineCount; i++) {
-        lineBuffer[i] = (char *) malloc(80 * sizeof(char));
-        memset(lineBuffer[i], ' ', 80 * sizeof(char));
+        lineBuffer[i] = (char *) malloc(LINE_LIMIT * sizeof(char));
+        memset(lineBuffer[i], ' ', LINE_LIMIT * sizeof(char));
     }
 
     //shift any existing lines down
@@ -81,18 +81,20 @@ void Document::createLine(int lineNum, int numLines) {
 
 void Document::shiftLineDown(int lineNum) {
     lineBuffer[lineNum + 1] = lineBuffer[lineNum];
-    memset(lineBuffer[lineNum], ' ', 80 * sizeof(char));
+    memset(lineBuffer[lineNum], ' ', LINE_LIMIT * sizeof(char));
 }
 
 void Document::insertPos(int lineNum, int charNum, char c) {
     if (isValid(c))
-        lineBuffer[lineNum][charNum] = c;
+        for (int i = LINE_LIMIT; i >= charNum; i--)
+            lineBuffer[lineNum][i + 1] = lineBuffer[lineNum][i];
+    lineBuffer[lineNum][charNum] = c;
 }
 
 void Document::deletePos(int lineNum, int charNum) {
-    for(int i = charNum+1; i < 80; i++)
-        lineBuffer[lineNum][i-1] = lineBuffer[lineNum][i];
-    lineBuffer[lineNum][80] = ' ';
+    for (int i = charNum + 1; i < LINE_LIMIT; i++)
+        lineBuffer[lineNum][i - 1] = lineBuffer[lineNum][i];
+    lineBuffer[lineNum][LINE_LIMIT] = ' ';
 }
 
 

editor/Utility.h

@@ -17,7 +17,7 @@
 typedef uint32_t u32;
 
 static bool isValid(char c) {
-    if (c >= '!' && c <= '~')
+    if ((c >= '!' && c <= '~') || c == ' ')
         return true;
     return false;
 }

main.cpp

@@ -5,22 +5,7 @@
 
 using namespace std;
 
-void printLines(Document doc, TTF_Font *font, SDL_Color color, SDL_Renderer *renderer) {
-    char *line;
-    int height = TTF_FontHeight(font);
-    for (int i = 0; i < doc.getLineCount(); i++) {
-        line = doc.getLine(i);
-        int texW = 0;
-        int texH = 0;
-        SDL_Surface *surface = TTF_RenderText_Solid(font, line, color);
-        SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
-
-        SDL_QueryTexture(texture, NULL, NULL, &texW, &texH);
-        SDL_Rect rect = {OFFSET_X, i * height, texW, texH};
-
-        SDL_RenderCopy(renderer, texture, NULL, &rect);
-    }
-}
+
 
 int main(int argc, char *argv[]) {
 /*==========< SDL Init >==============================================================================================*/
@@ -66,7 +51,6 @@ int main(int argc, char *argv[]) {
 /*======< Create SDL Window>==========================================================================================*/
 
     bool done = false;
-    int frameNum = 0;
     char ascii;
     while (!done) {
         SDL_Event event;
@@ -93,8 +77,7 @@ int main(int argc, char *argv[]) {
                         document.saveFile("output.txt");
                         break;
                     case SDLK_ENTER:
-                        document.createLine(currLine, 1);
-                        content.shiftPos(++currLine,0);
+                        content.shiftDown();
                         break;
                     case SDLK_UP:
                         content.shiftUp();
@@ -129,7 +112,7 @@ int main(int argc, char *argv[]) {
 
             cursor.fill(screenPixels);
             SDL_RenderCopy(renderer, screen, NULL, NULL);
-            printLines(document, font, color, renderer);
+            content.renderDocument(font, color, renderer);
             SDL_RenderPresent(renderer);
 
             SDL_Delay(10);

output.txt

@@ -1,5 +1,20 @@
-hello world
+a  is this working                                                               
+b                 idk man                                                       `
+c                                                                               �G�U
+d                                                                               ��7
+e
+f                                                                               
+                                                                                
 
 
 
+                                                                                
+
+                                                                                
+
+   hello                                                                        
+
+                                                                                
+
+