From a9d85b0c3ba7d95c3f8f10d09304852cd473294a Mon Sep 17 00:00:00 2001
From: Julianiolo <50519317+Julianiolo@users.noreply.github.com>
Date: Sun, 20 Jun 2021 13:27:15 +0200
Subject: [PATCH] added GetWindowHandle[GL/Native]
---
projects/Geany/raylib.c.tags | 3 ++-
projects/Notepad++/raylib_npp_parser/raylib_npp.xml | 5 ++++-
.../Notepad++/raylib_npp_parser/raylib_to_parse.h | 3 ++-
src/core.c | 12 +++++++++---
src/raylib.h | 3 ++-
5 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/projects/Geany/raylib.c.tags b/projects/Geany/raylib.c.tags
index 1b47efdd7..dfedcda36 100644
--- a/projects/Geany/raylib.c.tags
+++ b/projects/Geany/raylib.c.tags
@@ -15,7 +15,8 @@ SetWindowPosition|void|(int x, int y);|
SetWindowMonitor|void|(int monitor);|
SetWindowMinSize|void|(int width, int height);|
SetWindowSize|void|(int width, int height);|
-GetWindowHandle|void *|(void);|
+GetWindowHandleGL|void *|(void);|
+GetWindowHandleNative|void *|(void);|
GetScreenWidth|int|(void);|
GetScreenHeight|int|(void);|
GetMonitorCount|int|(void);|
diff --git a/projects/Notepad++/raylib_npp_parser/raylib_npp.xml b/projects/Notepad++/raylib_npp_parser/raylib_npp.xml
index 2c8bafb5e..84d8cf3e3 100644
--- a/projects/Notepad++/raylib_npp_parser/raylib_npp.xml
+++ b/projects/Notepad++/raylib_npp_parser/raylib_npp.xml
@@ -97,7 +97,10 @@
-
+
+
+
+
diff --git a/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h b/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h
index 8079f5c78..099cfcab5 100644
--- a/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h
+++ b/projects/Notepad++/raylib_npp_parser/raylib_to_parse.h
@@ -26,7 +26,8 @@ RLAPI void SetWindowPosition(int x, int y); // Set window
RLAPI void SetWindowMonitor(int monitor); // Set monitor for the current window (fullscreen mode)
RLAPI void SetWindowMinSize(int width, int height); // Set window minimum dimensions (for FLAG_WINDOW_RESIZABLE)
RLAPI void SetWindowSize(int width, int height); // Set window dimensions
-RLAPI void *GetWindowHandle(void); // Get native window handle
+RLAPI void *GetWindowHandleGL(void); // Get opengl window handle
+RLAPI void *GetWindowHandleNative(void); // Get native window handle
RLAPI int GetScreenWidth(void); // Get current screen width
RLAPI int GetScreenHeight(void); // Get current screen height
RLAPI int GetMonitorCount(void); // Get number of connected monitors
diff --git a/src/core.c b/src/core.c
index 87f8ca90d..577dab968 100644
--- a/src/core.c
+++ b/src/core.c
@@ -348,10 +348,10 @@ typedef struct { unsigned int width; unsigned int height; } Size;
typedef struct CoreData {
struct {
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
- GLFWwindow *handle; // Native window handle (graphic device)
+ GLFWwindow *handle; // opengl window handle (graphic device)
#endif
#if defined(PLATFORM_RPI)
- EGL_DISPMANX_WINDOW_T handle; // Native window handle (graphic device)
+ EGL_DISPMANX_WINDOW_T handle; // opengl window handle (graphic device)
#endif
#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM) || defined(PLATFORM_UWP)
#if defined(PLATFORM_DRM)
@@ -1467,8 +1467,14 @@ int GetScreenHeight(void)
return CORE.Window.currentFbo.height;
}
+// Get opengl window handle
+void *GetWindowHandleGL(void)
+{
+ return CORE.Window.handle;
+}
+
// Get native window handle
-void *GetWindowHandle(void)
+void *GetWindowHandleNative(void)
{
#if defined(PLATFORM_DESKTOP) && defined(_WIN32)
// NOTE: Returned handle is: void *HWND (windows.h)
diff --git a/src/raylib.h b/src/raylib.h
index db9bb4019..55637ddef 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -936,7 +936,8 @@ RLAPI void SetWindowPosition(int x, int y); // Set window
RLAPI void SetWindowMonitor(int monitor); // Set monitor for the current window (fullscreen mode)
RLAPI void SetWindowMinSize(int width, int height); // Set window minimum dimensions (for FLAG_WINDOW_RESIZABLE)
RLAPI void SetWindowSize(int width, int height); // Set window dimensions
-RLAPI void *GetWindowHandle(void); // Get native window handle
+RLAPI void *GetWindowHandleGL(void); // Get native window handle
+RLAPI void *GetWindowHandleNative(void); // Get native window handle
RLAPI int GetScreenWidth(void); // Get current screen width
RLAPI int GetScreenHeight(void); // Get current screen height
RLAPI int GetMonitorCount(void); // Get number of connected monitors