Initial HID PAD work, with GLFW only.
This commit is contained in:
parent
bb7ddede15
commit
4a94ec934a
7 changed files with 309 additions and 26 deletions
|
@ -8,6 +8,7 @@ set(SRCS
|
|||
file_search.cpp
|
||||
file_util.cpp
|
||||
hash.cpp
|
||||
key_map.cpp
|
||||
log_manager.cpp
|
||||
math_util.cpp
|
||||
mem_arena.cpp
|
||||
|
@ -39,6 +40,7 @@ set(HEADERS
|
|||
file_search.h
|
||||
file_util.h
|
||||
hash.h
|
||||
key_map.h
|
||||
linear_disk_cache.h
|
||||
log.h
|
||||
log_manager.h
|
||||
|
|
|
@ -7,6 +7,9 @@
|
|||
#include "common/common.h"
|
||||
#include "common/scm_rev.h"
|
||||
|
||||
#include "common/key_map.h"
|
||||
#include "core/hle/service/hid.h"
|
||||
|
||||
// Abstraction class used to provide an interface between emulation code and the frontend (e.g. SDL,
|
||||
// QGLWidget, GLFW, etc...)
|
||||
class EmuWindow
|
||||
|
@ -32,6 +35,22 @@ public:
|
|||
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
|
||||
virtual void DoneCurrent() = 0;
|
||||
|
||||
static void KeyPressed(KeyMap::CitraKey key) {
|
||||
HID_User::PADState mapped_key = KeyMap::Get3DSKey(key);
|
||||
|
||||
if (mapped_key.hex != HID_User::PAD_NONE.hex) {
|
||||
HID_User::PADButtonPress(mapped_key);
|
||||
}
|
||||
}
|
||||
|
||||
static void KeyReleased(KeyMap::CitraKey key) {
|
||||
HID_User::PADState mapped_key = KeyMap::Get3DSKey(key);
|
||||
|
||||
if (mapped_key.hex != HID_User::PAD_NONE.hex) {
|
||||
HID_User::PADButtonRelease(mapped_key);
|
||||
}
|
||||
}
|
||||
|
||||
Config GetConfig() const {
|
||||
return m_config;
|
||||
}
|
||||
|
|
21
src/common/key_map.cpp
Normal file
21
src/common/key_map.cpp
Normal file
|
@ -0,0 +1,21 @@
|
|||
// Copyright 2013 Dolphin Emulator Project
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "key_map.h"
|
||||
#include <map>
|
||||
|
||||
|
||||
namespace KeyMap {
|
||||
|
||||
std::map<CitraKey, HID_User::PADState> g_key_map;
|
||||
|
||||
void SetKeyMapping(CitraKey key, HID_User::PADState padState) {
|
||||
g_key_map[key].hex = padState.hex;
|
||||
}
|
||||
|
||||
HID_User::PADState Get3DSKey(CitraKey key) {
|
||||
return g_key_map[key];
|
||||
}
|
||||
|
||||
}
|
35
src/common/key_map.h
Normal file
35
src/common/key_map.h
Normal file
|
@ -0,0 +1,35 @@
|
|||
// Copyright 2013 Dolphin Emulator Project
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/hle/service/hid.h"
|
||||
|
||||
namespace KeyMap {
|
||||
|
||||
class CitraKey {
|
||||
public:
|
||||
CitraKey() : keyCode(0) {}
|
||||
CitraKey(int code) : keyCode(code) {}
|
||||
|
||||
int keyCode;
|
||||
|
||||
bool operator < (const CitraKey &other) const {
|
||||
return keyCode < other.keyCode;
|
||||
}
|
||||
|
||||
bool operator == (const CitraKey &other) const {
|
||||
return keyCode == other.keyCode;
|
||||
}
|
||||
};
|
||||
|
||||
struct DefaultKeyMapping {
|
||||
KeyMap::CitraKey key;
|
||||
HID_User::PADState state;
|
||||
};
|
||||
|
||||
void SetKeyMapping(CitraKey key, HID_User::PADState padState);
|
||||
HID_User::PADState Get3DSKey(CitraKey key);
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue