Added horizontal and vertical text drawing

DeveloperGY · Dec 22, 2022 · 78181a8 · 78181a8
1 parent 013e28c
commit 78181a8
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 9 deletions.
diff --git a/bin/libtermDisplay.a b/bin/libtermDisplay.a
diff --git a/bin/out b/bin/out
diff --git a/obj/draw.o b/obj/draw.o
diff --git a/src/main.cpp b/src/main.cpp
@@ -15,14 +15,8 @@ int main(void)
 
     while (ch != 'q')
     {
-        td_drawStrokeRect(2, 2, 5, 5, '#', TD_COLOR_WHITE, TD_COLOR_WHITE);
-        td_drawFillRect(3,3, 3, 3, '.', TD_COLOR_WHITE, TD_COLOR_DEFAULT);
-        td_drawRect(10, 7, 22, 12, 's', 'f', TD_COLOR_YELLOW, TD_COLOR_MAGENTA, TD_COLOR_WHITE, TD_COLOR_RED);
-        td_drawLine(0, 0, 10, 4, '*', TD_COLOR_RED, TD_COLOR_CYAN);
-        td_drawLine(0, 4, 10, 0, '*', TD_COLOR_BLACK, TD_COLOR_BLUE);
-        td_drawLine(0, 0, 4, 10, '*', TD_COLOR_CYAN, TD_COLOR_RED);
-        td_drawLine(0, 10, 4, 0, '*', TD_COLOR_BLUE, TD_COLOR_BLACK);
-        td_drawPoint(x, y, '@', TD_COLOR_YELLOW, TD_COLOR_DEFAULT);
+        td_drawTextHorizontal(0, 0, "Name: korpine", TD_COLOR_YELLOW, TD_COLOR_DEFAULT);
+        td_drawPoint(x, y, '@', TD_COLOR_CYAN, TD_COLOR_DEFAULT);
         td_display();
 
         ch = getch();

diff --git a/src/termDisplay/draw.c b/src/termDisplay/draw.c
@@ -219,5 +219,29 @@ void td_drawLine(int x1, int y1, int x2, int y2, char c, int fgColor, int bgColo
         }
     }
 
+    return;
+}
+
+void td_drawTextHorizontal(int x, int y, const char *str, int fgColor, int bgColor)
+{
+    size_t len = strlen(str);
+
+    for (int i=0; i<len; i++)
+    {
+        td_drawPoint(x+i, y, str[i], fgColor, bgColor);
+    }
+
+    return;
+}
+
+void td_drawTextVertical(int x, int y, const char *str, int fgColor, int bgColor)
+{
+    size_t len = strlen(str);
+
+    for (int i=0; i<len; i++)
+    {
+        td_drawPoint(x, y+i, str[i], fgColor, bgColor);
+    }
+
     return;
 }
diff --git a/src/termDisplay/termDisplay.h b/src/termDisplay/termDisplay.h
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <math.h>
+#include <string.h>
 
 #include <termios.h>
 
@@ -180,6 +181,34 @@ void td_drawRect(int x, int y, unsigned int width, unsigned int height, char str
 */
 void td_drawLine(int x1, int y1, int x2, int y2, char c, int fgColor, int bgColor);
 
+/**
+ * @brief Draws text horizontally at the specified coordinates with the specified colors
+ * 
+ * @param x The X Coordinate
+ * @param y The Y Coordinate
+ * 
+ * @param str The text to print (must be null terminated)
+ * 
+ * @param fgColor The foreground color
+ * @param bgColor The background color
+ * 
+*/
+void td_drawTextHorizontal(int x, int y, const char *str, int fgColor, int bgColor);
+
+/**
+ * @brief Draws text verically at the specified coordinates with the specified colors
+ * 
+ * @param x The X Coordinate
+ * @param y The Y Coordinate
+ * 
+ * @param str The text to print (must be null terminated)
+ * 
+ * @param fgColor The foreground color
+ * @param bgColor The background color
+ *  
+*/
+void td_drawTextVertical(int x, int y, const char *str, int fgColor, int bgColor);
+
 #ifdef __cplusplus
 }
 #endif
@@ -196,7 +225,9 @@ extern "C" {
 /**
  * @brief An unbuffered character input function to remove the need
  *        to press enter to input a character
- * 
+ *
+ * @warning Linux only!!!
+ *  
 */
 char getch();