Remove GLFW.jl

Project.toml

@@ -1,16 +1,16 @@
 name = "ImGuiGLFWBackend"
 uuid = "623d79b3-9695-4e60-bd7e-2a5aabaa6933"
 authors = ["Yupei Qi <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
-GLFW = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
+GLFW_jll = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
 LibCImGui = "9be01004-c4f5-478b-abeb-cb32b114cf5e"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [compat]
-GLFW = "3.4"
 LibCImGui = "1.82.0"
+GLFW_jll = "3.3"
 julia = "1.6"
 
 [extras]

README.md

@@ -3,6 +3,7 @@
 [![CI](https://github.com/JuliaImGui/ImGuiGLFWBackend.jl/actions/workflows/ci.yml/badge.svg)](https://github.com/JuliaImGui/ImGuiGLFWBackend.jl/actions/workflows/ci.yml)
 [![TagBot](https://github.com/JuliaImGui/ImGuiGLFWBackend.jl/actions/workflows/TagBot.yml/badge.svg)](https://github.com/JuliaImGui/ImGuiGLFWBackend.jl/actions/workflows/TagBot.yml)
 [![Coverage](https://codecov.io/gh/JuliaImGui/ImGuiGLFWBackend.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaImGui/ImGuiGLFWBackend.jl)
+[![](https://img.shields.io/badge/design%20principle-KISS-orange)](https://en.wikipedia.org/wiki/KISS_principle)
 
 Julia GLFW backend for ImGui.
 

gen/Manifest.toml

@@ -36,17 +36,11 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
 deps = ["ArgTools", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
-[[GLFW]]
-deps = ["GLFW_jll"]
-git-tree-sha1 = "35dbc482f0967d8dceaa7ce007d16f9064072166"
-uuid = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
-version = "3.4.1"
-
 [[GLFW_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"]
-git-tree-sha1 = "a199aefead29c3c2638c3571a9993b564109d45a"
+git-tree-sha1 = "dba1e8614e98949abfa60480b13653813d8f0157"
 uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
-version = "3.3.4+0"
+version = "3.3.5+0"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]

gen/Project.toml

@@ -1,7 +1,7 @@
 [deps]
 Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
-GLFW = "f7f18e0c-5ee9-5ccd-a5bf-e8befd85ed98"
+GLFW_jll = "0656b61e-2033-5cc2-a64a-77c0f6c09b89"
 
 [compat]
 Clang = "0.14.0"
-GLFW = "3.4"
+GLFW_jll = "3.3"

gen/generator.jl

@@ -1,5 +1,5 @@
 using Clang.Generators
-using GLFW.GLFW_jll
+using GLFW_jll
 
 cd(@__DIR__)
 

gen/prologue.jl

@@ -1 +1 @@
-using GLFW.GLFW_jll
+using GLFW_jll

src/ImGuiGLFWBackend.jl

@@ -1,7 +1,7 @@
 module ImGuiGLFWBackend
 
 using Libdl
-using GLFW
+using GLFW_jll
 using LibCImGui
 
 include("LibGLFW.jl")
@@ -11,8 +11,9 @@ const GLFW_GET_CLIPBOARD_TEXT_FUNCPTR = Ref{Ptr{Cvoid}}(C_NULL)
 const GLFW_SET_CLIPBOARD_TEXT_FUNCPTR = Ref{Ptr{Cvoid}}(C_NULL)
 
 function __init__()
-    GLFW_GET_CLIPBOARD_TEXT_FUNCPTR[] = dlsym(dlopen(GLFW.libglfw), :glfwGetClipboardString)
-    GLFW_SET_CLIPBOARD_TEXT_FUNCPTR[] = dlsym(dlopen(GLFW.libglfw), :glfwSetClipboardString)
+    glfwInit() == GLFW_TRUE && atexit(glfwTerminate)
+    GLFW_GET_CLIPBOARD_TEXT_FUNCPTR[] = dlsym(dlopen(libglfw), :glfwGetClipboardString)
+    GLFW_SET_CLIPBOARD_TEXT_FUNCPTR[] = dlsym(dlopen(libglfw), :glfwSetClipboardString)
 end
 
 function c_get(x::Ptr{NTuple{N,T}}, i) where {N,T}

src/LibGLFW.jl

@@ -1,6 +1,6 @@
 module LibGLFW
 
-using GLFW.GLFW_jll
+using GLFW_jll
 
 
 # typedef void ( * GLFWglproc ) ( void )

src/platform.jl

@@ -39,7 +39,7 @@ function ImGui_ImplGlfw_CreateWindow(viewport::Ptr{ImGuiViewport})
     data_Window = glfwCreateWindow(wx, wy, "No Title Yet", C_NULL, share_window)
     viewport.PlatformHandle = data_Window
     if Sys.iswindows()
-        viewport.PlatformHandleRaw = ccall((:glfwGetWin32Window, GLFW.libglfw), Ptr{Cvoid}, (Ptr{GLFWwindow},), data_Window)
+        viewport.PlatformHandleRaw = ccall((:glfwGetWin32Window, libglfw), Ptr{Cvoid}, (Ptr{GLFWwindow},), data_Window)
     end
     data.Window = data_Window