From 46c231a4c591a6477e3ca9bcd9aa67d6a0813e1b Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sun, 29 Aug 2021 13:20:35 +0200
Subject: [PATCH 1/4] printalign & alignment enum etc

---
 drivers/vga.c   | 17 ++++++++++++++++-
 drivers/vga.h   | 12 ++++++++++++
 kernel/kernel.c | 11 ++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/drivers/vga.c b/drivers/vga.c
index 2138ab7..545d71f 100644
--- a/drivers/vga.c
+++ b/drivers/vga.c
@@ -1,6 +1,7 @@
 // VGA Graphics Library
 #include "vga.h"
 #include "../kernel/io.h"
+#include "../lib/str.h"
 
 // Memory
 #define VGA_ADDRESS 	(char*)0xb8000
@@ -50,7 +51,7 @@ void set_cursor_pos(unsigned int col, unsigned int row) {
 void clear_screen() {
 	for( int c = 0; c < MAX_COLS; c++ )
 		for( int r = 0; r < MAX_ROWS; r++ )
-			writechar(0x20, c, r, 0x0f);
+			writechar(0x20, c, r, 0xf0);
 }
 
 /*
@@ -66,4 +67,18 @@ void println(char* str, int attribute_byte) {
 	cursor_row++; // Increment to next y-pos (newline)
 }
 
+void printalign(char* str, int attribute_byte, enum align alignment) {
+	unsigned int strlenbuf = strlen(str);
+
+	if( !alignment || alignment == LEFT ) {
+		print(str, attribute_byte);
+	} else if ( alignment == RIGHT ) {
+		set_cursor_pos(MAX_COLS - strlenbuf, cursor_row);
+	} else if ( alignment == MIDDLE ) {
+		set_cursor_pos((MAX_COLS/2) - (strlenbuf/2), cursor_row);
+	}
+
+	print(str, attribute_byte);
+}
+
 
diff --git a/drivers/vga.h b/drivers/vga.h
index 983fb09..04306ae 100644
--- a/drivers/vga.h
+++ b/drivers/vga.h
@@ -1,7 +1,19 @@
+#define VGA_ADDRESS 	(char*)0xb8000
+#define VGA_ADDRESS_MAX	(char*)0xb8fa0
+
+#define MAX_ROWS 25
+#define MAX_COLS 80
+
+static unsigned int cursor_row;
+static unsigned int cursor_col;
+
+enum align {LEFT, RIGHT, MIDDLE};
+
 char* get_memory_charpos(unsigned int col, unsigned int row);
 void writechar(char c, unsigned int col, unsigned int row, int colorcode);
 void clear_screen();
 void set_cursor_pos();
 void print();
 void println();
+void printalign(char* str, int attribute_byte, enum align alignment);
 void vga_init();
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 13aacf8..f59390f 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -6,13 +6,18 @@ void main() {
 	vga_init(); 	// Initialize the screen first
 			// i.e. clear the screen et cetera.
 
-	set_cursor_pos(28, 2);
-	print("eOS Version 0.1 2021", 0x0f);
+	char* title = "eOS Version 0.1 2021";
+	set_cursor_pos(0, 2);
+	printalign(title, 0xf0, MIDDLE);
+
+	char* subtitle = "A x86 operating system, licenced under GPL-2.0";
+	set_cursor_pos(0, 3);
+	printalign(subtitle, 0xf8, MIDDLE);
 
 
 	char* strbuf = "Hello";
 	char* str2 = "World!";
 	strbuf = strcat(strbuf, str2); 
 	set_cursor_pos(0, 0);
-	println(strbuf, 0x0f);
+	println(strbuf, 0xf0);
 }

From d95dcc2e172b9d487eaabb18a68ec74accf62bde Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sun, 29 Aug 2021 13:21:36 +0200
Subject: [PATCH 2/4] Change of string

---
 kernel/kernel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/kernel.c b/kernel/kernel.c
index f59390f..ad32614 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -15,8 +15,8 @@ void main() {
 	printalign(subtitle, 0xf8, MIDDLE);
 
 
-	char* strbuf = "Hello";
-	char* str2 = "World!";
+	char* strbuf = "String concat: ";
+	char* str2 = "WORKS! :D";
 	strbuf = strcat(strbuf, str2); 
 	set_cursor_pos(0, 0);
 	println(strbuf, 0xf0);

From 3186c55451c38cbb032576fc5539cd89974d39c0 Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sun, 29 Aug 2021 13:23:02 +0200
Subject: [PATCH 3/4] Cleanup

---
 drivers/vga.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/vga.c b/drivers/vga.c
index 545d71f..959b491 100644
--- a/drivers/vga.c
+++ b/drivers/vga.c
@@ -3,13 +3,6 @@
 #include "../kernel/io.h"
 #include "../lib/str.h"
 
-// Memory
-#define VGA_ADDRESS 	(char*)0xb8000
-#define VGA_ADDRESS_MAX	(char*)0xb8fa0
-
-#define MAX_ROWS 25
-#define MAX_COLS 80
-
 static unsigned int cursor_row = 0;
 static unsigned int cursor_col = 0;
 

From bfe8e419df129daae95c07ad48c281620d1001be Mon Sep 17 00:00:00 2001
From: "E. Almqvist" <elalmqvist@gmail.com>
Date: Sun, 29 Aug 2021 13:49:06 +0200
Subject: [PATCH 4/4] Preview update

---
 preview.png | Bin 1201 -> 3388 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/preview.png b/preview.png
index 285c5d7dafa57d8a858398a7e6111f698a070d75..42cc7ae826d73de1d73b5532ecbeafa1d756d61a 100644
GIT binary patch
literal 3388
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
a)n<{EMr`VpovgKY2nae75>S0O?#}NIZa~cd

literal 1201
zcmeAS@N?(olHy`uVBq!ia0y~yV4Basz?jFu1QhXD^P~<)aTa()7BevL9RXp+soH$f
z3=AyEo-U3d6?5L+x}DdeAixli`Ro7w9C@>aZmbhoWA7Btlgj6rQF`it2_w(|qQQLS
zJF*OO49<VPtN3A|(+AV$di!#A1_qOF)#VHq&SZVtHs?jU-_!ZqYCW$1I>_p)BVA>A
z_0CO>&&u<;9)GBfH48A%C@z;%s(Tl|%(d;roL_#Y8E2mBId-$~bbpOj&*AT1pRVWk
zI`Qs<W0KwLbko<m{vSjwO)t;&k@)F2;nu>IQ#Q>jS8P20S;mP&agSc!B)j0mBY#Bn
zHS{gs-wV1MR-8Z0_Epx)+q*;J7qslOR$jSo<MHm<DXl&dt1VxYEPJqL_D`={tD*}t
zOr=_LeP8k|JG5a3-_<jBCH-UlqSSuKUH*ReS(y8*=>lyRvaaz>nS59BymkDa(5|<#
z$6n34QT6a`Y^?Bs#PrXi-F1xzH?KVNxu#V0MM&)5vkCjM?(d7VzT;Y!p0GE(FMRda
znQ!m6R-Y@M{#-xoQ@r=`#<M*RcMsW2cw~OqW7_Y-k0<^pzq`_T<)7`p4?O*ttKC}t
zZ29EBxALA^hX|$bJFS}gHtlK1^|Ip|p1k>f#c9Eu`^?ILYgJv#+Eu4kGE_+2lx3Lb
mRt60BQ7{?;0~P}7zOn27tu?*-^4njK8$4b8T-G@yGywp$pZehd