Merge branch 'unstable' into trackhat

* unstable: (140 commits)
  tracker/pt: increase auto threshold bucket size again
  tracker/pt: limit max amount of extracted blobs
  gui: don't update main window if we're minimized
  tracker/pt: only show widget if the frame is visible
  tracker/pt: don't resize twice in widget
  freetrack/games: regen
  contrib/make-csv: perl sort isn't stable, don't ignore case
  tracker/pt: avoid widget temp QImage allocation
  spline-widget: oops, pass by reference
  tracker/pt: don't allocate temporary dynamic size arrays
  tracker/pt: don't copy points array needlessly
  tracker/pt: don't allocate temporary frame
  tracker/pt: cv::Mat::at<T> is slow, use cv::Mat::ptr
  tracker/pt: avoid widget malloc when able
  tracker/pt: optimize widget
  tracker/pt: update video widget at 40 -> 50 ms
  cmake/mingw-w64: update
  tracker/pt: reduce mutex contention
  gui: fix left margin
  tracker/pt: remove krap
  tracker/pt: move ctor out of the loop
  tracker/pt: nix unused
  tracker/pt: don't fill mask on frame
  pose-widget: also bilinear interpolation of alpha value
  ui: adjust margin
  ui: make more compact
  glwidget: use transparent octopus background
  api/mat: fix typos/breakage
  api/joy: refresh only manually on certain events
  pt: histogram more granular 6 -> 8
  cmake/api: link with strmiids.lib on win32
  tracker/pt: reduce auto thresholding histogram bucket size
  api/keys: prevent idempotent keys
  api/joy: move from header
  api/joy: prevent idempotent keypressed passed to receiver
  compat/options: get rid of std::string usage
  compat/options: move from header
  gui/settings: set parent, otherwise not modal
  gui/settings: don't forget to show a modal dialog before executing
  gui/main: don't raise a new window, it's enough to set visible
  api/joy: speed up poll_axis path
  api/joy: nix static, now that we're not a singleton
  tracker/joy: adapt to non-singleton joy worker
  joystick: no longer singleton, use fake window handle
  api/keys: use a fake window for DirectInput handle
  gui/keys: allow for pausing global keystrokes for options dialog
  api/keys: nix tautological #ifdef
  contrib/aruco: oops, right extension
  contrib/aruco: use @frost555's marker image
  api/camera-names: move to compat/
  ...

3 files changed, 49 insertions, 276 deletions

diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp
index 77fd7241..d10b15ca 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick.cpp
@@ -8,220 +8,29 @@
 #include "opentrack/plugin-api.hpp"
 #include <QMutexLocker>
 
-FTNoIR_Tracker::FTNoIR_Tracker() :
-    g_pDI(nullptr),
-    g_pJoystick(nullptr),
-    mtx(QMutex::Recursive),
-    iter(-1)
+FTNoIR_Tracker::FTNoIR_Tracker()
 {
-}
-
-void FTNoIR_Tracker::reload()
-{
-    s.b->reload();
-    QMutexLocker foo(&mtx);
-    if (g_pJoystick)
+    if (static_cast<QString>(s.guid) == "")
     {
-        g_pJoystick->Unacquire();
-        g_pJoystick->Release();
+        std::vector<win32_joy_ctx::joy_info> info = joy_ctx.get_joy_info();
+        if (info.size())
+        {
+            s.guid = info[0].guid;
+            s.b->save();
+        }
     }
-    if (g_pDI)
-        g_pDI->Release();
-
-    g_pJoystick = nullptr;
-    g_pDI = nullptr;
-
-    start_tracker(frame);
 }
 
 FTNoIR_Tracker::~FTNoIR_Tracker()
 {
-    if (g_pJoystick)
-    {
-        g_pJoystick->Unacquire();
-        g_pJoystick->Release();
-    }
-    if (g_pDI)
-    {
-        g_pDI->Release();
-    }
 }
 
