Added window input

src/PlotManager.cpp

@@ -1,9 +1,11 @@
 #include "PlotManager.hpp"
 
-void PlotManager::NewPlot()
+#include <iostream>
+
+void PlotManager::NewPlot(std::string title)
 {
 	currentID++;
-	OpenWindows.emplace_back(400, 400, currentID);
+	OpenWindows.emplace_back(400, 400, currentID, title);
 }
 
 WList::iterator PlotManager::Remove(WList::iterator it)
@@ -13,6 +15,29 @@ WList::iterator PlotManager::Remove(WList::iterator it)
 
 void PlotManager::Loop()
 {
+	// Check if the future has been set
+	if (inputFuture.wait_for(std::chrono::milliseconds(0)) != std::future_status::timeout)
+	{
+		inputThread.join();
+
+		std::string input = inputFuture.get();
+		for (int i = 0; i < (sizeof(QUIT_COMMANDS) / sizeof(uint64_t)); i++)
+		{
+			if (input == QUIT_COMMANDS[i])
+			{
+				Close();
+				return;
+			}
+		}
+
+		NewPlot(input);
+
+		inputPromise = std::promise<std::string>();
+		inputFuture = inputPromise.get_future();
+
+		inputThread = std::thread(&PlotManager::InputThreadFunction);
+	}
+
 	for (WList::iterator it = OpenWindows.begin(); it != OpenWindows.end();)
 	{
 		if (it->ShouldClose())
@@ -20,9 +45,6 @@ void PlotManager::Loop()
 			it->Destroy();
 			it = OpenWindows.erase(it);
 			
-			if (OpenWindows.empty())
-				isOpen = false;
-			
 			continue;
 		}
 
@@ -33,3 +55,29 @@ void PlotManager::Loop()
 		it++;
 	}
 }
+
+void PlotManager::Close()
+{
+	for (WList::iterator it = OpenWindows.begin(); it != OpenWindows.end();)
+	{
+		it->Destroy();
+		it = OpenWindows.erase(it);
+	}
+
+	try {
+		inputThread.detach();
+	} catch(...) {}
+	isOpen = false;
+}
+
+void PlotManager::InputThreadFunction()
+{
+	PlotMgrMutex.lock();
+	std::cout << "> ";
+	PlotMgrMutex.unlock();
+
+	std::string input;
+	std::cin >> input;
+
+	inputPromise.set_value(input);
+}

src/PlotManager.hpp

@@ -2,6 +2,9 @@
 
 #include <vector>
 
+#include <thread>
+#include <future>
+
 #include "PlotWindow.hpp"
 
 typedef std::vector<PlotWindow> WList;
@@ -9,15 +12,31 @@ typedef std::vector<PlotWindow> WList;
 class PlotManager
 {
 public:
-	static void NewPlot();
+	inline static const char* const QUIT_COMMANDS[2] = { "q", "quit" };
+public:
+	static void NewPlot(std::string title);
 	static WList::iterator Remove(WList::iterator it);
 
 	static void Loop();
 
+	static void Close();
+
 public:
 	inline static bool isOpen = true;
 
 private:
 	inline static WList OpenWindows;
 	inline static int currentID = 0;
+
+	inline static std::promise<std::string> inputPromise;
+	inline static std::future<std::string> inputFuture = inputPromise.get_future();
+
+	inline static std::mutex PlotMgrMutex;
+
+private:
+	static void InputThreadFunction();
+
+private:
+	inline static std::thread inputThread = std::thread(&PlotManager::InputThreadFunction);
+
 };

src/PlotWindow.cpp

@@ -3,10 +3,10 @@
 #include <iostream>
 #include <string>
 
-PlotWindow::PlotWindow(int w, int h, int id) :
+PlotWindow::PlotWindow(int w, int h, int id, std::string title) :
 	window(nullptr), id(id)
 {
-	window = glfwCreateWindow(w, h, (std::string("Plot ") + std::to_string(id)).c_str(), NULL, NULL);
+	window = glfwCreateWindow(w, h, ("Plot " + std::to_string(id) + " | " + title).c_str(), NULL, NULL);
 	if (window == nullptr)
 	{
 		const char* buffer = new const char[512];

src/PlotWindow.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <iostream>
+
 #include <glad/glad.h>
 #include <glfw/glfw3.h>
 
@@ -8,7 +10,7 @@
 class PlotWindow
 {
 public:
-	PlotWindow(int w, int h, int id);
+	PlotWindow(int w, int h, int id, std::string title);
 
 	bool ShouldClose() { return glfwWindowShouldClose(window); }
 	void Destroy();

src/main.cpp

@@ -21,11 +21,6 @@ int main(int argc, char** argv)
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 6);
 	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
-	for (int i = 0; i < 1; i++)
-	{
-		PlotManager::NewPlot();
-	}
-
 	while (PlotManager::isOpen)
 	{
 		glfwPollEvents();