Merge c46fe69009 into 3bae66c735

backends/imgui_impl_xlib.h

@@ -0,0 +1,61 @@
+// dear imgui: Platform Backend for Xlib
+// This needs to be used along with a Renderer (e.g. OpenGL3, Vulkan..)
+
+// Implemented features:
+//  [X] Platform: Clipboard support.
+//  [X] Platform: Mouse support.
+//  [X] Platform: Keyboard support.
+//  [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange'.
+// Issues:
+//  [ ] Platform: Missing touchscreen support.
+//  [ ] Platform: Missing gamepad support.
+//  [ ] Platform: Missing IME support.
+
+// You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.
+// Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need.
+// Learn about Dear ImGui:
+// - FAQ                  https://dearimgui.com/faq
+// - Getting Started      https://dearimgui.com/getting-started
+// - Documentation        https://dearimgui.com/docs (same as your local docs/ folder).
+// - Introduction, links and more at the top of imgui.cpp
+
+#pragma once
+#include "imgui.h"      // IMGUI_IMPL_API
+#ifndef IMGUI_DISABLE
+
+#include <X11/Xlib.h>
+
+IMGUI_IMPL_API bool     ImGui_ImplXlib_Init(Display* d, Window w);
+IMGUI_IMPL_API void     ImGui_ImplXlib_Shutdown();
+IMGUI_IMPL_API void     ImGui_ImplXlib_NewFrame();
+IMGUI_IMPL_API bool     ImGui_ImplXlib_ProcessEvent(XEvent* event);
+
+struct ImGui_ImplXlib_Data
+{
+    Display*        Dpy;
+    Window          Win;
+    int             Xi2Opcode;
+    XIM             IM;
+    XIC             IC;
+    timespec        Time;
+    int             MouseButtonsDown;
+    Cursor          MouseCursors[ImGuiMouseCursor_COUNT];
+    Cursor          LastMouseCursor;
+    char*           ClipboardTextData;
+    bool            SelectionWaiting;
+    bool            WantUpdateMonitors;
+    Atom            XA_CLIPBOARD;
+    Atom            XA_SELECTION;
+    Atom            XA_TARGETS;
+    Atom            XA_INCR;
+    Atom*           XA_MIME;
+    void*           RendererCtx;
+    unsigned int    MimeCount;
+
+    ImGui_ImplXlib_Data()   { memset((void*)this, 0, sizeof(*this)); }
+};
+
+ImGui_ImplXlib_Data* ImGui_ImplXlib_GetBackendData();
+void ImGui_ImplXlib_InitMultiViewportSupport();
+
+#endif // #ifndef IMGUI_DISABLE

examples/example_xlib_opengl3/Makefile

@@ -0,0 +1,55 @@
+#
+# Cross Platform Makefile
+# Compatible with Ubuntu 14.04.1
+#
+# You will need Xlib and Xinput:
+# Linux:
+#   apt-get install libx11-dev libxi-dev
+#
+
+#CXX = g++
+CXX = clang++
+
+EXE = example_xlib_opengl3
+IMGUI_DIR = ../..
+SOURCES = main.cpp
+SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
+SOURCES += $(IMGUI_DIR)/backends/imgui_impl_xlib.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl3.cpp
+OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
+
+CXXFLAGS = -std=c++11 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
+CXXFLAGS += -g -Wall -Wformat
+LIBS = -ldl -lGL -lX11 -lXi -lXrandr
+
+##---------------------------------------------------------------------
+## OPENGL ES
+##---------------------------------------------------------------------
+
+## This assumes a GL ES library available in the system, e.g. libGLESv2.so
+# CXXFLAGS += -DIMGUI_IMPL_OPENGL_ES2
+# LIBS += -lGLESv2
+## If you're on a Raspberry Pi and want to use the legacy drivers,
+## use the following instead:
+# LINUX_GL_LIBS = -L/opt/vc/lib -lbrcmGLESv2
+
+##---------------------------------------------------------------------
+## BUILD RULES
+##---------------------------------------------------------------------
+
+%.o:%.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+%.o:$(IMGUI_DIR)/%.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+%.o:$(IMGUI_DIR)/backends/%.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+all: $(EXE)
+	@echo Build complete for $(ECHO_MESSAGE)
+
+$(EXE): $(OBJS)
+	$(CXX) -o $@ $^ $(CXXFLAGS) $(LIBS)
+
+clean:
+	rm -f $(EXE) $(OBJS)

examples/example_xlib_opengl3/README.md

@@ -0,0 +1,11 @@
+
+# How to Build
+
+## Linux and similar Unixes
+
+Use our Makefile or directly:
+```
+c++ -I .. -I ../.. -I ../../backends
+  main.cpp ../../backends/imgui_impl_xlib.cpp ../../backends/imgui_impl_opengl3.cpp ../../imgui*.cpp
+   -lGL -lX11 -lXi -ldl
+```

examples/example_xlib_opengl3/main.cpp

