Merge branch 'unstable' into trackhat

* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name

1 files changed, 106 insertions, 0 deletions

diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
new file mode 100644
index 00000000..75305f07
--- /dev/null
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -0,0 +1,106 @@
+/* Copyright (c) 2013 Stanislaw Halik <sthalik@misaki.pl>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+#pragma once
+#include "ui_ftnoir_tracker_joystick_controls.h"
+#include <QComboBox>
+#include <QCheckBox>
+#include <QSpinBox>
+#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"
+using namespace options;
+
+struct settings : opts {
+    value<QString> joyid, 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),
+        joy_3(b, "axis-map-3", 3),
+        joy_4(b, "axis-map-4", 4),
+        joy_5(b, "axis-map-5", 5),
+        joy_6(b, "axis-map-6", 6)
+    {}
+};
+
+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 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;
+};
+
+class TrackerControls: public ITrackerDialog
+{
+    Q_OBJECT
+public:
+    TrackerControls();
+    void register_tracker(ITracker *) {}
+    void unregister_tracker() {}
+    Ui::UIJoystickControls ui;
+    FTNoIR_Tracker* tracker;
+    settings s;
+    struct joys {
+        QString name;
+        QString guid;
+    };
+    QList<joys> _joys;
+private slots:
+    void doOK();
+    void doCancel();
+};
+
+class FTNoIR_TrackerDll : public Metadata
+{
+public:
+    QString name() { return QString("Joystick input"); }
+    QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
+};
+