Browse Source
Dependencies: Remove GLFW, Add SDL2
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_filespull/15/merge
MerryMage
10 years ago
17 changed files with 551 additions and 304 deletions
-
13.travis-deps.sh
-
2.travis.yml
-
29CMakeLists.txt
-
2appveyor.yml
-
224externals/cmake-modules/FindSDL2.cmake
-
28externals/cmake-modules/WindowsCopyFiles.cmake
-
2src/CMakeLists.txt
-
19src/citra/CMakeLists.txt
-
4src/citra/citra.cpp
-
48src/citra/config.cpp
-
4src/citra/config.h
-
2src/citra/default_ini.h
-
168src/citra/emu_window/emu_window_glfw.cpp
-
54src/citra/emu_window/emu_window_glfw.h
-
167src/citra/emu_window/emu_window_sdl2.cpp
-
64src/citra/emu_window/emu_window_sdl2.h
-
25src/citra_qt/CMakeLists.txt
@ -0,0 +1,224 @@ |
|||||
|
|
||||
|
# This module defines |
||||
|
# SDL2_LIBRARY, the name of the library to link against |
||||
|
# SDL2_FOUND, if false, do not try to link to SDL2 |
||||
|
# SDL2_INCLUDE_DIR, where to find SDL.h |
||||
|
# |
||||
|
# This module responds to the the flag: |
||||
|
# SDL2_BUILDING_LIBRARY |
||||
|
# If this is defined, then no SDL2main will be linked in because |
||||
|
# only applications need main(). |
||||
|
# Otherwise, it is assumed you are building an application and this |
||||
|
# module will attempt to locate and set the the proper link flags |
||||
|
# as part of the returned SDL2_LIBRARY variable. |
||||
|
# |
||||
|
# Don't forget to include SDLmain.h and SDLmain.m your project for the |
||||
|
# OS X framework based version. (Other versions link to -lSDL2main which |
||||
|
# this module will try to find on your behalf.) Also for OS X, this |
||||
|
# module will automatically add the -framework Cocoa on your behalf. |
||||
|
# |
||||
|
# |
||||
|
# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration |
||||
|
# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library |
||||
|
# (SDL2.dll, libsdl2.so, SDL2.framework, etc). |
||||
|
# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. |
||||
|
# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value |
||||
|
# as appropriate. These values are used to generate the final SDL2_LIBRARY |
||||
|
# variable, but when these values are unset, SDL2_LIBRARY does not get created. |
||||
|
# |
||||
|
# |
||||
|
# $SDL2DIR is an environment variable that would |
||||
|
# correspond to the ./configure --prefix=$SDL2DIR |
||||
|
# used in building SDL2. |
||||
|
# l.e.galup 9-20-02 |
||||
|
# |
||||
|
# Modified by Eric Wing. |
||||
|
# Added code to assist with automated building by using environmental variables |
||||
|
# and providing a more controlled/consistent search behavior. |
||||
|
# Added new modifications to recognize OS X frameworks and |
||||
|
# additional Unix paths (FreeBSD, etc). |
||||
|
# Also corrected the header search path to follow "proper" SDL guidelines. |
||||
|
# Added a search for SDL2main which is needed by some platforms. |
||||
|
# Added a search for threads which is needed by some platforms. |
||||
|
# Added needed compile switches for MinGW. |
||||
|
# |
||||
|
# On OSX, this will prefer the Framework version (if found) over others. |
||||
|
# People will have to manually change the cache values of |
||||
|
# SDL2_LIBRARY to override this selection or set the CMake environment |
||||
|
# CMAKE_INCLUDE_PATH to modify the search paths. |
||||
|
# |
||||
|
# Note that the header path has changed from SDL2/SDL.h to just SDL.h |
||||
|
# This needed to change because "proper" SDL convention |
||||
|
# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability |
||||
|
# reasons because not all systems place things in SDL2/ (see FreeBSD). |
||||
|
|
||||
|
#============================================================================= |
||||
|
# Copyright 2003-2009 Kitware, Inc. |
||||
|
# |
||||
|
# Distributed under the OSI-approved BSD License (the "License"). |
||||
|
# |
||||
|
# This software is distributed WITHOUT ANY WARRANTY; without even the |
||||
|
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
||||
|
# See the License for more information. |
||||
|
#============================================================================= |
||||
|
# CMake - Cross Platform Makefile Generator |
||||
|
# Copyright 2000-2016 Kitware, Inc. |
||||
|
# Copyright 2000-2011 Insight Software Consortium |
||||
|
# All rights reserved. |
||||
|
# |
||||
|
# Redistribution and use in source and binary forms, with or without |
||||
|
# modification, are permitted provided that the following conditions |
||||
|
# are met: |
||||
|
# |
||||
|
# * Redistributions of source code must retain the above copyright |
||||
|
# notice, this list of conditions and the following disclaimer. |
||||
|
# |
||||
|
# * Redistributions in binary form must reproduce the above copyright |
||||
|
# notice, this list of conditions and the following disclaimer in the |
||||
|
# documentation and/or other materials provided with the distribution. |
||||
|
# |
||||
|
# * Neither the names of Kitware, Inc., the Insight Software Consortium, |
||||
|
# nor the names of their contributors may be used to endorse or promote |
||||
|
# products derived from this software without specific prior written |
||||
|
# permission. |
||||
|
# |
||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
|
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
|
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
|
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
|
# |
||||
|
# ------------------------------------------------------------------------------ |
||||
|
# |
||||
|
# The above copyright and license notice applies to distributions of |
||||
|
# CMake in source and binary form. Some source files contain additional |
||||
|
# notices of original copyright by their contributors; see each source |
||||
|
# for details. Third-party software packages supplied with CMake under |
||||
|
# compatible licenses provide their own copyright notices documented in |
||||
|
# corresponding subdirectories. |
||||
|
# |
||||
|
# ------------------------------------------------------------------------------ |
||||
|
# |
||||
|
# CMake was initially developed by Kitware with the following sponsorship: |
||||
|
# |
||||
|
# * National Library of Medicine at the National Institutes of Health |
||||
|
# as part of the Insight Segmentation and Registration Toolkit (ITK). |
||||
|
# |
||||
|
# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel |
||||
|
# Visualization Initiative. |
||||
|
# |
||||
|
# * National Alliance for Medical Image Computing (NAMIC) is funded by the |
||||
|
# National Institutes of Health through the NIH Roadmap for Medical Research, |
||||
|
# Grant U54 EB005149. |
||||
|
# |
||||
|
# * Kitware, Inc. |
||||
|
# |
||||
|
|
||||
|
message("<FindSDL2.cmake>") |
||||
|
|
||||
|
SET(SDL2_SEARCH_PATHS |
||||
|
~/Library/Frameworks |
||||
|
/Library/Frameworks |
||||
|
/usr/local |
||||
|
/usr |
||||
|
/sw # Fink |
||||
|
/opt/local # DarwinPorts |
||||
|
/opt/csw # Blastwave |
||||
|
/opt |
||||
|
${SDL2_PATH} |
||||
|
) |
||||
|
|
||||
|
FIND_LIBRARY(SDL2_LIBRARY_TEMP |
||||
|
NAMES SDL2 |
||||
|
HINTS |
||||
|
$ENV{SDL2DIR} |
||||
|
PATH_SUFFIXES lib64 lib |
||||
|
PATHS ${SDL2_SEARCH_PATHS} |
||||
|
) |
||||
|
|
||||
|
IF(SDL2_LIBRARY_TEMP) |
||||
|
FIND_PATH(SDL2_INCLUDE_DIR SDL.h |
||||
|
HINTS |
||||
|
$ENV{SDL2DIR} |
||||
|
PATH_SUFFIXES include/SDL2 include |
||||
|
PATHS ${SDL2_SEARCH_PATHS} |
||||
|
) |
||||
|
|
||||
|
IF(NOT SDL2_BUILDING_LIBRARY) |
||||
|
IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") |
||||
|
# Non-OS X framework versions expect you to also dynamically link to |
||||
|
# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms |
||||
|
# seem to provide SDL2main for compatibility even though they don't |
||||
|
# necessarily need it. |
||||
|
FIND_LIBRARY(SDL2MAIN_LIBRARY |
||||
|
NAMES SDL2main |
||||
|
HINTS |
||||
|
$ENV{SDL2DIR} |
||||
|
PATH_SUFFIXES lib64 lib |
||||
|
PATHS ${SDL2_SEARCH_PATHS} |
||||
|
) |
||||
|
ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") |
||||
|
ENDIF(NOT SDL2_BUILDING_LIBRARY) |
||||
|
|
||||
|
# SDL2 may require threads on your system. |
||||
|
# The Apple build may not need an explicit flag because one of the |
||||
|
# frameworks may already provide it. |
||||
|
# But for non-OSX systems, I will use the CMake Threads package. |
||||
|
IF(NOT APPLE) |
||||
|
FIND_PACKAGE(Threads) |
||||
|
ENDIF(NOT APPLE) |
||||
|
|
||||
|
# MinGW needs an additional library, mwindows |
||||
|
# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows |
||||
|
# (Actually on second look, I think it only needs one of the m* libraries.) |
||||
|
IF(MINGW) |
||||
|
SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") |
||||
|
ENDIF(MINGW) |
||||
|
|
||||
|
# For SDL2main |
||||
|
IF(NOT SDL2_BUILDING_LIBRARY) |
||||
|
IF(SDL2MAIN_LIBRARY) |
||||
|
SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP}) |
||||
|
ENDIF(SDL2MAIN_LIBRARY) |
||||
|
ENDIF(NOT SDL2_BUILDING_LIBRARY) |
||||
|
|
||||
|
# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. |
||||
|
# CMake doesn't display the -framework Cocoa string in the UI even |
||||
|
# though it actually is there if I modify a pre-used variable. |
||||
|
# I think it has something to do with the CACHE STRING. |
||||
|
# So I use a temporary variable until the end so I can set the |
||||
|
# "real" variable in one-shot. |
||||
|
IF(APPLE) |
||||
|
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") |
||||
|
ENDIF(APPLE) |
||||
|
|
||||
|
# For threads, as mentioned Apple doesn't need this. |
||||
|
# In fact, there seems to be a problem if I used the Threads package |
||||
|
# and try using this line, so I'm just skipping it entirely for OS X. |
||||
|
IF(NOT APPLE) |
||||
|
SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) |
||||
|
ENDIF(NOT APPLE) |
||||
|
|
||||
|
# For MinGW library |
||||
|
IF(MINGW) |
||||
|
SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) |
||||
|
ENDIF(MINGW) |
||||
|
|
||||
|
# Set the final string here so the GUI reflects the final state. |
||||
|
SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found") |
||||
|
|
||||
|
# Unset the temp variable to INTERNAL so it is not seen in the CMake GUI |
||||
|
UNSET(SDL2_LIBRARY_TEMP) |
||||
|
ENDIF(SDL2_LIBRARY_TEMP) |
||||
|
|
||||
|
message("</FindSDL2.cmake>") |
||||
|
|
||||
|
INCLUDE(FindPackageHandleStandardArgs) |
||||
|
|
||||
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) |
||||
@ -0,0 +1,28 @@ |
|||||
|
# Copyright 2016 Citra Emulator Project |
||||
|
# Licensed under GPLv2 or any later version |
||||
|
# Refer to the license.txt file included. |
||||
|
|
||||
|
# This file provides the function windows_copy_files. |
||||
|
# This is only valid on Windows. |
||||
|
|
||||
|
# Include guard |
||||
|
if(__windows_copy_files) |
||||
|
return() |
||||
|
endif() |
||||
|
set(__windows_copy_files YES) |
||||
|
|
||||
|
# Any number of files to copy from SOURCE_DIR to DEST_DIR can be specified after DEST_DIR. |
||||
|
# This copying happens post-build. |
||||
|
function(windows_copy_files TARGET SOURCE_DIR DEST_DIR) |
||||
|
# windows commandline expects the / to be \ so switch them |
||||
|
string(REPLACE "/" "\\\\" SOURCE_DIR ${SOURCE_DIR}) |
||||
|
string(REPLACE "/" "\\\\" DEST_DIR ${DEST_DIR}) |
||||
|
|
||||
|
# /NJH /NJS /NDL /NFL /NC /NS /NP - Silence any output |
||||
|
# cmake adds an extra check for command success which doesn't work too well with robocopy |
||||
|
# so trick it into thinking the command was successful with the || cmd /c "exit /b 0" |
||||
|
add_custom_command(TARGET ${TARGET} POST_BUILD |
||||
|
COMMAND if not exist ${DEST_DIR} mkdir ${DEST_DIR} 2> nul |
||||
|
COMMAND robocopy ${SOURCE_DIR} ${DEST_DIR} ${ARGN} /NJH /NJS /NDL /NFL /NC /NS /NP || cmd /c "exit /b 0" |
||||
|
) |
||||
|
endfunction() |
||||
@ -1,168 +0,0 @@ |
|||||
// Copyright 2014 Citra Emulator Project
|
|
||||
// Licensed under GPLv2 or any later version
|
|
||||
// Refer to the license.txt file included.
|
|
||||
|
|
||||
#include <algorithm>
|
|
||||
#include <cstdlib>
|
|
||||
#include <string>
|
|
||||
|
|
||||
// Let’s use our own GL header, instead of one from GLFW.
|
|
||||
#include <glad/glad.h>
|
|
||||
#define GLFW_INCLUDE_NONE
|
|
||||
#include <GLFW/glfw3.h>
|
|
||||
|
|
||||
#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<EmuWindow_GLFW*>(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<unsigned>(x), static_cast<unsigned>(y)); |
|
||||
else if (action == GLFW_RELEASE) |
|
||||
emu_window->TouchReleased(); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
void EmuWindow_GLFW::OnCursorPosEvent(GLFWwindow* win, double x, double y) { |
|
||||
GetEmuWindow(win)->TouchMoved(static_cast<unsigned>(std::max(x, 0.0)), static_cast<unsigned>(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<unsigned,unsigned>& minimal_size) { |
|
||||
std::pair<int,int> 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); |
|
||||
} |
|
||||
@ -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 <utility> |
|
||||
|
|
||||
#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<unsigned,unsigned>& 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; |
|
||||
}; |
|
||||
@ -0,0 +1,167 @@ |
|||||
|
// Copyright 2016 Citra Emulator Project
|
||||
|
// Licensed under GPLv2 or any later version
|
||||
|
// Refer to the license.txt file included.
|
||||
|
|
||||
|
#include <algorithm>
|
||||
|
#include <cstdlib>
|
||||
|
#include <string>
|
||||
|
|
||||
|
#define SDL_MAIN_HANDLED
|
||||
|
#include <SDL.h>
|
||||
|
|
||||
|
#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<int>(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<unsigned, unsigned>& minimal_size) { |
||||
|
SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second); |
||||
|
} |
||||
@ -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 <utility> |
||||
|
|
||||
|
#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<unsigned, unsigned>& 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; |
||||
|
}; |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue