From 4310bbb1ea571b5f32bf85fdf689239d44bc4a3f Mon Sep 17 00:00:00 2001 From: SrS2225a Date: Sun, 29 Dec 2024 21:17:32 -0800 Subject: [PATCH 1/5] added window icon support for wayland --- core/backends/glfw/backend.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/core/backends/glfw/backend.cpp b/core/backends/glfw/backend.cpp index ecb376d6..8f9b0bcc 100644 --- a/core/backends/glfw/backend.cpp +++ b/core/backends/glfw/backend.cpp @@ -99,6 +99,7 @@ namespace backend { glfwWindowHint(GLFW_CLIENT_API, OPENGL_VERSIONS_IS_ES[i] ? GLFW_OPENGL_ES_API : GLFW_OPENGL_API); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, OPENGL_VERSIONS_MINOR[i]); + glfwWindowHintString(GLFW_WAYLAND_APP_ID, "SDR++"); // Create window with graphics context monitor = glfwGetPrimaryMonitor(); From 7bccc673113041c2a3229fc12d252ec48bbe00e2 Mon Sep 17 00:00:00 2001 From: SrS2225a Date: Tue, 31 Dec 2024 19:56:42 -0800 Subject: [PATCH 2/5] changed GLFW_WAYLAND_APP_ID, to the correct string name --- core/backends/glfw/backend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/backends/glfw/backend.cpp b/core/backends/glfw/backend.cpp index 8f9b0bcc..6bbd4d9f 100644 --- a/core/backends/glfw/backend.cpp +++ b/core/backends/glfw/backend.cpp @@ -99,7 +99,7 @@ namespace backend { glfwWindowHint(GLFW_CLIENT_API, OPENGL_VERSIONS_IS_ES[i] ? GLFW_OPENGL_ES_API : GLFW_OPENGL_API); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, OPENGL_VERSIONS_MINOR[i]); - glfwWindowHintString(GLFW_WAYLAND_APP_ID, "SDR++"); + glfwWindowHintString(GLFW_WAYLAND_APP_ID, "sdrpp"); // Create window with graphics context monitor = glfwGetPrimaryMonitor(); From afef9f57abefc876dad21e78b5546fb3d0d55e85 Mon Sep 17 00:00:00 2001 From: SrS2225a Date: Sat, 4 Jan 2025 22:58:53 -0800 Subject: [PATCH 3/5] add check for correct glfw for macro --- core/backends/glfw/backend.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/backends/glfw/backend.cpp b/core/backends/glfw/backend.cpp index 6bbd4d9f..7a32fa7c 100644 --- a/core/backends/glfw/backend.cpp +++ b/core/backends/glfw/backend.cpp @@ -99,8 +99,10 @@ namespace backend { glfwWindowHint(GLFW_CLIENT_API, OPENGL_VERSIONS_IS_ES[i] ? GLFW_OPENGL_ES_API : GLFW_OPENGL_API); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, OPENGL_VERSIONS_MINOR[i]); - glfwWindowHintString(GLFW_WAYLAND_APP_ID, "sdrpp"); - + #if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4) + glfwWindowHintString(GLFW_WAYLAND_APP_ID, "sdrpp"); + #endif + // Create window with graphics context monitor = glfwGetPrimaryMonitor(); window = glfwCreateWindow(winWidth, winHeight, "SDR++ v" VERSION_STR " (Built at " __TIME__ ", " __DATE__ ")", NULL, NULL); From 6c6f4264b26de4c84fd246873d4b37c26f36ed12 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Tue, 7 Jan 2025 21:41:22 +0100 Subject: [PATCH 4/5] fix formatting --- core/backends/glfw/backend.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/backends/glfw/backend.cpp b/core/backends/glfw/backend.cpp index 7a32fa7c..e2c0028e 100644 --- a/core/backends/glfw/backend.cpp +++ b/core/backends/glfw/backend.cpp @@ -99,9 +99,9 @@ namespace backend { glfwWindowHint(GLFW_CLIENT_API, OPENGL_VERSIONS_IS_ES[i] ? GLFW_OPENGL_ES_API : GLFW_OPENGL_API); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, OPENGL_VERSIONS_MINOR[i]); - #if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4) + #if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4) glfwWindowHintString(GLFW_WAYLAND_APP_ID, "sdrpp"); - #endif + #endif // Create window with graphics context monitor = glfwGetPrimaryMonitor(); From 395186ffb0328379f7241d43df0f194a4a9e2d76 Mon Sep 17 00:00:00 2001 From: AlexandreRouma Date: Sun, 2 Feb 2025 07:10:04 +0100 Subject: [PATCH 5/5] another format fix --- core/backends/glfw/backend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/backends/glfw/backend.cpp b/core/backends/glfw/backend.cpp index e2c0028e..cdf0c5c1 100644 --- a/core/backends/glfw/backend.cpp +++ b/core/backends/glfw/backend.cpp @@ -100,7 +100,7 @@ namespace backend { glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, OPENGL_VERSIONS_MINOR[i]); #if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 4) - glfwWindowHintString(GLFW_WAYLAND_APP_ID, "sdrpp"); + glfwWindowHintString(GLFW_WAYLAND_APP_ID, "sdrpp"); #endif // Create window with graphics context