small changes

updated: CImGui/Dear ImGui to 1.92.9.dock

Author: dinau

demo/c/imgui.ini

@@ -2,11 +2,13 @@
 Pos=60,60
 Size=400,400
 Collapsed=0
+LastUsed=20260824
 
 [Window][Dear ImGui Demo]
 Pos=651,10
 Size=470,527
 Collapsed=0
+LastUsed=20260824
 
 [Window][Hello, world!]
 Pos=12,8
@@ -97,6 +99,7 @@ Collapsed=0
 Pos=14,15
 Size=602,242
 Collapsed=0
+LastUsed=20260824
 
 [Table][0xE525F08B,2]
 Column 0  Weight=1.5220

demo/c/main.c

@@ -97,7 +97,7 @@ void gui_main(Window *window) {
 // main
 //------
 int main(int argc, char *argv[]) {
-  Window *window = createImGui(1024, 768);
+  Window *window = createImGui(1024, 768, "Knobs");
 
   gui_main(window);
 

demo/utils/appImGui.c demo/utils/appImGui.cppdemo/utils/appImGui.c renamed to demo/utils/appImGui.cpp

@@ -1,20 +1,18 @@
 #include "appImGui.h"
-#include <stdlib.h>
-#include <stdbool.h>
 
 //------------------
 // --- setTheme
 //------------------
 void setTheme(int32_t num){
   switch (num){
   case 0:
-    igStyleColorsDark(NULL);
+    ImGui::StyleColorsDark(NULL);
     break;
   case 1:
-    igStyleColorsClassic(NULL);
+    ImGui::StyleColorsClassic(NULL);
     break;
   case 2:
-    igStyleColorsLight(NULL);
+    ImGui::StyleColorsLight(NULL);
     break;
   default:
     break;
@@ -24,7 +22,7 @@ void setTheme(int32_t num){
 //---------------
 // --- initImGui
 //---------------
-Window* createImGui(int32_t width, int32_t height){
+Window* createImGui(int32_t width, int32_t height, const char* title){
   if (!glfwInit())
     return NULL;
 
@@ -40,7 +38,7 @@ Window* createImGui(int32_t width, int32_t height){
   // just an extra window hint for resize
   glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
 
-  GLFWwindow* glfwwindow = glfwCreateWindow(width, height, "CImGuiFileDialog example", NULL, NULL);
+  GLFWwindow* glfwwindow = glfwCreateWindow(width, height, title, NULL, NULL);
   if (!glfwwindow)
   {
     printf("Failed to create window! Terminating!\n");
@@ -57,17 +55,7 @@ Window* createImGui(int32_t width, int32_t height){
   printf("opengl version: %s\n", (char *)glGetString(GL_VERSION));
 
   // setup imgui
-  igCreateContext(NULL);
-
-  // set docking
-  ImGuiIO *ioptr = igGetIO();
-  ioptr->ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;   // Enable Keyboard Controls
-  //ioptr->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;  // Enable Gamepad Controls
-#undef IMGUI_HAS_DOCK
-#ifdef IMGUI_HAS_DOCK
-  ioptr->ConfigFlags |= ImGuiConfigFlags_DockingEnable;       // Enable Docking
-  ioptr->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;     // Enable Multi-Viewport / Platform Windows
-#endif
+  ImGui::CreateContext(NULL);
 
   ImGui_ImplGlfw_InitForOpenGL(glfwwindow, true);
   ImGui_ImplOpenGL3_Init(glsl_version);
@@ -90,7 +78,7 @@ void destroyImGui(Window* window){
   // clean up
   ImGui_ImplOpenGL3_Shutdown();
   ImGui_ImplGlfw_Shutdown();
-  igDestroyContext(NULL);
+  ImGui::DestroyContext(NULL);
 
   glfwDestroyWindow(window->handle);
   glfwTerminate();
@@ -101,24 +89,15 @@ void destroyImGui(Window* window){
 // --- render
 //------------
 void render(Window* window){
-    ImGuiIO* ioptr = igGetIO();
+    auto ioptr = ImGui::GetIO();
     // render
-    igRender();
+    ImGui::Render();
     glfwMakeContextCurrent(window->handle);
-    glViewport(0, 0, (int)ioptr->DisplaySize.x, (int)ioptr->DisplaySize.y);
+    glViewport(0, 0, (int)ioptr.DisplaySize.x, (int)ioptr.DisplaySize.y);
     glClearColor(window->clearColor.x, window->clearColor.y, window->clearColor.z, window->clearColor.w);
 
     glClear(GL_COLOR_BUFFER_BIT);
-    ImGui_ImplOpenGL3_RenderDrawData(igGetDrawData());
-#ifdef IMGUI_HAS_DOCK
-    if (ioptr->ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
-    {
-      GLFWwindow *backup_current_window = glfwGetCurrentContext();
-      igUpdatePlatformWindows();
-      igRenderPlatformWindowsDefault(NULL, NULL);
-      glfwMakeContextCurrent(backup_current_window);
-    }
-#endif
+    ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
     glfwSwapBuffers(window->handle);
 
     if (window->showDelayWindow >= 0) window->showDelayWindow--;
@@ -132,5 +111,5 @@ void newFrame(void){
     // start imgui frame
     ImGui_ImplOpenGL3_NewFrame();
     ImGui_ImplGlfw_NewFrame();
-    igNewFrame();
+    ImGui::NewFrame();
 }

demo/utils/appImGui.h

@@ -1,22 +1,34 @@
 #pragma once
-#define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-#include "cimgui.h"
-#include "cimgui_impl.h"
+
+#ifdef __cplusplus
+#  include "imgui.h"
+#  include "imgui_impl_glfw.h"
+#  include "imgui_impl_opengl3.h"
+extern "C" {
+#else
+# ifdef DCIMGUI
+#   include "dcimgui.h"
+# else
+#   define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+#   include "cimgui.h"
+
+#   ifdef IMGUI_HAS_IMSTR
+#   define igBegin igBegin_Str
+#   define igCheckbox igCheckbox_Str
+#   define igButton igButton_Str
+#endif
+
+#define igGetIO igGetIO_Nil
+#  endif
+#endif
+
 #include <GLFW/glfw3.h>
 #include <stdio.h>
 #ifdef _MSC_VER
 #include <windows.h>
 #endif
 #include <GL/gl.h>
 
-#define igGetIO igGetIO_Nil
-
-#ifdef IMGUI_HAS_IMSTR
-#define igBegin igBegin_Str
-#define igCheckbox igCheckbox_Str
-#define igButton igButton_Str
-#endif
-
 #include "setupFonts.h"
 #include <stdlib.h>
 
@@ -26,8 +38,12 @@ typedef struct stWindow {
   int showDelayWindow;
 } Window;
 
-Window* createImGui(int32_t width, int32_t height);
+Window* createImGui(int32_t width, int32_t height, const char* title);
 void destroyImGui(Window* window);
 void render(Window* window);
 void newFrame(void);
 void setTheme(int32_t num);
+
+#ifdef __cplusplus
+}
+#endif

demo/utils/setupFonts.c demo/utils/setupFonts.cppdemo/utils/setupFonts.c renamed to demo/utils/setupFonts.cpp

@@ -1,15 +1,11 @@
-#include <float.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
 
-#define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-#include "cimgui.h"
+#include "imgui.h"
 #include "utils.h"
 #include "setupFonts.h"
 
-#define ImGui_GetIO igGetIO_Nil
-
 #define MAX_PATH  2048
 const char* IconFontPath = "../utils/fonticon/fa6/fa-solid-900.ttf";
 char sBufFontPath[MAX_PATH];
@@ -27,7 +23,7 @@ char LinuxFontNameTbl[][MAX_PATH] = { // For Linux Mint 22 (Ubuntu/Debian family
                            };
 
 /*-----------------
- * getFontPath()
+ * getWinFontPath()
  *----------------*/
 char* getWinFontPath(char* sBuf, int bufSize, const char* fontName) {
   char* sWinDir = getenv("windir");
@@ -43,20 +39,19 @@ float point2px(float point) { //## Convert point to pixel
   return (point * 96) / 72;
 }
 
-const ImWchar ranges_icon_fonts[]  = {(ImWchar)ICON_MIN_FA, (ImWchar)ICON_MAX_FA, (ImWchar)0};
 /*--------------
  * setupFonts()
  *-------------*/
 void setupFonts(void) {
-  ImGuiIO* pio = ImGui_GetIO();
-  ImFontConfig* config  = ImFontConfig_ImFontConfig();
+  ImGuiIO& pio = ImGui::GetIO();
+  ImFontConfig* config  = new ImFontConfig();
   ImFont* font = NULL;
   char* fontPath;
   int tableLen = sizeof(WinFontNameTbl) / MAX_PATH;
   for(int i=0; i<tableLen; i++){
     fontPath = getWinFontPath(sBufFontPath, sizeof(sBufFontPath), WinFontNameTbl[i]);
     if (existsFile(fontPath)) {
-      font = ImFontAtlas_AddFontFromFileTTF(pio->Fonts, fontPath, point2px(14.5)
+      font = pio.Fonts->AddFontFromFileTTF(fontPath, point2px(15.0)
           , config
           , NULL);
       printf("Found FontPath: [%s]\n",fontPath);
@@ -67,7 +62,7 @@ void setupFonts(void) {
   for(int i=0; i<tableLen; i++){
     fontPath = LinuxFontNameTbl[i];
     if (existsFile(fontPath)) {
-      font = ImFontAtlas_AddFontFromFileTTF(pio->Fonts, fontPath, point2px(13)
+      font = pio.Fonts->AddFontFromFileTTF(fontPath, point2px(13)
           , config
           , NULL);
       printf("Found FontPath: [%s]\n",fontPath);
@@ -77,9 +72,12 @@ void setupFonts(void) {
   if (font == NULL) {
     printf("Error!: Font loading falied: in %s\n", __FILE__);
     printf("Default has been set.\n");
-    ImFontAtlas_AddFontDefault(pio->Fonts, NULL);
+    pio.Fonts->AddFontDefaultVector(NULL);
   }
-  // Merge Icon font
+  // Merge IconFont
   config->MergeMode = true;
-  ImFontAtlas_AddFontFromFileTTF(pio->Fonts, IconFontPath, point2px(11), config , ranges_icon_fonts);
+  font = pio.Fonts->AddFontFromFileTTF(IconFontPath, point2px(11), config , NULL);
+  if (font != NULL){
+    printf("Found Icon FontPath: [%s]\n",IconFontPath);
+  }
 }

demo/utils/setupFonts.h

@@ -2,5 +2,13 @@
 #include <stdbool.h>
 #include "IconsFontAwesome6.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void setupFonts(void);
 bool existFile(const char* path);
+
+#ifdef __cplusplus
+}
+#endif

libs/cimgui/README.md

@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
 
 Notes:
-* currently this wrapper is based on version [1.92.4 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.92.9 of Dear ImGui with internal api]
 * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
 * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
@@ -106,10 +106,14 @@ Notes:
 # example bindings based on cimgui
 
 * [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui)
+* [cimgui-go](https://github.com/AllenDang/cimgui-go)
+* [Hexa.NET.ImGui](https://github.com/HexaEngine/Hexa.NET.ImGui)
+* [dear-imgui-rs](https://github.com/Latias94/dear-imgui-rs)
+* [CImGui.jl](https://github.com/Gnimuc/CImGui.jl)
 * [ImGui.NET](https://github.com/mellinoe/ImGui.NET)
+* [Zig-ImGui](https://github.com/SpexGuy/Zig-ImGui)
 * [nimgl/imgui](https://github.com/nimgl/imgui)
 * [kotlin-imgui](https://github.com/Dominaezzz/kotlin-imgui)
-* [CImGui.jl](https://github.com/Gnimuc/CImGui.jl)
 * [odin-imgui](https://github.com/ThisDrunkDane/odin-imgui)
 * [DerelictImgui](https://github.com/Extrawurst/DerelictImgui)
 * [BindBC-CimGui](https://github.com/MrcSnm/bindbc-cimgui)