summaryrefslogtreecommitdiffhomepage
path: root/opentrack
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-11-26 09:04:29 +0100
committerStanislaw Halik <sthalik@misaki.pl>2015-11-26 09:05:13 +0100
commit3566dc23946b798b396946297cbf70f2d46fd242 (patch)
treef9f23f4a0ac5c5a71b1166dd54f048f68e952b7a /opentrack
parente8c5d0cde6676c7924c92cd43ac36588a401c8e4 (diff)
api/shortcuts: move to separate definition
There's no need to have definitions in header for non-template classes
Diffstat (limited to 'opentrack')
-rw-r--r--opentrack/keybinding-worker.cpp10
-rw-r--r--opentrack/keybinding-worker.hpp13
-rw-r--r--opentrack/win32-joystick.cpp275
-rw-r--r--opentrack/win32-joystick.hpp308
4 files changed, 315 insertions, 291 deletions
diff --git a/opentrack/keybinding-worker.cpp b/opentrack/keybinding-worker.cpp
index dcf5c1b6..59bc4afd 100644
--- a/opentrack/keybinding-worker.cpp
+++ b/opentrack/keybinding-worker.cpp
@@ -14,6 +14,15 @@
#include <QDebug>
#include <QMutexLocker>
+bool Key::should_process()
+{
+ if (keycode == 0 && guid == "")
+ return false;
+ bool ret = timer.elapsed_ms() > 100;
+ timer.start();
+ return ret;
+}
+
KeybindingWorker::~KeybindingWorker() {
qDebug() << "keybinding worker stop";
should_quit = true;
@@ -172,6 +181,7 @@ void KeybindingWorker::remove_receiver(KeybindingWorker::fun* pos)
ok = true;
qDebug() << "remove receiver" << (long) pos;
receivers.erase(receivers.begin() + i);
+ break;
}
}
if (!ok)
diff --git a/opentrack/keybinding-worker.hpp b/opentrack/keybinding-worker.hpp
index 7661f88d..054182e7 100644
--- a/opentrack/keybinding-worker.hpp
+++ b/opentrack/keybinding-worker.hpp
@@ -35,18 +35,9 @@ struct Key {
bool held;
Timer timer;
public:
- Key() : keycode(0), shift(false), ctrl(false), alt(false), held(true)
- {
- }
+ Key() : keycode(0), shift(false), ctrl(false), alt(false), held(true) {}
- bool should_process()
- {
- if (keycode == 0 && guid == "")
- return false;
- bool ret = timer.elapsed_ms() > 100;
- timer.start();
- return ret;
- }
+ bool should_process();
};
struct OPENTRACK_EXPORT KeybindingWorker : private QThread
diff --git a/opentrack/win32-joystick.cpp b/opentrack/win32-joystick.cpp
index 56a1b070..29a51a43 100644
--- a/opentrack/win32-joystick.cpp
+++ b/opentrack/win32-joystick.cpp
@@ -31,4 +31,279 @@ win32_joy_ctx& win32_joy_ctx::make()
return ret;
}
+void win32_joy_ctx::poll(fn f)
+{
+ QMutexLocker l(&mtx);
+
+ refresh(false);
+ for (auto& j : joys())
+ {
+ j.second->poll(f);
+ }
+}
+
+bool win32_joy_ctx::poll_axis(const QString &guid, int axes[])
+{
+ QMutexLocker l(&mtx);
+
+ refresh(false);
+
+ auto iter = joys().find(guid);
+
+ if (iter == joys().end() || iter->second->joy_handle == nullptr)
+ return false;
+
+ auto& j = iter->second;
+
+ auto& joy_handle = j->joy_handle;
+ bool ok = false;
+ HRESULT hr;
+
+ (void) joy_handle->Acquire();
+
+ if (!FAILED(hr = joy_handle->Poll()))
+ ok = true;
+
+ if (!ok)
+ {
+ qDebug() << "joy acquire failed" << guid << hr;
+ (void) joy_handle->Unacquire();
+ return false;
+ }
+
+ DIJOYSTATE2 js;
+ memset(&js, 0, sizeof(js));
+
+ if (FAILED(hr = joy_handle->GetDeviceState(sizeof(js), &js)))
+ {
+ qDebug() << "joy get state failed" << guid << hr;
+ return false;
+ }
+
+ const int values[] = {
+ js.lX,
+ js.lY,
+ js.lZ,
+ js.lRx,
+ js.lRy,
+ js.lRz,
+ js.rglSlider[0],
+ js.rglSlider[1]
+ };
+
+ for (int i = 0; i < 8; i++)
+ axes[i] = values[i];
+
+ return true;
+}
+
+win32_joy_ctx::~win32_joy_ctx()
+{
+ release();
+}
+
+std::vector<win32_joy_ctx::joy_info> win32_joy_ctx::get_joy_info()
+{
+ QMutexLocker l(&mtx);
+
+ std::vector<joy_info> ret;
+
+ for (auto& j : joys())
+ ret.push_back(joy_info { j.second->name, j.first });
+
+ return ret;
+}
+
+win32_joy_ctx::win32_joy_ctx()
+{
+ refresh(true);
+}
+
+void win32_joy_ctx::release()
+{
+ qDebug() << "release joystick dinput handle";
+ joys() = std::unordered_map<QString, std::shared_ptr<joy>>();
+ {
+ auto& di = dinput_handle();
+ di->Release();
+ di = nullptr;
+ }
+}
+
+void win32_joy_ctx::refresh(bool first)
+{
+ if (!first)
+ {
+ if (timer_joylist.elapsed_ms() < joylist_refresh_ms)
+ return;
+ timer_joylist.start();
+ }
+
+ enum_state st(joys(), first);
+}
+
+QString win32_joy_ctx::guid_to_string(const GUID guid)
+{
+ char buf[40] = {0};
+ wchar_t szGuidW[40] = {0};
+
+ StringFromGUID2(guid, szGuidW, 40);
+ WideCharToMultiByte(0, 0, szGuidW, -1, buf, 40, NULL, NULL);
+
+ return QString(buf);
+}
+
+using fn = win32_joy_ctx::fn;
+
+void win32_joy_ctx::joy::release()
+{
+ if (joy_handle)
+ {
+ (void) joy_handle->Unacquire();
+ joy_handle->Release();
+ joy_handle = nullptr;
+ }
+}
+
+bool win32_joy_ctx::joy::poll(fn f)
+{
+ HRESULT hr;
+ bool ok = false;
+
+ if (joy_handle == nullptr)
+ return false;
+
+ (void) joy_handle->Acquire();
+
+ if (!FAILED(joy_handle->Poll()))
+ ok = true;
+
+ if (!ok)
+ {
+ qDebug() << "joy acquire failed" << guid << hr;
+ (void) joy_handle->Unacquire();
+ return false;
+ }
+
+ DIJOYSTATE2 js;
+ memset(&js, 0, sizeof(js));
+
+ if (FAILED(hr = joy_handle->GetDeviceState(sizeof(js), &js)))
+ {
+ qDebug() << "joy get state failed" << guid << hr;
+ return false;
+ }
+
+ first |= first_timer.elapsed_ms() > first_event_delay_ms;
+
+ for (int i = 0; i < 128; i++)
+ {
+ const bool state = !!(js.rgbButtons[i] & 0x80);
+ if (state != pressed[i] && first)
+ {
+ f(guid, i, state);
+ qDebug() << "btn" << guid << i << state;
+ }
+ pressed[i] = state;
+ }
+
+ return true;
+}
+
+win32_joy_ctx::enum_state::enum_state(std::unordered_map<QString, std::shared_ptr<joy> > &joys, bool first) : joys(joys), first(first)
+{
+ HRESULT hr;
+ LPDIRECTINPUT8 di = dinput_handle();
+
+ if(FAILED(hr = di->EnumDevices(DI8DEVCLASS_GAMECTRL,
+ EnumJoysticksCallback,
+ this,
+ DIEDFL_ATTACHEDONLY)))
+ {
+ qDebug() << "failed enum joysticks" << hr;
+ return;
+ }
+
+ for (auto it = joys.begin(); it != joys.end(); )
+ {
+ if (std::find_if(all.cbegin(), all.cend(), [&](const QString& guid2) -> bool { return it->second->guid == guid2; }) == all.cend())
+ it = joys.erase(it);
+ else
+ it++;
+ }
+}
+
+win32_joy_ctx::enum_state::EnumJoysticksCallback(const DIDEVICEINSTANCE *pdidInstance, void *pContext)
+{
+ enum_state& state = *reinterpret_cast<enum_state*>(pContext);
+ const QString guid = guid_to_string(pdidInstance->guidInstance);
+ const QString name = QString(pdidInstance->tszInstanceName);
+
+ auto it = state.joys.find(guid);
+ const bool exists = it != state.joys.end() && it->second->joy_handle != nullptr;
+
+ state.all.push_back(guid);
+
+ if (!exists)
+ {
+ HRESULT hr;
+ LPDIRECTINPUTDEVICE8 h;
+ LPDIRECTINPUT8 di = dinput_handle();
+ if (FAILED(hr = di->CreateDevice(pdidInstance->guidInstance, &h, nullptr)))
+ {
+ qDebug() << "createdevice" << guid << hr;
+ goto end;
+ }
+ if (FAILED(h->SetDataFormat(&c_dfDIJoystick2)))
+ {
+ qDebug() << "format";
+ h->Release();
+ goto end;
+ }
+
+ if (FAILED(h->SetCooperativeLevel((HWND) GetDesktopWindow(), DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)))
+ {
+ qDebug() << "coop";
+ h->Release();
+ goto end;
+ }
+ if (FAILED(hr = h->EnumObjects(EnumObjectsCallback, h, DIDFT_ALL)))
+ {
+ qDebug() << "enum-objects";
+ h->Release();
+ goto end;
+ }
+
+ qDebug() << "add joy" << guid;
+ state.joys[guid] = std::make_shared<joy>(h, guid, name, state.first);
+ }
+end:
+ return DIENUM_CONTINUE;
+}
+
+win32_joy_ctx::enum_state::EnumObjectsCallback(const DIDEVICEOBJECTINSTANCE *pdidoi, void *ctx)
+{
+ if (pdidoi->dwType & DIDFT_AXIS)
+ {
+ DIPROPRANGE diprg;
+ memset(&diprg, 0, sizeof(diprg));
+ diprg.diph.dwSize = sizeof( DIPROPRANGE );
+ diprg.diph.dwHeaderSize = sizeof( DIPROPHEADER );
+ diprg.diph.dwHow = DIPH_BYID;
+ diprg.diph.dwObj = pdidoi->dwType;
+ diprg.lMax = joy_axis_size;
+ diprg.lMin = -joy_axis_size;
+
+ HRESULT hr;
+
+ if (FAILED(hr = reinterpret_cast<LPDIRECTINPUTDEVICE8>(ctx)->SetProperty(DIPROP_RANGE, &diprg.diph)))
+ {
+ qDebug() << "DIPROP_RANGE" << hr;
+ return DIENUM_STOP;
+ }
+ }
+
+ return DIENUM_CONTINUE;
+}
+
#endif
diff --git a/opentrack/win32-joystick.hpp b/opentrack/win32-joystick.hpp
index b08da6c8..334b617a 100644
--- a/opentrack/win32-joystick.hpp
+++ b/opentrack/win32-joystick.hpp
@@ -39,77 +39,6 @@ struct hash<QString>
struct OPENTRACK_EXPORT win32_joy_ctx
{
using fn = std::function<void(const QString& guid, int btn, bool held)>;
-
- void poll(fn f)
- {
- QMutexLocker l(&mtx);
-
- refresh(false);
- for (auto& j : joys())
- {
- j.second->poll(f);
- }
- }
-
- bool poll_axis(const QString& guid, int axes[8])
- {
- QMutexLocker l(&mtx);
-
- refresh(false);
-
- auto iter = joys().find(guid);
-
- if (iter == joys().end() || iter->second->joy_handle == nullptr)
- return false;
-
- auto& j = iter->second;
-
- auto& joy_handle = j->joy_handle;
- bool ok = false;
- HRESULT hr;
-
- (void) joy_handle->Acquire();
-
- if (!FAILED(hr = joy_handle->Poll()))
- ok = true;
-
- if (!ok)
- {
- qDebug() << "joy acquire failed" << guid << hr;
- (void) joy_handle->Unacquire();
- return false;
- }
-
- DIJOYSTATE2 js;
- memset(&js, 0, sizeof(js));
-
- if (FAILED(hr = joy_handle->GetDeviceState(sizeof(js), &js)))
- {
- qDebug() << "joy get state failed" << guid << hr;
- return false;
- }
-
- const int values[] = {
- js.lX,
- js.lY,
- js.lZ,
- js.lRx,
- js.lRy,
- js.lRz,
- js.rglSlider[0],
- js.rglSlider[1]
- };
-
- for (int i = 0; i < 8; i++)
- axes[i] = values[i];
-
- return true;
- }
-
- ~win32_joy_ctx()
- {
- release();
- }
enum { joy_axis_size = 65535 };
@@ -117,78 +46,42 @@ struct OPENTRACK_EXPORT win32_joy_ctx
{
QString name, guid;
};
-
- std::vector<joy_info> get_joy_info()
- {
- QMutexLocker l(&mtx);
-
- std::vector<joy_info> ret;
-
- for (auto& j : joys())
- ret.push_back(joy_info { j.second->name, j.first });
-
- return ret;
- }
+ void poll(fn f);
+ bool poll_axis(const QString& guid, int axes[8]);
+ ~win32_joy_ctx();
+ std::vector<joy_info> get_joy_info();
static win32_joy_ctx& make();
-
win32_joy_ctx(const win32_joy_ctx&) = delete;
win32_joy_ctx& operator=(const win32_joy_ctx&) = delete;
-private:
- static QString guid_to_string(const GUID guid)
- {
- char buf[40] = {0};
- wchar_t szGuidW[40] = {0};
-
- StringFromGUID2(guid, szGuidW, 40);
- WideCharToMultiByte(0, 0, szGuidW, -1, buf, 40, NULL, NULL);
-
- return QString(buf);
- }
- static LPDIRECTINPUT8& dinput_handle();
+private:
+ enum { joylist_refresh_ms = 250 };
- win32_joy_ctx()
- {
- refresh(true);
- }
- void release()
- {
- qDebug() << "release joystick dinput handle";
- joys() = std::unordered_map<QString, std::shared_ptr<joy>>();
- {
- auto& di = dinput_handle();
- di->Release();
- di = nullptr;
- }
- }
-
- void refresh(bool first)
- {
- if (!first)
- {
- if (timer_joylist.elapsed_ms() < joylist_refresh_ms)
- return;
- timer_joylist.start();
- }
-
- enum_state st(joys(), first);
- }
QMutex mtx;
Timer timer_joylist;
- enum { joylist_refresh_ms = 250 };
+
+ static QString guid_to_string(const GUID guid);
+ static LPDIRECTINPUT8& dinput_handle();
+ win32_joy_ctx();
+ void release();
+ void refresh(bool first);
+
+ struct joy;
+ static std::unordered_map<QString, std::shared_ptr<joy>>& joys();
struct joy
{
+ enum { first_event_delay_ms = 3000 };
+
LPDIRECTINPUTDEVICE8 joy_handle;
QString guid, name;
bool pressed[128];
Timer first_timer;
bool first;
-
- enum { first_event_delay_ms = 3000 };
- joy(LPDIRECTINPUTDEVICE8 handle, const QString& guid, const QString& name, bool first) : joy_handle(handle), guid(guid), name(name), first(first)
+ joy(LPDIRECTINPUTDEVICE8 handle, const QString& guid, const QString& name, bool first)
+ : joy_handle(handle), guid(guid), name(name), first(first)
{
qDebug() << "got joy" << guid;
for (int i = 0; i < 128; i++)
@@ -201,166 +94,21 @@ private:
release();
}
- void release()
- {
- if (joy_handle)
- {
- (void) joy_handle->Unacquire();
- joy_handle->Release();
- joy_handle = nullptr;
- }
- }
-
- bool poll(fn f)
- {
- HRESULT hr;
- bool ok = false;
-
- if (joy_handle == nullptr)
- return false;
-
- (void) joy_handle->Acquire();
-
- if (!FAILED(joy_handle->Poll()))
- ok = true;
-
- if (!ok)
- {
- qDebug() << "joy acquire failed" << guid << hr;
- (void) joy_handle->Unacquire();
- return false;
- }
-
- DIJOYSTATE2 js;
- memset(&js, 0, sizeof(js));
-
- if (FAILED(hr = joy_handle->GetDeviceState(sizeof(js), &js)))
- {
- qDebug() << "joy get state failed" << guid << hr;
- return false;
- }
-
- first |= first_timer.elapsed_ms() > first_event_delay_ms;
-
- for (int i = 0; i < 128; i++)
- {
- const bool state = !!(js.rgbButtons[i] & 0x80);
- if (state != pressed[i] && first)
- {
- f(guid, i, state);
- qDebug() << "btn" << guid << i << state;
- }
- pressed[i] = state;
- }
-
- return true;
- }
+ void release();
+ bool poll(fn f);
};
- struct enum_state
+ class enum_state
{
std::unordered_map<QString, std::shared_ptr<joy>>& joys;
- std::vector<QString> all;
bool first;
-
- enum_state(std::unordered_map<QString, std::shared_ptr<joy>>& joys, bool first) : joys(joys), first(first)
- {
- HRESULT hr;
- LPDIRECTINPUT8 di = dinput_handle();
-
- if(FAILED(hr = di->EnumDevices(DI8DEVCLASS_GAMECTRL,
- EnumJoysticksCallback,
- this,
- DIEDFL_ATTACHEDONLY)))
- {
- qDebug() << "failed enum joysticks" << hr;
- return;
- }
-
- for (auto it = joys.begin(); it != joys.end(); )
- {
- if (std::find_if(all.cbegin(), all.cend(), [&](const QString& guid2) -> bool { return it->second->guid == guid2; }) == all.cend())
- it = joys.erase(it);
- else
- it++;
- }
- }
-
- static BOOL CALLBACK EnumJoysticksCallback(const DIDEVICEINSTANCE* pdidInstance, VOID* pContext)
- {
- enum_state& state = *reinterpret_cast<enum_state*>(pContext);
- const QString guid = guid_to_string(pdidInstance->guidInstance);
- const QString name = QString(pdidInstance->tszInstanceName);
-
- auto it = state.joys.find(guid);
- const bool exists = it != state.joys.end() && it->second->joy_handle != nullptr;
-
- state.all.push_back(guid);
-
- if (!exists)
- {
- HRESULT hr;
- LPDIRECTINPUTDEVICE8 h;
- LPDIRECTINPUT8 di = dinput_handle();
- if (FAILED(hr = di->CreateDevice(pdidInstance->guidInstance, &h, nullptr)))
- {
- qDebug() << "createdevice" << guid << hr;
- goto end;
- }
- if (FAILED(h->SetDataFormat(&c_dfDIJoystick2)))
- {
- qDebug() << "format";
- h->Release();
- goto end;
- }
-
- if (FAILED(h->SetCooperativeLevel((HWND) GetDesktopWindow(), DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)))
- {
- qDebug() << "coop";
- h->Release();
- goto end;
- }
- if (FAILED(hr = h->EnumObjects(EnumObjectsCallback, h, DIDFT_ALL)))
- {
- qDebug() << "enum-objects";
- h->Release();
- goto end;
- }
-
- qDebug() << "add joy" << guid;
- state.joys[guid] = std::make_shared<joy>(h, guid, name, state.first);
- }
-
-end: return DIENUM_CONTINUE;
- }
-
- static BOOL CALLBACK EnumObjectsCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* ctx)
- {
- if (pdidoi->dwType & DIDFT_AXIS)
- {
- DIPROPRANGE diprg;
- memset(&diprg, 0, sizeof(diprg));
- diprg.diph.dwSize = sizeof( DIPROPRANGE );
- diprg.diph.dwHeaderSize = sizeof( DIPROPHEADER );
- diprg.diph.dwHow = DIPH_BYID;
- diprg.diph.dwObj = pdidoi->dwType;
- diprg.lMax = joy_axis_size;
- diprg.lMin = -joy_axis_size;
-
- HRESULT hr;
-
- if (FAILED(hr = reinterpret_cast<LPDIRECTINPUTDEVICE8>(ctx)->SetProperty(DIPROP_RANGE, &diprg.diph)))
- {
- qDebug() << "DIPROP_RANGE" << hr;
- return DIENUM_STOP;
- }
- }
-
- return DIENUM_CONTINUE;
- }
+
+ std::vector<QString> all;
+ static BOOL CALLBACK EnumJoysticksCallback(const DIDEVICEINSTANCE* pdidInstance, VOID* pContext);
+ static BOOL CALLBACK EnumObjectsCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* ctx);
+ public:
+ enum_state(std::unordered_map<QString, std::shared_ptr<joy>>& joys, bool first);
};
-
- static std::unordered_map<QString, std::shared_ptr<joy>>& joys();
};
#endif