From ba2a54a9dd6e5a263c5e6886e55b3bc55b95b4ab Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 1 Mar 2016 17:24:18 +0000 Subject: Dependencies: Remove GLFW, Add SDL2 citra: Remove GLFW, Add SDL2 FindSDL2: Do not CACHE SDL2_* variables if library is not found EmuWindow_SDL2: Set minimal client area at initialisation time EmuWindow_SDL2: Corrections EmuWindow_SDL2: Fix no decorations on startup on OS X cmake: windows_copy_files --- src/citra/emu_window/emu_window_glfw.cpp | 168 ------------------------------- src/citra/emu_window/emu_window_glfw.h | 54 ---------- src/citra/emu_window/emu_window_sdl2.cpp | 167 ++++++++++++++++++++++++++++++ src/citra/emu_window/emu_window_sdl2.h | 64 ++++++++++++ 4 files changed, 231 insertions(+), 222 deletions(-) delete mode 100644 src/citra/emu_window/emu_window_glfw.cpp delete mode 100644 src/citra/emu_window/emu_window_glfw.h create mode 100644 src/citra/emu_window/emu_window_sdl2.cpp create mode 100644 src/citra/emu_window/emu_window_sdl2.h (limited to 'src/citra/emu_window') diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp deleted file mode 100644 index 9453b1f48..000000000 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ /dev/null @@ -1,168 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#include -#include -#include - -// Let’s use our own GL header, instead of one from GLFW. -#include -#define GLFW_INCLUDE_NONE -#include - -#include "common/assert.h" -#include "common/key_map.h" -#include "common/logging/log.h" -#include "common/scm_rev.h" -#include "common/string_util.h" - -#include "video_core/video_core.h" - -#include "core/settings.h" -#include "core/hle/service/hid/hid.h" - -#include "citra/emu_window/emu_window_glfw.h" - -EmuWindow_GLFW* EmuWindow_GLFW::GetEmuWindow(GLFWwindow* win) { - return static_cast(glfwGetWindowUserPointer(win)); -} - -void EmuWindow_GLFW::OnMouseButtonEvent(GLFWwindow* win, int button, int action, int mods) { - if (button == GLFW_MOUSE_BUTTON_LEFT) { - auto emu_window = GetEmuWindow(win); - auto layout = emu_window->GetFramebufferLayout(); - double x, y; - glfwGetCursorPos(win, &x, &y); - - if (action == GLFW_PRESS) - emu_window->TouchPressed(static_cast(x), static_cast(y)); - else if (action == GLFW_RELEASE) - emu_window->TouchReleased(); - } -} - -void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* win, double x, double y) { - GetEmuWindow(win)->TouchMoved(static_cast(std::max(x, 0.0)), static_cast(std::max(y, 0.0))); -} - -/// Called by GLFW when a key event occurs -void EmuWindow_GLFW::OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods) { - auto emu_window = GetEmuWindow(win); - int keyboard_id = emu_window->keyboard_id; - - if (action == GLFW_PRESS) { - emu_window->KeyPressed({key, keyboard_id}); - } else if (action == GLFW_RELEASE) { - emu_window->KeyReleased({key, keyboard_id}); - } -} - -/// Whether the window is still open, and a close request hasn't yet been sent -const bool EmuWindow_GLFW::IsOpen() { - return glfwWindowShouldClose(m_render_window) == 0; -} - -void EmuWindow_GLFW::OnFramebufferResizeEvent(GLFWwindow* win, int width, int height) { - GetEmuWindow(win)->NotifyFramebufferLayoutChanged(EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height)); -} - -void EmuWindow_GLFW::OnClientAreaResizeEvent(GLFWwindow* win, int width, int height) { - // NOTE: GLFW provides no proper way to set a minimal window size. - // Hence, we just ignore the corresponding EmuWindow hint. - OnFramebufferResizeEvent(win, width, height); -} - -/// EmuWindow_GLFW constructor -EmuWindow_GLFW::EmuWindow_GLFW() { - keyboard_id = KeyMap::NewDeviceId(); - - ReloadSetKeymaps(); - - glfwSetErrorCallback([](int error, const char *desc){ - LOG_ERROR(Frontend, "GLFW 0x%08x: %s", error, desc); - }); - - // Initialize the window - if(glfwInit() != GL_TRUE) { - LOG_CRITICAL(Frontend, "Failed to initialize GLFW! Exiting..."); - exit(1); - } - glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); - glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); - // GLFW on OSX requires these window hints to be set to create a 3.2+ GL context. - glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); - glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); - - std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); - m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, - (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), - window_title.c_str(), nullptr, nullptr); - - if (m_render_window == nullptr) { - LOG_CRITICAL(Frontend, "Failed to create GLFW window! Exiting..."); - exit(1); - } - - glfwSetWindowUserPointer(m_render_window, this); - - // 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); - glfwSetMouseButtonCallback(m_render_window, OnMouseButtonEvent); - glfwSetCursorPosCallback(m_render_window, OnCursorPosEvent); - glfwSetFramebufferSizeCallback(m_render_window, OnFramebufferResizeEvent); - glfwSetWindowSizeCallback(m_render_window, OnClientAreaResizeEvent); - - DoneCurrent(); -} - -/// EmuWindow_GLFW destructor -EmuWindow_GLFW::~EmuWindow_GLFW() { - glfwTerminate(); -} - -/// Swap buffers to display the next frame -void EmuWindow_GLFW::SwapBuffers() { - glfwSwapBuffers(m_render_window); -} - -/// Polls window events -void EmuWindow_GLFW::PollEvents() { - glfwPollEvents(); -} - -/// Makes the GLFW OpenGL context current for the caller thread -void EmuWindow_GLFW::MakeCurrent() { - glfwMakeContextCurrent(m_render_window); -} - -/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread -void EmuWindow_GLFW::DoneCurrent() { - glfwMakeContextCurrent(nullptr); -} - -void EmuWindow_GLFW::ReloadSetKeymaps() { - for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { - KeyMap::SetKeyMapping({Settings::values.input_mappings[Settings::NativeInput::All[i]], keyboard_id}, Service::HID::pad_mapping[i]); - } -} - -void EmuWindow_GLFW::OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) { - std::pair current_size; - glfwGetWindowSize(m_render_window, ¤t_size.first, ¤t_size.second); - - DEBUG_ASSERT((int)minimal_size.first > 0 && (int)minimal_size.second > 0); - int new_width = std::max(current_size.first, (int)minimal_size.first); - int new_height = std::max(current_size.second, (int)minimal_size.second); - - if (current_size != std::make_pair(new_width, new_height)) - glfwSetWindowSize(m_render_window, new_width, new_height); -} diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h deleted file mode 100644 index 7ccd5e6aa..000000000 --- a/src/citra/emu_window/emu_window_glfw.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -#include - -#include "common/emu_window.h" - -struct GLFWwindow; - -class EmuWindow_GLFW : public EmuWindow { -public: - EmuWindow_GLFW(); - ~EmuWindow_GLFW(); - - /// Swap buffers to display the next frame - void SwapBuffers() override; - - /// Polls window events - void PollEvents() override; - - /// Makes the graphics context current for the caller thread - void MakeCurrent() override; - - /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread - void DoneCurrent() override; - - static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods); - - static void OnMouseButtonEvent(GLFWwindow* window, int button, int action, int mods); - - static void OnCursorPosEvent(GLFWwindow* window, double x, double y); - - /// Whether the window is still open, and a close request hasn't yet been sent - const bool IsOpen(); - - static void OnClientAreaResizeEvent(GLFWwindow* win, int width, int height); - - static void OnFramebufferResizeEvent(GLFWwindow* win, int width, int height); - - void ReloadSetKeymaps() override; - -private: - void OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) override; - - static EmuWindow_GLFW* GetEmuWindow(GLFWwindow* win); - - GLFWwindow* m_render_window; ///< Internal GLFW render window - - /// Device id of keyboard for use with KeyMap - int keyboard_id; -}; diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp new file mode 100644 index 000000000..1fed82e78 --- /dev/null +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -0,0 +1,167 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include +#include +#include + +#define SDL_MAIN_HANDLED +#include + +#include "common/key_map.h" +#include "common/logging/log.h" +#include "common/scm_rev.h" +#include "common/string_util.h" + +#include "core/settings.h" +#include "core/hle/service/hid/hid.h" + +#include "citra/emu_window/emu_window_sdl2.h" + +#include "video_core/video_core.h" + +void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { + TouchMoved((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); +} + +void EmuWindow_SDL2::OnMouseButton(u32 button, u8 state, s32 x, s32 y) { + if (button != SDL_BUTTON_LEFT) + return; + + if (state == SDL_PRESSED) { + TouchPressed((unsigned)std::max(x, 0), (unsigned)std::max(y, 0)); + } else { + TouchReleased(); + } +} + +void EmuWindow_SDL2::OnKeyEvent(int key, u8 state) { + if (state == SDL_PRESSED) { + KeyPressed({ key, keyboard_id }); + } else if (state == SDL_RELEASED) { + KeyReleased({ key, keyboard_id }); + } +} + +bool EmuWindow_SDL2::IsOpen() const { + return is_open; +} + +void EmuWindow_SDL2::OnResize() { + int width, height; + + SDL_GetWindowSize(render_window, &width, &height); + + NotifyFramebufferLayoutChanged(EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height)); +} + +EmuWindow_SDL2::EmuWindow_SDL2() { + keyboard_id = KeyMap::NewDeviceId(); + + ReloadSetKeymaps(); + + SDL_SetMainReady(); + + // Initialize the window + if (SDL_Init(SDL_INIT_VIDEO) < 0) { + LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); + exit(1); + } + + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + + std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); + render_window = SDL_CreateWindow(window_title.c_str(), + SDL_WINDOWPOS_UNDEFINED, // x position + SDL_WINDOWPOS_UNDEFINED, // y position + VideoCore::kScreenTopWidth, + VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight, + SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI); + + if (render_window == nullptr) { + LOG_CRITICAL(Frontend, "Failed to create SDL2 window! Exiting..."); + exit(1); + } + + gl_context = SDL_GL_CreateContext(render_window); + + if (gl_context == nullptr) { + LOG_CRITICAL(Frontend, "Failed to create SDL2 GL context! Exiting..."); + exit(1); + } + + OnResize(); + OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size); + SDL_PumpEvents(); + + DoneCurrent(); +} + +EmuWindow_SDL2::~EmuWindow_SDL2() { + SDL_GL_DeleteContext(gl_context); + SDL_Quit(); +} + +void EmuWindow_SDL2::SwapBuffers() { + SDL_GL_SwapWindow(render_window); +} + +void EmuWindow_SDL2::PollEvents() { + SDL_Event event; + + // SDL_PollEvent returns 0 when there are no more events in the event queue + while (SDL_PollEvent(&event)) { + switch (event.type) { + case SDL_WINDOWEVENT: + switch (event.window.event) { + case SDL_WINDOWEVENT_SIZE_CHANGED: + case SDL_WINDOWEVENT_RESIZED: + case SDL_WINDOWEVENT_MAXIMIZED: + case SDL_WINDOWEVENT_RESTORED: + case SDL_WINDOWEVENT_MINIMIZED: + OnResize(); + break; + case SDL_WINDOWEVENT_CLOSE: + is_open = false; + break; + } + break; + case SDL_KEYDOWN: + case SDL_KEYUP: + OnKeyEvent(static_cast(event.key.keysym.scancode), event.key.state); + break; + case SDL_MOUSEMOTION: + OnMouseMotion(event.motion.x, event.motion.y); + break; + case SDL_MOUSEBUTTONDOWN: + case SDL_MOUSEBUTTONUP: + OnMouseButton(event.button.button, event.button.state, event.button.x, event.button.y); + break; + case SDL_QUIT: + is_open = false; + break; + } + } +} + +void EmuWindow_SDL2::MakeCurrent() { + SDL_GL_MakeCurrent(render_window, gl_context); +} + +void EmuWindow_SDL2::DoneCurrent() { + SDL_GL_MakeCurrent(render_window, nullptr); +} + +void EmuWindow_SDL2::ReloadSetKeymaps() { + for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { + KeyMap::SetKeyMapping({ Settings::values.input_mappings[Settings::NativeInput::All[i]], keyboard_id }, Service::HID::pad_mapping[i]); + } +} + +void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) { + SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second); +} diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h new file mode 100644 index 000000000..77279f022 --- /dev/null +++ b/src/citra/emu_window/emu_window_sdl2.h @@ -0,0 +1,64 @@ +// Copyright 2016 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include + +#include "common/emu_window.h" + +struct SDL_Window; + +class EmuWindow_SDL2 : public EmuWindow { +public: + EmuWindow_SDL2(); + ~EmuWindow_SDL2(); + + /// Swap buffers to display the next frame + void SwapBuffers() override; + + /// Polls window events + void PollEvents() override; + + /// Makes the graphics context current for the caller thread + void MakeCurrent() override; + + /// Releases the GL context from the caller thread + void DoneCurrent() override; + + /// Whether the window is still open, and a close request hasn't yet been sent + bool IsOpen() const; + + /// Load keymap from configuration + void ReloadSetKeymaps() override; + +private: + /// Called by PollEvents when a key is pressed or released. + void OnKeyEvent(int key, u8 state); + + /// Called by PollEvents when the mouse moves. + void OnMouseMotion(s32 x, s32 y); + + /// Called by PollEvents when a mouse button is pressed or released + void OnMouseButton(u32 button, u8 state, s32 x, s32 y); + + /// Called by PollEvents when any event that may cause the window to be resized occurs + void OnResize(); + + /// Called when a configuration change affects the minimal size of the window + void OnMinimalClientAreaChangeRequest(const std::pair& minimal_size) override; + + /// Is the window still open? + bool is_open = true; + + /// Internal SDL2 render window + SDL_Window* render_window; + + using SDL_GLContext = void *; + /// The OpenGL context associated with the window + SDL_GLContext gl_context; + + /// Device id of keyboard for use with KeyMap + int keyboard_id; +}; -- cgit v1.2.3