Merge branch 'master' into 1.11

2021-03-18 00:21:09 +03:00
parent a5982dd0fa 1390db1444
commit 1a961a0600
33 changed files with 15184 additions and 130 deletions
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -453,6 +453,22 @@ LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			HandleMouseEvents();
 			return 0;

+		/* CityMania code start */
+		case WM_MBUTTONUP:
+			ReleaseCapture();
+			HandleKeypress(CM_WKC_MOUSE_MIDDLE, 0);
+			return 0;
+
+		case WM_XBUTTONUP: {
+			ReleaseCapture();
+			int button = CM_WKC_MOUSE_OTHER_START + GET_XBUTTON_WPARAM(wParam) - 1;
+			if (button >= CM_WKC_MOUSE_OTHER_START && button < CM_WKC_MOUSE_OTHER_END) {
+				HandleKeypress(button, 0);
+			}
+			return 0;
+		}
+		/* CityMania code end */
+
 		case WM_MOUSELEAVE:
 			UndrawMouseCursor();
 			_cursor.in_window = false;