From 93e8f5024e7c06bcfea2edcb431f73cde6369834 Mon Sep 17 00:00:00 2001 From: clindholm Date: Sat, 11 Jan 2025 15:03:12 +0100 Subject: [PATCH 1/2] vendor/glfw: add GetMonitorWorkarea binding --- vendor/glfw/bindings/bindings.odin | 1 + vendor/glfw/wrapper.odin | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index a4be006b0..e59239483 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -71,6 +71,7 @@ foreign glfw { GetPrimaryMonitor :: proc() -> MonitorHandle --- GetMonitors :: proc(count: ^c.int) -> [^]MonitorHandle --- GetMonitorPos :: proc(monitor: MonitorHandle, xpos, ypos: ^c.int) --- + GetMonitorWorkarea :: proc(monitor: MonitorHandle, xpos, ypos, width, height: ^c.int) --- GetMonitorPhysicalSize :: proc(monitor: MonitorHandle, widthMM, heightMM: ^c.int) --- GetMonitorContentScale :: proc(monitor: MonitorHandle, xscale, yscale: ^f32) --- diff --git a/vendor/glfw/wrapper.odin b/vendor/glfw/wrapper.odin index fa9329aa7..854dcdf9a 100644 --- a/vendor/glfw/wrapper.odin +++ b/vendor/glfw/wrapper.odin @@ -33,6 +33,10 @@ GetMonitorPos :: proc "c" (monitor: MonitorHandle) -> (xpos, ypos: c.int) { glfw.GetMonitorPos(monitor, &xpos, &ypos) return } +GetMonitorWorkarea :: proc "c" (monitor: MonitorHandle) -> (xpos, ypos, width, height: c.int) { + glfw.GetMonitorWorkarea(monitor, &xpos, &ypos, &width, &height) + return +} GetMonitorPhysicalSize :: proc "c" (monitor: MonitorHandle) -> (widthMM, heightMM: c.int) { glfw.GetMonitorPhysicalSize(monitor, &widthMM, &heightMM) return From 794e812932fb291e5dc8157e06e8a132c8231e17 Mon Sep 17 00:00:00 2001 From: Harold Brenes Date: Wed, 15 Jan 2025 02:04:49 -0500 Subject: [PATCH 2/2] Fixes crash when unused defines are used in conjunction with `-ignore-warnings`. --- src/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 41c7170f6..1de5d987b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1801,7 +1801,10 @@ gb_internal void check_defines(BuildContext *bc, Checker *c) { if (!found) { ERROR_BLOCK(); warning(nullptr, "given -define:%.*s is unused in the project", LIT(name)); - error_line("\tSuggestion: use the -show-defineables flag for an overview of the possible defines\n"); + + if (!global_ignore_warnings()) { + error_line("\tSuggestion: use the -show-defineables flag for an overview of the possible defines\n"); + } } } }