mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-08-31 12:09:08 +01:00
Merge pull request #377 from adityaruplaha/sdl2-fullscreen
SDL2: Implement fullscreen. (Original PR: citra-emu/citra#3607)
This commit is contained in:
commit
62937798a0
3 changed files with 40 additions and 4 deletions
|
@ -56,7 +56,28 @@ void EmuWindow_SDL2::OnResize() {
|
||||||
UpdateCurrentFramebufferLayout(width, height);
|
UpdateCurrentFramebufferLayout(width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
EmuWindow_SDL2::EmuWindow_SDL2() {
|
void EmuWindow_SDL2::Fullscreen() {
|
||||||
|
if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN) == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NGLOG_ERROR(Frontend, "Fullscreening failed: {}", SDL_GetError());
|
||||||
|
|
||||||
|
// Try a different fullscreening method
|
||||||
|
NGLOG_INFO(Frontend, "Attempting to use borderless fullscreen...");
|
||||||
|
if (SDL_SetWindowFullscreen(render_window, SDL_WINDOW_FULLSCREEN_DESKTOP) == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NGLOG_ERROR(Frontend, "Borderless fullscreening failed: {}", SDL_GetError());
|
||||||
|
|
||||||
|
// Fallback algorithm: Maximise window.
|
||||||
|
// Works on all systems (unless something is seriously wrong), so no fallback for this one.
|
||||||
|
NGLOG_INFO(Frontend, "Falling back on a maximised window...");
|
||||||
|
SDL_MaximizeWindow(render_window);
|
||||||
|
}
|
||||||
|
|
||||||
|
EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
|
||||||
InputCommon::Init();
|
InputCommon::Init();
|
||||||
|
|
||||||
SDL_SetMainReady();
|
SDL_SetMainReady();
|
||||||
|
@ -90,6 +111,10 @@ EmuWindow_SDL2::EmuWindow_SDL2() {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fullscreen) {
|
||||||
|
Fullscreen();
|
||||||
|
}
|
||||||
|
|
||||||
gl_context = SDL_GL_CreateContext(render_window);
|
gl_context = SDL_GL_CreateContext(render_window);
|
||||||
|
|
||||||
if (gl_context == nullptr) {
|
if (gl_context == nullptr) {
|
||||||
|
|
|
@ -12,7 +12,7 @@ struct SDL_Window;
|
||||||
|
|
||||||
class EmuWindow_SDL2 : public EmuWindow {
|
class EmuWindow_SDL2 : public EmuWindow {
|
||||||
public:
|
public:
|
||||||
EmuWindow_SDL2();
|
explicit EmuWindow_SDL2(bool fullscreen);
|
||||||
~EmuWindow_SDL2();
|
~EmuWindow_SDL2();
|
||||||
|
|
||||||
/// Swap buffers to display the next frame
|
/// Swap buffers to display the next frame
|
||||||
|
@ -43,6 +43,9 @@ private:
|
||||||
/// Called by PollEvents when any event that may cause the window to be resized occurs
|
/// Called by PollEvents when any event that may cause the window to be resized occurs
|
||||||
void OnResize();
|
void OnResize();
|
||||||
|
|
||||||
|
/// Called when user passes the fullscreen parameter flag
|
||||||
|
void Fullscreen();
|
||||||
|
|
||||||
/// Called when a configuration change affects the minimal size of the window
|
/// Called when a configuration change affects the minimal size of the window
|
||||||
void OnMinimalClientAreaChangeRequest(
|
void OnMinimalClientAreaChangeRequest(
|
||||||
const std::pair<unsigned, unsigned>& minimal_size) override;
|
const std::pair<unsigned, unsigned>& minimal_size) override;
|
||||||
|
|
|
@ -50,6 +50,7 @@ static void PrintHelp(const char* argv0) {
|
||||||
std::cout << "Usage: " << argv0
|
std::cout << "Usage: " << argv0
|
||||||
<< " [options] <filename>\n"
|
<< " [options] <filename>\n"
|
||||||
"-g, --gdbport=NUMBER Enable gdb stub on port NUMBER\n"
|
"-g, --gdbport=NUMBER Enable gdb stub on port NUMBER\n"
|
||||||
|
"-f, --fullscreen Start in fullscreen mode\n"
|
||||||
"-h, --help Display this help and exit\n"
|
"-h, --help Display this help and exit\n"
|
||||||
"-v, --version Output version information and exit\n";
|
"-v, --version Output version information and exit\n";
|
||||||
}
|
}
|
||||||
|
@ -76,15 +77,18 @@ int main(int argc, char** argv) {
|
||||||
#endif
|
#endif
|
||||||
std::string filepath;
|
std::string filepath;
|
||||||
|
|
||||||
|
bool fullscreen = false;
|
||||||
|
|
||||||
static struct option long_options[] = {
|
static struct option long_options[] = {
|
||||||
{"gdbport", required_argument, 0, 'g'},
|
{"gdbport", required_argument, 0, 'g'},
|
||||||
|
{"fullscreen", no_argument, 0, 'f'},
|
||||||
{"help", no_argument, 0, 'h'},
|
{"help", no_argument, 0, 'h'},
|
||||||
{"version", no_argument, 0, 'v'},
|
{"version", no_argument, 0, 'v'},
|
||||||
{0, 0, 0, 0},
|
{0, 0, 0, 0},
|
||||||
};
|
};
|
||||||
|
|
||||||
while (optind < argc) {
|
while (optind < argc) {
|
||||||
char arg = getopt_long(argc, argv, "g:hv", long_options, &option_index);
|
char arg = getopt_long(argc, argv, "g:fhv", long_options, &option_index);
|
||||||
if (arg != -1) {
|
if (arg != -1) {
|
||||||
switch (arg) {
|
switch (arg) {
|
||||||
case 'g':
|
case 'g':
|
||||||
|
@ -98,6 +102,10 @@ int main(int argc, char** argv) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'f':
|
||||||
|
fullscreen = true;
|
||||||
|
NGLOG_INFO(Frontend, "Starting in fullscreen mode...");
|
||||||
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
PrintHelp(argv[0]);
|
PrintHelp(argv[0]);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -137,7 +145,7 @@ int main(int argc, char** argv) {
|
||||||
Settings::values.use_gdbstub = use_gdbstub;
|
Settings::values.use_gdbstub = use_gdbstub;
|
||||||
Settings::Apply();
|
Settings::Apply();
|
||||||
|
|
||||||
std::unique_ptr<EmuWindow_SDL2> emu_window{std::make_unique<EmuWindow_SDL2>()};
|
std::unique_ptr<EmuWindow_SDL2> emu_window{std::make_unique<EmuWindow_SDL2>(fullscreen)};
|
||||||
|
|
||||||
Core::System& system{Core::System::GetInstance()};
|
Core::System& system{Core::System::GetInstance()};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue