From f821ce6490dcc1a75affe8bb2463774efdaa11fa Mon Sep 17 00:00:00 2001 From: jacob Date: Sat, 1 Mar 2025 13:36:30 -0600 Subject: [PATCH] fix mouse4 & mouse5 sys btn --- src/sock_win32.c | 2 +- src/sys_win32.c | 4 ++-- src/user.c | 3 --- src/user.h | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/sock_win32.c b/src/sock_win32.c index 7c58f543..b83d713a 100644 --- a/src/sock_win32.c +++ b/src/sock_win32.c @@ -77,7 +77,7 @@ INTERNAL struct sock_address sock_address_from_ip_port_cstr(char *ip_cstr, char if (status == 0) { while (ai_res) { if (ai_res->ai_family == AF_INET) { - struct sockaddr_in *sockaddr = (struct sockaddr_in *)(void *)ai_res->ai_addr; + struct sockaddr_in *sockaddr = (struct sockaddr_in *)ai_res->ai_addr; res.valid = true; res.family = SOCK_ADDRESS_FAMILY_IPV4; res.portnb = sockaddr->sin_port; diff --git a/src/sys_win32.c b/src/sys_win32.c index 4d2affee..053c2f0e 100644 --- a/src/sys_win32.c +++ b/src/sys_win32.c @@ -1113,9 +1113,9 @@ INTERNAL LRESULT CALLBACK win32_window_proc(HWND hwnd, UINT msg, WPARAM wparam, case WM_XBUTTONUP: case WM_XBUTTONDOWN: { u32 wparam_xbutton = GET_XBUTTON_WPARAM(wparam); if (wparam_xbutton == XBUTTON1) { - button = SYS_BTN_M3; - } else if (wparam_xbutton == XBUTTON2) { button = SYS_BTN_M4; + } else if (wparam_xbutton == XBUTTON2) { + button = SYS_BTN_M5; } } break; } diff --git a/src/user.c b/src/user.c index ad4e2853..99a63d0a 100644 --- a/src/user.c +++ b/src/user.c @@ -150,7 +150,6 @@ GLOBAL READONLY enum user_bind_kind g_binds[SYS_BTN_COUNT] = { [SYS_BTN_MWHEELUP] = USER_BIND_KIND_ZOOM_IN, [SYS_BTN_MWHEELDOWN] = USER_BIND_KIND_ZOOM_OUT, [SYS_BTN_M3] = USER_BIND_KIND_PAN, - [SYS_BTN_CTRL] = USER_BIND_KIND_CTRL_TEST, #if RTC /* Debug */ @@ -1082,8 +1081,6 @@ INTERNAL void user_update(void) { /* Draw collider using support points */ u32 detail = 32; - //u32 detail = 64; - //u32 detail = 512; draw_collider_line(G.ui_cmd_buffer, G.world_to_ui_xf, collider, xf, thickness, color, detail); } { diff --git a/src/user.h b/src/user.h index 1bfab82b..8515f2d0 100644 --- a/src/user.h +++ b/src/user.h @@ -25,7 +25,6 @@ enum user_bind_kind { USER_BIND_KIND_FIRE, /* Testing */ - USER_BIND_KIND_DEBUG_CLEAR, USER_BIND_KIND_DEBUG_SPAWN, USER_BIND_KIND_DEBUG_FOLLOW, @@ -38,7 +37,6 @@ enum user_bind_kind { USER_BIND_KIND_ZOOM_IN, USER_BIND_KIND_ZOOM_OUT, USER_BIND_KIND_PAN, - USER_BIND_KIND_CTRL_TEST, #if RTC /* Debug */