remove some includes and add some docs

Author: MESYETI

doc/README.md

@@ -0,0 +1,4 @@
+# doc
+Some documentation for yterm
+
+- [config](/doc/config.md) - info on configuring yterm

doc/config.md

@@ -0,0 +1,31 @@
+# yterm config
+yterm config is stored in `~/.config/yterm`
+
+All config is stored as json
+
+## config.json
+This is the main config file for yterm, it contains these properties:
+- `theme`: contains the name of the theme being used
+
+## Theme files
+Theme files are stored in `~/.config/yterm/themes`
+
+They contain these colours that you can set:
+- `black`
+- `red`
+- `green`
+- `yellow`
+- `blue`
+- `magenta`
+- `cyan`
+- `white`
+- `grey`
+- `bright_red`
+- `bright_green`
+- `bright_yellow`
+- `bright_blue`
+- `bright_magenta`
+- `bright_cyan`
+- `bright_white`
+- `fg` (the default foreground colour)
+- `bg` (the default background colour)

source/components.h

@@ -13,13 +13,10 @@
 #include <pwd.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <termios.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_ttf.h>
 #include <noch/json.h>

source/escapes.c

@@ -252,32 +252,7 @@ void HandleEscape(Terminal* terminal) {
 
 	NEXT_BYTE();
 
-	if (in == ']') {
-		NEXT_BYTE();
-	}
-
 	if (in != '[') {
-		// TODO: clean up this mess
-		NEXT_BYTE();
-		if (in != '0') {
-			return;
-		}
-		NEXT_BYTE();
-		if (in != ';') {
-			return;
-		}
-
-		char* title = SafeMalloc(1);
-		title[0]    = 0;
-
-		NEXT_BYTE();
-		while (in != 7) {
-			title = SafeRealloc(title, strlen(title) + 2);
-			strncat(title, &in, 1);
-			NEXT_BYTE();
-		}
-		// TODO: set title
-		free(title);
 		return;
 	}
 

source/main.c

@@ -31,11 +31,15 @@ static void Usage(FILE* file) {
 	args_usage_fprint(file, execPath, usages, ARRAY_LEN(usages), APP_DESC, true);
 }
 
-static void ParseFlags(args_t* args) {
-	bool flagHelp    = false;
-	bool flagVersion = false;
+static void ParseFlags(args_t* args, Terminal* terminal) {
+	bool flagHelp     = false;
+	bool flagVersion  = false;
+	bool flagNoEscape = false;
 	flag_bool("h", "help",    "Show the usage",   &flagHelp);
 	flag_bool("v", "version", "Show the version", &flagVersion);
+	flag_bool(
+		"e", "no-escape", "Disables interpreting escape sequences", &flagNoEscape
+	);
 
 	size_t where;
 	bool   extra;
@@ -60,17 +64,20 @@ static void ParseFlags(args_t* args) {
 
 		exit(0);
 	}
+
+	if (flagNoEscape) {
+		terminal->config.interpretEscapes = false;
+	}
 }
 
 int main(int argc, const char** argv, char** env) {
-	args_t args = args_new(argc, argv);
-	execPath    = args_shift(&args);
-	ParseFlags(&args);
-
 	Terminal terminal;
-
 	Terminal_Init(&terminal);
 
+	args_t args = args_new(argc, argv);
+	execPath    = args_shift(&args);
+	ParseFlags(&args, &terminal);
+
 	// init video
 	terminal.video = Video_Init();
 	SDL_StartTextInput();

source/terminal.c

@@ -46,9 +46,11 @@ void Terminal_Update(Terminal* terminal) {
 
 		switch (in) {
 			case '\x1b': {
-				HandleEscape(terminal);
-				break;
-			}
+				if (terminal->config.interpretEscapes) {
+					HandleEscape(terminal);
+					break;
+				}
+			} // fall through
 			default: {
 				TextScreen_PutCharacter(&terminal->buffer, in);
 			}