Merge branch 'gui'

Author: BitTim

.gitignore

@@ -33,6 +33,7 @@
 
 # Cached files
 .cache
+<<<<<<< HEAD
 cache
 build
 
@@ -41,3 +42,9 @@ bitPresent
 
 # VSCode
 .vscode
+=======
+build
+
+# Binaries
+bitPresent
+>>>>>>> gui

.vscode/c_cpp_properties.json

@@ -0,0 +1,31 @@
+{
+  "configurations": [
+      {
+          "name": "include paths",
+          "includePath": [
+              "/usr/lib/wx/include/gtk3-unicode-3.0",
+              "/usr/include/wx-3.0",
+              "/usr/include/gtk-3.0",
+              "/usr/include/pango-1.0",
+              "/usr/include/glib-2.0",
+              "/usr/lib/glib-2.0/include",
+              "/usr/include/harfbuzz",
+              "/usr/include/freetype2",
+              "/usr/include/libpng16",
+              "/usr/include/fribidi",
+              "/usr/include/cairo",
+              "/usr/include/pixman-1",
+              "/usr/include/gdk-pixbuf-2.0",
+              "/usr/include/libmount",
+              "/usr/include/blkid",
+              "/usr/include/gio-unix-2.0",
+              "/usr/include/atk-1.0",
+              "/usr/include/at-spi2-atk/2.0",
+              "/usr/include/dbus-1.0",
+              "/usr/lib/dbus-1.0/include",
+              "/usr/include/at-spi-2.0"
+          ]
+      }
+  ],
+  "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,72 @@
+{
+  "files.associations": {
+    "cctype": "cpp",
+    "clocale": "cpp",
+    "cmath": "cpp",
+    "cstdarg": "cpp",
+    "cstddef": "cpp",
+    "cstdio": "cpp",
+    "cstdlib": "cpp",
+    "cstring": "cpp",
+    "ctime": "cpp",
+    "cwchar": "cpp",
+    "cwctype": "cpp",
+    "array": "cpp",
+    "atomic": "cpp",
+    "hash_map": "cpp",
+    "strstream": "cpp",
+    "bit": "cpp",
+    "*.tcc": "cpp",
+    "bitset": "cpp",
+    "chrono": "cpp",
+    "codecvt": "cpp",
+    "complex": "cpp",
+    "condition_variable": "cpp",
+    "cstdint": "cpp",
+    "deque": "cpp",
+    "list": "cpp",
+    "map": "cpp",
+    "set": "cpp",
+    "unordered_map": "cpp",
+    "unordered_set": "cpp",
+    "vector": "cpp",
+    "exception": "cpp",
+    "algorithm": "cpp",
+    "functional": "cpp",
+    "iterator": "cpp",
+    "memory": "cpp",
+    "memory_resource": "cpp",
+    "numeric": "cpp",
+    "optional": "cpp",
+    "random": "cpp",
+    "ratio": "cpp",
+    "string": "cpp",
+    "string_view": "cpp",
+    "system_error": "cpp",
+    "tuple": "cpp",
+    "type_traits": "cpp",
+    "utility": "cpp",
+    "fstream": "cpp",
+    "initializer_list": "cpp",
+    "iomanip": "cpp",
+    "iosfwd": "cpp",
+    "iostream": "cpp",
+    "istream": "cpp",
+    "limits": "cpp",
+    "mutex": "cpp",
+    "new": "cpp",
+    "ostream": "cpp",
+    "sstream": "cpp",
+    "stdexcept": "cpp",
+    "streambuf": "cpp",
+    "thread": "cpp",
+    "cfenv": "cpp",
+    "cinttypes": "cpp",
+    "typeindex": "cpp",
+    "typeinfo": "cpp",
+    "valarray": "cpp",
+    "variant": "cpp",
+    "future": "cpp"
+  }
+  
+}

Linux/Makefile

@@ -3,8 +3,8 @@ vpath %.cc src
 PRODUCT := bitPresent
 
 CXX := g++
-CXXFLAGS := -c -g
-CXXLIBS := -lSDL2 -lSDL2_ttf -lSDL2_image -lhpdf
+CXXFLAGS := -c -std=c++17 `wx-config-gtk3 --cxxflags`
+CXXLIBS := -lSDL2 -lSDL2_ttf -lSDL2_image -lhpdf `wx-config-gtk3 --libs`
 CXXINCDIRS := -I.
 
 SOURCE := $(shell find . -name *.cc)
@@ -43,4 +43,4 @@ run: $(PRODUCT)
 debug: $(PRODUCT)
 	@gdb $<
 
--include $(DEPFILES)
+-include $(DEPFILES)

Linux/dat/BPLogo.png

@@ -0,0 +1,186 @@
+#include <algorithm>
+#include <vector>
+#include <fstream>
+
+#include <filesystem>
+namespace fs = std::filesystem;
+
+#include "lib/fileParser.hh"
+#include "lib/objects.hh"
+#include "lib/gui.hh"
+#include "lib/globals.hh"
+
+int nDotWarn = 0;
+
+std::vector<std::string> tokenize(std::string path)
+{
+	std::vector<std::string> tokens;
+
+	std::ifstream file(path.c_str());
+	if (file.fail()) return tokens;
+
+	std::string line;
+	std::string buffer;
+	int cline = 0;
+
+	while (std::getline(file, line))
+	{
+		cline += 1;
+		if (line[0] == '.')
+		{
+			int index = line.find(" ");
+			if (index == std::string::npos)
+			{
+				gprintf("[WARNING](Line %d): Invalid '.' command statement. Ignoring\n", cline);
+				nDotWarn++;
+				continue;
+			}
+			else
+			{
+				tokens.push_back(line.substr(0, index));
+				tokens.push_back(line.substr(index + 1, line.length() - 1));
+			}
+		}
+		else
+		{
+			tokens.push_back(line);
+		}
+	}
+
+	if(Global::useGUI) progress();
+
+	file.close();
+	return tokens;
+}
+
+void parse(std::vector<std::string> tokens)
+{
+	int cline = nDotWarn;
+
+	if(Global::_PRESENT[Global::_CPRESENT] == nullptr)
+	{
+		gprintf("[ERROR]: Presentation object does not exist\n");
+		return;
+	}
+
+	for (int i = 0; i < tokens.size(); i++)
+	{
+		cline += 1;
+
+		//Skip empty tokens
+		if (tokens[i] == "") continue;
+
+		//Check for commands
+		if (tokens[i] == ".background")
+		{
+			i += 1;
+			if (tokens[i][0] == '<' || tokens[i][0] == '[' || tokens[i][0] == '-') gprintf("[WARNING](Line %d): Using instruction(\"%s\") as argument for '.background'\n", cline, tokens[i].c_str());
+			Global::_BACKGROUND = tokens[i];
+			continue;
+		}
+
+		if (tokens[i] == ".image")
+		{
+			i += 1;
+			if (tokens[i][0] == '<' || tokens[i][0] == '[' || tokens[i][0] == '-') gprintf("[WARNING](Line %d): Using instruction(\"%s\") as argument for '.image'\n", cline, tokens[i].c_str());
+			if (Global::_CSLIDE < 0) gprintf("[WARNING]: '.image' used outside of a slide. Ignoring...\n");
+			else Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].image = tokens[i];
+			continue;
+		}
+
+		if (tokens[i] == ".font")
+		{
+			i += 1;
+			if (tokens[i][0] == '<' || tokens[i][0] == '[' || tokens[i][0] == '-') gprintf("[WARNING](Line %d): Using instruction(\"%s\") as argument for '.image'\n", cline, tokens[i].c_str());
+			
+			if(fs::path(tokens[i]).is_relative())
+      {
+        std::string tmp;
+        tmp = Global::_INPATH + tokens[i];
+        tokens[i] = tmp;
+      }
+			
+			Global::_FONT = { {"title", TTF_OpenFont(tokens[i].c_str(), 68)}, {"subtitle", TTF_OpenFont(tokens[i].c_str(), 50)}, {"normal", TTF_OpenFont(tokens[i].c_str(), 34)} };
+			if (Global::_FONT["title"] == NULL || Global::_FONT["subtitle"] == NULL || Global::_FONT["normal"] == NULL)
+			{
+				gprintf("[ERROR](Line %d): Error loading font. Reverting to default\n", cline);
+				Global::_FONT = Global::_DEFAULTFONT;
+			}
+			continue;
+		}
+
+		if (tokens[i] == ".color")
+		{
+			i += 1;
+			if (tokens[i] == "default") Global::_TEXTCOLOR = Global::_DEFAULTTEXTCOLOR;
+			else
+			{
+				uint8_t r = std::stoi(tokens[i].substr(0, 2), nullptr, 16);
+				uint8_t g = std::stoi(tokens[i].substr(2, 2), nullptr, 16);
+				uint8_t b = std::stoi(tokens[i].substr(4, 2), nullptr, 16);
+
+				Global::_TEXTCOLOR = new SDL_Color{ r, g, b };
+			}
+			continue;
+		}
+
+		//Check for other defining Tokens
+		if (tokens[i][0] == '<' && tokens[i][tokens[i].length() - 1] == '>')
+		{
+			Global::_PRESENT[Global::_CPRESENT]->slides.push_back(Slide());
+			Global::_CSLIDE = Global::_CSLIDE + 1;
+			Global::_CPOINT = -1;
+
+			Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].titleSlide = true;
+
+			std::string tmp = tokens[i].substr(1, tokens[i].length() - 2);
+			Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].title = tmp;
+			continue;
+		}
+
+		if (tokens[i][0] == '[' && tokens[i][tokens[i].length() - 1] == ']')
+		{
+			Global::_PRESENT[Global::_CPRESENT]->slides.push_back(Slide());
+			Global::_CSLIDE = Global::_CSLIDE + 1;
+			Global::_CPOINT = -1;
+
+			std::string tmp = tokens[i].substr(1, tokens[i].length() - 2);
+			Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].title = tmp;
+			continue;
+		}
+
+		if (tokens[i][0] == '-' && tokens[i][tokens[i].length() - 1] == '-')
+		{
+			if (Global::_CSLIDE < 0) gprintf("[WARNING](Line %d): Defined subtitle outside of a slide. Ignoring...\n", cline);
+			else
+			{
+				std::string tmp = tokens[i].substr(1, tokens[i].length() - 2);
+				Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].subtitle = tmp;
+			}
+			continue;
+		}
+
+		if (tokens[i][0] == '*')
+		{
+			if (Global::_CSLIDE < 0) gprintf("[WARNING](Line %d): Defined subpoint outside of a slide. Ignoring...\n", cline);
+			else if (Global::_CPOINT < 0) gprintf("[WARNING](Line %d): Defined subpoint outside of a point. Ignoring...\n", cline);
+			else
+			{
+				int cutoff = 1;
+				if (tokens[i][1] == ' ') cutoff = 2;
+				Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].points[Global::_CPOINT].subPoints.push_back(tokens[i].substr(cutoff, tokens[i].length() - 1));
+			}
+			continue;
+		}
+
+		//Add non-special strings as points to slides
+		if (Global::_CSLIDE < 0) gprintf("[WARNING](Line %d): Defined point outside of a slide. Ignoring...\n", cline);
+		else
+		{
+			Global::_PRESENT[Global::_CPRESENT]->slides[Global::_CSLIDE].points.push_back(Point(tokens[i]));
+			Global::_CPOINT = Global::_CPOINT + 1;
+		}
+	}
+
+	tokens.clear();
+}