Commit: e828b335cb2a4bfce84b5dfc8ac7acbf72fafe4f - glow (git)

Cross-Platform OpenGL Windowing Library

Commit MetaInfo

• Revision: e828b335cb2a4bfce84b5dfc8ac7acbf72fafe4f (tree)
• Time: 2020-02-23 02:45:28
• Author: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Log Message

Fix issue with sometimes clicking the X on a window not closing it

Change Summary

• modified: glow_win32.c

Incremental Difference

--- a/glow_win32.c
+++ b/glow_win32.c
@@ -184,83 +184,92 @@ static LRESULT WINAPI glow_window_proc(HWND wnd,
     WPARAM parm,
     LPARAM lparam){
     
-    if(msg == WM_CREATE){
-        struct Glow_Window *const window =
-            (struct Glow_Window *)(((CREATESTRUCT*)lparam)->lpCreateParams);
-        const int let =
-            ChoosePixelFormat((window->dc = GetDC(wnd)), &glow_pixel_format);
-        
-        /* This will get set to -1 if adaptive vsync works. */
-        int interval = 1;
-        const char *const ext = glGetString(GL_EXTENSIONS);
-        
-        SetPixelFormat(window->dc, let, &glow_pixel_format);
-        window->ctx.ctx = wglCreateContext(window->dc);
-        window->ctx.dc = window->dc;
-        wglMakeCurrent(window->dc, window->ctx.ctx);
-        
-        /* Try to get VSync or, if requested, adaptive VSync. */
-        if((window->adaptive_vsync || window->vsync) &&
-            strstr(ext, "WGL_EXT_swap_control") != NULL){
-            
-            typedef BOOL(*wgl_swap_interval_func)(int);
-            
-            const wgl_swap_interval_func wglSwapIntervalEXT =
-                (wgl_swap_interval_func)wglGetProcAddress(
-                    "wglSwapIntervalEXT");
-            
-            assert(wglSwapIntervalEXT);
-            
-            /* Try to use control_tear if requested. */
-            if(window->adaptive_vsync &&
-                strstr(ext, "WGL_EXT_extensions_string") != NULL){
-                
-                typedef const char*(*wgl_extension_strings_func)(void);
+    switch(msg){
+        case WM_CREATE:
+            {
+                struct Glow_Window *const window =
+                    (void*)(((CREATESTRUCT*)lparam)->lpCreateParams);
+                const int pix_format = ChoosePixelFormat(
+                    (window->dc = GetDC(wnd)),
+                    &glow_pixel_format);
                 
-                const wgl_extension_strings_func wglGetExtensionsStringEXT =
-                    (wgl_extension_strings_func)wglGetProcAddress(
-                        "wglGetExtensionsStringEXT");
+                /* This will get set to -1 if adaptive vsync works. */
+                int interval = 1;
+                const char *const ext = glGetString(GL_EXTENSIONS);
                 
-                assert(wglGetExtensionsStringEXT);
+                SetPixelFormat(window->dc, pix_format, &glow_pixel_format);
+                window->ctx.ctx = wglCreateContext(window->dc);
+                window->ctx.dc = window->dc;
+                wglMakeCurrent(window->dc, window->ctx.ctx);
                 
-                if(wglGetExtensionsStringEXT){
-                    const char *const wgl_ext = wglGetExtensionsStringEXT();
-                    if(strstr(wgl_ext, "WGL_EXT_swap_control_tear") != NULL){
-                        interval = -1;
+                /* Try to get VSync or, if requested, adaptive VSync. */
+                if((window->adaptive_vsync || window->vsync) &&
+                    strstr(ext, "WGL_EXT_swap_control") != NULL){
+                    
+                    typedef BOOL(*wgl_swap_interval_func)(int);
+                    
+                    const wgl_swap_interval_func wglSwapIntervalEXT =
+                        (wgl_swap_interval_func)wglGetProcAddress(
+                            "wglSwapIntervalEXT");
+                    
+                    assert(wglSwapIntervalEXT);
+                    
+                    /* Try to use control_tear if requested. */
+                    if(window->adaptive_vsync &&
+                        strstr(ext, "WGL_EXT_extensions_string") != NULL){
+                        
+                        typedef const char*(*wgl_extension_strings_func)(void);
+                        
+                        const wgl_extension_strings_func
+                            wglGetExtensionsStringEXT =
+                            (wgl_extension_strings_func)wglGetProcAddress(
+                                "wglGetExtensionsStringEXT");
+                        
+                        assert(wglGetExtensionsStringEXT);
+                        
+                        const char *const wgl_ext =
+                            wglGetExtensionsStringEXT();
+                        
+                        if(strstr(wgl_ext, "WGL_EXT_swap_control_tear") !=
+                            NULL){
+                            
+                            interval = -1;
+                        }
+                    }
+                    
+                    /* Set the interval if either adaptive VSync or regular
+                     * VSync was requested.
+                     */
+                    if(((window->adaptive_vsync && interval == -1) ||
+                        window->vsync) &&
+                        wglSwapIntervalEXT != NULL){
+                        
+                        wglSwapIntervalEXT(interval);
                     }
                 }
-            }
-            
-            /* Set the interval if either adaptive VSync or regular VSync was
-             * requested.
-             */
-            if(((window->adaptive_vsync && interval == -1) || window->vsync) &&
-                wglSwapIntervalEXT != NULL){
                 
-                wglSwapIntervalEXT(interval);
+                glClearColor(0.75f, 0.333f, 0.0f, 1.0f);
+                SetFocus(wnd);
+                return 0;
             }
-        }
-        
-        glClearColor(0.75f, 0.333f, 0.0f, 1.0f);
-        SetFocus(wnd);
-        return 0;
-    }
-    else if(msg == WM_SHOWWINDOW){
-        if(parm == FALSE){
+        case WM_SHOWWINDOW:
+            if(parm == FALSE){
+                DestroyWindow(wnd);
+                return 0;
+            }
+            else{
+                ShowWindow(wnd, SW_SHOWNORMAL);
+                SetFocus(wnd);
+            }
+            return 0;
+        case WM_CLOSE:
+            return DefWindowProc(wnd, msg, parm, lparam);
+        case WM_NCDESTROY: /* FALLTHROUGH */
+        case WM_DESTROY:
             PostQuitMessage(EXIT_SUCCESS);
-        }
-        else{
-            ShowWindow(wnd, SW_SHOWNORMAL);
-            SetFocus(wnd);
-        }
-        return 0;
-    }
-    else if(msg == WM_CLOSE || msg == WM_DESTROY){
-        PostQuitMessage(EXIT_SUCCESS);
-        return 0;
-    }
-    else{
-        return DefWindowProc(wnd, msg, parm, lparam);
+            return 0;
+        default:
+            return DefWindowProc(wnd, msg, parm, lparam);
     }
 }
 
@@ -461,6 +470,9 @@ static BOOL glow_translate_event(const MSG *msg, struct Glow_Window *window,
         case WM_KEYUP:
             out_event->type = pressed ?
                 eGlowKeyboardPressed : eGlowKeyboardReleased;
+            
+            TranslateMessage(msg);
+            
             {
                 const char c = glow_get_key_char(msg->wParam),
                     *c_str;
@@ -501,9 +513,10 @@ static BOOL glow_translate_event(const MSG *msg, struct Glow_Window *window,
 				window, out_event->value.mouse.xy);
             out_event->type = eGlowMouseMoved;
             return TRUE;
-        case WM_DESTROY:
-        case WM_CLOSE:
-        case WM_QUIT:
+        
+        case WM_DESTROY: /* FALLTHROUGH */
+        case WM_CLOSE: /* FALLTHROUGH */
+        case WM_QUIT: /* Note that quit actually never happens right now... */
             out_event->type = eGlowQuit;
             return TRUE;
         default:
@@ -516,9 +529,12 @@ static BOOL glow_translate_event(const MSG *msg, struct Glow_Window *window,
 unsigned Glow_GetEvent(struct Glow_Window *window,
     struct Glow_Event *out_event){
     MSG msg;
+    
     do{
-        if(!PeekMessage(&msg, window->win, 0, 0, PM_REMOVE))
+        if(!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)){
             return 0;
+        }
+        
         DispatchMessage(&msg);
     }while(!glow_translate_event(&msg, window, out_event));
 
@@ -530,8 +546,17 @@ unsigned Glow_GetEvent(struct Glow_Window *window,
 void Glow_WaitEvent(struct Glow_Window *window,
     struct Glow_Event *out_event){
     MSG msg;
+    
     do{
-        GetMessage(&msg, window->win, 0, 0);
+        if(GetMessage(&msg, NULL, 0, 0)){
+            DispatchMessage(&msg);
+        }
+        else{
+            /* Got a WM_QUIT */
+            out_event->type = eGlowQuit;
+            PostQuitMessage(msg.wParam);
+            return;
+        }
     }while(!glow_translate_event(&msg, window, out_event));
 }