From e0091261ed226403059df69b674abffcbd1b0e12 Mon Sep 17 00:00:00 2001
From: Alexander 'z33ky' Hirsch <1zeeky@gmail.com>
Date: Sat, 20 Mar 2021 13:58:23 +0100
Subject: [PATCH] Fix Buttons not working on Linux with newer gcc

The button mask is created by shifting a bit according to the
MouseCode, which is just a renamed ButtonCode_t.
Mouse buttons start at 107, which is way out of range for our ints.

To fix this, introduce MouseButtonBit(), which checks if a button code
corresponds to a mouse button at all and returns a usable bitmask
for the corresponding mouse button code.
This is then used for the button mask.
---
 sp/src/public/vgui/MouseCode.h        | 9 +++++++++
 sp/src/vgui2/vgui_controls/Button.cpp | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sp/src/public/vgui/MouseCode.h b/sp/src/public/vgui/MouseCode.h
index 7ba16214..9b13fc81 100644
--- a/sp/src/public/vgui/MouseCode.h
+++ b/sp/src/public/vgui/MouseCode.h
@@ -18,6 +18,15 @@
 namespace vgui
 {
 typedef ButtonCode_t MouseCode;
+
+static inline int MouseButtonBit(MouseCode code)
+{
+	if (code < MOUSE_FIRST || code > MOUSE_LAST) {
+		Assert(false);
+		return 0;
+	}
+	return 1 << (code - MOUSE_FIRST);
+}
 }
 
 #endif // MOUSECODE_H
diff --git a/sp/src/vgui2/vgui_controls/Button.cpp b/sp/src/vgui2/vgui_controls/Button.cpp
index cceb8043..406c3e13 100644
--- a/sp/src/vgui2/vgui_controls/Button.cpp
+++ b/sp/src/vgui2/vgui_controls/Button.cpp
@@ -695,12 +695,12 @@ void Button::SetMouseClickEnabled(MouseCode code,bool state)
 	if(state)
 	{
 		//set bit to 1
-		_mouseClickMask|=1<<((int)(code+1));
+		_mouseClickMask|=MouseButtonBit(code);
 	}
 	else
 	{
 		//set bit to 0
-		_mouseClickMask&=~(1<<((int)(code+1)));
+		_mouseClickMask&=~MouseButtonBit(code);
 	}	
 }
 
@@ -709,7 +709,7 @@ void Button::SetMouseClickEnabled(MouseCode code,bool state)
 //-----------------------------------------------------------------------------
 bool Button::IsMouseClickEnabled(MouseCode code)
 {
-	if(_mouseClickMask&(1<<((int)(code+1))))
+	if(_mouseClickMask&MouseButtonBit(code))
 	{
 		return true;
 	}