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

5 files changed, 30 insertions, 15 deletions

diff --git a/spline-widget/CMakeLists.txt b/spline-widget/CMakeLists.txt
index 03706d91..651a7874 100644
--- a/spline-widget/CMakeLists.txt
+++ b/spline-widget/CMakeLists.txt
@@ -1 +1,2 @@
-opentrack_boilerplate(opentrack-spline-widget NO-LINKER-SCRIPT)
+opentrack_boilerplate(opentrack-spline-widget NO-LINKER-SCRIPT NO-COMPAT LINKAGE)
+target_link_libraries(opentrack-spline-widget opentrack-compat)
diff --git a/spline-widget/functionconfig.cpp b/spline-widget/functionconfig.cpp
index dcc9ca65..777b4f6f 100644
--- a/spline-widget/functionconfig.cpp
+++ b/spline-widget/functionconfig.cpp
@@ -62,7 +62,7 @@ float Map::getValueInternal(int x) {
     return ret * sign;
 }
 
-static QPointF ensureInBounds(QList<QPointF> points, int i) {
+static QPointF ensureInBounds(const QList<QPointF>& points, int i) {
     int siz = points.size();
     if (siz == 0 || i < 0)
         return QPointF(0, 0);
@@ -219,7 +219,11 @@ void Map::loadSettings(QSettings& settings, const QString& title) {
 void Map::saveSettings(QSettings& settings, const QString& title) {
     QMutexLocker foo(&_mutex);
     settings.beginGroup(QString("Curves-%1").arg(title));
-    int max = cur.input.size();
+
+    if (cur.input.size() == 0)
+        cur.input.push_back(QPointF(max_x, max_y));
+
+    const int max = cur.input.size();
     settings.setValue("point-count", max);
 
     for (int i = 0; i < max; i++) {
diff --git a/spline-widget/functionconfig.h b/spline-widget/functionconfig.h
index 3d2fc23c..145ee14e 100644
--- a/spline-widget/functionconfig.h
+++ b/spline-widget/functionconfig.h
@@ -18,7 +18,7 @@
 #include <limits>
 #include "opentrack-compat/qcopyable-mutex.hpp"
 
-#ifdef BUILD_opentrack_spline_widget
+#ifdef BUILD_spline_widget
 #   define SPLINE_WIDGET_EXPORT Q_DECL_EXPORT
 #else
 #   define SPLINE_WIDGET_EXPORT Q_DECL_IMPORT
@@ -30,7 +30,7 @@ private:
 
     struct State {
         QList<QPointF> input;
-        std::vector<float> data;        
+        std::vector<float> data;
     };
 
     int precision() const;
@@ -52,6 +52,8 @@ public:
     {
         setMaxInput(maxx);
         setMaxOutput(maxy);
+        if (cur.input.size() == 0)
+            cur.input.push_back(QPointF(maxx, maxy));
         reload();
     }
 
diff --git a/spline-widget/qfunctionconfigurator.cpp b/spline-widget/qfunctionconfigurator.cpp
index 7ab1e360..256bf45e 100644
--- a/spline-widget/qfunctionconfigurator.cpp
+++ b/spline-widget/qfunctionconfigurator.cpp
@@ -5,7 +5,7 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
 using namespace options;
 #include "spline-widget/qfunctionconfigurator.h"
 #include <QPainter>
@@ -15,13 +15,13 @@ using namespace options;
 #include <cmath>
 #include <algorithm>
 
-static const int pointSize = 5;
-
 QFunctionConfigurator::QFunctionConfigurator(QWidget *parent) :
     QWidget(parent),
     _config(nullptr),
     moving_control_point_idx(-1),
-    _draw_function(true)
+    _draw_function(true),
+    snap_x(0),
+    snap_y(0)
 {
     update_range();
     setMouseTracking(true);
@@ -358,7 +358,7 @@ void QFunctionConfigurator::mouseMoveEvent(QMouseEvent *e)
         }
 
         if (is_on_point) {
-            setCursor(Qt::OpenHandCursor);
+            setCursor(Qt::CrossCursor);
         }
         else {
             setCursor(Qt::ArrowCursor);
@@ -402,9 +402,8 @@ void QFunctionConfigurator::update_range()
 
 bool QFunctionConfigurator::point_within_pixel(const QPointF &pt, const QPointF &pixel)
 {
-    QPointF pixel2 = point_to_pixel(pt);
-    return pixel2.x() >= pixel.x() - pointSize && pixel2.x() < pixel.x() + pointSize &&
-           pixel2.y() >= pixel.y() - pointSize && pixel2.y() < pixel.y() + pointSize;
+    QPointF tmp = pixel - point_to_pixel(pt);
+    return sqrt(QPointF::dotProduct(tmp, tmp)) < pointSize;
 }
 
 QPointF QFunctionConfigurator::pixel_coord_to_point(const QPointF& point)
@@ -412,8 +411,13 @@ QPointF QFunctionConfigurator::pixel_coord_to_point(const QPointF& point)
     if (!_config)
         return QPointF(-1, -1);
 
-    double x = (point.x() - pixel_bounds.x()) / c.x();
-    double y = (pixel_bounds.height() - point.y() + pixel_bounds.y()) / c.y();
+    int x = (point.x() - pixel_bounds.x()) / c.x();
+    int y = (pixel_bounds.height() - point.y() + pixel_bounds.y()) / c.y();
+    
+    if (snap_x > 0)
+        x -= x % snap_x;
+    if (snap_y > 0)
+        y -= y % snap_y;
 
     if (x < 0)
         x = 0;
diff --git a/spline-widget/qfunctionconfigurator.h b/spline-widget/qfunctionconfigurator.h
index 4a9cb5f1..ce8208a8 100644
--- a/spline-widget/qfunctionconfigurator.h
+++ b/spline-widget/qfunctionconfigurator.h
@@ -19,6 +19,7 @@ class SPLINE_WIDGET_EXPORT QFunctionConfigurator : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier)
+    enum { pointSize = 5 };
 public:
     QFunctionConfigurator(QWidget *parent = 0);
     
@@ -39,6 +40,8 @@ public:
         _background = QPixmap();
         update();
     }
+    void set_snap(int x, int y) { snap_x = x; snap_y = y; }
+    void get_snap(int& x, int& y) const { x = snap_x; y = snap_y; }
 protected slots:
     void paintEvent(QPaintEvent *e) override;
     void mousePressEvent(QMouseEvent *e) override;
@@ -72,4 +75,5 @@ private:
     QPixmap _background;
     QPixmap _function;
     bool _draw_function;
+    int snap_x, snap_y;
 };