diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
4 files changed, 471 insertions, 469 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index 3d7a02a3a0..79b86a487d 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -2,10 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include <X11/XKBlib.h> #include <cmath> #include <cstdlib> #include <cstring> -#include <X11/XKBlib.h> #include "InputCommon/ControllerInterface/Xlib/XInput2.h" @@ -25,7 +25,6 @@ // * 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. @@ -46,325 +45,324 @@ namespace ciface { namespace XInput2 { - // This function will add zero or more KeyboardMouse objects to devices. void Init(std::vector<Core::Device*>& devices, void* const hwnd) { - Display* dpy = XOpenDisplay(nullptr); + Display* dpy = XOpenDisplay(nullptr); - // xi_opcode is important; it will be used to identify XInput events by - // the polling loop in UpdateInput. - int xi_opcode, event, error; + // 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 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; + // verify that the XInput extension is at at least version 2.0 + int major = 2, minor = 0; - if (XIQueryVersion(dpy, &major, &minor) != Success) - return; + if (XIQueryVersion(dpy, &major, &minor) != Success) + return; - // register all master devices with Dolphin + // register all master devices with Dolphin - XIDeviceInfo* all_masters; - XIDeviceInfo* current_master; - int num_masters; + XIDeviceInfo* all_masters; + XIDeviceInfo* current_master; + int num_masters; - all_masters = XIQueryDevice(dpy, XIAllMasterDevices, &num_masters); + all_masters = XIQueryDevice(dpy, XIAllMasterDevices, &num_masters); - for (int i = 0; i < num_masters; i++) - { - current_master = &all_masters[i]; - if (current_master->use == XIMasterPointer) - // Since current_master is a master pointer, its attachment must - // be a master keyboard. - devices.push_back(new KeyboardMouse((Window)hwnd, xi_opcode, current_master->deviceid, current_master->attachment)); - } + for (int i = 0; i < num_masters; i++) + { + current_master = &all_masters[i]; + if (current_master->use == XIMasterPointer) + // Since current_master is a master pointer, its attachment must + // be a master keyboard. + devices.push_back(new KeyboardMouse((Window)hwnd, xi_opcode, current_master->deviceid, + current_master->attachment)); + } - XCloseDisplay(dpy); + XCloseDisplay(dpy); - XIFreeDeviceInfo(all_masters); + XIFreeDeviceInfo(all_masters); } // 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) +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]; - if ((current_slave->use != XISlavePointer && current_slave->use != XISlaveKeyboard) || current_slave->attachment != deviceid) - continue; - mask->deviceid = current_slave->deviceid; - XISelectEvents(m_display, window, mask, 1); - } - - XIFreeDeviceInfo(all_slaves); + // 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]; + if ((current_slave->use != XISlavePointer && current_slave->use != XISlaveKeyboard) || + current_slave->attachment != deviceid) + continue; + mask->deviceid = current_slave->deviceid; + XISelectEvents(m_display, window, mask, 1); + } + + XIFreeDeviceInfo(all_slaves); } KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard) - : m_window(window), xi_opcode(opcode), pointer_deviceid(pointer), keyboard_deviceid(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(nullptr); - - 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)); - - XISetMask(mask_buf, XI_ButtonPress); - XISetMask(mask_buf, XI_ButtonRelease); - XISetMask(mask_buf, XI_RawMotion); - XISetMask(mask_buf, XI_KeyPress); - XISetMask(mask_buf, XI_KeyRelease); - - 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) - { - Key* temp_key = new Key(m_display, i, m_state.keyboard); - if (temp_key->m_keyname.length()) - AddInput(temp_key); - else - delete temp_key; - } - - // Mouse Buttons - for (int i = 0; i < 5; i++) - AddInput(new Button(i, &m_state.buttons)); - - // Mouse Cursor, X-/+ and Y-/+ - for (int i = 0; i != 4; ++i) - AddInput(new Cursor(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.cursor.y : &m_state.cursor.x)); - - // Mouse Axis, X-/+ and Y-/+ - for (int i = 0; i != 4; ++i) - AddInput(new Axis(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.axis.y : &m_state.axis.x)); + 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(nullptr); + + 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)); + + XISetMask(mask_buf, XI_ButtonPress); + XISetMask(mask_buf, XI_ButtonRelease); + XISetMask(mask_buf, XI_RawMotion); + XISetMask(mask_buf, XI_KeyPress); + XISetMask(mask_buf, XI_KeyRelease); + + 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) + { + Key* temp_key = new Key(m_display, i, m_state.keyboard); + if (temp_key->m_keyname.length()) + AddInput(temp_key); + else + delete temp_key; + } + + // Mouse Buttons + for (int i = 0; i < 5; i++) + AddInput(new Button(i, &m_state.buttons)); + + // Mouse Cursor, X-/+ and Y-/+ + for (int i = 0; i != 4; ++i) + AddInput(new Cursor(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.cursor.y : &m_state.cursor.x)); + + // Mouse Axis, X-/+ and Y-/+ + for (int i = 0; i != 4; ++i) + AddInput(new Axis(!!(i & 2), !!(i & 1), (i & 2) ? &m_state.axis.y : &m_state.axis.x)); } KeyboardMouse::~KeyboardMouse() { - XCloseDisplay(m_display); + XCloseDisplay(m_display); } // Update the mouse cursor controls void KeyboardMouse::UpdateCursor() { - double root_x, root_y, win_x, win_y; - Window root, child; + double root_x, root_y, win_x, win_y; + Window root, child; - // unused-- we're not interested in button presses here, as those are - // updated using events - XIButtonState button_state; - XIModifierState mods; - XIGroupState group; + // 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); + 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); + free(button_state.mask); - XWindowAttributes win_attribs; - XGetWindowAttributes(m_display, m_window, &win_attribs); + XWindowAttributes win_attribs; + XGetWindowAttributes(m_display, m_window, &win_attribs); - // the mouse position as a range from -1 to 1 - m_state.cursor.x = win_x / (float)win_attribs.width * 2 - 1; - m_state.cursor.y = win_y / (float)win_attribs.height * 2 - 1; + // the mouse position as a range from -1 to 1 + m_state.cursor.x = win_x / (float)win_attribs.width * 2 - 1; + m_state.cursor.y = win_y / (float)win_attribs.height * 2 - 1; } void 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)) - { - 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: - m_state.buttons |= 1<<(dev_event->detail-1); - break; - case XI_ButtonRelease: - m_state.buttons &= ~(1<<(dev_event->detail-1)); - break; - case XI_KeyPress: - m_state.keyboard[dev_event->detail / 8] |= 1<<(dev_event->detail % 8); - break; - case XI_KeyRelease: - 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 - // 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)) - { - delta_delta = raw_event->raw_values[0]; - // test for inf and nan - if (delta_delta == delta_delta && 1+delta_delta != delta_delta) - delta_x += delta_delta; - } - if (XIMaskIsSet(raw_event->valuators.mask, 1)) - { - delta_delta = raw_event->raw_values[1]; - // test for inf and nan - if (delta_delta == delta_delta && 1+delta_delta != delta_delta) - delta_y += delta_delta; - } - break; - } - - XFreeEventData(m_display, &event.xcookie); - } - - // apply axis smoothing - m_state.axis.x *= MOUSE_AXIS_SMOOTHING; - m_state.axis.x += delta_x; - m_state.axis.x /= MOUSE_AXIS_SMOOTHING+1.0f; - m_state.axis.y *= MOUSE_AXIS_SMOOTHING; - m_state.axis.y += delta_y; - m_state.axis.y /= MOUSE_AXIS_SMOOTHING+1.0f; + 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)) + { + 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: + m_state.buttons |= 1 << (dev_event->detail - 1); + break; + case XI_ButtonRelease: + m_state.buttons &= ~(1 << (dev_event->detail - 1)); + break; + case XI_KeyPress: + m_state.keyboard[dev_event->detail / 8] |= 1 << (dev_event->detail % 8); + break; + case XI_KeyRelease: + 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 + // 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)) + { + delta_delta = raw_event->raw_values[0]; + // test for inf and nan + if (delta_delta == delta_delta && 1 + delta_delta != delta_delta) + delta_x += delta_delta; + } + if (XIMaskIsSet(raw_event->valuators.mask, 1)) + { + delta_delta = raw_event->raw_values[1]; + // test for inf and nan + if (delta_delta == delta_delta && 1 + delta_delta != delta_delta) + delta_y += delta_delta; + } + break; + } + + XFreeEventData(m_display, &event.xcookie); + } + + // apply axis smoothing + m_state.axis.x *= MOUSE_AXIS_SMOOTHING; + m_state.axis.x += delta_x; + m_state.axis.x /= MOUSE_AXIS_SMOOTHING + 1.0f; + m_state.axis.y *= MOUSE_AXIS_SMOOTHING; + m_state.axis.y += delta_y; + m_state.axis.y /= MOUSE_AXIS_SMOOTHING + 1.0f; } std::string KeyboardMouse::GetName() const { - // This is the name string we got from the X server for this master - // pointer/keyboard pair. - return name; + // This is the name string we got from the X server for this master + // pointer/keyboard pair. + return name; } std::string KeyboardMouse::GetSource() const { - return "XInput2"; + return "XInput2"; } int KeyboardMouse::GetId() const { - return -1; + return -1; } KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) - : m_display(display), m_keyboard(keyboard), m_keycode(keycode) + : m_display(display), m_keyboard(keyboard), m_keycode(keycode) { - int i = 0; - KeySym keysym = 0; - do - { - keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); - i++; - } - while (keysym == NoSymbol && i < 8); - - // 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 || - XKeysymToString(keysym) == nullptr) - m_keyname = std::string(); - else - m_keyname = std::string(XKeysymToString(keysym)); + int i = 0; + KeySym keysym = 0; + do + { + keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); + i++; + } while (keysym == NoSymbol && i < 8); + + // 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 || XKeysymToString(keysym) == nullptr) + m_keyname = std::string(); + else + m_keyname = std::string(XKeysymToString(keysym)); } ControlState KeyboardMouse::Key::GetState() const { - return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; + return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } KeyboardMouse::Button::Button(unsigned int index, unsigned int* buttons) - : m_buttons(buttons), m_index(index) + : m_buttons(buttons), m_index(index) { - // this will be a problem if we remove the hardcoded five-button limit - name = std::string("Click ") + (char)('1' + m_index); + // this will be a problem if we remove the hardcoded five-button limit + name = std::string("Click ") + (char)('1' + m_index); } ControlState KeyboardMouse::Button::GetState() const { - return ((*m_buttons & (1 << m_index)) != 0); + return ((*m_buttons & (1 << m_index)) != 0); } KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float* cursor) - : m_cursor(cursor), m_index(index), m_positive(positive) + : m_cursor(cursor), m_index(index), m_positive(positive) { - name = std::string("Cursor ") + (char)('X' + m_index) + (m_positive ? '+' : '-'); + name = std::string("Cursor ") + (char)('X' + m_index) + (m_positive ? '+' : '-'); } ControlState KeyboardMouse::Cursor::GetState() const { - return std::max(0.0f, *m_cursor / (m_positive ? 1.0f : -1.0f)); + return std::max(0.0f, *m_cursor / (m_positive ? 1.0f : -1.0f)); } KeyboardMouse::Axis::Axis(u8 index, bool positive, const float* axis) - : m_axis(axis), m_index(index), m_positive(positive) + : m_axis(axis), m_index(index), m_positive(positive) { - name = std::string("Axis ") + (char)('X' + m_index) + (m_positive ? '+' : '-'); + name = std::string("Axis ") + (char)('X' + m_index) + (m_positive ? '+' : '-'); } ControlState KeyboardMouse::Axis::GetState() const { - return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); + return std::max(0.0f, *m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY)); } - } } diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 09a59706e3..e8f2e2e06b 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -7,9 +7,9 @@ #pragma once extern "C" { -#include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/extensions/XInput2.h> +#include <X11/keysym.h> } #include "InputCommon/ControllerInterface/Device.h" @@ -18,103 +18,101 @@ namespace ciface { namespace XInput2 { - void Init(std::vector<Core::Device*>& devices, void* const hwnd); class KeyboardMouse : public Core::Device { - private: - struct State - { - char keyboard[32]; - unsigned int buttons; - struct - { - float x, y; - } cursor, axis; - }; - - class Key : public Input - { - friend class KeyboardMouse; - public: - std::string GetName() const override { return m_keyname; } - Key(Display* display, KeyCode keycode, const char* keyboard); - ControlState GetState() const override; - - 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 override { return name; } - Button(unsigned int index, unsigned int* buttons); - ControlState GetState() const override; - - private: - const unsigned int* m_buttons; - const unsigned int m_index; - std::string name; - }; - - class Cursor : public Input - { - public: - std::string GetName() const override { return name; } - bool IsDetectable() override { return false; } - Cursor(u8 index, bool positive, const float* cursor); - ControlState GetState() const override; - - private: - const float* m_cursor; - const u8 m_index; - const bool m_positive; - std::string name; - }; - - class Axis : public Input - { - public: - std::string GetName() const override { return name; } - bool IsDetectable() override { return false; } - Axis(u8 index, bool positive, const float* axis); - ControlState GetState() const override; - - private: - const float* m_axis; - const u8 m_index; - const bool m_positive; - std::string name; - }; + struct State + { + char keyboard[32]; + unsigned int buttons; + struct + { + float x, y; + } cursor, axis; + }; + + class Key : public Input + { + friend class KeyboardMouse; + + public: + std::string GetName() const override { return m_keyname; } + Key(Display* display, KeyCode keycode, const char* keyboard); + ControlState GetState() const override; + + 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 override { return name; } + Button(unsigned int index, unsigned int* buttons); + ControlState GetState() const override; + + private: + const unsigned int* m_buttons; + const unsigned int m_index; + std::string name; + }; + + class Cursor : public Input + { + public: + std::string GetName() const override { return name; } + bool IsDetectable() override { return false; } + Cursor(u8 index, bool positive, const float* cursor); + ControlState GetState() const override; + + private: + const float* m_cursor; + const u8 m_index; + const bool m_positive; + std::string name; + }; + + class Axis : public Input + { + public: + std::string GetName() const override { return name; } + bool IsDetectable() override { return false; } + Axis(u8 index, bool positive, const float* axis); + ControlState GetState() const override; + + private: + const float* m_axis; + const u8 m_index; + const bool m_positive; + std::string name; + }; private: - void SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid); - void UpdateCursor(); + void SelectEventsForDevice(Window window, XIEventMask* mask, int deviceid); + void UpdateCursor(); public: - void UpdateInput() override; + void UpdateInput() override; - KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid); - ~KeyboardMouse(); + KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid); + ~KeyboardMouse(); - std::string GetName() const override; - std::string GetSource() const override; - int GetId() const override; + std::string GetName() const override; + std::string GetSource() const override; + int GetId() const override; private: - Window m_window; - Display* m_display; - State m_state; - int xi_opcode; - const int pointer_deviceid, keyboard_deviceid; - std::string name; + Window m_window; + Display* m_display; + State m_state; + int xi_opcode; + const int pointer_deviceid, keyboard_deviceid; + std::string name; }; - } } diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index e198f1112d..71269c74f7 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include <cstring> #include <X11/XKBlib.h> +#include <cstring> #include "InputCommon/ControllerInterface/Xlib/Xlib.h" @@ -11,149 +11,156 @@ namespace ciface { namespace Xlib { - void Init(std::vector<Core::Device*>& devices, void* const hwnd) { - devices.push_back(new KeyboardMouse((Window)hwnd)); + devices.push_back(new KeyboardMouse((Window)hwnd)); } KeyboardMouse::KeyboardMouse(Window window) : m_window(window) { - memset(&m_state, 0, sizeof(m_state)); + memset(&m_state, 0, sizeof(m_state)); - m_display = XOpenDisplay(nullptr); + m_display = XOpenDisplay(nullptr); - int min_keycode, max_keycode; - XDisplayKeycodes(m_display, &min_keycode, &max_keycode); + int min_keycode, max_keycode; + XDisplayKeycodes(m_display, &min_keycode, &max_keycode); - // Keyboard Keys - for (int i = min_keycode; i <= max_keycode; ++i) - { - Key *temp_key = new Key(m_display, i, m_state.keyboard); - if (temp_key->m_keyname.length()) - AddInput(temp_key); - else - delete temp_key; - } + // Keyboard Keys + for (int i = min_keycode; i <= max_keycode; ++i) + { + Key* temp_key = new Key(m_display, i, m_state.keyboard); + if (temp_key->m_keyname.length()) + AddInput(temp_key); + else + delete temp_key; + } - // Mouse Buttons - AddInput(new Button(Button1Mask, m_state.buttons)); - AddInput(new Button(Button2Mask, m_state.buttons)); - AddInput(new Button(Button3Mask, m_state.buttons)); - AddInput(new Button(Button4Mask, m_state.buttons)); - AddInput(new Button(Button5Mask, m_state.buttons)); + // Mouse Buttons + AddInput(new Button(Button1Mask, m_state.buttons)); + AddInput(new Button(Button2Mask, m_state.buttons)); + AddInput(new Button(Button3Mask, m_state.buttons)); + AddInput(new Button(Button4Mask, m_state.buttons)); + AddInput(new Button(Button5Mask, m_state.buttons)); - // 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 Cursor, X-/+ and Y-/+ + for (int i = 0; i != 4; ++i) + AddInput(new Cursor(!!(i & 2), !!(i & 1), (&m_state.cursor.x)[!!(i & 2)])); } KeyboardMouse::~KeyboardMouse() { - XCloseDisplay(m_display); + XCloseDisplay(m_display); } void KeyboardMouse::UpdateInput() { - XQueryKeymap(m_display, m_state.keyboard); + XQueryKeymap(m_display, m_state.keyboard); - int root_x, root_y, win_x, win_y; - Window root, child; - XQueryPointer(m_display, m_window, &root, &child, &root_x, &root_y, &win_x, &win_y, &m_state.buttons); + int root_x, root_y, win_x, win_y; + Window root, child; + XQueryPointer(m_display, m_window, &root, &child, &root_x, &root_y, &win_x, &win_y, + &m_state.buttons); - // update mouse cursor - XWindowAttributes win_attribs; - XGetWindowAttributes(m_display, m_window, &win_attribs); + // update mouse cursor + XWindowAttributes win_attribs; + XGetWindowAttributes(m_display, m_window, &win_attribs); - // the mouse position as a range from -1 to 1 - m_state.cursor.x = (float)win_x / (float)win_attribs.width * 2 - 1; - m_state.cursor.y = (float)win_y / (float)win_attribs.height * 2 - 1; + // the mouse position as a range from -1 to 1 + m_state.cursor.x = (float)win_x / (float)win_attribs.width * 2 - 1; + m_state.cursor.y = (float)win_y / (float)win_attribs.height * 2 - 1; } std::string KeyboardMouse::GetName() const { - return "Keyboard Mouse"; + return "Keyboard Mouse"; } std::string KeyboardMouse::GetSource() const { - return "Xlib"; + return "Xlib"; } int KeyboardMouse::GetId() const { - return 0; + return 0; } KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) - : m_display(display), m_keyboard(keyboard), m_keycode(keycode) -{ - int i = 0; - KeySym keysym = 0; - do - { - keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); - i++; - } - while (keysym == NoSymbol && i < 8); - - // 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 || - XKeysymToString(keysym) == nullptr) - m_keyname = std::string(); - else - m_keyname = std::string(XKeysymToString(keysym)); + : m_display(display), m_keyboard(keyboard), m_keycode(keycode) +{ + int i = 0; + KeySym keysym = 0; + do + { + keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0); + i++; + } while (keysym == NoSymbol && i < 8); + + // 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 || XKeysymToString(keysym) == nullptr) + m_keyname = std::string(); + else + m_keyname = std::string(XKeysymToString(keysym)); } ControlState KeyboardMouse::Key::GetState() const { - return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; + return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0; } ControlState KeyboardMouse::Button::GetState() const { - return ((m_buttons & m_index) != 0); + return ((m_buttons & m_index) != 0); } ControlState KeyboardMouse::Cursor::GetState() const { - return std::max(0.0f, m_cursor / (m_positive ? 1.0f : -1.0f)); + return std::max(0.0f, m_cursor / (m_positive ? 1.0f : -1.0f)); } std::string KeyboardMouse::Key::GetName() const { - return m_keyname; + return m_keyname; } std::string KeyboardMouse::Cursor::GetName() const { - static char tmpstr[] = "Cursor .."; - tmpstr[7] = (char)('X' + m_index); - tmpstr[8] = (m_positive ? '+' : '-'); - return tmpstr; + static char tmpstr[] = "Cursor .."; + tmpstr[7] = (char)('X' + m_index); + tmpstr[8] = (m_positive ? '+' : '-'); + return tmpstr; } std::string KeyboardMouse::Button::GetName() const { - char button = '0'; - switch (m_index) - { - case Button1Mask: button = '1'; break; - case Button2Mask: button = '2'; break; - case Button3Mask: button = '3'; break; - case Button4Mask: button = '4'; break; - case Button5Mask: button = '5'; break; - } - - static char tmpstr[] = "Click ."; - tmpstr[6] = button; - return tmpstr; + char button = '0'; + switch (m_index) + { + case Button1Mask: + button = '1'; + break; + case Button2Mask: + button = '2'; + break; + case Button3Mask: + button = '3'; + break; + case Button4Mask: + button = '4'; + break; + case Button5Mask: + button = '5'; + break; + } + + static char tmpstr[] = "Click ."; + tmpstr[6] = button; + return tmpstr; } - } } diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index 6fe72e4da7..94388211c0 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -4,8 +4,8 @@ #pragma once -#include <X11/keysym.h> #include <X11/Xlib.h> +#include <X11/keysym.h> #include "InputCommon/ControllerInterface/Device.h" @@ -13,81 +13,80 @@ namespace ciface { namespace Xlib { - void Init(std::vector<Core::Device*>& devices, void* const hwnd); class KeyboardMouse : public Core::Device { - private: - struct State - { - char keyboard[32]; - unsigned int buttons; - struct - { - float x, y; - } cursor; - }; - - class Key : public Input - { - friend class KeyboardMouse; - public: - std::string GetName() const override; - Key(Display* display, KeyCode keycode, const char* keyboard); - ControlState GetState() const override; - - 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 override; - Button(unsigned int index, unsigned int& buttons) - : m_buttons(buttons), m_index(index) {} - ControlState GetState() const override; - - private: - const unsigned int& m_buttons; - const unsigned int m_index; - }; - - class Cursor : public Input - { - public: - std::string GetName() const override; - bool IsDetectable() override { return false; } - Cursor(u8 index, bool positive, const float& cursor) - : m_cursor(cursor), m_index(index), m_positive(positive) {} - ControlState GetState() const override; - - private: - const float& m_cursor; - const u8 m_index; - const bool m_positive; - }; + struct State + { + char keyboard[32]; + unsigned int buttons; + struct + { + float x, y; + } cursor; + }; + + class Key : public Input + { + friend class KeyboardMouse; + + public: + std::string GetName() const override; + Key(Display* display, KeyCode keycode, const char* keyboard); + ControlState GetState() const override; + + 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 override; + Button(unsigned int index, unsigned int& buttons) : m_buttons(buttons), m_index(index) {} + ControlState GetState() const override; + + private: + const unsigned int& m_buttons; + const unsigned int m_index; + }; + + class Cursor : public Input + { + public: + std::string GetName() const override; + bool IsDetectable() override { return false; } + Cursor(u8 index, bool positive, const float& cursor) + : m_cursor(cursor), m_index(index), m_positive(positive) + { + } + ControlState GetState() const override; + + private: + const float& m_cursor; + const u8 m_index; + const bool m_positive; + }; public: - void UpdateInput() override; + void UpdateInput() override; - KeyboardMouse(Window window); - ~KeyboardMouse(); + KeyboardMouse(Window window); + ~KeyboardMouse(); - std::string GetName() const override; - std::string GetSource() const override; - int GetId() const override; + std::string GetName() const override; + std::string GetSource() const override; + int GetId() const override; private: - Window m_window; - Display* m_display; - State m_state; + Window m_window; + Display* m_display; + State m_state; }; - } } |