-#ifdef __GNUC__
-#	pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-static BOOL CALLBACK EnumObjectsCallback( const DIDEVICEOBJECTINSTANCE* pdidoi,
-                                   VOID* pContext )
+void FTNoIR_Tracker::start_tracker(QFrame*)
 {
-    auto self = (FTNoIR_Tracker*) pContext;
-
-    if( pdidoi->dwType & DIDFT_AXIS )
-    {
-        DIPROPRANGE diprg = {0};
-        diprg.diph.dwSize = sizeof( DIPROPRANGE );
-        diprg.diph.dwHeaderSize = sizeof( DIPROPHEADER );
-        diprg.diph.dwHow = DIPH_BYID;
-        diprg.diph.dwObj = pdidoi->dwType;
-        diprg.lMax = FTNoIR_Tracker::AXIS_MAX;
-        diprg.lMin = -FTNoIR_Tracker::AXIS_MAX;
-
-        if( FAILED( self->g_pJoystick->SetProperty( DIPROP_RANGE, &diprg.diph ) ) )
-            return DIENUM_STOP;
-
-        self->iter++;
-    }
-
-    return self->iter == 8 ? DIENUM_STOP : DIENUM_CONTINUE;
-}
-
-static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
-{
-    auto self = reinterpret_cast<FTNoIR_Tracker*>(pContext);
-    bool stop = QString(pdidInstance->tszInstanceName) == self->s.joyid;
-
-    if (stop)
-    {
-        if (self->guid_to_check.size())
-        {
-            QString guid = guid_to_string(pdidInstance->guidInstance);
-            if (guid != self->guid_to_check)
-            {
-                return DIENUM_CONTINUE;
-            }
-            else
-                qDebug() << "guid ok" << self->guid_to_check;
-        }
-
-        (void) self->g_pDI->CreateDevice( pdidInstance->guidInstance, &self->g_pJoystick, NULL);
-        qDebug() << "device" << static_cast<QString>(self->s.joyid);
-    }
-
-    return stop ? DIENUM_STOP : DIENUM_CONTINUE;
-}
-
-void FTNoIR_Tracker::start_tracker(QFrame* frame)
-{
-    QMutexLocker foo(&mtx);
-    this->frame = frame;
-    iter = 0;
-    auto hr = CoInitialize( nullptr );
-
-    if( FAILED( hr = DirectInput8Create( GetModuleHandle( NULL ), DIRECTINPUT_VERSION,
-                                         IID_IDirectInput8, ( VOID** )&g_pDI, NULL ) ) )
-    {
-        qDebug() << "create";
-        goto fail;
-    }
-
-    guid_to_check = s.guid;
-
-    if( FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL,
-                                         EnumJoysticksCallback,
-                                         this,
-                                         DIEDFL_ATTACHEDONLY)))
-    {
-        qDebug() << "enum1";
-        goto fail;
-    }
-
-    if (!g_pJoystick && guid_to_check.size())
-    {
-        guid_to_check = "";
-
-        if( FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL,
-                                             EnumJoysticksCallback,
-                                             this,
-                                             DIEDFL_ATTACHEDONLY)))
-        {
-            qDebug() << "enum2";
-            goto fail;
-        }
-    }
-
-    if (!g_pJoystick)
-    {
-        qDebug() << "ENODEV";
-        goto fail;
-    }
-
-    if (FAILED(g_pJoystick->SetDataFormat(&c_dfDIJoystick)))
-    {
-        qDebug() << "format";
-        goto fail;
-    }
-
-    if (FAILED(g_pJoystick->SetCooperativeLevel((HWND) frame->window()->winId(), DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)))
-    {
-        qDebug() << "coop";
-        goto fail;
-    }
-
-    iter = 0;
-
-    if( FAILED( hr = g_pJoystick->EnumObjects( EnumObjectsCallback,
-                                               ( VOID* )this, DIDFT_ALL )))
-    {
-        qDebug() << "enum axes";
-        goto fail;
-    }
-
-    return;
-
-fail:
-    if (g_pJoystick)
-        g_pJoystick->Release();
-    if (g_pDI)
-        g_pDI->Release();
-    g_pJoystick = nullptr;
-    g_pDI = nullptr;
-
-    qDebug() << "joy init failure";
 }
 
 void FTNoIR_Tracker::data(double *data)
 {
-    QMutexLocker foo(&mtx);
-    DIJOYSTATE js = {0};
-
-    if( !g_pDI || !g_pJoystick)
-        return;
-
-    bool ok = false;
-
-    for (int i = 0; i < 100; i++)
-    {
-        if (!FAILED(g_pJoystick->Poll()))
-        {
-                ok = true;
-                break;
-        }
-        if (g_pJoystick->Acquire() != DI_OK)
-                continue;
-        else
-                ok = true;
-        break;
-    }
-
-    if (!ok)
-            return;
-
-    HRESULT hr = 0;
-
-    if( FAILED( hr = g_pJoystick->GetDeviceState( sizeof( js ), &js ) ) )
-        return;
-
-    const LONG values[] = {
-        js.lX,
-        js.lY,
-        js.lZ,
-        js.lRx,
-        js.lRy,
-        js.lRz,
-        js.rglSlider[0],
-        js.rglSlider[1]
-    };
-
     int map[6] = {
         s.joy_1 - 1,
         s.joy_2 - 1,
@@ -239,14 +48,21 @@ void FTNoIR_Tracker::data(double *data)
         180,
         180
     };
-
-    for (int i = 0; i < 6; i++)
+    
+    const QString guid = s.guid;
+    int axes[8];
+    const bool ret = joy_ctx.poll_axis(guid, axes);
+    
+    if (ret)
     {
-        int k = map[i] - 1;
-        if (k < 0 || k >= 8)
-            data[i] = 0;
-        else
-            data[i] = values[k] * limits[i] / AXIS_MAX;
+        for (int i = 0; i < 6; i++)
+        {
+            int k = map[i] - 1;
+            if (k < 0 || k >= 8)
+                data[i] = 0;
+            else
+                data[i] = axes[k] * limits[i] / AXIS_MAX;
+        }
     }
 }
 
diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
index 75305f07..1f940b63 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.h
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -12,30 +12,20 @@
 #include <QMessageBox>
 #include <QSettings>
 #include <QList>
-#include <QMutex>
 #include <QFrame>
 #include <QStringList>
 #include <cmath>
 #include "opentrack/plugin-api.hpp"
-#ifndef DIRECTINPUT_VERSION
-#   define DIRECTINPUT_VERSION 0x800
-#endif
-#include <windows.h>
-#include <commctrl.h>
-#include <basetsd.h>
-#include <dinput.h>
-#include <oleauto.h>
-#include <shellapi.h>
 
-#include "opentrack/options.hpp"
+#include "opentrack/win32-joystick.hpp"
+#include "opentrack-compat/options.hpp"
 using namespace options;
 
 struct settings : opts {
-    value<QString> joyid, guid;
+    value<QString> guid;
     value<int> joy_1, joy_2, joy_3, joy_4, joy_5, joy_6;
     settings() :
         opts("tracker-joystick"),
-        joyid(b, "joy-id", ""),
         guid(b, "joy-guid", ""),
         joy_1(b, "axis-map-1", 1),
         joy_2(b, "axis-map-2", 2),
@@ -46,35 +36,17 @@ struct settings : opts {
     {}
 };
 
-template<typename = void>
-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);
-}
-
 class FTNoIR_Tracker : public ITracker
 {
 public:
     FTNoIR_Tracker();
     ~FTNoIR_Tracker();
-    void start_tracker(QFrame *frame);
+    void start_tracker(QFrame *);
     void data(double *data);
-    void reload();
-    LPDIRECTINPUT8          g_pDI;
-    LPDIRECTINPUTDEVICE8    g_pJoystick;
-    QMutex mtx;
-    QFrame* frame;
-    DIDEVICEINSTANCE def;
-    int iter; // XXX bad style
     settings s;
-    QString guid_to_check;
-    static constexpr int AXIS_MAX = 65535;
+    QString guid;
+    static constexpr int AXIS_MAX = win32_joy_ctx::joy_axis_size - 1;
+    win32_joy_ctx joy_ctx;
 };
 
 class TrackerControls: public ITrackerDialog
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 0463933f..a6fa6605 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -1,19 +1,6 @@
 #include "ftnoir_tracker_joystick.h"
 #include "opentrack/plugin-api.hpp"
 
-static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
-{
-    auto self = ( TrackerControls* )pContext;
-    auto name = QString(pdidInstance->tszInstanceName);
-    auto guid = guid_to_string(pdidInstance->guidInstance);
-    TrackerControls::joys cur { name, guid };
-    self->_joys.append(cur);
-
-    self->ui.joylist->addItem(name + " " + guid);
-
-    return DIENUM_CONTINUE;
-}
-
 TrackerControls::TrackerControls() : tracker(nullptr)
 {
     ui.setupUi( this );
@@ -23,22 +10,25 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
     {
-        auto hr = CoInitialize( nullptr );
-        LPDIRECTINPUT8 g_pDI = nullptr;
-
-        if( FAILED( hr = DirectInput8Create( GetModuleHandle( NULL ), DIRECTINPUT_VERSION,
-                                             IID_IDirectInput8, ( VOID** )&g_pDI, NULL ) ) )
-            goto fin;
-
-        if( FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL,
-                                             EnumJoysticksCallback,
-                                             this,
-                                             DIEDFL_ATTACHEDONLY )))
-            goto fin;
-
-fin:
-        if (g_pDI)
-            g_pDI->Release();
+        win32_joy_ctx joy_ctx;
+        
+        _joys = QList<joys>();
+        
+        for (auto j : joy_ctx.get_joy_info())
+            _joys.push_back(joys { j.name, j.guid });
+    }
+    
+    {
+        const QString guid = s.guid;
+        int idx = 0;
+        for (int i = 0; i < _joys.size(); i++)
+        {
+            const joys& j = _joys[i];
+            if (j.guid == guid)
+                idx = i;
+            ui.joylist->addItem(j.name + " " + j.guid);
+        }
+        ui.joylist->setCurrentIndex(idx);
     }
 
     tie_setting(s.joy_1, ui.joy_1);
@@ -54,10 +44,7 @@ void TrackerControls::doOK() {
     joys def { "", "" };
     auto val = _joys.value(idx, def);
     s.guid = val.guid;
-    s.joyid = val.name;
     s.b->save();
-    if (tracker)
-        tracker->reload();
     this->close();
 }
 
@@ -65,5 +52,3 @@ void TrackerControls::doCancel() {
     s.b->reload();
     this->close();
 }
-
-