From 1649da2a354d1d06486d6d77e508b0b749fe7302 Mon Sep 17 00:00:00 2001
From: James Rowe <jroweboy@gmail.com>
Date: Sat, 1 Apr 2017 07:05:47 -0600
Subject: [PATCH] Implement proper touch screen support by emulating the stylus

Using a mouse for touch screen controls doesn't accurately encompass the
feel that one gets when using the 3ds stylus. This PR adds experimental
support for using a stylus for touch screen controls.
---
 dist/stylus.png              | Bin 0 -> 12541 bytes
 src/citra_qt/CMakeLists.txt  |   9 +++-
 src/citra_qt/bootmanager.cpp |  80 ++++++++++++++++++++++++++++-----
 src/citra_qt/bootmanager.h   |  11 +++++
 src/citra_qt/citra-qt.rc     |   1 -
 src/citra_qt/main.cpp        |   5 ++-
 src/citra_qt/overlay.cpp     |  66 +++++++++++++++++++++++++++
 src/citra_qt/overlay.h       |  32 +++++++++++++
 src/citra_qt/resources.qrc   |   7 +++
 src/citra_qt/stylus.cpp      |  84 +++++++++++++++++++++++++++++++++++
 src/citra_qt/stylus.h        |  61 +++++++++++++++++++++++++
 11 files changed, 341 insertions(+), 15 deletions(-)
 create mode 100644 dist/stylus.png
 create mode 100644 src/citra_qt/overlay.cpp
 create mode 100644 src/citra_qt/overlay.h
 create mode 100644 src/citra_qt/resources.qrc
 create mode 100644 src/citra_qt/stylus.cpp
 create mode 100644 src/citra_qt/stylus.h

diff --git a/dist/stylus.png b/dist/stylus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d64aed43195975dfa89d14e5f1b57231ddb4fc78
GIT binary patch
literal 12541
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

literal 0
HcmV?d00001

diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 2b1c59a92..2fe3ae670 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
@@ -29,6 +30,8 @@ set(SRCS
             game_list.cpp
             hotkeys.cpp
             main.cpp
+            overlay.cpp
+            stylus.cpp
             ui_settings.cpp
             citra-qt.rc
             Info.plist
@@ -63,6 +66,8 @@ set(HEADERS
             game_list_p.h
             hotkeys.h
             main.h
+            overlay.h
+            stylus.h
             ui_settings.h
             )
 
@@ -92,10 +97,10 @@ endif()
 if (APPLE)
     set(MACOSX_ICON "../../dist/citra.icns")
     set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON})
+    add_executable(citra-qt MACOSX_BUNDLE ${SRCS} ${HEADERS} ${UI_HDRS} ${MACOSX_ICON} resources.qrc)
     set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 else()
-    add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
+    add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS} resources.qrc)
 endif()
 target_link_libraries(citra-qt core video_core audio_core common input_common)
 target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index bae576d6a..4f844709d 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -100,13 +100,18 @@ private:
     bool do_painting;
 };
 
+Stylus* GRenderWindow::GetStylus() {
+    return stylus.get();
+}
+
 GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread)
     : QWidget(parent), child(nullptr), emu_thread(emu_thread) {
 
     std::string window_title = Common::StringFromFormat("Citra %s| %s-%s", Common::g_build_name,
                                                         Common::g_scm_branch, Common::g_scm_desc);
     setWindowTitle(QString::fromStdString(window_title));
-
+    setFocusPolicy(Qt::StrongFocus);
+    setMouseTracking(true);
     InputCommon::Init();
 }
 
@@ -148,6 +153,16 @@ void GRenderWindow::DoneCurrent() {
 
 void GRenderWindow::PollEvents() {}
 
+void GRenderWindow::UpdateStylusSize(unsigned width, unsigned height) {
+    if (overlay) {
+        QRect rect = QApplication::desktop()->screenGeometry();
+        LOG_WARNING(Frontend, "rect %d, %d", rect.width(), rect.height());
+        overlay->setFixedWidth(rect.width());
+        overlay->setFixedHeight(rect.height() - 1);
+        overlay->update();
+    }
+}
+
 // On Qt 5.0+, this correctly gets the size of the framebuffer (pixels).
 //
 // Older versions get the window size (density independent pixels),
@@ -159,6 +174,7 @@ void GRenderWindow::OnFramebufferSizeChanged() {
     qreal pixelRatio = windowPixelRatio();
     unsigned width = child->QPaintDevice::width() * pixelRatio;
     unsigned height = child->QPaintDevice::height() * pixelRatio;
+    UpdateStylusSize(width, height);
     UpdateCurrentFramebufferLayout(width, height);
 }
 
@@ -209,12 +225,22 @@ void GRenderWindow::keyReleaseEvent(QKeyEvent* event) {
     InputCommon::GetKeyboard()->ReleaseKey(event->key());
 }
 
+void GRenderWindow::UpdateStylusPosition(QMouseEvent* event) {
+    auto pos = event->pos();
+    stylus->UpdatePosition(pos.x(), pos.y());
+    overlay->update();
+}
+
 void GRenderWindow::mousePressEvent(QMouseEvent* event) {
     auto pos = event->pos();
-    if (event->button() == Qt::LeftButton) {
-        qreal pixelRatio = windowPixelRatio();
-        this->TouchPressed(static_cast<unsigned>(pos.x() * pixelRatio),
-                           static_cast<unsigned>(pos.y() * pixelRatio));
+    if (event->button() == Qt::LeftButton && stylus->Contains(pos)) {
+        stylus->SetHoldPoint(pos);
+        if (stylus->IsNearCenter(pos)) {
+            stylus->SetState(StylusState::HOLD);
+        } else {
+            stylus->SetState(StylusState::ROTATE);
+        }
+        QApplication::setOverrideCursor(Qt::ClosedHandCursor);
     } else if (event->button() == Qt::RightButton) {
         motion_emu->BeginTilt(pos.x(), pos.y());
     }
@@ -222,17 +248,44 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) {
 
 void GRenderWindow::mouseMoveEvent(QMouseEvent* event) {
     auto pos = event->pos();
-    qreal pixelRatio = windowPixelRatio();
-    this->TouchMoved(std::max(static_cast<unsigned>(pos.x() * pixelRatio), 0u),
-                     std::max(static_cast<unsigned>(pos.y() * pixelRatio), 0u));
-    motion_emu->Tilt(pos.x(), pos.y());
+
+    if (stylus->GetState() == StylusState::HOLD) {
+        UpdateStylusPosition(event);
+        qreal pixelRatio = windowPixelRatio();
+        QPoint p = stylus->GetTouchPoint();
+        QPoint screen = mapToGlobal(QWidget::geometry().topLeft());
+        this->TouchMoved(std::max(static_cast<unsigned>((p.x() - screen.x()) * pixelRatio), 0u),
+                         std::max(static_cast<unsigned>((p.y() - screen.y()) * pixelRatio), 0u));
+    } else if (stylus->GetState() == StylusState::ROTATE) {
+        stylus->Rotate(pos);
+        overlay->update();
+    }
+    if (event->button() == Qt::LeftButton) {
+    } else if (event->button() == Qt::RightButton) {
+        motion_emu->Tilt(pos.x(), pos.y());
+    }
+}
+void GRenderWindow::mouseDoubleClickEvent(QMouseEvent* e) {
+    if (e->button() == Qt::LeftButton && stylus->Contains(e->pos())) {
+        qreal pixelRatio = windowPixelRatio();
+        QPoint p = stylus->GetTouchPoint();
+        QPoint screen = mapToGlobal(QWidget::geometry().topLeft());
+        LOG_ERROR(Frontend, "screen %d, %d", screen.x(), screen.y());
+        this->TouchPressed(static_cast<unsigned>((p.x() - screen.x()) * pixelRatio),
+                           static_cast<unsigned>((p.y() - screen.y()) * pixelRatio));
+        stylus->SetState(StylusState::HOLD);
+        stylus->SetHoldPoint(e->pos());
+    }
 }
 
 void GRenderWindow::mouseReleaseEvent(QMouseEvent* event) {
-    if (event->button() == Qt::LeftButton)
+    if (event->button() == Qt::LeftButton) {
         this->TouchReleased();
-    else if (event->button() == Qt::RightButton)
+        stylus->SetState(StylusState::DROP);
+        QApplication::restoreOverrideCursor();
+    } else if (event->button() == Qt::RightButton) {
         motion_emu->EndTilt();
+    }
 }
 
 void GRenderWindow::focusOutEvent(QFocusEvent* event) {
@@ -287,13 +340,18 @@ void GRenderWindow::OnMinimalClientAreaChangeRequest(
 
 void GRenderWindow::OnEmulationStarting(EmuThread* emu_thread) {
     motion_emu = std::make_unique<Motion::MotionEmu>(*this);
+    stylus = std::make_unique<Stylus>();
+    overlay = std::make_unique<Overlay>(this);
     this->emu_thread = emu_thread;
     child->DisablePainting();
+    overlay->show();
 }
 
 void GRenderWindow::OnEmulationStopping() {
     motion_emu = nullptr;
+    stylus = nullptr;
     emu_thread = nullptr;
+    overlay = nullptr;
     child->EnablePainting();
 }
 
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index 9d39f1af8..07685d551 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -9,10 +9,13 @@
 #include <mutex>
 #include <QGLWidget>
 #include <QThread>
+#include "citra_qt/overlay.h"
+#include "citra_qt/stylus.h"
 #include "common/thread.h"
 #include "core/frontend/emu_window.h"
 #include "core/frontend/motion_emu.h"
 
+
 class QKeyEvent;
 class QScreen;
 
@@ -127,12 +130,14 @@ public:
     void mousePressEvent(QMouseEvent* event) override;
     void mouseMoveEvent(QMouseEvent* event) override;
     void mouseReleaseEvent(QMouseEvent* event) override;
+    void GRenderWindow::mouseDoubleClickEvent(QMouseEvent* e) override;
 
     void focusOutEvent(QFocusEvent* event) override;
 
     void OnClientAreaResized(unsigned width, unsigned height);
 
     void InitRenderTarget();
+    Stylus* GRenderWindow::GetStylus();
 
 public slots:
     void moveContext(); // overridden
@@ -146,6 +151,8 @@ signals:
     void Closed();
 
 private:
+    void UpdateStylusPosition(QMouseEvent* event);
+    void UpdateStylusSize(unsigned width, unsigned height);
     void OnMinimalClientAreaChangeRequest(
         const std::pair<unsigned, unsigned>& minimal_size) override;
 
@@ -157,6 +164,10 @@ private:
 
     /// Motion sensors emulation
     std::unique_ptr<Motion::MotionEmu> motion_emu;
+    std::unique_ptr<Stylus> stylus;
+    std::unique_ptr<Overlay> overlay;
+
+    StylusState stylus_state;
 
 protected:
     void showEvent(QShowEvent* event) override;
diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc
index fea603004..480c3bf12 100644
--- a/src/citra_qt/citra-qt.rc
+++ b/src/citra_qt/citra-qt.rc
@@ -6,4 +6,3 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 CITRA_ICON              ICON                    "../../dist/citra.ico"
-
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 2723a0217..821971540 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -71,10 +71,13 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
 
     setWindowTitle(QString("Citra %1| %2-%3")
                        .arg(Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc));
+    setWindowIcon(QIcon(":citra_icon.ico"));
+    setMouseTracking(true);
+    centralWidget()->setMouseTracking(true);
     show();
 
     game_list->PopulateAsync(UISettings::values.gamedir, UISettings::values.gamedir_deepscan);
-
+    game_list->setMouseTracking(true);
     QStringList args = QApplication::arguments();
     if (args.length() >= 2) {
         BootGame(args[1]);
diff --git a/src/citra_qt/overlay.cpp b/src/citra_qt/overlay.cpp
new file mode 100644
index 000000000..210b47fae
--- /dev/null
+++ b/src/citra_qt/overlay.cpp
@@ -0,0 +1,66 @@
+
+#include <QPainter>
+
+#include "citra_qt/bootmanager.h"
+#include "citra_qt/overlay.h"
+#include "citra_qt/stylus.h"
+
+Overlay::Overlay(GRenderWindow* parent) : QWidget(parent), parent(parent) {
+    // setWindowFlags(Qt::Widget | Qt::FramelessWindowHint);
+    // // setParent(0); // Create TopLevel-Widget
+    // setAttribute(Qt::WA_NoSystemBackground, true);
+    // setAttribute(Qt::WA_TranslucentBackground, true);
+    // setWindowFlags(Qt::FramelessWindowHint | Qt::ToolTip | Qt::WindowStaysOnTopHint);
+    setWindowFlags(Qt::FramelessWindowHint | Qt::ToolTip);
+    setAttribute(Qt::WA_TransparentForMouseEvents);
+    setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_TranslucentBackground);
+    setFocusPolicy(Qt::NoFocus);
+    setMouseTracking(false);
+    move(0, 0);
+}
+
+void Overlay::keyPressEvent(QKeyEvent* event) {
+    parent->keyPressEvent(event);
+}
+
+void Overlay::keyReleaseEvent(QKeyEvent* event) {
+    parent->keyReleaseEvent(event);
+}
+
+void Overlay::mousePressEvent(QMouseEvent* event) {
+    parent->mousePressEvent(event);
+    QApplication::setActiveWindow(window());
+}
+void Overlay::mouseMoveEvent(QMouseEvent* event) {
+    parent->mouseMoveEvent(event);
+    // window()->setFocus();
+    QApplication::setActiveWindow(window());
+}
+void Overlay::mouseDoubleClickEvent(QMouseEvent* event) {
+    parent->mouseDoubleClickEvent(event);
+    // window()->setFocus();
+    QApplication::setActiveWindow(window());
+}
+void Overlay::mouseReleaseEvent(QMouseEvent* event) {
+    parent->mouseReleaseEvent(event);
+    // window()->setFocus();
+    QApplication::setActiveWindow(window());
+}
+
+void Overlay::paintEvent(QPaintEvent* ev) {
+    Stylus* stylus = parent->GetStylus();
+    QPainter painter(this);
+    // set the viewport to match the screen size
+    // painter.setWindow(QApplication::desktop()->screenGeometry());
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    // painter.setPen(palette().dark().color());
+    // painter.setBrush(Qt::NoBrush);
+    // painter.drawRect(QRect(0, 0, width() - 1, height() - 1));
+    // QPoint p = stylus->GetTouchPoint();
+    // painter.drawEllipse(QRect(p.x() - 5, p.y() - 5, 10, 10));
+    QTransform t = stylus->GetTransform();
+    painter.setTransform(t);
+    painter.drawPixmap(0, 0, stylus->GetPix());
+    // painter.drawRect(0, 0, stylus->GetRect().width(), stylus->GetRect().height());
+}
\ No newline at end of file
diff --git a/src/citra_qt/overlay.h b/src/citra_qt/overlay.h
new file mode 100644
index 000000000..7d4a115b3
--- /dev/null
+++ b/src/citra_qt/overlay.h
@@ -0,0 +1,32 @@
+// Copyright 20XX Citra Emulator Project
+// Licensed under GPLv2 or any later version (but not GPLv824 cause that one sucked)
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QPainter>
+#include <QtWidgets>
+
+class Stylus;
+class GRenderWindow;
+
+class Overlay : public QWidget {
+    Q_OBJECT
+public:
+    Overlay(GRenderWindow* parent);
+
+protected:
+    void paintEvent(QPaintEvent* ev) override;
+
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseReleaseEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+    void mouseDoubleClickEvent(QMouseEvent* event) override;
+
+    void keyPressEvent(QKeyEvent* event);
+    void keyReleaseEvent(QKeyEvent* event);
+
+private:
+    GRenderWindow* parent;
+    Stylus* stylus;
+};
\ No newline at end of file
diff --git a/src/citra_qt/resources.qrc b/src/citra_qt/resources.qrc
new file mode 100644
index 000000000..1d081b2aa
--- /dev/null
+++ b/src/citra_qt/resources.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+<qresource>
+    <file alias="citra_icon.ico">../../dist/citra.ico</file>
+    <file alias="stylus.png">../../dist/stylus.png</file>
+</qresource>
+</RCC>
\ No newline at end of file
diff --git a/src/citra_qt/stylus.cpp b/src/citra_qt/stylus.cpp
new file mode 100644
index 000000000..fcac8fe94
--- /dev/null
+++ b/src/citra_qt/stylus.cpp
@@ -0,0 +1,84 @@
+#include <QApplication>
+#include <QtWidgets>
+
+#include "citra_qt/stylus.h"
+#include "common/logging/log.h"
+
+Stylus::Stylus() {
+    pic = QPixmap(":stylus.png");
+    x = QApplication::desktop()->screenGeometry().width() / 2;
+    y = QApplication::desktop()->screenGeometry().height() / 2;
+    rotation = 0;
+}
+
+Stylus::~Stylus() {}
+
+void Stylus::SetHoldPoint(QPoint p) {
+    // hold = QPoint(p.x() - x, p.y() - y);
+    diff = QPoint(p.x() - x, p.y() - y);
+    hold = p;
+}
+
+void Stylus::Rotate(QPoint n) {
+    QPoint center = GetCenter();
+    // get the angle from the center to the initial click point
+    qreal init_x = hold.x() - center.x();
+    qreal init_y = hold.y() - center.y();
+    qreal initial_angle = std::atan2(init_y, init_x);
+    qreal x = n.x() - center.x();
+    qreal y = n.y() - center.y();
+
+    qreal mv_angle = std::atan2(y, x);
+
+    // get the changed angle
+    rotation = (mv_angle - initial_angle) * 180 / M_PI;
+
+    if (std::fabs(rotation) > 360.0) {
+        rotation = fmod(rotation, 360);
+    }
+}
+
+bool Stylus::IsNearCenter(QPoint n) {
+    // QPoint c = GetCenter();
+    // return (n - c).manhattanLength() < 75;
+    // jokes on you i'm now checking to see if its the top half or the bottom half
+    QTransform t = GetTransform();
+    QRect top = QRect(0, 0, pic.width(), pic.height() / 2);
+    return t.mapRect(top).contains(n);
+}
+
+QPoint Stylus::GetCenter() {
+    return QRect(x, y, pic.width(), pic.height()).center();
+}
+
+void Stylus::UpdatePosition(unsigned x, unsigned y) {
+    this->x = x - diff.x();
+    this->y = y - diff.y();
+}
+
+QTransform Stylus::GetTransform() {
+    QTransform t;
+    t.translate(x, y);
+    t.rotate(rotation);
+    return t;
+}
+
+QRect Stylus::GetRect() {
+    return QRect(0, 0, pic.width(), pic.height());
+}
+
+QPolygon Stylus::GetPoly() {
+    QTransform t = GetTransform();
+    QRect r = GetRect();
+    return t.mapToPolygon(r);
+}
+
+bool Stylus::Contains(QPoint pos) {
+    QPolygon p = GetPoly();
+    return p.containsPoint(pos, Qt::OddEvenFill);
+}
+
+QPoint Stylus::GetTouchPoint() {
+    QTransform t = GetTransform();
+    return t.map(QPoint(pic.width() / 2, pic.height() - 10));
+}
\ No newline at end of file
diff --git a/src/citra_qt/stylus.h b/src/citra_qt/stylus.h
new file mode 100644
index 000000000..c714ab88e
--- /dev/null
+++ b/src/citra_qt/stylus.h
@@ -0,0 +1,61 @@
+// Copyright 20XX Citra Emulator Project
+// Licensed under GPLv2 or any later version (but not GPLv824 cause that one sucked)
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QPainter>
+#include <QVector2D>
+
+enum class StylusState : unsigned { ROTATE, HOLD, DROP, COUNT };
+
+class Stylus {
+public:
+    Stylus();
+    ~Stylus();
+    StylusState GetState() {
+        return state;
+    }
+
+    void Rotate(QPoint p);
+
+    void SetHoldPoint(QPoint p);
+
+    void SetState(StylusState s) {
+        state = s;
+    }
+    void UpdatePosition(unsigned x, unsigned y);
+    unsigned GetX() {
+        return x;
+    }
+    unsigned GetY() {
+        return y;
+    }
+
+    QPixmap GetPix() {
+        return pic;
+    }
+
+    QTransform GetTransform();
+
+    QPolygon GetPoly();
+
+    bool Contains(QPoint p);
+
+    QPoint GetTouchPoint();
+
+    bool IsNearCenter(QPoint p);
+
+    QPoint GetCenter();
+
+    QRect GetRect();
+
+private:
+    unsigned x;
+    unsigned y;
+    qreal rotation;
+    QPixmap pic;
+    StylusState state;
+    QPoint hold;
+    QPoint diff;
+};
\ No newline at end of file