piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reformat all the things. Have fun with merge conflicts.

Browse Source
This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h
View File

@ -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;
};
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;
class Key : public Input
{
friend class KeyboardMouse;
private:
std::string m_keyname;
Display* const m_display;
const char* const m_keyboard;
const KeyCode m_keycode;
};
public:
std::string GetName() const override;
Key(Display* display, KeyCode keycode, const char* keyboard);
ControlState GetState() const override;
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:
std::string m_keyname;
Display* const m_display;
const char* const m_keyboard;
const KeyCode m_keycode;
};
private:
const unsigned int& m_buttons;
const unsigned int m_index;
};
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;
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 unsigned int& m_buttons;
const unsigned int m_index;
};
private:
const float& m_cursor;
const u8 m_index;
const bool m_positive;
};
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;
};
}
}