Fix names and add definitions of native glfw header

Author: lmariscal

src/glfw.nim

@@ -25,7 +25,7 @@ else:
 
   # Thanks to ephja for making this build system
   when defined(windows):
-    {.passC: "-D_GLFW_WIN32 -DGLFW_EXPOSE_NATIVE_WIN32",
+    {.passC: "-D_GLFW_WIN32",
       passL: "-lopengl32 -lgdi32",
       compile: "glfw/private/glfw/src/win32_init.c",
       compile: "glfw/private/glfw/src/win32_joystick.c",

src/glfw/native.nim

@@ -10,6 +10,12 @@
 ## Turning ``glfwMakeContextCurrent(window)`` into ``window.makeContextCurrent()``.
 ##
 ## You can check the original documentation `here <http://www.glfw.org/docs/latest/>`_.
+##
+##  **By using the native access functions you assert that you know what you're
+##  doing and how to fix problems caused by using them.  If you don't, you
+##  shouldn't be using them.**
+##
+##  Please assert that you are using the right system for the right procedures.
 
 import glfw
 
@@ -21,6 +27,27 @@ when defined(glfwDLL):
   else:
     const glfw_dll* = "libglfw.so.3"
 
+when defined(windows):
+  {.passC: "-DGLFW_EXPOSE_NATIVE_WIN32".}
+  if not defined(vulkan):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_WGL".}
+elif defined(macosx):
+  {.passC: "-DGLFW_EXPOSE_NATIVE_COCOA".}
+  if not defined(vulkan):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_NSGL".}
+else:
+  if defined(wayland):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_WAYLAND".}
+  else:
+    {.passC: "-DGLFW_EXPOSE_NATIVE_X11".}
+
+  if defined(mesa):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_OSMESA".}
+  elif defined(egl):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_EGL".}
+  elif not defined(vulkan):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_GLX".}
+
 # Procs
 when defined(glfwDLL):
   {.push dynlib: glfw_dll, cdecl.}
@@ -231,7 +258,7 @@ proc getGLXWindow*(window: GLFWWindow): pointer #[GLXWindow]# {.importc: "glfwGe
   ## @since Added in version 3.2.
   ##
   ## @ingroup native
-proc wl_display*(): pointer #[struct]# {.importc: "wl_display*".}
+proc getWaylandDisplay*(): pointer #[struct]# {.importc: "glfwGetWaylandDisplay".}
   ## @brief Returns the `struct wl_display*` used by GLFW.
   ##
   ## @return The `struct wl_display*` used by GLFW, or `NULL` if an
@@ -243,7 +270,7 @@ proc wl_display*(): pointer #[struct]# {.importc: "wl_display*".}
   ## @since Added in version 3.2.
   ##
   ## @ingroup native
-proc wl_output*(monitor: GLFWMonitor): pointer #[struct]# {.importc: "wl_output*".}
+proc getWaylandMonitor*(monitor: GLFWMonitor): pointer #[struct]# {.importc: "glfwGetWaylandMonitor".}
   ## @brief Returns the `struct wl_output*` of the specified monitor.
   ##
   ## @return The `struct wl_output*` of the specified monitor, or `NULL` if an
@@ -255,7 +282,7 @@ proc wl_output*(monitor: GLFWMonitor): pointer #[struct]# {.importc: "wl_output*
   ## @since Added in version 3.2.
   ##
   ## @ingroup native
-proc wl_surface*(window: GLFWWindow): pointer #[struct]# {.importc: "wl_surface*".}
+proc getWaylandWindow*(window: GLFWWindow): pointer #[struct]# {.importc: "glfwGetWaylandWindow".}
   ## @brief Returns the main `struct wl_surface*` of the specified window.
   ##
   ## @return The main `struct wl_surface*` of the specified window, or `NULL` if

tests/test.nim

@@ -1,7 +1,7 @@
 # Copyright 2019, NimGL contributors.
 
 import unittest
-import glfw
+import glfw, glfw/native
 
 proc keyProc(window: GLFWWindow, key: int32, scancode: int32, action: int32, mods: int32): void {.cdecl.} =
   if key == GLFWKey.Escape and action == GLFWPress:
@@ -20,6 +20,10 @@ suite "GLFW":
     discard window.setKeyCallback(keyProc)
     window.makeContextCurrent()
 
+    var hwnd = window.getWGLContext()
+    if hwnd == nil:
+      echo "oh no"
+
   test "main loop":
     while not window.windowShouldClose:
       glfwPollEvents()

tools/generator.nim

@@ -311,7 +311,7 @@ proc genProcs*(output: var string, isNative: bool) =
       parts.delete(0, 0)
     returnType = returnType.translateType()
 
-    let originalName = parts[1].split('(')[0]
+    var originalName = parts[1].split('(')[0]
     var argsLine = line.split("(")[1]
     var argsTypes = argsLine.split(",")
     argsTypes = argsTypes.filter(proc (x: string): bool = x != "void" and x != "")
@@ -341,12 +341,15 @@ proc genProcs*(output: var string, isNative: bool) =
       procName[0] = procName[0].toLowerAscii()
 
     if isNative:
-      if procName == "urface*":
-        procName = "wl_surface"
-      elif procName == "wl_display*":
-        procName = "wl_display"
+      if procName == "wl_display*":
+        procName = "getWaylandDisplay"
+        originalName = "glfwGetWaylandDisplay"
       elif procName == "utput*":
-        procName = "wl_output"
+        procName = "getWaylandMonitor"
+        originalName = "glfwGetWaylandMonitor"
+      elif procName == "urface*":
+        procName = "getWaylandWindow"
+        originalName = "glfwGetWaylandWindow"
 
     argsTypes = argsTypes.map(translateType)
     if procName == "glfwCreateWindow":

tools/utils.nim

@@ -28,7 +28,7 @@ else:
 
   # Thanks to ephja for making this build system
   when defined(windows):
-    {.passC: "-D_GLFW_WIN32 -DGLFW_EXPOSE_NATIVE_WIN32",
+    {.passC: "-D_GLFW_WIN32",
       passL: "-lopengl32 -lgdi32",
       compile: "glfw/private/glfw/src/win32_init.c",
       compile: "glfw/private/glfw/src/win32_joystick.c",
@@ -101,6 +101,12 @@ const srcNativeHeader* = """
 ## Turning ``glfwMakeContextCurrent(window)`` into ``window.makeContextCurrent()``.
 ##
 ## You can check the original documentation `here <http://www.glfw.org/docs/latest/>`_.
+##
+##  **By using the native access functions you assert that you know what you're
+##  doing and how to fix problems caused by using them.  If you don't, you
+##  shouldn't be using them.**
+##
+##  Please assert that you are using the right system for the right procedures.
 
 import glfw
 
@@ -111,6 +117,27 @@ when defined(glfwDLL):
     const glfw_dll* = "libglfw3.dylib"
   else:
     const glfw_dll* = "libglfw.so.3"
+
+when defined(windows):
+  {.passC: "-DGLFW_EXPOSE_NATIVE_WIN32".}
+  if not defined(vulkan):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_WGL".}
+elif defined(macosx):
+  {.passC: "-DGLFW_EXPOSE_NATIVE_COCOA".}
+  if not defined(vulkan):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_NSGL".}
+else:
+  if defined(wayland):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_WAYLAND".}
+  else:
+    {.passC: "-DGLFW_EXPOSE_NATIVE_X11".}
+
+  if defined(mesa):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_OSMESA".}
+  elif defined(egl):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_EGL".}
+  elif not defined(vulkan):
+    {.passC: "-DGLFW_EXPOSE_NATIVE_GLX".}
 """
 
 const preProcs* = """