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/
  ...

1 files changed, 7 insertions, 35 deletions

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