From b645ea6c5f9536fd80fb29089b8d5e814e210935 Mon Sep 17 00:00:00 2001 From: Kasin Sparks Date: Fri, 14 Apr 2023 23:59:31 -0400 Subject: [PATCH] libobs: Fix mouse button push to talk for linux Fixes issue with mouse buttons 4 and 5 not working for push to talk when using linux --- libobs/obs-nix-x11.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libobs/obs-nix-x11.c b/libobs/obs-nix-x11.c index a60048a5f..7ba79cb5b 100644 --- a/libobs/obs-nix-x11.c +++ b/libobs/obs-nix-x11.c @@ -22,7 +22,7 @@ #include "obs-nix-x11.h" #include -#if defined(XINPUT_FOUND) +#if defined(XCB_XINPUT_FOUND) #include #endif #include @@ -94,7 +94,7 @@ struct obs_hotkeys_platform { int num_keysyms; int syms_per_code; -#if defined(XINPUT_FOUND) +#if defined(XCB_XINPUT_FOUND) bool pressed[XINPUT_MOUSE_LEN]; bool update[XINPUT_MOUSE_LEN]; bool button_pressed[XINPUT_MOUSE_LEN]; @@ -829,7 +829,7 @@ static inline xcb_window_t root_window(obs_hotkeys_platform_t *context, return 0; } -#if defined(XINPUT_FOUND) +#if defined(XCB_XINPUT_FOUND) static inline void registerMouseEvents(struct obs_core_hotkeys *hotkeys) { obs_hotkeys_platform_t *context = hotkeys->platform_context; @@ -860,7 +860,7 @@ static bool obs_nix_x11_hotkeys_platform_init(struct obs_core_hotkeys *hotkeys) hotkeys->platform_context = bzalloc(sizeof(obs_hotkeys_platform_t)); hotkeys->platform_context->display = display; -#if defined(XINPUT_FOUND) +#if defined(XCB_XINPUT_FOUND) registerMouseEvents(hotkeys); #endif fill_base_keysyms(hotkeys); @@ -889,7 +889,7 @@ static bool mouse_button_pressed(xcb_connection_t *connection, { bool ret = false; -#if defined(XINPUT_FOUND) +#if defined(XCB_XINPUT_FOUND) memset(context->pressed, 0, XINPUT_MOUSE_LEN); memset(context->update, 0, XINPUT_MOUSE_LEN);