got backspace and delete working

Author: OverPoweredDev

editor/Content.cpp

@@ -0,0 +1,44 @@
+#include "Content.h"
+
+Content::Content(Document *doc, Cursor *cur) {
+    this->document = doc;
+    this->cursor = cur;
+}
+
+void Content::shiftLeft() {
+    if (cursor->x > OFFSET_X) {
+        cursor->x -= cursor->charWidth;
+        cursor->charNumber -= 1;
+    }
+}
+
+void Content::shiftRight() {
+    if (cursor->charNumber < LINE_LIMIT && cursor->x < SCREEN_WIDTH) {
+        cursor->x += cursor->charWidth;
+        cursor->charNumber += 1;
+    }
+}
+
+void Content::shiftUp() {
+    if (cursor->y > 0) {
+        cursor->y -= cursor->height;
+        cursor->lineNumber -= 1;
+    }
+}
+
+void Content::shiftDown() {
+    if (cursor->lineNumber < document->lineCount) {
+        cursor->y += cursor->height;
+        cursor->lineNumber += 1;
+    }
+}
+
+void Content::shiftPos(int lineNum, int charNum) {
+    if (charNum < LINE_LIMIT && lineNum < document->lineCount) {
+        cursor->x = OFFSET_X + (cursor->charWidth * charNum);
+        cursor->y = cursor->height * lineNum;
+        cursor->lineNumber = lineNum;
+        cursor->charNumber = charNum;
+    }
+}
+

editor/Content.h

@@ -0,0 +1,29 @@
+#ifndef LOOP_EDITORVIEW_H
+#define LOOP_EDITORVIEW_H
+
+#include "Utility.h"
+#include "Document.h"
+#include "Cursor.h"
+
+class Content {
+private:
+    Document *document;
+    Cursor *cursor;
+
+public:
+    Content(Document *doc, Cursor *cur);
+
+    //cursor shifting
+    void shiftUp();
+    void shiftDown();
+    void shiftLeft();
+    void shiftRight();
+    void shiftPos(int lineNum, int charNum);
+
+    //getters
+    int getCharHeight();
+    int getCharWidth();
+};
+
+
+#endif //LOOP_EDITORVIEW_H

editor/Cursor.cpp

@@ -13,35 +13,11 @@ void Cursor::fill(u32 *screen_pixels) {
     }
 }
 
-void Cursor::shiftLeft() {
-    if (x > OFFSET_X) {
-        this->x -= charWidth;
-        this->charNumber -= 1;
-    }
-}
-
-void Cursor::shiftRight() {
-    if(charNumber < LINE_LIMIT && x < SCREEN_WIDTH) {
-        this->x += charWidth;
-        this->charNumber += 1;
-    }
-}
-
-void Cursor::shiftUp() {
-    this->y -= height;
-    this->lineNumber -= 1;
-}
-
-void Cursor::shiftDown() {
-    this->y += height;
-    this->lineNumber += 1;
-}
-
 //getters
-int Cursor::getLineNumber(){
+int Cursor::getLineNumber() {
     return lineNumber;
 }
 
-int Cursor::getCharNumber(){
+int Cursor::getCharNumber() {
     return charNumber;
 }

editor/Cursor.h

@@ -2,9 +2,10 @@
 #define L00P_RECTANGLE_H
 
 #include "Utility.h"
+#include "Document.h"
 
 class Cursor {
-private:
+public:
     int x = OFFSET_X;
     int y = 0;
     int width = 2;
@@ -14,20 +15,11 @@ class Cursor {
     int lineNumber = 0;
     u32 color = 30;
 
-public:
     Cursor(TTF_Font *font);
-
     void fill(u32 *screen_pixels);
 
-    void shiftUp();
-    void shiftDown();
-    void shiftLeft();
-    void shiftRight();
-
-    //getters
     int getLineNumber();
     int getCharNumber();
-    int getLineHeight();
 };
 
 

editor/Document.cpp

@@ -17,7 +17,7 @@ void Document::init(string filename) {
 
     for (int i = 0; i < lineCount; i++) {
         lineBuffer[i] = (char *) malloc(80 * sizeof(char));
-        memset(lineBuffer[i], ' ', 80);
+        memset(lineBuffer[i], ' ', 80 * sizeof(char));
     }
 
     //reset cursor
@@ -26,9 +26,9 @@ void Document::init(string filename) {
 
     while (getline(inFile, line)) {
         for (char c: line)
-            lineBuffer[numLine][numChar++] = c;
+            insertPos(numLine, numChar++, c);
         numChar = 0;
-        numLine += 1;
+        numLine++;
     }
 
     this->documentHasChanged = false;
@@ -62,12 +62,37 @@ void Document::printToConsole() {
 
 
 //editing
-void Document::insert(int lineNum, int charNum, char c) {
-    lineBuffer[lineNum][charNum] = c;
+void Document::createLine(int lineNum, int numLines) {
+    int prevCount = lineCount;
+    lineCount += numLines;
+    realloc(lineBuffer, lineCount * sizeof(char *));
+
+    //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));
+    }
+
+    //shift any existing lines down
+    for (int i = lineCount - 1; i < lineNum; i--) {
+        shiftLineDown(i);
+    }
+}
+
+void Document::shiftLineDown(int lineNum) {
+    lineBuffer[lineNum + 1] = lineBuffer[lineNum];
+    memset(lineBuffer[lineNum], ' ', 80 * sizeof(char));
+}
+
+void Document::insertPos(int lineNum, int charNum, char c) {
+    if (isValid(c))
+        lineBuffer[lineNum][charNum] = c;
 }
 
 void Document::deletePos(int lineNum, int charNum) {
-    lineBuffer[lineNum][charNum] = ' ';
+    for(int i = charNum+1; i < 80; i++)
+        lineBuffer[lineNum][i-1] = lineBuffer[lineNum][i];
+    lineBuffer[lineNum][80] = ' ';
 }
 
 

editor/Document.h

@@ -7,12 +7,11 @@
 using namespace std;
 
 class Document {
-private:
+public:
     char **lineBuffer;
     bool documentHasChanged;
     int lineCount = 0;
 
-public:
     //file handling
     void init(std::string filename);
     void saveFile(std::string filename);
@@ -21,7 +20,9 @@ class Document {
     void printToConsole();
 
     //editing
-    void insert(int lineNum, int charNum, char c);
+    void createLine(int lineNum, int numLines);
+    void shiftLineDown(int lineNum);
+    void insertPos(int lineNum, int charNum, char c);
     void deletePos(int lineNum, int charNum);
 
     //getters

editor/Utility.h

@@ -0,0 +1,25 @@
+#ifndef L00P_UTILITY_H
+#define L00P_UTILITY_H
+
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_ttf.h>
+#include <string>
+#include <iostream>
+#include <cassert>
+
+#define SCREEN_WIDTH 1024
+#define SCREEN_HEIGHT 576
+#define COMMON_COLOR_MAX 255
+#define OFFSET_X 40
+#define LINE_LIMIT 80
+#define SDLK_ENTER 13
+
+typedef uint32_t u32;
+
+static bool isValid(char c) {
+    if (c >= '!' && c <= '~')
+        return true;
+    return false;
+}
+
+#endif //L00P_UTILITY_H