lovr.system.is/setWindowFullscreen;

GLFW only for now, best effort.  Tested on X11 so far.

Author: bjornbytes

CHANGES.md

@@ -57,6 +57,7 @@ dev
 - Add `lovr.audio.getStream`.
 - Add `AudioStream`.
 - Add `Sound:get/setFrame`.
+- Add `lovr.system.is/setWindowFullscreen`.
 
 ### Change
 
@@ -123,6 +124,7 @@ dev
 - Deprecate `lovr.math.mat4` (use `lovr.math.newMat4`).
 - Deprecate `t.math.globals` (use `vector` and `quaternion`).
 - Deprecate `Layer:getPass` (use your own `Pass`).
+- Deprecate ability to use zero for window dimensions in `lovr.conf` (use `t.window.fullscreen`).
 
 ### Remove
 

src/api/l_system.c

@@ -177,6 +177,13 @@ static int l_lovrSystemOpenWindow(lua_State* L) {
   }
   lua_pop(L, 1);
 
+  // Deprecated method for setting fullscreen
+  if (window.width == 0 || window.height == 0) {
+    window.fullscreen = true;
+    window.width = 720;
+    window.height = 800;
+  }
+
   bool success = lovrSystemOpenWindow(&window);
   lovrRelease(image, lovrImageDestroy);
   luax_assert(L, success);
@@ -201,6 +208,18 @@ static int l_lovrSystemIsWindowFocused(lua_State* L) {
   return 1;
 }
 
