mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 16:49:09 +01:00
core/emu_window: Remove touch input
This commit is contained in:
parent
c405a19b73
commit
173a6b1e57
2 changed files with 16 additions and 114 deletions
|
@ -3,66 +3,31 @@
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include "common/settings.h"
|
|
||||||
#include "core/frontend/emu_window.h"
|
#include "core/frontend/emu_window.h"
|
||||||
#include "core/frontend/input.h"
|
|
||||||
|
|
||||||
namespace Core::Frontend {
|
namespace Core::Frontend {
|
||||||
|
|
||||||
GraphicsContext::~GraphicsContext() = default;
|
GraphicsContext::~GraphicsContext() = default;
|
||||||
|
|
||||||
class EmuWindow::TouchState : public Input::Factory<Input::TouchDevice>,
|
|
||||||
public std::enable_shared_from_this<TouchState> {
|
|
||||||
public:
|
|
||||||
std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage&) override {
|
|
||||||
return std::make_unique<Device>(shared_from_this());
|
|
||||||
}
|
|
||||||
|
|
||||||
std::mutex mutex;
|
|
||||||
|
|
||||||
Input::TouchStatus status;
|
|
||||||
|
|
||||||
private:
|
|
||||||
class Device : public Input::TouchDevice {
|
|
||||||
public:
|
|
||||||
explicit Device(std::weak_ptr<TouchState>&& touch_state_) : touch_state(touch_state_) {}
|
|
||||||
Input::TouchStatus GetStatus() const override {
|
|
||||||
if (auto state = touch_state.lock()) {
|
|
||||||
std::lock_guard guard{state->mutex};
|
|
||||||
return state->status;
|
|
||||||
}
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::weak_ptr<TouchState> touch_state;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
EmuWindow::EmuWindow() {
|
EmuWindow::EmuWindow() {
|
||||||
// TODO: Find a better place to set this.
|
// TODO: Find a better place to set this.
|
||||||
config.min_client_area_size =
|
config.min_client_area_size =
|
||||||
std::make_pair(Layout::MinimumSize::Width, Layout::MinimumSize::Height);
|
std::make_pair(Layout::MinimumSize::Width, Layout::MinimumSize::Height);
|
||||||
active_config = config;
|
active_config = config;
|
||||||
touch_state = std::make_shared<TouchState>();
|
|
||||||
Input::RegisterFactory<Input::TouchDevice>("emu_window", touch_state);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EmuWindow::~EmuWindow() {
|
EmuWindow::~EmuWindow() {}
|
||||||
Input::UnregisterFactory<Input::TouchDevice>("emu_window");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
std::pair<f32, f32> EmuWindow::MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const {
|
||||||
* Check if the given x/y coordinates are within the touchpad specified by the framebuffer layout
|
std::tie(framebuffer_x, framebuffer_y) = ClipToTouchScreen(framebuffer_x, framebuffer_y);
|
||||||
* @param layout FramebufferLayout object describing the framebuffer size and screen positions
|
const float x =
|
||||||
* @param framebuffer_x Framebuffer x-coordinate to check
|
static_cast<float>(framebuffer_x - framebuffer_layout.screen.left) /
|
||||||
* @param framebuffer_y Framebuffer y-coordinate to check
|
static_cast<float>(framebuffer_layout.screen.right - framebuffer_layout.screen.left);
|
||||||
* @return True if the coordinates are within the touchpad, otherwise false
|
const float y =
|
||||||
*/
|
static_cast<float>(framebuffer_y - framebuffer_layout.screen.top) /
|
||||||
static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, u32 framebuffer_x,
|
static_cast<float>(framebuffer_layout.screen.bottom - framebuffer_layout.screen.top);
|
||||||
u32 framebuffer_y) {
|
|
||||||
return (framebuffer_y >= layout.screen.top && framebuffer_y < layout.screen.bottom &&
|
return std::make_pair(x, y);
|
||||||
framebuffer_x >= layout.screen.left && framebuffer_x < layout.screen.right);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<u32, u32> EmuWindow::ClipToTouchScreen(u32 new_x, u32 new_y) const {
|
std::pair<u32, u32> EmuWindow::ClipToTouchScreen(u32 new_x, u32 new_y) const {
|
||||||
|
@ -75,49 +40,6 @@ std::pair<u32, u32> EmuWindow::ClipToTouchScreen(u32 new_x, u32 new_y) const {
|
||||||
return std::make_pair(new_x, new_y);
|
return std::make_pair(new_x, new_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuWindow::TouchPressed(u32 framebuffer_x, u32 framebuffer_y, size_t id) {
|
|
||||||
if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (id >= touch_state->status.size()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::lock_guard guard{touch_state->mutex};
|
|
||||||
const float x =
|
|
||||||
static_cast<float>(framebuffer_x - framebuffer_layout.screen.left) /
|
|
||||||
static_cast<float>(framebuffer_layout.screen.right - framebuffer_layout.screen.left);
|
|
||||||
const float y =
|
|
||||||
static_cast<float>(framebuffer_y - framebuffer_layout.screen.top) /
|
|
||||||
static_cast<float>(framebuffer_layout.screen.bottom - framebuffer_layout.screen.top);
|
|
||||||
|
|
||||||
touch_state->status[id] = std::make_tuple(x, y, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EmuWindow::TouchReleased(size_t id) {
|
|
||||||
if (id >= touch_state->status.size()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
std::lock_guard guard{touch_state->mutex};
|
|
||||||
touch_state->status[id] = std::make_tuple(0.0f, 0.0f, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EmuWindow::TouchMoved(u32 framebuffer_x, u32 framebuffer_y, size_t id) {
|
|
||||||
if (id >= touch_state->status.size()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!std::get<2>(touch_state->status[id])) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!IsWithinTouchscreen(framebuffer_layout, framebuffer_x, framebuffer_y)) {
|
|
||||||
std::tie(framebuffer_x, framebuffer_y) = ClipToTouchScreen(framebuffer_x, framebuffer_y);
|
|
||||||
}
|
|
||||||
|
|
||||||
TouchPressed(framebuffer_x, framebuffer_y, id);
|
|
||||||
}
|
|
||||||
|
|
||||||
void EmuWindow::UpdateCurrentFramebufferLayout(u32 width, u32 height) {
|
void EmuWindow::UpdateCurrentFramebufferLayout(u32 width, u32 height) {
|
||||||
NotifyFramebufferLayoutChanged(Layout::DefaultFrameLayout(width, height));
|
NotifyFramebufferLayoutChanged(Layout::DefaultFrameLayout(width, height));
|
||||||
}
|
}
|
||||||
|
|
|
@ -112,28 +112,6 @@ public:
|
||||||
/// Returns if window is shown (not minimized)
|
/// Returns if window is shown (not minimized)
|
||||||
virtual bool IsShown() const = 0;
|
virtual bool IsShown() const = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* Signal that a touch pressed event has occurred (e.g. mouse click pressed)
|
|
||||||
* @param framebuffer_x Framebuffer x-coordinate that was pressed
|
|
||||||
* @param framebuffer_y Framebuffer y-coordinate that was pressed
|
|
||||||
* @param id Touch event ID
|
|
||||||
*/
|
|
||||||
void TouchPressed(u32 framebuffer_x, u32 framebuffer_y, size_t id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Signal that a touch released event has occurred (e.g. mouse click released)
|
|
||||||
* @param id Touch event ID
|
|
||||||
*/
|
|
||||||
void TouchReleased(size_t id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Signal that a touch movement event has occurred (e.g. mouse was moved over the emu window)
|
|
||||||
* @param framebuffer_x Framebuffer x-coordinate
|
|
||||||
* @param framebuffer_y Framebuffer y-coordinate
|
|
||||||
* @param id Touch event ID
|
|
||||||
*/
|
|
||||||
void TouchMoved(u32 framebuffer_x, u32 framebuffer_y, size_t id);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns currently active configuration.
|
* Returns currently active configuration.
|
||||||
* @note Accesses to the returned object need not be consistent because it may be modified in
|
* @note Accesses to the returned object need not be consistent because it may be modified in
|
||||||
|
@ -212,6 +190,11 @@ protected:
|
||||||
client_area_height = size.second;
|
client_area_height = size.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a screen postion into the equivalent touchscreen position.
|
||||||
|
*/
|
||||||
|
std::pair<f32, f32> MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const;
|
||||||
|
|
||||||
WindowSystemInfo window_info;
|
WindowSystemInfo window_info;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -237,9 +220,6 @@ private:
|
||||||
WindowConfig config; ///< Internal configuration (changes pending for being applied in
|
WindowConfig config; ///< Internal configuration (changes pending for being applied in
|
||||||
/// ProcessConfigurationChanges)
|
/// ProcessConfigurationChanges)
|
||||||
WindowConfig active_config; ///< Internal active configuration
|
WindowConfig active_config; ///< Internal active configuration
|
||||||
|
|
||||||
class TouchState;
|
|
||||||
std::shared_ptr<TouchState> touch_state;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Core::Frontend
|
} // namespace Core::Frontend
|
||||||
|
|
Loading…
Reference in a new issue