Added support for relative paths

Author: BitTim

Linux/Makefile

@@ -3,7 +3,7 @@ vpath %.cc src
 PRODUCT := bitPresent
 
 CXX := g++
-CXXFLAGS := -c -g `wx-config-gtk3 --cxxflags`
+CXXFLAGS := -c -std=c++17 `wx-config-gtk3 --cxxflags`
 CXXLIBS := -lSDL2 -lSDL2_ttf -lSDL2_image -lhpdf `wx-config-gtk3 --libs`
 CXXINCDIRS := -I.
 

Linux/src/fileParser.cc

@@ -2,6 +2,9 @@
 #include <vector>
 #include <fstream>
 
+#include <filesystem>
+namespace fs = std::filesystem;
+
 #include "lib/fileParser.hh"
 #include "lib/objects.hh"
 #include "lib/gui.hh"
@@ -89,6 +92,14 @@ void parse(std::vector<std::string> tokens)
 		{
 			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)
 			{

Linux/src/gui.cc

@@ -95,6 +95,11 @@ void guiMain::OnCreateBtnClicked(wxCommandEvent &evt)
   else if(outputPathBox->GetValue() == wxEmptyString) wxMessageBox(wxT("Please specify an output file and try again"), wxT("No output file specified"), wxICON_WARNING);
   else
   {
+    Global::_INPATH = inputPathBox->GetValue();
+    int lastDirSep = Global::_INPATH.find_last_of("/\\");
+    std::string tmp = Global::_INPATH.substr(0, lastDirSep + 1);
+    Global::_INPATH = tmp;
+
     createPresent((std::string) inputPathBox->GetValue(), (std::string) outputPathBox->GetValue());
     terminal->SetDefaultStyle(wxTextAttr(*wxGREEN));
     gprintf("You may now close this application\n");

Linux/src/imageGenerator.cc

@@ -1,5 +1,8 @@
 #include "lib/imageGenerator.hh"
 
+#include <filesystem>
+namespace fs = std::filesystem;
+
 #include "lib/objects.hh"
 #include "lib/globals.hh"
 #include "lib/gui.hh"
@@ -13,6 +16,13 @@ SDL_Surface* generateSurface(int slide)
     SDL_FillRect(surface, NULL, SDL_MapRGB(surface->format, 255, 255, 255));
     if (Global::_BACKGROUND != "none" && Global::_BACKGROUND != "default")
     {
+        if(fs::path(Global::_BACKGROUND).is_relative())
+        {
+            std::string tmp;
+            tmp = Global::_INPATH + Global::_BACKGROUND;
+            Global::_BACKGROUND = tmp;
+        }
+
         image = IMG_Load(Global::_BACKGROUND.c_str());
         if (image == NULL) gprintf("[ERROR]: Rendering Background: %s\n", SDL_GetError());
         else SDL_BlitScaled(image, NULL, surface, NULL);
@@ -92,6 +102,13 @@ SDL_Surface* generateSurface(int slide)
 
         if (Global::_PRESENT[Global::_CPRESENT]->slides[slide].image != "none")
         {
+            if(fs::path(Global::_PRESENT[Global::_CPRESENT]->slides[slide].image).is_relative())
+            {
+                std::string tmp;
+                tmp = Global::_INPATH + Global::_PRESENT[Global::_CPRESENT]->slides[slide].image;
+                Global::_PRESENT[Global::_CPRESENT]->slides[slide].image = tmp;
+            }
+
             image = IMG_Load(Global::_PRESENT[Global::_CPRESENT]->slides[slide].image.c_str());
             if (image == NULL) gprintf("[ERROR]: Rendering Image: %s\n", SDL_GetError());
             else

Linux/src/lib/globals.hh

@@ -17,6 +17,7 @@ struct Global
 
     static bool useGUI;
     static guiApp* gApp;
+    static std::string _INPATH;
 
     static std::vector<Presentation*> _PRESENT;
     static int _CPRESENT;

Linux/src/main.cc

@@ -27,6 +27,7 @@ std::string Global::_DEFAULTBACKGROUND = "";
 
 bool Global::useGUI = false;
 guiApp* Global::gApp = nullptr;
+std::string Global::_INPATH = "";
 
 std::string Global::_STATUS = "Ready";
 int Global::_MAXPROGRESS = 7;
@@ -49,6 +50,12 @@ int main(int argc, char* argv[])
 	else
 	{
 		inpath = argv[1];
+    int lastDirSep = inpath.find_last_of("/\\");
+    std::string tmp = inpath.substr(0, lastDirSep + 1);
+    inpath = tmp;
+
+		Global::_INPATH = inpath;
+
 		if (argc == 3) outpath = argv[2];
 		else outpath = "presentation.pdf";
 	}