+static int l_lovrSystemIsWindowFullscreen(lua_State* L) {
+  bool fullscreen = lovrSystemIsWindowFullscreen();
+  lua_pushboolean(L, fullscreen);
+  return 1;
+}
+
+static int l_lovrSystemSetWindowFullscreen(lua_State* L) {
+  bool fullscreen = lua_toboolean(L, 1);
+  lovrSystemSetWindowFullscreen(fullscreen);
+  return 0;
+}
+
 static int l_lovrSystemGetWindowWidth(lua_State* L) {
   uint32_t width, height;
   lovrSystemGetWindowSize(&width, &height);
@@ -363,6 +382,8 @@ static const luaL_Reg lovrSystem[] = {
   { "isWindowOpen", l_lovrSystemIsWindowOpen },
   { "isWindowVisible", l_lovrSystemIsWindowVisible },
   { "isWindowFocused", l_lovrSystemIsWindowFocused },
+  { "isWindowFullscreen", l_lovrSystemIsWindowFullscreen },
+  { "setWindowFullscreen", l_lovrSystemSetWindowFullscreen },
   { "getWindowWidth", l_lovrSystemGetWindowWidth },
   { "getWindowHeight", l_lovrSystemGetWindowHeight },
   { "getWindowDimensions", l_lovrSystemGetWindowDimensions },

src/core/os.h

@@ -190,6 +190,8 @@ bool os_window_open(const os_window_config* config);
 bool os_window_is_open(void);
 bool os_window_is_visible(void);
 bool os_window_is_focused(void);
+bool os_window_is_fullscreen(void);
+void os_window_set_fullscreen(bool fullscreen);
 void os_window_get_size(uint32_t* width, uint32_t* height);
 float os_window_get_pixel_density(void);
 void os_window_message_box(const char* message);

src/core/os_glfw.h

@@ -137,6 +137,7 @@ static struct {
   fn_mousewheel_move* onMouseWheelMove;
   uint32_t width;
   uint32_t height;
+  bool fullscreen;
 } glfwState;
 
 static void onError(int code, const char* description) {
@@ -163,8 +164,6 @@ static void onWindowFocus(GLFWwindow* window, int focused) {
 
 static void onWindowResize(GLFWwindow* window, int width, int height) {
   if (glfwState.onWindowResize && width > 0 && height > 0) {
-    glfwState.width = width;
-    glfwState.height = height;
     glfwState.onWindowResize(width, height);
   }
 }
@@ -377,29 +376,22 @@ bool os_window_open(const os_window_config* config) {
   glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
   glfwWindowHint(GLFW_RESIZABLE, config->resizable);
 
-  if (config->width == 0 && config->height == 0) {
-    glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
-  }
-
-  bool center = config->centered && !config->fullscreen && config->width > 0 && config->height > 0;
+  bool center = config->centered && !config->fullscreen;
 
   if (center) {
     glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);
   }
 
   GLFWmonitor* monitor = glfwGetPrimaryMonitor();
   const GLFWvidmode* mode = glfwGetVideoMode(monitor);
-  uint32_t width = config->width ? config->width : (uint32_t) mode->width;
-  uint32_t height = config->height ? config->height : (uint32_t) mode->height;
+  uint32_t width = config->fullscreen ? (uint32_t) mode->width : config->width;
+  uint32_t height = config->fullscreen ? (uint32_t) mode->height : config->height;
 
   if (config->fullscreen) {
-    glfwWindowHint(GLFW_RED_BITS, mode->redBits);
-    glfwWindowHint(GLFW_GREEN_BITS, mode->greenBits);
-    glfwWindowHint(GLFW_BLUE_BITS, mode->blueBits);
-    glfwWindowHint(GLFW_REFRESH_RATE, mode->refreshRate);
+    glfwWindowHint(GLFW_DECORATED, GLFW_FALSE);
   }
 
-  glfwState.window = glfwCreateWindow(width, height, config->title, config->fullscreen ? monitor : NULL, NULL);
+  glfwState.window = glfwCreateWindow(width, height, config->title, NULL, NULL);
 
   if (!glfwState.window) {
     return false;
@@ -429,8 +421,9 @@ bool os_window_open(const os_window_config* config) {
   glfwSetMouseButtonCallback(glfwState.window, onMouseButton);
   glfwSetCursorPosCallback(glfwState.window, onMouseMove);
   glfwSetScrollCallback(glfwState.window, onMouseWheelMove);
-  glfwState.width = width;
-  glfwState.height = height;
+  glfwState.width = config->width;
+  glfwState.height = config->height;
+  glfwState.fullscreen = config->fullscreen;
   return true;
 }
 
@@ -446,9 +439,38 @@ bool os_window_is_focused(void) {
   return glfwState.window && glfwGetWindowAttrib(glfwState.window, GLFW_FOCUSED);
 }
 
+bool os_window_is_fullscreen(void) {
+  return glfwState.fullscreen;
+}
+
+void os_window_set_fullscreen(bool fullscreen) {
+  if (!glfwState.window) {
+    return;
+  }
+
+  glfwState.fullscreen = fullscreen;
+
+  if (fullscreen) {
+    os_window_get_size(&glfwState.width, &glfwState.height);
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
+    glfwSetWindowSize(glfwState.window, mode->width, mode->height);
+    glfwSetWindowAttrib(glfwState.window, GLFW_DECORATED, false);
+    glfwSetWindowPos(glfwState.window, 0, 0);
+  } else {
+    int x, y, w, h;
+    int width = (int) glfwState.width;
+    int height = (int) glfwState.height;
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    glfwGetMonitorWorkarea(monitor, &x, &y, &w, &h);
+    glfwSetWindowSize(glfwState.window, width, height);
+    glfwSetWindowAttrib(glfwState.window, GLFW_DECORATED, true);
+    glfwSetWindowPos(glfwState.window, x + (w - width) / 2, y + (h - height) / 2);
+  }
+}
+
 void os_window_get_size(uint32_t* width, uint32_t* height) {
-  *width = glfwState.width;
-  *height = glfwState.height;
+  glfwGetWindowSize(glfwState.window, width, height);
 }
 
 float os_window_get_pixel_density(void) {

src/modules/system/system.c

@@ -159,6 +159,14 @@ bool lovrSystemIsWindowFocused(void) {
   return os_window_is_focused();
 }
 
+bool lovrSystemIsWindowFullscreen(void) {
+  return os_window_is_fullscreen();
+}
+
+void lovrSystemSetWindowFullscreen(bool fullscreen) {
+  return os_window_set_fullscreen(fullscreen);
+}
+
 void lovrSystemGetWindowSize(uint32_t* width, uint32_t* height) {
   os_window_get_size(width, height);
 }

src/modules/system/system.h

@@ -19,6 +19,8 @@ bool lovrSystemOpenWindow(struct os_window_config* config);
 bool lovrSystemIsWindowOpen(void);
 bool lovrSystemIsWindowVisible(void);
 bool lovrSystemIsWindowFocused(void);
+bool lovrSystemIsWindowFullscreen(void);
+void lovrSystemSetWindowFullscreen(bool fullscreen);
 void lovrSystemGetWindowSize(uint32_t* width, uint32_t* height);
 float lovrSystemGetWindowDensity(void);
 void lovrSystemPollEvents(void);