Formatting changes

* Removed extra private specifier since everything is already private here. Can be undone if it's felt this makes things less clear
* Add separate static xwininput handler method and made HandleAllegroMouseInput non-static. Tweaked method comments a bit
* Removed void argument from HandleAllegroMouseInput

Author: garethyr

Managers/UInputMan.cpp

@@ -126,7 +126,7 @@ namespace RTE {
 		poll_joystick();
 
 #ifdef __unix__
-		_xwin_input_handler = HandleAllegroMouseInput;
+		_xwin_input_handler = XWinInputHandlerOverride;
 #endif
 
 		return 0;
@@ -1034,8 +1034,8 @@ namespace RTE {
 			events.push_back(e);
 		}
 
-		g_UInputMan.m_AllegroMousePreviousX = mouse_x;
-		g_UInputMan.m_AllegroMousePreviousY = mouse_y;
+		m_AllegroMousePreviousX = mouse_x;
+		m_AllegroMousePreviousY = mouse_y;
 		int mouseDeltaX = 0;
 		int mouseDeltaY = 0;
 
@@ -1044,13 +1044,13 @@ namespace RTE {
 		for (std::vector<XEvent>::reverse_iterator event = events.rbegin(); event < events.rend(); ++event) {
 			switch (event->type) {
 				case MotionNotify: {
-					mouseDeltaX = event->xmotion.x - g_UInputMan.m_AllegroMousePreviousX;
-					mouseDeltaY = event->xmotion.y - g_UInputMan.m_AllegroMousePreviousY;
+					mouseDeltaX = event->xmotion.x - m_AllegroMousePreviousX;
+					mouseDeltaY = event->xmotion.y - m_AllegroMousePreviousY;
 					_xwin_mouse_interrupt(mouseDeltaX, mouseDeltaY, 0, 0, mouse_b);
-					_mouse_x = g_UInputMan.m_AllegroMousePreviousX = !g_UInputMan.m_TrapMousePos ? event->xmotion.x : halfResX;
-					_mouse_y = g_UInputMan.m_AllegroMousePreviousY = !g_UInputMan.m_TrapMousePos ? event->xmotion.y : halfResY;
+					_mouse_x = m_AllegroMousePreviousX = !m_TrapMousePos ? event->xmotion.x : halfResX;
+					_mouse_y = m_AllegroMousePreviousY = !m_TrapMousePos ? event->xmotion.y : halfResY;
 
-					if (g_UInputMan.m_TrapMousePos && (mouseDeltaX != 0 || mouseDeltaY != 0)) {
+					if (m_TrapMousePos && (mouseDeltaX != 0 || mouseDeltaY != 0)) {
 						XWarpPointer(_xwin.display, _xwin.window, _xwin.window, 0, 0, 0, 0, halfResX, halfResY);
 					}
 					break;
@@ -1067,7 +1067,7 @@ namespace RTE {
 		_xwin.mouse_warped = 0;
 		_xwin_private_handle_input();
 
-		if (g_UInputMan.m_TrapMousePos) {
+		if (m_TrapMousePos) {
 			mouse_x = _xwin.window_width / 2;
 			mouse_y = _xwin.window_height / 2;
 		}

Managers/UInputMan.h

@@ -797,18 +797,20 @@ namespace RTE {
 		UInputMan & operator=(const UInputMan &rhs) = delete;
 
 #ifdef __unix__
-	private:
-
 		int m_AllegroMousePreviousX; //!< Stored mouse x position for the allegro event handler.
 		int m_AllegroMousePreviousY; //!< Stored mouse y position for the allegro event handler.
 
+		/// <summary>
+		/// Necessary static handler method ensuring mouse inputs work well on Linux. Must be applied to _xwin_input_handler when manager is initialized.
+		/// </summary>
+		static void XWinInputHandlerOverride() { g_UInputMan.HandleAllegroMouseInput(); }
+
 		/// <summary>
 		/// Mouse input handler to circumvent the input drops that allegro does regularly, by replacing and disabling the default warping behaviour.
 		/// Motion events that are generated while the handler is working are offset such that the allegro driver doesn't mess up the mickeys.
-		/// This also handles the centering warp for relative mouse motion.
-		/// Should be applied to _xwin_input_handler. Might not run in the main thread, depending on how allegro was built.
+		/// This also handles the centering warp for relative mouse motion. Might not run in the main thread, depending on how allegro was built.
 		/// </summary>
-		static void HandleAllegroMouseInput(void);
+		void HandleAllegroMouseInput();
 
 		/// <summary>
 		/// Position the mouse on the screen in window coordinates. Generates MouseMotion events if the requested position is different from the actual mouse position.