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, 16 insertions, 7 deletions

diff --git a/gui/ui.h b/gui/ui.h
index c1e71ca9..42a85e47 100644
--- a/gui/ui.h
+++ b/gui/ui.h
@@ -17,9 +17,12 @@
 #include <QString>
 #include <QMenu>
 
+#include <vector>
+#include <tuple>
+
 #include "ui_main.h"
 
-#include "opentrack/options.hpp"
+#include "opentrack-compat/options.hpp"
 #include "opentrack/main-settings.hpp"
 #include "opentrack/plugin-support.hpp"
 #include "opentrack/tracker.h"
@@ -33,9 +36,11 @@
 
 using namespace options;
 
-class MainWindow : public QMainWindow, private State
+class MainWindow : public QMainWindow, public State
 {
     Q_OBJECT
+    
+    Shortcuts global_shortcuts;
 
     Ui::OpentrackUI ui;
     mem<QSystemTrayIcon> tray;
@@ -45,11 +50,11 @@ class MainWindow : public QMainWindow, private State
     mem<OptionsDialog> options_widget;
     mem<MapWidget> mapping_widget;
     QShortcut kbd_quit;
-    QPixmap no_feed_pixmap;
     mem<IProtocolDialog> pProtocolDialog;
     process_detector_worker det;
     QMenu profile_menu;
     bool is_refreshing_profiles;
+    volatile bool keys_paused;
     QTimer save_timer;
     update_dialog::query update_query;
 
@@ -70,6 +75,7 @@ class MainWindow : public QMainWindow, private State
     void maybe_save();
     bool maybe_not_close_tracking();
     void closeEvent(QCloseEvent *e) override;
+    void register_shortcuts();
 private slots:
     void _save();
     void save();
@@ -92,10 +98,13 @@ private slots:
     void startTracker();
     void stopTracker();
     void reload_options();
-public slots:
-    void shortcutRecentered();
-    void shortcutToggled();
-    void shortcutZeroed();
+    void mark_minimized(bool is_minimized);
+signals:
+    void emit_start_tracker();
+    void emit_stop_tracker();
+    void emit_toggle_tracker();
+    
+    void emit_minimized(bool);
 public:
     MainWindow();
     ~MainWindow();