diff --git a/src/modules/window/Window.cpp b/src/modules/window/Window.cpp index 8ab4d85d4..c513bc4e2 100644 --- a/src/modules/window/Window.cpp +++ b/src/modules/window/Window.cpp @@ -89,19 +89,19 @@ StringMap::Entry Window::settingEntri StringMap Window::settings(Window::settingEntries, sizeof(Window::settingEntries)); -StringMap::Entry Window::fullscreenTypeEntries[] = +StringMap::Entry Window::fullscreenTypeEntries[] = { - {"exclusive", Window::FULLSCREEN_TYPE_EXCLUSIVE}, - {"desktop", Window::FULLSCREEN_TYPE_DESKTOP}, + {"exclusive", FULLSCREEN_EXCLUSIVE}, + {"desktop", FULLSCREEN_DESKTOP}, }; -StringMap Window::fullscreenTypes(Window::fullscreenTypeEntries, sizeof(Window::fullscreenTypeEntries)); +StringMap Window::fullscreenTypes(Window::fullscreenTypeEntries, sizeof(Window::fullscreenTypeEntries)); StringMap::Entry Window::messageBoxTypeEntries[] = { - {"error", Window::MESSAGEBOX_ERROR}, - {"warning", Window::MESSAGEBOX_WARNING}, - {"info", Window::MESSAGEBOX_INFO}, + {"error", MESSAGEBOX_ERROR}, + {"warning", MESSAGEBOX_WARNING}, + {"info", MESSAGEBOX_INFO}, }; StringMap Window::messageBoxTypes(Window::messageBoxTypeEntries, sizeof(Window::messageBoxTypeEntries)); diff --git a/src/modules/window/Window.h b/src/modules/window/Window.h index 02bb6773b..733df72b3 100644 --- a/src/modules/window/Window.h +++ b/src/modules/window/Window.h @@ -66,9 +66,9 @@ public: enum FullscreenType { - FULLSCREEN_TYPE_EXCLUSIVE, - FULLSCREEN_TYPE_DESKTOP, - FULLSCREEN_TYPE_MAX_ENUM + FULLSCREEN_EXCLUSIVE, + FULLSCREEN_DESKTOP, + FULLSCREEN_MAX_ENUM }; enum MessageBoxType @@ -189,8 +189,8 @@ private: static StringMap::Entry settingEntries[]; static StringMap settings; - static StringMap::Entry fullscreenTypeEntries[]; - static StringMap fullscreenTypes; + static StringMap::Entry fullscreenTypeEntries[]; + static StringMap fullscreenTypes; static StringMap::Entry messageBoxTypeEntries[]; static StringMap messageBoxTypes; @@ -200,7 +200,7 @@ private: struct WindowSettings { bool fullscreen = false; - Window::FullscreenType fstype = Window::FULLSCREEN_TYPE_EXCLUSIVE; + Window::FullscreenType fstype = Window::FULLSCREEN_DESKTOP; bool vsync = true; int msaa = 0; bool resizable = false; diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 76e039aa0..12e34a7d9 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -376,7 +376,7 @@ bool Window::setWindow(int width, int height, WindowSettings *settings) if (f.fullscreen) { - if (f.fstype == FULLSCREEN_TYPE_DESKTOP) + if (f.fstype == FULLSCREEN_DESKTOP) sdlflags |= SDL_WINDOW_FULLSCREEN_DESKTOP; else { @@ -511,12 +511,12 @@ void Window::updateSettings(const WindowSettings &newsettings) if ((wflags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) { curMode.settings.fullscreen = true; - curMode.settings.fstype = FULLSCREEN_TYPE_DESKTOP; + curMode.settings.fstype = FULLSCREEN_DESKTOP; } else if ((wflags & SDL_WINDOW_FULLSCREEN) == SDL_WINDOW_FULLSCREEN) { curMode.settings.fullscreen = true; - curMode.settings.fstype = FULLSCREEN_TYPE_EXCLUSIVE; + curMode.settings.fstype = FULLSCREEN_EXCLUSIVE; } else { @@ -547,7 +547,7 @@ void Window::updateSettings(const WindowSettings &newsettings) // Only minimize on focus loss if the window is in exclusive-fullscreen // mode. - if (curMode.settings.fullscreen && curMode.settings.fstype == FULLSCREEN_TYPE_EXCLUSIVE) + if (curMode.settings.fullscreen && curMode.settings.fstype == FULLSCREEN_EXCLUSIVE) SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1"); else SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0"); @@ -594,7 +594,7 @@ bool Window::setFullscreen(bool fullscreen, Window::FullscreenType fstype) if (fullscreen) { - if (fstype == FULLSCREEN_TYPE_DESKTOP) + if (fstype == FULLSCREEN_DESKTOP) sdlflags = SDL_WINDOW_FULLSCREEN_DESKTOP; else { diff --git a/src/modules/window/wrap_Window.cpp b/src/modules/window/wrap_Window.cpp index 4765c68d0..8956b0818 100644 --- a/src/modules/window/wrap_Window.cpp +++ b/src/modules/window/wrap_Window.cpp @@ -92,8 +92,8 @@ int w_setMode(lua_State *L) } else { - // Default to exclusive fullscreen mode. - settings.fstype = Window::FULLSCREEN_TYPE_EXCLUSIVE; + // Default to desktop fullscreen mode. + settings.fstype = Window::FULLSCREEN_DESKTOP; } lua_pop(L, 1); @@ -138,7 +138,7 @@ int w_getMode(lua_State *L) lua_newtable(L); - const char *fstypestr = "exclusive"; + const char *fstypestr = "desktop"; Window::getConstant(settings.fstype, fstypestr); lua_pushstring(L, fstypestr); @@ -222,14 +222,14 @@ int w_getFullscreenModes(lua_State *L) int w_setFullscreen(lua_State *L) { bool fullscreen = luax_toboolean(L, 1); - Window::FullscreenType fstype = Window::FULLSCREEN_TYPE_MAX_ENUM; + Window::FullscreenType fstype = Window::FULLSCREEN_MAX_ENUM; const char *typestr = lua_isnoneornil(L, 2) ? 0 : luaL_checkstring(L, 2); if (typestr && !Window::getConstant(typestr, fstype)) return luaL_error(L, "Invalid fullscreen type: %s", typestr); bool success = false; - if (fstype == Window::FULLSCREEN_TYPE_MAX_ENUM) + if (fstype == Window::FULLSCREEN_MAX_ENUM) success = instance()->setFullscreen(fullscreen); else success = instance()->setFullscreen(fullscreen, fstype); diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index bd6c1a061..89dc1da45 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -326,7 +326,7 @@ function love.init() minwidth = 1, minheight = 1, fullscreen = false, - fullscreentype = "exclusive", + fullscreentype = "desktop", display = 1, vsync = true, msaa = 0, diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index 9fce0c1d3..b82733f90 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -607,7 +607,7 @@ const unsigned char boot_lua[] = 0x09, 0x09, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x2c, 0x0a, 0x09, 0x09, 0x09, 0x66, 0x75, 0x6c, 0x6c, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x20, - 0x3d, 0x20, 0x22, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x22, 0x2c, 0x0a, + 0x3d, 0x20, 0x22, 0x64, 0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x22, 0x2c, 0x0a, 0x09, 0x09, 0x09, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x20, 0x3d, 0x20, 0x31, 0x2c, 0x0a, 0x09, 0x09, 0x09, 0x76, 0x73, 0x79, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x2c, 0x0a, 0x09, 0x09, 0x09, 0x6d, 0x73, 0x61, 0x61, 0x20, 0x3d, 0x20, 0x30, 0x2c, 0x0a,