drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[turbine/glfw] Fix to handle null click handler
All checks were successful
Build / build (push) Successful in 1m9s
Details

Browse Source
This commit is contained in:
Gary Talent
2025-12-03 20:44:01 -06:00
parent 63d0abaa3c
commit 03328ac10f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/olympic/turbine/src/glfw/turbine.cpp
View File

@@ -285,11 +285,11 @@ static void handleKeyPress(Context &ctx, int const key, bool const down) noexcep
map[GLFW_KEY_ESCAPE] = Key::Escape; map[GLFW_KEY_ESCAPE] = Key::Escape;
return map; return map;
}(); }();
auto const eventHandler = keyEventHandler(ctx);
auto const keyIdx = static_cast<std::size_t>(key); auto const keyIdx = static_cast<std::size_t>(key);
if (keyIdx < keyMap.size()) { if (keyIdx < keyMap.size()) {
auto const k = keyMap[keyIdx]; auto const k = keyMap[keyIdx];
setKeyDownStatus(ctx, k, down); setKeyDownStatus(ctx, k, down);
auto const eventHandler = keyEventHandler(ctx);
if (eventHandler) { if (eventHandler) {
eventHandler(ctx, k, down); eventHandler(ctx, k, down);
} }
@@ -306,7 +306,9 @@ static void handleGlfwMouseButtonEvent(
int) noexcept { int) noexcept {
auto &ctx = *static_cast<Context*>(glfwGetWindowUserPointer(window)); auto &ctx = *static_cast<Context*>(glfwGetWindowUserPointer(window));
setMandatoryRefreshPeriod(ctx, ticksMs(ctx) + config::MandatoryRefreshPeriod); setMandatoryRefreshPeriod(ctx, ticksMs(ctx) + config::MandatoryRefreshPeriod);
ctx.mouseButtonEventHandler(ctx, btn, action == 1); if (ctx.mouseButtonEventHandler) {
ctx.mouseButtonEventHandler(ctx, btn, action == 1);
}
} }
static void handleGlfwKeyEvent(GLFWwindow *window, int const key, int, int const action, int) noexcept { static void handleGlfwKeyEvent(GLFWwindow *window, int const key, int, int const action, int) noexcept {