summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/input.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/input.h')
-rw-r--r--src/emu/input.h131
1 files changed, 83 insertions, 48 deletions
diff --git a/src/emu/input.h b/src/emu/input.h
index 3ca97ae1e99..24b6dd062d2 100644
--- a/src/emu/input.h
+++ b/src/emu/input.h
@@ -17,6 +17,10 @@
#ifndef MAME_EMU_INPUT_H
#define MAME_EMU_INPUT_H
+#include <algorithm>
+#include <array>
+#include <iterator>
+
//**************************************************************************
// CONSTANTS
@@ -358,7 +362,12 @@ class input_code
{
public:
// construction/destruction
- input_code(input_device_class devclass = DEVICE_CLASS_INVALID, int devindex = 0, input_item_class itemclass = ITEM_CLASS_INVALID, input_item_modifier modifier = ITEM_MODIFIER_NONE, input_item_id itemid = ITEM_ID_INVALID)
+ constexpr input_code(
+ input_device_class devclass = DEVICE_CLASS_INVALID,
+ int devindex = 0,
+ input_item_class itemclass = ITEM_CLASS_INVALID,
+ input_item_modifier modifier = ITEM_MODIFIER_NONE,
+ input_item_id itemid = ITEM_ID_INVALID) noexcept
: m_internal(((devclass & 0xf) << 28) | ((devindex & 0xff) << 20) | ((itemclass & 0xf) << 16) | ((modifier & 0xf) << 12) | (itemid & 0xfff))
{
assert(devclass >= 0 && devclass < DEVICE_CLASS_MAXIMUM);
@@ -367,30 +376,48 @@ public:
assert(modifier >= 0 && modifier < ITEM_MODIFIER_MAXIMUM);
assert(itemid >= 0 && itemid < ITEM_ID_ABSOLUTE_MAXIMUM);
}
- input_code(const input_code &src)
- : m_internal(src.m_internal) { }
+ constexpr input_code(const input_code &src) noexcept = default;
// operators
- bool operator==(const input_code &rhs) const { return m_internal == rhs.m_internal; }
- bool operator!=(const input_code &rhs) const { return m_internal != rhs.m_internal; }
+ constexpr bool operator==(const input_code &rhs) const noexcept { return m_internal == rhs.m_internal; }
+ constexpr bool operator!=(const input_code &rhs) const noexcept { return m_internal != rhs.m_internal; }
// getters
- bool internal() const { return device_class() == DEVICE_CLASS_INTERNAL; }
- input_device_class device_class() const { return input_device_class((m_internal >> 28) & 0xf); }
- int device_index() const { return ((m_internal >> 20) & 0xff); }
- input_item_class item_class() const { return input_item_class((m_internal >> 16) & 0xf); }
- input_item_modifier item_modifier() const { return input_item_modifier((m_internal >> 12) & 0xf); }
- input_item_id item_id() const { return input_item_id(m_internal & 0xfff); }
+ constexpr bool internal() const noexcept { return device_class() == DEVICE_CLASS_INTERNAL; }
+ constexpr input_device_class device_class() const noexcept { return input_device_class((m_internal >> 28) & 0xf); }
+ constexpr int device_index() const noexcept { return ((m_internal >> 20) & 0xff); }
+ constexpr input_item_class item_class() const noexcept { return input_item_class((m_internal >> 16) & 0xf); }
+ constexpr input_item_modifier item_modifier() const noexcept { return input_item_modifier((m_internal >> 12) & 0xf); }
+ constexpr input_item_id item_id() const noexcept { return input_item_id(m_internal & 0xfff); }
// setters
- void set_device_class(input_device_class devclass) { assert(devclass >= 0 && devclass <= 0xf); m_internal = (m_internal & ~(0xf << 28)) | ((devclass & 0xf) << 28); }
- void set_device_index(int devindex) { assert(devindex >= 0 && devindex <= 0xff); m_internal = (m_internal & ~(0xff << 20)) | ((devindex & 0xff) << 20); }
- void set_item_class(input_item_class itemclass) { assert(itemclass >= 0 && itemclass <= 0xf); m_internal = (m_internal & ~(0xf << 16)) | ((itemclass & 0xf) << 16); }
- void set_item_modifier(input_item_modifier modifier) { assert(modifier >= 0 && modifier <= 0xf); m_internal = (m_internal & ~(0xf << 12)) | ((modifier & 0xf) << 12); }
- void set_item_id(input_item_id itemid) { assert(itemid >= 0 && itemid <= 0xfff); m_internal = (m_internal & ~0xfff) | (itemid & 0xfff); }
+ void set_device_class(input_device_class devclass) noexcept
+ {
+ assert(devclass >= 0 && devclass <= 0xf);
+ m_internal = (m_internal & ~(0xf << 28)) | ((devclass & 0xf) << 28);
+ }
+ void set_device_index(int devindex) noexcept
+ {
+ assert(devindex >= 0 && devindex <= 0xff);
+ m_internal = (m_internal & ~(0xff << 20)) | ((devindex & 0xff) << 20);
+ }
+ void set_item_class(input_item_class itemclass) noexcept
+ {
+ assert(itemclass >= 0 && itemclass <= 0xf);
+ m_internal = (m_internal & ~(0xf << 16)) | ((itemclass & 0xf) << 16);
+ }
+ void set_item_modifier(input_item_modifier modifier) noexcept
+ {
+ assert(modifier >= 0 && modifier <= 0xf);
+ m_internal = (m_internal & ~(0xf << 12)) | ((modifier & 0xf) << 12);
+ }
+ void set_item_id(input_item_id itemid) noexcept
+ {
+ assert(itemid >= 0 && itemid <= 0xfff);
+ m_internal = (m_internal & ~0xfff) | (itemid & 0xfff);
+ }
private:
- // internal state
u32 m_internal;
};
@@ -402,41 +429,59 @@ class input_seq
{
public:
// construction/destruction
- input_seq(input_code code0 = input_seq::end_code, input_code code1 = input_seq::end_code, input_code code2 = input_seq::end_code, input_code code3 = input_seq::end_code, input_code code4 = input_seq::end_code, input_code code5 = input_seq::end_code, input_code code6 = input_seq::end_code)
- { set(code0, code1, code2, code3, code4, code5, code6); }
- input_seq(const input_seq &rhs) { memcpy(m_code, rhs.m_code, sizeof(m_code)); }
+ template <typename... T> constexpr input_seq(input_code code_0 = end_code, T... code_n) noexcept
+ {
+ set(code_0, code_n...);
+ }
+ constexpr input_seq(const input_seq &rhs) noexcept = default;
// operators
- bool operator==(const input_seq &rhs) const { return (memcmp(m_code, rhs.m_code, sizeof(m_code)) == 0); }
- bool operator!=(const input_seq &rhs) const { return (memcmp(m_code, rhs.m_code, sizeof(m_code)) != 0); }
- input_code operator[](int index) const { return (index >= 0 && index < ARRAY_LENGTH(m_code)) ? m_code[index] : input_seq::end_code; }
- input_seq &operator+=(input_code code);
- input_seq &operator|=(input_code code);
+ bool operator==(const input_seq &rhs) const noexcept { return m_code == rhs.m_code; }
+ bool operator!=(const input_seq &rhs) const noexcept { return m_code != rhs.m_code; }
+ constexpr input_code operator[](int index) const noexcept { return (index >= 0 && index < m_code.size()) ? m_code[index] : end_code; }
+ input_seq &operator+=(input_code code) noexcept;
+ input_seq &operator|=(input_code code) noexcept;
// getters
- int length() const;
- bool is_valid() const;
- bool is_default() const { return m_code[0] == default_code; }
+ constexpr bool empty() const noexcept { return m_code[0] == end_code; }
+ constexpr int max_size() const noexcept { return std::tuple_size<decltype(m_code)>::value; }
+ int length() const noexcept;
+ bool is_valid() const noexcept;
+ constexpr bool is_default() const noexcept { return m_code[0] == default_code; }
// setters
- void set(input_code code0 = input_seq::end_code, input_code code1 = input_seq::end_code, input_code code2 = input_seq::end_code, input_code code3 = input_seq::end_code, input_code code4 = input_seq::end_code, input_code code5 = input_seq::end_code, input_code code6 = input_seq::end_code);
- void reset() { set(); }
- void set_default() { set(default_code); }
- void backspace();
- void replace(input_code oldcode, input_code newcode);
+ template <typename... T> void set(input_code code_0, T... code_n) noexcept
+ {
+ static_assert(sizeof...(T) < std::tuple_size<decltype(m_code)>::value, "too many codes for input_seq");
+ set<0>(code_0, code_n...);
+ }
+ void reset() noexcept { set(end_code); }
+ void set_default() noexcept { set(default_code); }
+ void backspace() noexcept;
+ void replace(input_code oldcode, input_code newcode) noexcept;
// constant codes used in sequences
- static const input_code end_code;
- static const input_code default_code;
- static const input_code not_code;
- static const input_code or_code;
+ static constexpr input_code end_code { DEVICE_CLASS_INTERNAL, 0, ITEM_CLASS_INVALID, ITEM_MODIFIER_NONE, ITEM_ID_SEQ_END };
+ static constexpr input_code default_code { DEVICE_CLASS_INTERNAL, 0, ITEM_CLASS_INVALID, ITEM_MODIFIER_NONE, ITEM_ID_SEQ_DEFAULT };
+ static constexpr input_code not_code { DEVICE_CLASS_INTERNAL, 0, ITEM_CLASS_INVALID, ITEM_MODIFIER_NONE, ITEM_ID_SEQ_NOT };
+ static constexpr input_code or_code { DEVICE_CLASS_INTERNAL, 0, ITEM_CLASS_INVALID, ITEM_MODIFIER_NONE, ITEM_ID_SEQ_OR };
// constant sequences
static const input_seq empty_seq;
private:
+ template <unsigned N> void set() noexcept
+ {
+ std::fill(std::next(m_code.begin(), N), m_code.end(), end_code);
+ }
+ template <unsigned N, typename... T> void set(input_code code_0, T... code_n) noexcept
+ {
+ m_code[N] = code_0;
+ set<N + 1>(code_n...);
+ }
+
// internal state
- input_code m_code[16];
+ std::array<input_code, 16> m_code;
};
@@ -478,11 +523,6 @@ public:
bool seq_pressed(const input_seq &seq);
s32 seq_axis_value(const input_seq &seq, input_item_class &itemclass);
- // input sequence polling
- void seq_poll_start(input_item_class itemclass, const input_seq *startseq = nullptr);
- bool seq_poll();
- const input_seq &seq_poll_final() const { return m_poll_seq; }
-
// input sequence helpers
input_seq seq_clean(const input_seq &seq) const;
std::string seq_name(const input_seq &seq) const;
@@ -503,11 +543,6 @@ private:
// classes
std::array<std::unique_ptr<input_class>, DEVICE_CLASS_MAXIMUM> m_class;
-
- // sequence polling state
- input_seq m_poll_seq;
- osd_ticks_t m_poll_seq_last_ticks;
- input_item_class m_poll_seq_class;
};