mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 09:09:52 -06:00
A few changes to the GCPadNew needed to compile in linux, and put GCPadNew back into the linux build. Also changed file properties to eol-style native.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5268 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -1,70 +1,70 @@
|
||||
#ifndef _CIFACE_XLIB_H_
|
||||
#define _CIFACE_XLIB_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace XInput
|
||||
{
|
||||
|
||||
void Init( std::vector<ControllerInterface::Device*>& devices, void* const hwnd );
|
||||
|
||||
class Keyboard : public ControllerInterface::Device
|
||||
{
|
||||
friend class ControllerInterface;
|
||||
friend class ControllerInterface::ControlReference;
|
||||
|
||||
protected:
|
||||
|
||||
struct State
|
||||
{
|
||||
char keyboard[32];
|
||||
// mouse crap will go here
|
||||
};
|
||||
|
||||
class Input : public ControllerInterface::Input
|
||||
{
|
||||
friend class Keyboard;
|
||||
protected:
|
||||
ControlState GetState( const State* const state ) = 0;
|
||||
}
|
||||
|
||||
class Key : public Input
|
||||
{
|
||||
friend class Keyboard;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Key( KeySym keysym ) : m_keysym(keysym) {}
|
||||
ControlState GetState( const State* const state );
|
||||
private:
|
||||
const KeySym m_keysym
|
||||
|
||||
};
|
||||
|
||||
bool UpdateInput();
|
||||
bool UpdateOutput();
|
||||
|
||||
ControlState Keyboard::GetInputState( const ControllerInterface::Device::Input* const input );
|
||||
void Keyboard::SetOutputState( const ControllerInterface::Device::Output* const output, const ControlState state );
|
||||
|
||||
public:
|
||||
Keyboard( Display* const display );
|
||||
~Keyboard();
|
||||
|
||||
std::string GetName() const;
|
||||
std::string GetSource() const;
|
||||
int GetId() const;
|
||||
|
||||
private:
|
||||
Display* const m_display;
|
||||
State m_state;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
#ifndef _CIFACE_XLIB_H_
|
||||
#define _CIFACE_XLIB_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace XInput
|
||||
{
|
||||
|
||||
void Init( std::vector<ControllerInterface::Device*>& devices, void* const hwnd );
|
||||
|
||||
class Keyboard : public ControllerInterface::Device
|
||||
{
|
||||
friend class ControllerInterface;
|
||||
friend class ControllerInterface::ControlReference;
|
||||
|
||||
protected:
|
||||
|
||||
struct State
|
||||
{
|
||||
char keyboard[32];
|
||||
// mouse crap will go here
|
||||
};
|
||||
|
||||
class Input : public ControllerInterface::Input
|
||||
{
|
||||
friend class Keyboard;
|
||||
protected:
|
||||
ControlState GetState( const State* const state ) = 0;
|
||||
}
|
||||
|
||||
class Key : public Input
|
||||
{
|
||||
friend class Keyboard;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Key( KeySym keysym ) : m_keysym(keysym) {}
|
||||
ControlState GetState( const State* const state );
|
||||
private:
|
||||
const KeySym m_keysym
|
||||
|
||||
};
|
||||
|
||||
bool UpdateInput();
|
||||
bool UpdateOutput();
|
||||
|
||||
ControlState Keyboard::GetInputState( const ControllerInterface::Device::Input* const input );
|
||||
void Keyboard::SetOutputState( const ControllerInterface::Device::Output* const output, const ControlState state );
|
||||
|
||||
public:
|
||||
Keyboard( Display* const display );
|
||||
~Keyboard();
|
||||
|
||||
std::string GetName() const;
|
||||
std::string GetSource() const;
|
||||
int GetId() const;
|
||||
|
||||
private:
|
||||
Display* const m_display;
|
||||
State m_state;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user