Imtui

.gitmodules

@@ -31,3 +31,6 @@
 [submodule "depends/googletest"]
 	path = depends/googletest
 	url = ../../google/googletest.git
+[submodule "depends/imtui"]
+	path = depends/imtui
+	url = https://github.com/ggerganov/imtui.git

CMakeLists.txt

@@ -75,7 +75,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 if(MSVC)
     # increase warning level and treat warnings as errors
-    add_compile_options("/WX")
+    #add_compile_options("/WX")
     add_compile_options("/W3")
 
     # disable C4819 code-page warning
@@ -419,6 +419,8 @@ include_directories(depends/tthread)
 include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(depends/clsocket/src)
 include_directories(depends/xlsxio/include)
+include_directories(depends/imtui/include)
+include_directories(depends/imtui/third-party/imgui)
 add_subdirectory(depends)
 
 # Testing with CTest

depends/CMakeLists.txt

@@ -81,3 +81,7 @@ if(MSVC)
     target_compile_options(xlsxio_read_STATIC PRIVATE /wd4013 /wd4244)
     target_compile_options(xlsxio_write_STATIC PRIVATE /wd4013 /wd4244)
 endif()
+
+set(IMTUI_SUPPORT_NCURSES OFF CACHE BOOL "")
+set(IMTUI_SUPPORT_CURL OFF CACHE BOOL "")
+add_subdirectory(imtui)

library/CMakeLists.txt

@@ -129,6 +129,7 @@ set(MODULE_HEADERS
     include/modules/Graphic.h
     include/modules/Gui.h
     include/modules/GuiHooks.h
+    include/modules/ImTuiImpl.h
     include/modules/Items.h
     include/modules/Job.h
     include/modules/Kitchen.h
@@ -154,6 +155,7 @@ set(MODULE_SOURCES
     modules/Filesystem.cpp
     modules/Graphic.cpp
     modules/Gui.cpp
+    modules/ImTuiImpl.cpp
     modules/Items.cpp
     modules/Job.cpp
     modules/Kitchen.cpp
@@ -399,7 +401,7 @@ if(APPLE)
     set_target_properties(dfhack PROPERTIES SOVERSION 1.0.0)
 endif()
 
-target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version ${PROJECT_LIBS})
+target_link_libraries(dfhack protobuf-lite clsocket lua jsoncpp_static dfhack-version imtui ${PROJECT_LIBS})
 set_target_properties(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
 target_link_libraries(dfhack-client protobuf-lite clsocket jsoncpp_static)

library/LuaApi.cpp

@@ -432,6 +432,18 @@ static int dfhack_persistent_deleteTilemask(lua_State *state)
     return 1;
 }
 
+static int debug_ImGui(lua_State* state)
+{
+    ImGui::Begin("Hello");
+
+    ImGui::Text("Hello there!");
+
+    ImGui::End();
+
+    lua_pushboolean(state, true);
+    return 1;
+}
+
 static const luaL_Reg dfhack_persistent_funcs[] = {
     { "get", dfhack_persistent_get },
     { "delete", dfhack_persistent_delete },
@@ -3340,6 +3352,7 @@ static const luaL_Reg dfhack_internal_funcs[] = {
     { "getCommandDescription", internal_getCommandDescription },
     { "threadid", internal_threadid },
     { "md5File", internal_md5file },
+    { "debugImGui", debug_ImGui },
     { NULL, NULL }
 };
 

library/include/modules/ImTuiImpl.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "imtui/imtui.h"
+
+struct ImGuiContext;
+
+namespace ImTuiInterop
+{
+	namespace impl
+	{
+		void init_current_context();
+
+		void new_frame();
+
+		void draw_frame();
+
+		void shutdown();
+	}
+
+	struct ui_state
+	{
+		ImGuiContext* last_context;
+		ImGuiContext* ctx;
+
+		ui_state();
+
+		void activate();
+
+		void new_frame();
+
+		void draw_frame();
+
+		void deactivate();
+	};
+
+	//returns an inactive imgui context system
+	ui_state make_ui_system();
+}

library/include/modules/Screen.h

@@ -39,6 +39,7 @@ distribution.
 #include "df/zoom_commands.h"
 
 #include "modules/GuiHooks.h"
+#include "modules/ImTuiImpl.h"
 
 namespace df
 {
@@ -355,6 +356,7 @@ namespace DFHack
     };
 
     class DFHACK_EXPORT dfhack_lua_viewscreen : public dfhack_viewscreen {
+        ImTuiInterop::ui_state st;
         std::string focus;
 
         void update_focus(lua_State *L, int idx);