コミット: e4dad582e2f58b9ae1e55247257c97c25a9f12bb - glow (git)

Cross-Platform OpenGL Windowing Library

コミットメタ情報

• リビジョン: e4dad582e2f58b9ae1e55247257c97c25a9f12bb (tree)
• 日時: 2022-04-01 11:37:25
• 作者: AlaskanEmily <emily@alas...>
• コミッター: AlaskanEmily

ログメッセージ

Report errors from Glow_CreateWindow and Glow_CreateContext.

This only implements this change for X11 and Win32, the Haiku and SDL2 backends
will need to be updated.

変更サマリ

• modified: glow.h
• modified: glow_win32.c
• modified: glow_x11.c

差分

--- a/glow.h
+++ b/glow.h
@@ -164,10 +164,11 @@ GLOW_EXPORT GLOW_CONST unsigned Glow_WindowStructSize(void);
  * @brief Creates a Window
  *
  * The window is hidden by default.
+ * @returns 0 on success, -1 on failure.
  * 
  * @sa Glow_ShowWindow
  */
-GLOW_EXPORT void Glow_CreateWindow(struct Glow_Window *out,
+GLOW_EXPORT int Glow_CreateWindow(struct Glow_Window *out,
     unsigned w, unsigned h, const char *title, int flags);
 
 /**

--- a/glow_win32.c
+++ b/glow_win32.c
@@ -332,9 +332,18 @@ void *Glow_GetProcAddress(const char *name){
 
 /******************************************************************************/
 
-void Glow_CreateWindow(struct Glow_Window *out,
+int Glow_CreateWindow(struct Glow_Window *out,
     unsigned w, unsigned h, const char *title, int flags){
     
+    RECT size;
+    /* Set the style based on the flags. */
+    const DWORD style =
+        (((flags & GLOW_UNDECORATED) == 0) ?
+            GLOW_WINDOW_STYLE : WS_OVERLAPPED) |
+        (((flags & GLOW_RESIZABLE) == 0) ?
+            0 : (WS_THICKFRAME | WS_MAXIMIZEBOX));
+    DWORD adj_w, adj_h;
+    
     if(glow_app == NULL){
         const HINSTANCE app = glow_app = GetModuleHandle(NULL);
         const HICON icon = LoadIcon(app, MAKEINTRESOURCE(101));
@@ -355,33 +364,33 @@ void Glow_CreateWindow(struct Glow_Window *out,
         RegisterClass(&wc);
     }
 
-    {
-        RECT size;
-        /* Set the style based on the flags. */
-        const DWORD style =
-            (((flags & GLOW_UNDECORATED) == 0) ?
-                GLOW_WINDOW_STYLE : WS_OVERLAPPED) |
-            (((flags & GLOW_RESIZABLE) == 0) ?
-                0 : (WS_THICKFRAME | WS_MAXIMIZEBOX));
-        
-        size.left = 0;
-        size.top = 0;
-        size.right = w;
-        size.bottom = h;
-        /* Note that AdjustWindowRect will center the client area around the
-         * left/top of the input, so we will need to use the differences for
-         * the actual window dimensions. */
-        AdjustWindowRect(&size, style, TRUE);
-        out->win = CreateWindow(GLOW_CLASS_NAME,
-            title,
-            style,
-            64, 64, size.right - size.left, size.bottom - size.top,
-            NULL, NULL,
-            glow_app,
-            out);
-        out->adaptive_vsync = (flags & GLOW_ADAPTIVE_VSYNC) != 0;
-        out->vsync = (flags & GLOW_VSYNC) != 0;
+    size.left = 0;
+    size.top = 0;
+    size.right = w;
+    size.bottom = h;
+    /* Note that AdjustWindowRect will center the client area around the
+     * left/top of the input, so we will need to use the differences for
+     * the actual window dimensions. */
+    if(AdjustWindowRect(&size, style, TRUE)){
+        adj_w = size.right - size.left;
+        adj_h = size.bottom - size.top;
     }
+    else{
+        adj_w = w;
+        adj_w = h;
+    }
+    out->win = CreateWindow(GLOW_CLASS_NAME,
+        title,
+        style,
+        64, 64, w, h,
+        NULL, NULL,
+        glow_app,
+        out);
+    if(out->win == NULL)
+        return -1;
+    out->adaptive_vsync = (flags & GLOW_ADAPTIVE_VSYNC) != 0;
+    out->vsync = (flags & GLOW_VSYNC) != 0;
+    return 0;
 }
 
 /******************************************************************************/

--- a/glow_x11.c
+++ b/glow_x11.c
@@ -118,7 +118,7 @@ void *Glow_GetProcAddress(const char *name){
 
 /******************************************************************************/
 
-void Glow_CreateWindow(struct Glow_Window *window,
+int Glow_CreateWindow(struct Glow_Window *window,
     unsigned w, unsigned h, const char *title, int flags){
     
     window->w = w;
@@ -132,8 +132,8 @@ void Glow_CreateWindow(struct Glow_Window *window,
     window->ctx = NULL;
 
     if(window->dpy == NULL){
-        fputs("Could not open an X11 display\n", stderr);
-        return;
+        /* fputs("Could not open an X11 display\n", stderr); */
+        return -1;
     }
     
     window->scr = DefaultScreenOfDisplay(window->dpy);
@@ -145,10 +145,10 @@ void Glow_CreateWindow(struct Glow_Window *window,
         GLXFBConfig *const config = glXChooseFBConfig(window->dpy,
             window->scr_id, glow_attribs, &num);
         if(config == NULL || num == 0){
-            fputs("Could not get glX framebuffer configuration\n", stderr);
+            /* fputs("Could not get glX framebuffer configuration\n", stderr); */
             XCloseDisplay(window->dpy);
             window->dpy = NULL;
-            return;
+            return -1;
         }
         for(i = 0; i < num; i++){
             XVisualInfo *const info =
@@ -179,16 +179,16 @@ void Glow_CreateWindow(struct Glow_Window *window,
     /* Get a glX visual info for the fbconfig */
     window->vis = glXGetVisualFromFBConfig(window->dpy, window->fbconfig);
     if(window->vis == NULL){
-        fputs("Could not create a glX visual\n", stderr);
+        /* fputs("Could not create a glX visual\n", stderr); */
         XCloseDisplay(window->dpy);
         window->dpy = NULL;
-        return;
+        return -1;
     }
     if(window->scr_id != window->vis->screen){
-        fputs("Screen does not match a given visual\n", stderr);
+        /* fputs("Screen does not match a given visual\n", stderr); */
         XCloseDisplay(window->dpy);
         window->dpy = NULL;
-        return;
+        return -1;
     }
 
     /* Open the window. */
@@ -212,6 +212,7 @@ void Glow_CreateWindow(struct Glow_Window *window,
     XSelectInput(window->dpy, window->wnd, GLOW_X_EVENT_MASK);
     
     XSync(window->dpy, False);
+    return 0;
 }
 
 /******************************************************************************/