Fixup EmuWindow interface and implementations thereof.
This commit is contained in:
parent
221a9b023d
commit
bd8f491e4c
|
@ -2,6 +2,8 @@
|
||||||
// Licensed under GPLv2
|
// Licensed under GPLv2
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <GLFW/glfw3.h>
|
||||||
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
|
|
||||||
#include "video_core/video_core.h"
|
#include "video_core/video_core.h"
|
||||||
|
@ -10,22 +12,21 @@
|
||||||
|
|
||||||
#include "citra/emu_window/emu_window_glfw.h"
|
#include "citra/emu_window/emu_window_glfw.h"
|
||||||
|
|
||||||
|
EmuWindow_GLFW* EmuWindow_GLFW::GetEmuWindow(GLFWwindow* win) {
|
||||||
|
return static_cast<EmuWindow_GLFW*>(glfwGetWindowUserPointer(win));
|
||||||
|
}
|
||||||
|
|
||||||
/// Called by GLFW when a key event occurs
|
/// Called by GLFW when a key event occurs
|
||||||
void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) {
|
void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) {
|
||||||
|
|
||||||
if (!VideoCore::g_emu_window) {
|
int keyboard_id = GetEmuWindow(win)->keyboard_id;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int keyboard_id = ((EmuWindow_GLFW*)VideoCore::g_emu_window)->keyboard_id;
|
|
||||||
|
|
||||||
if (action == GLFW_PRESS) {
|
if (action == GLFW_PRESS) {
|
||||||
EmuWindow::KeyPressed({key, keyboard_id});
|
EmuWindow::KeyPressed({key, keyboard_id});
|
||||||
}
|
} else if (action == GLFW_RELEASE) {
|
||||||
|
|
||||||
if (action == GLFW_RELEASE) {
|
|
||||||
EmuWindow::KeyReleased({key, keyboard_id});
|
EmuWindow::KeyReleased({key, keyboard_id});
|
||||||
}
|
}
|
||||||
|
|
||||||
HID_User::PadUpdateComplete();
|
HID_User::PadUpdateComplete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,8 +35,18 @@ const bool EmuWindow_GLFW::IsOpen() {
|
||||||
return glfwWindowShouldClose(m_render_window) == 0;
|
return glfwWindowShouldClose(m_render_window) == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EmuWindow_GLFW::GetFramebufferSize(int* fbWidth, int* fbHeight) {
|
void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) {
|
||||||
glfwGetFramebufferSize(m_render_window, fbWidth, fbHeight);
|
_dbg_assert_(GUI, width > 0);
|
||||||
|
_dbg_assert_(GUI, height > 0);
|
||||||
|
|
||||||
|
GetEmuWindow(win)->NotifyFramebufferSizeChanged(std::pair<unsigned,unsigned>(width, height));
|
||||||
|
}
|
||||||
|
|
||||||
|
void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) {
|
||||||
|
_dbg_assert_(GUI, width > 0);
|
||||||
|
_dbg_assert_(GUI, height > 0);
|
||||||
|
|
||||||
|
GetEmuWindow(win)->NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned>(width, height));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// EmuWindow_GLFW constructor
|
/// EmuWindow_GLFW constructor
|
||||||
|
@ -57,17 +68,27 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
|
||||||
|
|
||||||
m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
|
m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
|
||||||
(VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
|
(VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
|
||||||
m_window_title.c_str(), NULL, NULL);
|
GetWindowTitle().c_str(), NULL, NULL);
|
||||||
|
|
||||||
if (m_render_window == NULL) {
|
if (m_render_window == NULL) {
|
||||||
printf("Failed to create GLFW window! Exiting...");
|
printf("Failed to create GLFW window! Exiting...");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup callbacks
|
|
||||||
glfwSetWindowUserPointer(m_render_window, this);
|
glfwSetWindowUserPointer(m_render_window, this);
|
||||||
glfwSetKeyCallback(m_render_window, OnKeyEvent);
|
|
||||||
|
|
||||||
|
// Notify base interface about window state
|
||||||
|
int width, height;
|
||||||
|
glfwGetFramebufferSize(m_render_window, &width, &height);
|
||||||
|
OnFramebufferResizeEvent(m_render_window, width, height);
|
||||||
|
|
||||||
|
glfwGetWindowSize(m_render_window, &width, &height);
|
||||||
|
OnClientAreaResizeEvent(m_render_window, width, height);
|
||||||
|
|
||||||
|
// Setup callbacks
|
||||||
|
glfwSetKeyCallback(m_render_window, OnKeyEvent);
|
||||||
|
glfwSetFramebufferSizeCallback(m_render_window, OnFramebufferResizeEvent);
|
||||||
|
glfwSetWindowSizeCallback(m_render_window, OnClientAreaResizeEvent);
|
||||||
|
|
||||||
DoneCurrent();
|
DoneCurrent();
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
|
|
||||||
#include "common/emu_window.h"
|
#include "common/emu_window.h"
|
||||||
|
|
||||||
|
struct GLFWwindow;
|
||||||
|
|
||||||
class EmuWindow_GLFW : public EmuWindow {
|
class EmuWindow_GLFW : public EmuWindow {
|
||||||
public:
|
public:
|
||||||
EmuWindow_GLFW();
|
EmuWindow_GLFW();
|
||||||
|
@ -30,12 +30,15 @@ public:
|
||||||
/// Whether the window is still open, and a close request hasn't yet been sent
|
/// Whether the window is still open, and a close request hasn't yet been sent
|
||||||
const bool IsOpen();
|
const bool IsOpen();
|
||||||
|
|
||||||
|
static void OnClientAreaResizeEvent(GLFWwindow* win, int width, int height);
|
||||||
|
|
||||||
|
static void OnFramebufferResizeEvent(GLFWwindow* win, int width, int height);
|
||||||
|
|
||||||
void ReloadSetKeymaps() override;
|
void ReloadSetKeymaps() override;
|
||||||
|
|
||||||
/// Gets the size of the window in pixels
|
|
||||||
void GetFramebufferSize(int* fbWidth, int* fbHeight);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
static EmuWindow_GLFW* GetEmuWindow(GLFWwindow* win);
|
||||||
|
|
||||||
GLFWwindow* m_render_window; ///< Internal GLFW render window
|
GLFWwindow* m_render_window; ///< Internal GLFW render window
|
||||||
|
|
||||||
/// Device id of keyboard for use with KeyMap
|
/// Device id of keyboard for use with KeyMap
|
||||||
|
|
|
@ -88,20 +88,20 @@ void EmuThread::Stop()
|
||||||
class GGLWidgetInternal : public QGLWidget
|
class GGLWidgetInternal : public QGLWidget
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent) : QGLWidget(fmt, parent)
|
GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent)
|
||||||
{
|
: QGLWidget(fmt, parent), parent(parent) {
|
||||||
parent_ = parent;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void paintEvent(QPaintEvent* ev) override
|
void paintEvent(QPaintEvent* ev) override {
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void resizeEvent(QResizeEvent* ev) override {
|
void resizeEvent(QResizeEvent* ev) override {
|
||||||
parent_->SetClientAreaWidth(size().width());
|
parent->OnClientAreaResized(ev->size().width(), ev->size().height());
|
||||||
parent_->SetClientAreaHeight(size().height());
|
parent->OnFramebufferSizeChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
GRenderWindow* parent_;
|
GRenderWindow* parent;
|
||||||
};
|
};
|
||||||
|
|
||||||
EmuThread& GRenderWindow::GetEmuThread()
|
EmuThread& GRenderWindow::GetEmuThread()
|
||||||
|
@ -127,9 +127,16 @@ GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this
|
||||||
layout->addWidget(child);
|
layout->addWidget(child);
|
||||||
layout->setMargin(0);
|
layout->setMargin(0);
|
||||||
setLayout(layout);
|
setLayout(layout);
|
||||||
QObject::connect(&emu_thread, SIGNAL(started()), this, SLOT(moveContext()));
|
connect(&emu_thread, SIGNAL(started()), this, SLOT(moveContext()));
|
||||||
|
|
||||||
|
OnFramebufferSizeChanged();
|
||||||
|
NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned>(child->width(), child->height()));
|
||||||
|
|
||||||
BackupGeometry();
|
BackupGeometry();
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||||
|
connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, SLOT(OnFramebufferSizeChanged()));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void GRenderWindow::moveContext()
|
void GRenderWindow::moveContext()
|
||||||
|
@ -182,22 +189,26 @@ void GRenderWindow::PollEvents() {
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// On Qt 5.1+, this correctly gets the size of the framebuffer (pixels).
|
// On Qt 5.0+, this correctly gets the size of the framebuffer (pixels).
|
||||||
//
|
//
|
||||||
// Older versions get the window size (density independent pixels),
|
// Older versions get the window size (density independent pixels),
|
||||||
// and hence, do not support DPI scaling ("retina" displays).
|
// and hence, do not support DPI scaling ("retina" displays).
|
||||||
// The result will be a viewport that is smaller than the extent of the window.
|
// The result will be a viewport that is smaller than the extent of the window.
|
||||||
void GRenderWindow::GetFramebufferSize(int* fbWidth, int* fbHeight)
|
void GRenderWindow::OnFramebufferSizeChanged()
|
||||||
{
|
{
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
|
// Screen changes potentially incur a change in screen DPI, hence we should update the framebuffer size
|
||||||
int pixelRatio = child->QPaintDevice::devicePixelRatio();
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||||
|
// windowHandle() might not be accessible until the window is displayed to screen.
|
||||||
|
auto pixel_ratio = windowHandle() ? (windowHandle()->screen()->devicePixelRatio()) : 1.0;
|
||||||
|
|
||||||
*fbWidth = child->QPaintDevice::width() * pixelRatio;
|
unsigned width = child->QPaintDevice::width() * pixel_ratio;
|
||||||
*fbHeight = child->QPaintDevice::height() * pixelRatio;
|
unsigned height = child->QPaintDevice::height() * pixel_ratio;
|
||||||
#else
|
#else
|
||||||
*fbWidth = child->QPaintDevice::width();
|
unsigned width = child->QPaintDevice::width();
|
||||||
*fbHeight = child->QPaintDevice::height();
|
unsigned height = child->QPaintDevice::height();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
NotifyFramebufferSizeChanged(std::make_pair(width, height));
|
||||||
}
|
}
|
||||||
|
|
||||||
void GRenderWindow::BackupGeometry()
|
void GRenderWindow::BackupGeometry()
|
||||||
|
@ -260,3 +271,7 @@ void GRenderWindow::ReloadSetKeymaps()
|
||||||
KeyMap::SetKeyMapping({Settings::values.pad_sdown_key, keyboard_id}, HID_User::PAD_CIRCLE_DOWN);
|
KeyMap::SetKeyMapping({Settings::values.pad_sdown_key, keyboard_id}, HID_User::PAD_CIRCLE_DOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height)
|
||||||
|
{
|
||||||
|
NotifyClientAreaSizeChanged(std::make_pair(width, height));
|
||||||
|
}
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
|
#include <atomic>
|
||||||
|
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QGLWidget>
|
#include <QGLWidget>
|
||||||
#include <atomic>
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "common/emu_window.h"
|
#include "common/emu_window.h"
|
||||||
|
|
||||||
class GRenderWindow;
|
class QScreen;
|
||||||
class QKeyEvent;
|
class QKeyEvent;
|
||||||
|
|
||||||
|
class GRenderWindow;
|
||||||
|
|
||||||
class EmuThread : public QThread
|
class EmuThread : public QThread
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -96,7 +100,6 @@ public:
|
||||||
void MakeCurrent() override;
|
void MakeCurrent() override;
|
||||||
void DoneCurrent() override;
|
void DoneCurrent() override;
|
||||||
void PollEvents() override;
|
void PollEvents() override;
|
||||||
void GetFramebufferSize(int* fbWidth, int* fbHeight) override;
|
|
||||||
|
|
||||||
void BackupGeometry();
|
void BackupGeometry();
|
||||||
void RestoreGeometry();
|
void RestoreGeometry();
|
||||||
|
@ -110,8 +113,12 @@ public:
|
||||||
|
|
||||||
void ReloadSetKeymaps() override;
|
void ReloadSetKeymaps() override;
|
||||||
|
|
||||||
|
void OnClientAreaResized(unsigned width, unsigned height);
|
||||||
|
|
||||||
|
void OnFramebufferSizeChanged();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void moveContext();
|
void moveContext(); // overridden
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QGLWidget* child;
|
QGLWidget* child;
|
||||||
|
|
|
@ -43,54 +43,59 @@ public:
|
||||||
static void KeyReleased(KeyMap::HostDeviceKey key);
|
static void KeyReleased(KeyMap::HostDeviceKey key);
|
||||||
|
|
||||||
WindowConfig GetConfig() const {
|
WindowConfig GetConfig() const {
|
||||||
return m_config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetConfig(const WindowConfig& val) {
|
void SetConfig(const WindowConfig& val) {
|
||||||
m_config = val;
|
config = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets the size of the window in pixels
|
/**
|
||||||
virtual void GetFramebufferSize(int* fbWidth, int* fbHeight) = 0;
|
* Gets the size of the framebuffer in pixels
|
||||||
|
*/
|
||||||
int GetClientAreaWidth() const {
|
const std::pair<unsigned,unsigned> GetFramebufferSize() const {
|
||||||
return m_client_area_width;
|
return framebuffer_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetClientAreaWidth(const int val) {
|
/**
|
||||||
m_client_area_width = val;
|
* Gets window client area width in logical coordinates
|
||||||
}
|
*/
|
||||||
|
std::pair<unsigned,unsigned> GetClientAreaSize() const {
|
||||||
int GetClientAreaHeight() const {
|
return std::make_pair(client_area_width, client_area_height);
|
||||||
return m_client_area_height;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetClientAreaHeight(const int val) {
|
|
||||||
m_client_area_height = val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GetWindowTitle() const {
|
std::string GetWindowTitle() const {
|
||||||
return m_window_title;
|
return window_title;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetWindowTitle(std::string val) {
|
void SetWindowTitle(const std::string& val) {
|
||||||
m_window_title = val;
|
window_title = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
EmuWindow():
|
EmuWindow() : // TODO: What the hell... -.- - don't hardcode dimensions here without applying them in a sensible manner...
|
||||||
m_window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc)),
|
window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc))
|
||||||
m_client_area_width(640),
|
m_client_area_width(640),
|
||||||
m_client_area_height(480)
|
m_client_area_height(480),
|
||||||
{}
|
{}
|
||||||
virtual ~EmuWindow() {}
|
virtual ~EmuWindow() {}
|
||||||
|
|
||||||
std::string m_window_title; ///< Current window title, should be used by window impl.
|
std::pair<unsigned,unsigned> NotifyFramebufferSizeChanged(const std::pair<unsigned,unsigned>& size) {
|
||||||
|
framebuffer_size = size;
|
||||||
|
}
|
||||||
|
|
||||||
int m_client_area_width; ///< Current client width, should be set by window impl.
|
void NotifyClientAreaSizeChanged(std::pair<unsigned,unsigned> size) {
|
||||||
int m_client_area_height; ///< Current client height, should be set by window impl.
|
client_area_width = size.first;
|
||||||
|
client_area_height = size.second;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
WindowConfig m_config; ///< Internal configuration
|
std::string window_title; ///< Current window title, should be used by window impl.
|
||||||
|
|
||||||
|
std::pair<unsigned,unsigned> framebuffer_size;
|
||||||
|
|
||||||
|
unsigned client_area_width; ///< Current client width, should be set by window impl.
|
||||||
|
unsigned client_area_height; ///< Current client height, should be set by window impl.
|
||||||
|
|
||||||
|
WindowConfig config; ///< Internal configuration
|
||||||
};
|
};
|
||||||
|
|
|
@ -230,10 +230,10 @@ void RendererOpenGL::SetWindow(EmuWindow* window) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void RendererOpenGL::UpdateViewportExtent() {
|
void RendererOpenGL::UpdateViewportExtent() {
|
||||||
int width_in_pixels;
|
unsigned width_in_pixels;
|
||||||
int height_in_pixels;
|
unsigned height_in_pixels;
|
||||||
|
|
||||||
render_window->GetFramebufferSize(&width_in_pixels, &height_in_pixels);
|
std::tie(width_in_pixels, height_in_pixels) = render_window->GetFramebufferSize();
|
||||||
|
|
||||||
// No update needed if framebuffer size hasn't changed
|
// No update needed if framebuffer size hasn't changed
|
||||||
if (width_in_pixels == framebuffer_size.width && height_in_pixels == framebuffer_size.height) {
|
if (width_in_pixels == framebuffer_size.width && height_in_pixels == framebuffer_size.height) {
|
||||||
|
|
Reference in New Issue