MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update RGFW

Browse Source
This commit is contained in:
ColleagueRiley 2024-11-26 21:12:59 -05:00
parent 6bbed2993b
commit 3729901903
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/external/RGFW.h vendored
View File

@ -88,6 +88,7 @@
Joshua Rowe (omnisci3nce) - bug fix, review (macOS) Joshua Rowe (omnisci3nce) - bug fix, review (macOS)
@lesleyrs -> bug fix, review (OpenGL) @lesleyrs -> bug fix, review (OpenGL)
Nick Porcino (meshula) - testing, organization, review (MacOS, examples) Nick Porcino (meshula) - testing, organization, review (MacOS, examples)
@DarekParodia -> code review (X11) (C++)
*/ */
#if _MSC_VER #if _MSC_VER
@ -634,6 +635,8 @@ RGFWDEF void RGFW_setClassName(char* name);
/*! this has to be set before createWindow is called, else the fulscreen size is used */ /*! this has to be set before createWindow is called, else the fulscreen size is used */
RGFWDEF void RGFW_setBufferSize(RGFW_area size); /*!< the buffer cannot be resized (by RGFW) */ RGFWDEF void RGFW_setBufferSize(RGFW_area size); /*!< the buffer cannot be resized (by RGFW) */
/* NOTE: (windows)If the executable has an icon resource named RGFW_ICON, it will be set as the initial icon for the window.*/
RGFWDEF RGFW_window* RGFW_createWindow( RGFWDEF RGFW_window* RGFW_createWindow(
const char* name, /* name of the window */ const char* name, /* name of the window */
RGFW_rect rect, /* rect of window */ RGFW_rect rect, /* rect of window */
@ -2805,7 +2808,7 @@ Start of Linux / Unix defines
u32 i; u32 i;
win->event.type = 0; win->event.type = 0;
XEvent reply = { ClientMessage };
switch (E.type) { switch (E.type) {
case KeyPress: case KeyPress:
@ -2944,7 +2947,6 @@ Start of Linux / Unix defines
if ((win->_winArgs & RGFW_ALLOW_DND) == 0) if ((win->_winArgs & RGFW_ALLOW_DND) == 0)
break; break;
XEvent reply = { ClientMessage };
reply.xclient.window = xdnd.source; reply.xclient.window = xdnd.source;
reply.xclient.format = 32; reply.xclient.format = 32;
reply.xclient.data.l[0] = (long) win->src.window; reply.xclient.data.l[0] = (long) win->src.window;
@ -5295,7 +5297,7 @@ RGFW_UNUSED(win); /*!< if buffer rendering is not being used */
if (RGFW_Shcore_dll == NULL) { if (RGFW_Shcore_dll == NULL) {
RGFW_Shcore_dll = LoadLibraryA("shcore.dll"); RGFW_Shcore_dll = LoadLibraryA("shcore.dll");
GetDpiForMonitorSRC = (PFN_GetDpiForMonitor)(void*)GetProcAddress(RGFW_Shcore_dll, "GetDpiForMonitor"); GetDpiForMonitorSRC = (PFN_GetDpiForMonitor)(void*)GetProcAddress(RGFW_Shcore_dll, "GetDpiForMonitor");
#if defined(_WIN64) || (_WIN32_WINNT >= 0x0600) #if (_WIN32_WINNT >= 0x0600)
SetProcessDPIAware(); SetProcessDPIAware();
#endif #endif
} }
@ -5340,6 +5342,11 @@ RGFW_UNUSED(win); /*!< if buffer rendering is not being used */
Class.hCursor = LoadCursor(NULL, IDC_ARROW); Class.hCursor = LoadCursor(NULL, IDC_ARROW);
Class.lpfnWndProc = WndProc; Class.lpfnWndProc = WndProc;
Class.hIcon = LoadImageA(GetModuleHandleW(NULL), "RGFW_ICON", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
if (Class.hIcon == NULL) {
Class.hIcon = LoadImageA(NULL, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
}
RegisterClassA(&Class); RegisterClassA(&Class);
DWORD window_style = WS_CLIPSIBLINGS | WS_CLIPCHILDREN; DWORD window_style = WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
@ -5352,7 +5359,8 @@ RGFW_UNUSED(win); /*!< if buffer rendering is not being used */
if (!(args & RGFW_NO_RESIZE)) if (!(args & RGFW_NO_RESIZE))
window_style |= WS_SIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME; window_style |= WS_SIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME;
} else } else
window_style |= WS_POPUP | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX; window_style |= WS_POPUP | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX;
HWND dummyWin = CreateWindowA(Class.lpszClassName, name, window_style, win->r.x, win->r.y, win->r.w, win->r.h, 0, 0, inh, 0); HWND dummyWin = CreateWindowA(Class.lpszClassName, name, window_style, win->r.x, win->r.y, win->r.w, win->r.h, 0, 0, inh, 0);
@ -8356,17 +8364,28 @@ EM_BOOL Emscripten_on_fullscreenchange(int eventType, const EmscriptenFullscreen
RGFW_root->r = RGFW_RECT(0, 0, e->screenWidth, e->screenHeight); RGFW_root->r = RGFW_RECT(0, 0, e->screenWidth, e->screenHeight);
EM_ASM("Module.canvas.focus();");
if (fullscreen == RGFW_FALSE) { if (fullscreen == RGFW_FALSE) {
RGFW_root->r = RGFW_RECT(0, 0, ogRect.w, ogRect.h); RGFW_root->r = RGFW_RECT(0, 0, ogRect.w, ogRect.h);
// emscripten_request_fullscreen("#canvas", 0);
} else {
#if __EMSCRIPTEN_major__ >= 1 && __EMSCRIPTEN_minor__ >= 29 && __EMSCRIPTEN_tiny__ >= 0
EmscriptenFullscreenStrategy FSStrat = {0};
FSStrat.scaleMode = EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH;//EMSCRIPTEN_FULLSCREEN_SCALE_ASPECT;// : EMSCRIPTEN_FULLSCREEN_SCALE_STRETCH;
FSStrat.canvasResolutionScaleMode = EMSCRIPTEN_FULLSCREEN_CANVAS_SCALE_HIDEF;
FSStrat.filteringMode = EMSCRIPTEN_FULLSCREEN_FILTERING_DEFAULT;
emscripten_request_fullscreen_strategy("#canvas", 1, &FSStrat);
#else
emscripten_request_fullscreen("#canvas", 1);
#endif
} }
emscripten_set_canvas_element_size("#canvas", RGFW_root->r.w, RGFW_root->r.h); emscripten_set_canvas_element_size("#canvas", RGFW_root->r.w, RGFW_root->r.h);
#ifdef LEGACY_GL_EMULATION
EM_ASM("Module.canvas.focus()");
#endif
RGFW_windowResizeCallback(RGFW_root, RGFW_root->r); RGFW_windowResizeCallback(RGFW_root, RGFW_root->r);
return EM_TRUE; return EM_TRUE;
} }