Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h

4 files changed, 71 insertions, 71 deletions

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
index b42eda1f21..23cadd3ee6 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
@@ -8,8 +8,8 @@
 #include <cmath>
 
 // This is an input plugin using the XInput 2.0 extension to the X11 protocol,
-// loosely based on the old XLib plugin. (Has nothing to do with the XInput 
-// API on Windows.) 
+// loosely based on the old XLib plugin. (Has nothing to do with the XInput
+// API on Windows.)
 
 // This plugin creates one KeyboardMouse object for each master pointer/
 // keyboard pair. Each KeyboardMouse object exports four types of controls:
@@ -20,20 +20,20 @@
 //      center of the emulator window.
 // *    Mouse axis controls: one for each cardinal direction. Calculated using
 //      a running average of relative mouse motion on each axis.
-// *    Key controls: these correspond to a limited subset of the keyboard 
+// *    Key controls: these correspond to a limited subset of the keyboard
 //      keys.
 
 
 // Mouse axis control tuning. Unlike absolute mouse position, relative mouse
 // motion data needs to be tweaked and smoothed out a bit to be usable.
 
-// Mouse axis control output is simply divided by this number. In practice, 
+// Mouse axis control output is simply divided by this number. In practice,
 // that just means you can use a smaller "dead zone" if you bind axis controls
 // to a joystick. No real need to make this customizable.
 #define MOUSE_AXIS_SENSITIVITY		8.0f
 
 // The mouse axis controls use a weighted running average. Each frame, the new
-// value is the average of the old value and the amount of relative mouse 
+// value is the average of the old value and the amount of relative mouse
 // motion during that frame. The old value is weighted by a ratio of
 // MOUSE_AXIS_SMOOTHING:1 compared to the new value. Increasing
 // MOUSE_AXIS_SMOOTHING makes the controls smoother, decreasing it makes them
@@ -49,31 +49,31 @@ namespace XInput2
 void Init(std::vector<Core::Device*>& devices, void* const hwnd)
 {
 	Display* dpy;
-	
+
 	dpy = XOpenDisplay(NULL);
-	
-	// xi_opcode is important; it will be used to identify XInput events by 
+
+	// xi_opcode is important; it will be used to identify XInput events by
 	// the polling loop in UpdateInput.
 	int xi_opcode, event, error;
-	
+
 	// verify that the XInput extension is available
 	if (!XQueryExtension(dpy, "XInputExtension", &xi_opcode, &event, &error))
 		return;
-	
+
 	// verify that the XInput extension is at at least version 2.0
 	int major = 2, minor = 0;
-	
+
 	if (XIQueryVersion(dpy, &major, &minor) != Success)
 		return;
-	
+
 	// register all master devices with Dolphin
-	
+
 	XIDeviceInfo*	all_masters;
 	XIDeviceInfo*	current_master;
 	int				num_masters;
-	
+
 	all_masters = XIQueryDevice(dpy, XIAllMasterDevices, &num_masters);
-	
+
 	for (int i = 0; i < num_masters; i++)
 	{
 		current_master = &all_masters[i];
@@ -82,34 +82,34 @@ void Init(std::vector<Core::Device*>& devices, void* const hwnd)
 			// be a master keyboard.
 			devices.push_back(new KeyboardMouse((Window)hwnd, xi_opcode, current_master->deviceid, current_master->attachment));
 	}
-	
+
 	XCloseDisplay(dpy);
-	
+
 	XIFreeDeviceInfo(all_masters);
 }
 
