Merge pull request #1575 from nicolasnoble/more-gui-extra

Adding some more Lua bindings for UI

Author: nicolasnoble

src/gui/gui.cc

@@ -285,7 +285,7 @@ void PCSX::GUI::glErrorCallback(GLenum source, GLenum type, GLuint id, GLenum se
 void PCSX::GUI::setLua(Lua L) {
     setLuaCommon(L);
     LoadImguiBindings(L.getState());
-    LuaFFI::open_imguiextra(L);
+    LuaFFI::open_imguiextra(this, L);
     LuaFFI::open_gl(L);
     LuaFFI::open_nvg(L);
     {

src/gui/imguiextraffi.lua

@@ -26,6 +26,9 @@ void imguiGetViewportSize(unsigned id, ImVec2*);
 void imguiGetViewportWorkPos(unsigned id, ImVec2*);
 void imguiGetViewportWorkSize(unsigned id, ImVec2*);
 float imguiGetViewportDpiScale(unsigned id);
+void imguiLogText(const char* text);
+void guiUseMainFont();
+void guiUseMonoFont();
 ]]
 
 local C = ffi.load 'IMGUIEXTRA'
@@ -63,6 +66,10 @@ imgui.extra = {
         return ret[0]
     end,
     getViewportDpiScale = C.imguiGetViewportDpiScale,
+    logText = C.imguiLogText,
 }
 
+PCSX.GUI.useMainFont = C.guiUseMainFont
+PCSX.GUI.useMonoFont = C.guiUseMonoFont
+
 -- )EOF"

src/gui/luaimguiextra.cc

@@ -19,12 +19,15 @@
 
 #include "gui/luaimguiextra.h"
 
+#include "gui/gui.h"
 #include "imgui/imgui.h"
 #include "imgui_stdlib.h"
 #include "lua/luawrapper.h"
 
 namespace {
 
+PCSX::GUI* s_gui = nullptr;
+
 unsigned imguiGetCurrentViewportId() { return ImGui::GetWindowViewport()->ID; }
 unsigned imguiGetViewportFlags(unsigned id) { return ImGui::FindViewportByID(id)->Flags; }
 void imguiSetViewportFlags(unsigned id, unsigned flags) { ImGui::FindViewportByID(id)->Flags = flags; }
@@ -33,6 +36,9 @@ void imguiGetViewportSize(unsigned id, ImVec2* ret) { *ret = ImGui::FindViewport
 void imguiGetViewportWorkPos(unsigned id, ImVec2* ret) { *ret = ImGui::FindViewportByID(id)->WorkPos; }
 void imguiGetViewportWorkSize(unsigned id, ImVec2* ret) { *ret = ImGui::FindViewportByID(id)->WorkSize; }
 float imguiGetViewportDpiScale(unsigned id) { return ImGui::FindViewportByID(id)->DpiScale; }
+void imguiLogText(const char* text) { ImGui::LogText("%s", text); }
+void guiUseMainFont() { s_gui->useMainFont(); }
+void guiUseMonoFont() { s_gui->useMonoFont(); }
 
 template <typename T, size_t S>
 void registerSymbol(PCSX::Lua L, const char (&name)[S], const T ptr) {
@@ -56,14 +62,18 @@ void registerAllSymbols(PCSX::Lua L) {
     REGISTER(L, imguiGetViewportWorkPos);
     REGISTER(L, imguiGetViewportWorkSize);
     REGISTER(L, imguiGetViewportDpiScale);
+    REGISTER(L, imguiLogText);
+    REGISTER(L, guiUseMainFont);
+    REGISTER(L, guiUseMonoFont);
 
     L.settable();
     L.pop();
 }
 
 }  // namespace
 
-void PCSX::LuaFFI::open_imguiextra(Lua L) {
+void PCSX::LuaFFI::open_imguiextra(GUI* gui, Lua L) {
+    s_gui = gui;
     registerAllSymbols(L);
     static int lualoader = 2;
     static const char* imguiextra = (

src/gui/luaimguiextra.h

@@ -23,9 +23,11 @@
 
 namespace PCSX {
 
+class GUI;
+
 namespace LuaFFI {
 
-void open_imguiextra(Lua L);
+void open_imguiextra(GUI*, Lua L);
 
 }