mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-10-06 00:31:48 +02:00
3ce1d19f7a
byuu says: I've completely redone the ethos InputManager and ruby to work on HID::Device objects instead of one giant scancode pool. Currently only the udev driver supports the changes to ruby, so only Linux users will be able to compile and run this WIP build. The nice thing about the new system is that it's now possible to uniquely identify controllers, so if you swap out gamepads, you won't end up with it working but with all the mappings all screwed up. Since higan lets you map multiple physical inputs to one emulated input, you can now configure your keyboard and multiple gamepads to the same emulated input, and then just use whatever controller you want. Because USB gamepad makers failed to provide unique serial#s with each controller, we have to limit the mapping to specific USB ports. Otherwise, we couldn't distinguish two otherwise identical gamepads. So basically your computer USB ports act like real game console input port numbers. Which is kind of neat, I guess. And the really nice thing about the new system is that we now have the capability to support hotplugging input devices. I haven't yet added this to any drivers, but I'm definitely going to add it to udev for v094 official. Finally, with the device ID (vendor ID + product ID) exposed, we gain one last really cool feature that we may be able to develop more in the future. Say we created a joypad.bml file to include with higan. In it, we'd store the Xbox 360 controller, and pre-defined button mappings for each emulated system. So if higan detects you have an Xbox 360 controller, you can just plug it in and use it. Even better, we can clearly specify the difference between triggers and analog axes, and name each individual input. So you'd see "Xbox 360 Gamepad #1: Left Trigger" instead of higan v093's "JP0::Axis2.Hi" Note: for right now, ethos' input manager isn't filtering the device IDs to look pretty. So you're going to see a 64-bit hex value for a device ID right now instead of something like Joypad#N for now.
178 lines
3.9 KiB
C++
178 lines
3.9 KiB
C++
/* Global Headers */
|
|
|
|
#if defined(PLATFORM_X)
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
#include <X11/Xatom.h>
|
|
#elif defined(PLATFORM_MACOSX)
|
|
#define decimal CocoaDecimal
|
|
#include <Cocoa/Cocoa.h>
|
|
#include <Carbon/Carbon.h>
|
|
#undef decimal
|
|
#elif defined(PLATFORM_WINDOWS)
|
|
#define _WIN32_WINNT 0x0501
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
using namespace nall;
|
|
|
|
/* Video */
|
|
|
|
#define DeclareVideo(Name) \
|
|
struct Video##Name : Video { \
|
|
bool cap(const string& name) { return p.cap(name); } \
|
|
any get(const string& name) { return p.get(name); } \
|
|
bool set(const string& name, const any& value) { return p.set(name, value); } \
|
|
\
|
|
bool lock(uint32_t*& data, unsigned& pitch, unsigned width, unsigned height) { return p.lock(data, pitch, width, height); } \
|
|
void unlock() { p.unlock(); } \
|
|
\
|
|
void clear() { p.clear(); } \
|
|
void refresh() { p.refresh(); } \
|
|
bool init() { return p.init(); } \
|
|
void term() { p.term(); } \
|
|
\
|
|
Video##Name() : p(*new pVideo##Name) {} \
|
|
~Video##Name() { delete &p; } \
|
|
\
|
|
private: \
|
|
pVideo##Name& p; \
|
|
};
|
|
|
|
#ifdef VIDEO_CGL
|
|
#include <ruby/video/cgl.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_DIRECT3D
|
|
#include <ruby/video/direct3d.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_DIRECTDRAW
|
|
#include <ruby/video/directdraw.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_GDI
|
|
#include <ruby/video/gdi.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_GLX
|
|
#include <ruby/video/glx.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_SDL
|
|
#include <ruby/video/sdl.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_WGL
|
|
#include <ruby/video/wgl.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_XSHM
|
|
#include <ruby/video/xshm.cpp>
|
|
#endif
|
|
|
|
#ifdef VIDEO_XV
|
|
#include <ruby/video/xv.cpp>
|
|
#endif
|
|
|
|
/* Audio */
|
|
|
|
#define DeclareAudio(Name) \
|
|
struct Audio##Name : Audio { \
|
|
bool cap(const string& name) { return p.cap(name); } \
|
|
any get(const string& name) { return p.get(name); } \
|
|
bool set(const string& name, const any& value) { return p.set(name, value); } \
|
|
\
|
|
void sample(uint16_t left, uint16_t right) { p.sample(left, right); } \
|
|
void clear() { p.clear(); } \
|
|
bool init() { return p.init(); } \
|
|
void term() { p.term(); } \
|
|
\
|
|
Audio##Name() : p(*new pAudio##Name) {} \
|
|
~Audio##Name() { delete &p; } \
|
|
\
|
|
private: \
|
|
pAudio##Name& p; \
|
|
};
|
|
|
|
#ifdef AUDIO_ALSA
|
|
#include <ruby/audio/alsa.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_AO
|
|
#include <ruby/audio/ao.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_DIRECTSOUND
|
|
#include <ruby/audio/directsound.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_OPENAL
|
|
#include <ruby/audio/openal.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_OSS
|
|
#include <ruby/audio/oss.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_PULSEAUDIO
|
|
#include <ruby/audio/pulseaudio.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_PULSEAUDIOSIMPLE
|
|
#include <ruby/audio/pulseaudiosimple.cpp>
|
|
#endif
|
|
|
|
#ifdef AUDIO_XAUDIO2
|
|
#include <ruby/audio/xaudio2.cpp>
|
|
#endif
|
|
|
|
/* Input */
|
|
|
|
#define DeclareInput(Name) \
|
|
struct Input##Name : Input { \
|
|
bool cap(const string& name) { return p.cap(name); } \
|
|
any get(const string& name) { return p.get(name); } \
|
|
bool set(const string& name, const any& value) { return p.set(name, value); } \
|
|
\
|
|
bool acquire() { return p.acquire(); } \
|
|
bool unacquire() { return p.unacquire(); } \
|
|
bool acquired() { return p.acquired(); } \
|
|
\
|
|
vector<HID::Device*> poll() { return p.poll(); } \
|
|
bool poll(int16_t* table) { return p.poll(table); } \
|
|
void rumble(uint64_t id, bool enable) { return p.rumble(id, enable); } \
|
|
bool init() { return p.init(); } \
|
|
void term() { p.term(); } \
|
|
\
|
|
Input##Name() : p(*new pInput##Name) {} \
|
|
~Input##Name() { delete &p; } \
|
|
\
|
|
private: \
|
|
pInput##Name& p; \
|
|
};
|
|
|
|
#ifdef INPUT_CARBON
|
|
#include <ruby/input/carbon.cpp>
|
|
#endif
|
|
|
|
#ifdef INPUT_DIRECTINPUT
|
|
#include <ruby/input/directinput.cpp>
|
|
#endif
|
|
|
|
#ifdef INPUT_RAWINPUT
|
|
#include <ruby/input/rawinput.cpp>
|
|
#endif
|
|
|
|
#ifdef INPUT_SDL
|
|
#include <ruby/input/sdl.cpp>
|
|
#endif
|
|
|
|
#ifdef INPUT_UDEV
|
|
#include <ruby/input/udev.cpp>
|
|
#endif
|
|
|
|
#ifdef INPUT_XLIB
|
|
#include <ruby/input/xlib.cpp>
|
|
#endif
|