-// Apply the event mask to the device and all its slaves. Only used in the 
+// Apply the event mask to the device and all its slaves. Only used in the
 // constructor. Remember, each KeyboardMouse has its own copy of the event
 // stream, which is how multiple event masks can "coexist."
 void KeyboardMouse::SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid)
 {
 	// Set the event mask for the master device.
-	
+
 	mask->deviceid = deviceid;
 	XISelectEvents(m_display, window, mask, 1);
-	
+
 	// Query all the master device's slaves and set the same event mask for
 	// those too. There are two reasons we want to do this. For mouse devices,
 	// we want the raw motion events, and only slaves (i.e. physical hardware
 	// devices) emit those. For keyboard devices, selecting slaves avoids
 	// dealing with key focus.
-	
+
 	XIDeviceInfo*	all_slaves;
 	XIDeviceInfo*	current_slave;
 	int				num_slaves;
-	
+
 	all_slaves = XIQueryDevice(m_display, XIAllDevices, &num_slaves);
-	
+
 	for (int i = 0; i < num_slaves; i++)
 	{
 		current_slave = &all_slaves[i];
@@ -118,33 +118,33 @@ void KeyboardMouse::SelectEventsForDevice(Window window, XIEventMask *mask, int
 		mask->deviceid = current_slave->deviceid;
 		XISelectEvents(m_display, window, mask, 1);
 	}
-	
+
 	XIFreeDeviceInfo(all_slaves);
 }
 
-KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard) 
+KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard)
 	: m_window(window), xi_opcode(opcode), pointer_deviceid(pointer), keyboard_deviceid(keyboard)
 {
 	memset(&m_state, 0, sizeof(m_state));
-	
+
 	// The cool thing about each KeyboardMouse object having its own Display
 	// is that each one gets its own separate copy of the X11 event stream,
 	// which it can individually filter to get just the events it's interested
 	// in. So be aware that each KeyboardMouse object actually has its own X11
 	// "context."
 	m_display = XOpenDisplay(NULL);
-	
+
 	int min_keycode, max_keycode;
 	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
-	
+
 	int unused; // should always be 1
 	XIDeviceInfo* pointer_device = XIQueryDevice(m_display, pointer_deviceid, &unused);
 	name = std::string(pointer_device->name);
 	XIFreeDeviceInfo(pointer_device);
-	
+
 	XIEventMask		mask;
 	unsigned char	mask_buf[(XI_LASTEVENT + 7)/8];
-	
+
 	mask.mask_len = sizeof(mask_buf);
 	mask.mask = mask_buf;
 	memset(mask_buf, 0, sizeof(mask_buf));
@@ -155,9 +155,9 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar
 	XISetMask(mask_buf, XI_KeyPress);
 	XISetMask(mask_buf, XI_KeyRelease);
 
-	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, pointer_deviceid);	
+	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, pointer_deviceid);
 	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, keyboard_deviceid);
-	
+
 	// Keyboard Keys
 	for (int i = min_keycode; i <= max_keycode; ++i)
 	{
@@ -175,7 +175,7 @@ KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboar
 	// Mouse Cursor, X-/+ and Y-/+
 	for (int i = 0; i != 4; ++i)
 		AddInput(new Cursor(!!(i & 2), !!(i & 1), (&m_state.cursor.x)[!!(i & 2)]));
-	
+
 	// Mouse Axis, X-/+ and Y-/+
 	for (int i = 0; i != 4; ++i)
 		AddInput(new Axis(!!(i & 2), !!(i & 1), (&m_state.axis.x)[!!(i & 2)]));
@@ -191,15 +191,15 @@ void KeyboardMouse::UpdateCursor()
 {
 	double root_x, root_y, win_x, win_y;
 	Window root, child;
-	
-	// unused-- we're not interested in button presses here, as those are 
+
+	// unused-- we're not interested in button presses here, as those are
 	// updated using events
 	XIButtonState button_state;
 	XIModifierState mods;
 	XIGroupState group;
-	
+
 	XIQueryPointer(m_display, pointer_deviceid, m_window, &root, &child, &root_x, &root_y, &win_x, &win_y, &button_state, &mods, &group);
-	
+
 	free (button_state.mask);
 
 	XWindowAttributes win_attribs;
@@ -213,32 +213,32 @@ void KeyboardMouse::UpdateCursor()
 bool KeyboardMouse::UpdateInput()
 {
 	XFlush(m_display);
-	
+
 	// Get the absolute position of the mouse pointer
 	UpdateCursor();
-	
+
 	// for the axis controls
 	float delta_x = 0.0f, delta_y = 0.0f;
 	double delta_delta;
-	
+
 	// Iterate through the event queue - update the axis controls, mouse
 	// button controls, and keyboard controls.
 	XEvent event;
-	while (XPending(m_display)) 
+	while (XPending(m_display))
 	{
 		XNextEvent(m_display, &event);
-		
+
 		if (event.xcookie.type != GenericEvent)
 			continue;
 		if (event.xcookie.extension != xi_opcode)
 			continue;
 		if (!XGetEventData(m_display, &event.xcookie))
 			continue;
-		
+
 		// only one of these will get used
 		XIDeviceEvent* dev_event = (XIDeviceEvent*)event.xcookie.data;
 		XIRawEvent* raw_event = (XIRawEvent*)event.xcookie.data;
-		
+
 		switch (event.xcookie.evtype)
 		{
 		case XI_ButtonPress:
@@ -254,7 +254,7 @@ bool KeyboardMouse::UpdateInput()
 			m_state.keyboard[dev_event->detail / 8] &= ~(1<<(dev_event->detail % 8));
 			break;
 		case XI_RawMotion:
-			// always safe because there is always at least one byte in 
+			// always safe because there is always at least one byte in
 			// raw_event->valuators.mask, and if a bit is set in the mask,
 			// then the value in raw_values is also available.
 			if (XIMaskIsSet(raw_event->valuators.mask, 0))
@@ -273,10 +273,10 @@ bool KeyboardMouse::UpdateInput()
 			}
 			break;
 		}
-		
+
 		XFreeEventData(m_display, &event.xcookie);
 	}
-	
+
 	// apply axis smoothing
 	m_state.axis.x *= MOUSE_AXIS_SMOOTHING;
 	m_state.axis.x += delta_x;
@@ -284,7 +284,7 @@ bool KeyboardMouse::UpdateInput()
 	m_state.axis.y *= MOUSE_AXIS_SMOOTHING;
 	m_state.axis.y += delta_y;
 	m_state.axis.y /= MOUSE_AXIS_SMOOTHING+1.0f;
-	
+
 	return true;
 }
 
@@ -322,10 +322,10 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key
 	}
 	while (keysym == NoSymbol && i < 8);
 
