Updated app.h version

mattiasgustavsson · Sep 10, 2022 · 2de408c · 2de408c
1 parent 5b93852
commit 2de408c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![build](https://github.com/mattiasgustavsson/dos-like/workflows/build/badge.svg)
+![build](https://github.com/mattiasgustavsson/template_project/workflows/build/badge.svg)
 
 # template_project
 Basic setup for building something with app.h on Windows/Linux/Mac/Web

diff --git a/source/libs/app.h b/source/libs/app.h
@@ -3,7 +3,7 @@
           Licensing information can be found at the end of the file.
 ------------------------------------------------------------------------------
 
-app.h - v0.4 - Small cross-platform base framework for graphical apps.
+app.h - v0.5 - Small cross-platform base framework for graphical apps.
 
 Do this:
     #define APP_IMPLEMENTATION
@@ -187,9 +187,6 @@ Here's a basic sample program which starts a windowed app and plots random pixel
         return app_run( app_proc, NULL, NULL, NULL, NULL );
     }
 
-    // pass-through so the program will build with either /SUBSYSTEM:WINDOWS or /SUBSYSTEN:CONSOLE
-    extern "C" int __stdcall WinMain( struct HINSTANCE__*, struct HINSTANCE__*, char*, int ) { return main( __argc, __argv ); }
-
 
 
 API Documentation
@@ -715,6 +712,7 @@ details.
 #ifdef APP_IMPLEMENTATION
 #undef APP_IMPLEMENTATION
 
+#include <stdlib.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //    OPENGL CODE - Shared between platform implementations
@@ -767,6 +765,7 @@ details.
 
     #if defined( APP_WASM )
         #include <wajic_gl.h>
+        #define WA_CORO_IMPLEMENT_NANOSLEEP
         #include <wajic_coro.h>
     #else
         #include <GL/glew.h>
@@ -1657,6 +1656,8 @@ static LRESULT CALLBACK app_internal_wndproc( HWND hwnd, UINT message, WPARAM wp
         case WM_LBUTTONDBLCLK:
             input_event.type = APP_INPUT_DOUBLE_CLICK; input_event.data.key = APP_KEY_LBUTTON;
             app_internal_add_input_event( app, &input_event );
+            input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = APP_KEY_LBUTTON;
+            app_internal_add_input_event(app, &input_event);
             break;
         case WM_RBUTTONDOWN:
             input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = APP_KEY_RBUTTON;
@@ -1669,6 +1670,8 @@ static LRESULT CALLBACK app_internal_wndproc( HWND hwnd, UINT message, WPARAM wp
         case WM_RBUTTONDBLCLK:
             input_event.type = APP_INPUT_DOUBLE_CLICK; input_event.data.key = APP_KEY_RBUTTON;
             app_internal_add_input_event( app, &input_event );
+            input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = APP_KEY_RBUTTON;
+            app_internal_add_input_event(app, &input_event);
             break;
         case WM_MBUTTONDOWN:
             input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = APP_KEY_MBUTTON;
@@ -1681,6 +1684,8 @@ static LRESULT CALLBACK app_internal_wndproc( HWND hwnd, UINT message, WPARAM wp
         case WM_MBUTTONDBLCLK:
             input_event.type = APP_INPUT_DOUBLE_CLICK; input_event.data.key = APP_KEY_MBUTTON;
             app_internal_add_input_event( app, &input_event );
+            input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = APP_KEY_MBUTTON;
+            app_internal_add_input_event(app, &input_event);
             break;
         case WM_XBUTTONDOWN:
             input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = HIWORD( wparam ) == 1 ? APP_KEY_XBUTTON1 :APP_KEY_XBUTTON2;
@@ -1693,6 +1698,8 @@ static LRESULT CALLBACK app_internal_wndproc( HWND hwnd, UINT message, WPARAM wp
         case WM_XBUTTONDBLCLK:
             input_event.type = APP_INPUT_DOUBLE_CLICK; input_event.data.key = HIWORD( wparam ) == 1 ? APP_KEY_XBUTTON1 :APP_KEY_XBUTTON2;
             app_internal_add_input_event( app, &input_event );
+            input_event.type = APP_INPUT_KEY_DOWN; input_event.data.key = HIWORD( wparam ) == 1 ? APP_KEY_XBUTTON1 :APP_KEY_XBUTTON2;
+            app_internal_add_input_event(app, &input_event);
             break;
         case WM_SYSKEYDOWN:
         case WM_KEYDOWN:
@@ -1864,7 +1871,7 @@ static LRESULT CALLBACK app_internal_wndproc( HWND hwnd, UINT message, WPARAM wp
                 app->GetRawInputDataPtr( (HRAWINPUT) lparam, RID_INPUT, &raw, &size, sizeof( RAWINPUTHEADER ) );
                 if( raw.header.dwType == RIM_TYPEMOUSE )
                     {
-                    if( ( raw.data.mouse.usFlags & 1 ) == MOUSE_MOVE_RELATIVE) 
+                    if( ( raw.data.mouse.usFlags & 1 ) == MOUSE_MOVE_RELATIVE)
                         {
                         float dx = (float) raw.data.mouse.lLastX;
                         float dy = (float) raw.data.mouse.lLastY;
@@ -2902,33 +2909,17 @@ void app_window_size( app_t* app, int width, int height )
 
 int app_window_width( app_t* app )
     {
-    int width = app->windowed_w;
-    if( app->screenmode == APP_SCREENMODE_WINDOW )
-        {
-        WINDOWPLACEMENT placement;
-        placement.length = sizeof( placement );
-        GetWindowPlacement( app->hwnd, &placement );
-        width = placement.rcNormalPosition.right - placement.rcNormalPosition.left;
-        }
-    RECT r = app_internal_rect( 0, 0, 0, 0 );
-    AdjustWindowRect( &r, APP_WINDOWED_WS_STYLE | WS_VISIBLE, FALSE );
-    return width - ( r.right - r.left );
+    RECT r;
+    GetClientRect( app->hwnd, &r );
+    return r.right - r.left;
     }
 
 
 int app_window_height( app_t* app )
     {
-    int height = app->windowed_h;
-    if( app->screenmode == APP_SCREENMODE_WINDOW )
-        {
-        WINDOWPLACEMENT placement;
-        placement.length = sizeof( placement );
-        GetWindowPlacement( app->hwnd, &placement );
-        height = placement.rcNormalPosition.bottom - placement.rcNormalPosition.top;
-        }
-    RECT r = app_internal_rect( 0, 0, 0, 0 );
-    AdjustWindowRect( &r, APP_WINDOWED_WS_STYLE | WS_VISIBLE, FALSE );
-    return height - ( r.bottom - r.top );
+    RECT r;
+    GetClientRect( app->hwnd, &r );
+    return r.bottom - r.top;
     }
 
 
@@ -3389,7 +3380,7 @@ int app_run( int (*app_proc)( app_t*, void* ), void* user_data, void* memctx, vo
     int result = 0xff;
     int display_count;
     int glres;
-          
+
     if( SDL_Init( SDL_INIT_EVERYTHING ) < 0 )
         {
 //        printf( "SDL could not initialize! SDL_Error: %s\n", SDL_GetError() );