@@ -0,0 +1,235 @@
+// Dear ImGui: standalone example application for Xlib + OpenGL
+
+// Learn about Dear ImGui:
+// - FAQ                  https://dearimgui.com/faq
+// - Getting Started      https://dearimgui.com/getting-started
+// - Documentation        https://dearimgui.com/docs (same as your local docs/ folder).
+// - Introduction, links and more at the top of imgui.cpp
+
+#include "imgui.h"
+#include "imgui_impl_xlib.h"
+#include "imgui_impl_opengl3.h"
+#include <stdio.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <GL/glxext.h>
+
+// Main code
+void ImGui_ImplXlib_SetRendererCtx(GLXContext ctx);
+int main(int, char**)
+{
+    // Setup Xlib
+    Display *display = XOpenDisplay(NULL);
+    if (display == NULL) {
+        printf("Error: Could not open display\n");
+        return -1;
+    }
+
+    int screen_id = DefaultScreen(display);
+
+    static int visual_attribs[] = {
+        GLX_RENDER_TYPE, GLX_RGBA_BIT,
+        GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+        GLX_DOUBLEBUFFER, True,
+        GLX_RED_SIZE, 8,
+        GLX_GREEN_SIZE, 8,
+        GLX_BLUE_SIZE, 8,
+    	GLX_DEPTH_SIZE, 24,
+    	GLX_STENCIL_SIZE, 8,
+        None
+    };
+
+    int num_fbc = 0;
+    GLXFBConfig *fbc = glXChooseFBConfig(display, screen_id, visual_attribs, &num_fbc);
+    if (!fbc) {
+        printf("Error: glXChooseFBConfig() failed\n");
+        return -1;
+    }
+
+    XVisualInfo *visual = glXGetVisualFromFBConfig(display, fbc[0]);
+    if (visual == 0) {
+        printf("Error: Could not create correct visual window\n");
+        XCloseDisplay(display);
+        return -1;
+    }
+
+    // Create window
+    XSetWindowAttributes window_attribs;
+    window_attribs.border_pixel = 0;
+    window_attribs.background_pixel = None;
+    window_attribs.colormap = XCreateColormap(display, RootWindow(display, screen_id), visual->visual, AllocNone);
+    Window window = XCreateWindow(display, RootWindow(display, screen_id), 0, 0, 1280, 720, 0, visual->depth, InputOutput, visual->visual, CWBackPixel | CWColormap | CWBorderPixel, &window_attribs);
+
+   // Handle window closing
+    Atom wmDeleteMessage = XInternAtom(display, "WM_DELETE_WINDOW", False);
+    XSetWMProtocols(display, window, &wmDeleteMessage, 1);
+
+    XFree(visual);
+
+    // Create GLX context
+    PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = NULL;
+    glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC) glXGetProcAddressARB((const GLubyte *)"glXCreateContextAttribsARB");
+
+#if defined(IMGUI_IMPL_OPENGL_ES2)
+    // GL ES 2.0 + GLSL 100
+    const char* glsl_version = "#version 100";
+    int context_attribs[] = {
+        GLX_CONTEXT_FLAGS_ARB        , 0,
+        GLX_CONTEXT_PROFILE_MASK_ARB , GLX_CONTEXT_ES2_PROFILE_BIT_EXT,
+        GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
+        GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+        None
+    };
+#else
+    // GL 3.0 + GLSL 130
+    const char* glsl_version = "#version 130";
+    int context_attribs[] = {
+        GLX_CONTEXT_FLAGS_ARB        , 0,
+        GLX_CONTEXT_PROFILE_MASK_ARB , GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+        GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+        GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+        None
+    };
+#endif
+
+    GLXContext glx_context = glXCreateContextAttribsARB(display, fbc[0], 0, True, context_attribs);
+    if (glx_context == 0) {
+        printf("Error: Could not create GLX context\n");
+        XCloseDisplay(display);
+        return -1;
+    }
+
+    XMapWindow(display, window);
+    glXMakeCurrent(display, window, glx_context);
+
+    // Setup Dear ImGui context
+    IMGUI_CHECKVERSION();
+    ImGui::CreateContext();
+    ImGuiIO& io = ImGui::GetIO(); (void)io;
+    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
+    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
+
+    // Setup Dear ImGui style
+    ImGui::StyleColorsDark();
+    //ImGui::StyleColorsLight();
+
+    // Setup Platform/Renderer backends
+    ImGui_ImplXlib_Init(display, window);
+    ImGui_ImplOpenGL3_Init(glsl_version);
+    ImGui_ImplXlib_SetRendererCtx(glx_context);
+
+    GLXWindow wctx = glXCreateWindow(ImGui_ImplXlib_GetBackendData()->Dpy, fbc[0], window, context_attribs);
+    ImGui_ImplXlib_Data* bd = ImGui_ImplXlib_GetBackendData();
+    glXMakeCurrent(bd->Dpy, wctx, (GLXContext)bd->RendererCtx);
+
+    // Load Fonts
+    // - If no fonts are loaded, dear imgui will use the default font. You can also load multiple fonts and use ImGui::PushFont()/PopFont() to select them.
+    // - AddFontFromFileTTF() will return the ImFont* so you can store it if you need to select the font among multiple.
+    // - If the file cannot be loaded, the function will return a nullptr. Please handle those errors in your application (e.g. use an assertion, or display an error and quit).
+    // - The fonts will be rasterized at a given size (w/ oversampling) and stored into a texture when calling ImFontAtlas::Build()/GetTexDataAsXXXX(), which ImGui_ImplXXXX_NewFrame below will call.
+    // - Use '#define IMGUI_ENABLE_FREETYPE' in your imconfig file to use Freetype for higher quality font rendering.
+    // - Read 'docs/FONTS.md' for more instructions and details.
+    // - Remember that in C/C++ if you want to include a backslash \ in a string literal you need to write a double backslash \\ !
+    // - Our Emscripten build process allows embedding fonts to be accessible at runtime from the "fonts/" folder. See Makefile.emscripten for details.
+    //io.Fonts->AddFontDefault();
+    //io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\segoeui.ttf", 18.0f);
+    //io.Fonts->AddFontFromFileTTF("../../misc/fonts/DroidSans.ttf", 16.0f);
+    //io.Fonts->AddFontFromFileTTF("../../misc/fonts/Roboto-Medium.ttf", 16.0f);
+    //io.Fonts->AddFontFromFileTTF("../../misc/fonts/Cousine-Regular.ttf", 15.0f);
+    //ImFont* font = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, nullptr, io.Fonts->GetGlyphRangesJapanese());
+    //IM_ASSERT(font != nullptr);
+
+    // Our state
+    bool show_demo_window = true;
+    bool show_another_window = false;
+    ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
+
+    // Main loop
+    bool done = false;
+    while (!done)
+    {
+        // Poll and handle events (inputs, window resize, etc.)
+        // You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs.
+        // - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application, or clear/overwrite your copy of the mouse data.
+        // - When io.WantCaptureKeyboard is true, do not dispatch keyboard input data to your main application, or clear/overwrite your copy of the keyboard data.
+        // Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags.
+        while (XPending(display))
+        {
+            XEvent event;
+            XNextEvent(display, &event);
+            ImGui_ImplXlib_ProcessEvent(&event);
+
+            if (event.type == ClientMessage && event.xclient.window == window && (Atom)event.xclient.data.l[0] == wmDeleteMessage)
+                done = true;
+        }
+
+        // Start the Dear ImGui frame
+        ImGui_ImplOpenGL3_NewFrame();
+        ImGui_ImplXlib_NewFrame();
+        ImGui::NewFrame();
+
+        ImGui::DockSpaceOverViewport();
+        // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
+        if (show_demo_window)
+            ImGui::ShowDemoWindow(&show_demo_window);
+
+        // 2. Show a simple window that we create ourselves. We use a Begin/End pair to create a named window.
+        {
+            static float f = 0.0f;
+            static int counter = 0;
+            static char text[512] = {0};
+
+            ImGui::Begin("Hello, world!");                          // Create a window called "Hello, world!" and append into it.
+
+            ImGui::Text("This is some useful text.");               // Display some text (you can use a format strings too)
+            ImGui::Checkbox("Demo Window", &show_demo_window);      // Edit bools storing our window open/close state
+            ImGui::Checkbox("Another Window", &show_another_window);
+
+            ImGui::SliderFloat("float", &f, 0.0f, 1.0f);            // Edit 1 float using a slider from 0.0f to 1.0f
+            ImGui::ColorEdit3("clear color", (float*)&clear_color); // Edit 3 floats representing a color
+
+            ImGui::InputText("input text", text, 512);
+
+            if (ImGui::Button("Button"))                            // Buttons return true when clicked (most widgets return true when edited/activated)
+                counter++;
+            ImGui::SameLine();
+            ImGui::Text("counter = %d", counter);
+
+            ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
+            ImGui::End();
+        }
+
+        // 3. Show another simple window.
+        if (show_another_window)
+        {
+            ImGui::Begin("Another Window", &show_another_window);   // Pass a pointer to our bool variable (the window will have a closing button that will clear the bool when clicked)
+            ImGui::Text("Hello from another window!");
+            if (ImGui::Button("Close Me"))
+                show_another_window = false;
+            ImGui::End();
+        }
+        // Rendering
+        ImGui::Render();
+        ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
+        if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) {
+            ImGui::UpdatePlatformWindows();
+            ImGui::RenderPlatformWindowsDefault();
+            ImGui_ImplXlib_Data* bd = ImGui_ImplXlib_GetBackendData();
+            glXMakeCurrent(bd->Dpy, wctx, (GLXContext)bd->RendererCtx);
+        }
+        glXSwapBuffers(display, wctx);
+    }
+
+    // Cleanup
+    ImGui_ImplOpenGL3_Shutdown();
+    ImGui_ImplXlib_Shutdown();
+    ImGui::DestroyContext();
+
+    glXDestroyContext(display, glx_context);
+    XDestroyWindow(display, window);
+    XFreeColormap(display, window_attribs.colormap);
+    XCloseDisplay(display);
+
+    return 0;
+}