-	// Convert to upper case for the keyname	
+	// Convert to upper case for the keyname
 	if (keysym >= 97 && keysym <= 122)
 		keysym -= 32;
-	
+
 	// 0x0110ffff is the top of the unicode character range according
 	// to keysymdef.h although it is probably more than we need.
 	if (keysym == NoSymbol || keysym > 0x0110ffff ||
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
index 58a1a38c8c..dfb8fa285d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
@@ -35,7 +35,7 @@ private:
 			float x, y;
 		} cursor, axis;
 	};
-	
+
 	class Key : public Input
 	{
 		friend class KeyboardMouse;
@@ -43,21 +43,21 @@ private:
 		std::string GetName() const { return m_keyname; }
 		Key(Display* display, KeyCode keycode, const char* keyboard);
 		ControlState GetState() const;
-		
+
 	private:
 		std::string	m_keyname;
 		Display* const	m_display;
 		const char* const m_keyboard;
 		const KeyCode	m_keycode;
 	};
-	
+
 	class Button : public Input
 	{
 	public:
 		std::string GetName() const { return name; }
 		Button(unsigned int index, unsigned int& buttons);
 		ControlState GetState() const;
-		
+
 	private:
 		const unsigned int& m_buttons;
 		const unsigned int m_index;
@@ -71,14 +71,14 @@ private:
 		bool IsDetectable() { return false; }
 		Cursor(u8 index, bool positive, const float& cursor);
 		ControlState GetState() const;
-	
+
 	private:
 		const float& m_cursor;
 		const u8 m_index;
 		const bool m_positive;
 		std::string name;
 	};
-	
+
 	class Axis : public Input
 	{
 	public:
@@ -93,22 +93,22 @@ private:
 		const bool m_positive;
 		std::string name;
 	};
-	
+
 private:
 	void SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid);
 	void UpdateCursor();
-	
+
 public:
 	bool UpdateInput();
 	bool UpdateOutput();
-	
+
 	KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
 	~KeyboardMouse();
-	
+
 	std::string GetName() const;
 	std::string GetSource() const;
 	int GetId() const;
-	
+
 private:
 	Window m_window;
 	Display* m_display;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
index 7016c4908b..e507b88c9f 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
@@ -20,7 +20,7 @@ KeyboardMouse::KeyboardMouse(Window window) : m_window(window)
 
 	int min_keycode, max_keycode;
 	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
-	
+
 	// Keyboard Keys
 	for (int i = min_keycode; i <= max_keycode; ++i)
 	{
@@ -99,7 +99,7 @@ KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* key
 		i++;
 	}
 	while (keysym == NoSymbol && i < 8);
-	
+
 	// Convert to upper case for the keyname
 	if (keysym >= 97 && keysym <= 122)
 		keysym -= 32;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
index c178f1e9b4..35b6100081 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
@@ -26,7 +26,7 @@ private:
 			float x, y;
 		} cursor;
 	};
-	
+
 	class Key : public Input
 	{
 		friend class KeyboardMouse;
@@ -34,14 +34,14 @@ private:
 		std::string GetName() const;
 		Key(Display* display, KeyCode keycode, const char* keyboard);
 		ControlState GetState() const;
-		
+
 	private:
 		std::string	m_keyname;
 		Display* const	m_display;
 		const char* const m_keyboard;
 		const KeyCode	m_keycode;
 	};
-	
+
 	class Button : public Input
 	{
 	public:
@@ -49,7 +49,7 @@ private:
 		Button(unsigned int index, unsigned int& buttons)
 			: m_buttons(buttons), m_index(index) {}
 		ControlState GetState() const;
-		
+
 	private:
 		const unsigned int& m_buttons;
 		const unsigned int m_index;
@@ -69,18 +69,18 @@ private:
 		const u8 m_index;
 		const bool m_positive;
 	};
-	
+
 public:
 	bool UpdateInput();
 	bool UpdateOutput();
-	
+
 	KeyboardMouse(Window window);
 	~KeyboardMouse();
-	
+
 	std::string GetName() const;
 	std::string GetSource() const;
 	int GetId() const;
-	
+
 private:
 	Window m_window;
 	Display* m_display;