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

update RGFW (fix X11 bug)

Browse Source
This commit is contained in:
ColleagueRiley 2024-11-27 20:45:01 -05:00
parent f1cf7bf349
commit 77f23bcc6a
1 changed files with 521 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/external/RGFW.h vendored
View File

@ -1790,12 +1790,12 @@ u32 RGFW_window_checkFPS(RGFW_window* win, u32 fpsCap) {
u64 deltaTime = RGFW_getTimeNS() - win->event.frameTime; u64 deltaTime = RGFW_getTimeNS() - win->event.frameTime;
u32 output_fps = 0; u32 output_fps = 0;
u64 fps = (u64)round(1e+9 / deltaTime); u64 fps = round(1e+9 / deltaTime);
output_fps= fps; output_fps= fps;
if (fpsCap && fps > fpsCap) { if (fpsCap && fps > fpsCap) {
u64 frameTimeNS = (u64)(1e+9 / fpsCap); u64 frameTimeNS = 1e+9 / fpsCap;
u64 sleepTimeMS = (u64)((frameTimeNS - deltaTime) / 1e6); u64 sleepTimeMS = (frameTimeNS - deltaTime) / 1e6;
if (sleepTimeMS > 0) { if (sleepTimeMS > 0) {
RGFW_sleep(sleepTimeMS); RGFW_sleep(sleepTimeMS);
@ -1809,7 +1809,7 @@ u32 RGFW_window_checkFPS(RGFW_window* win, u32 fpsCap) {
return (u32) output_fps; return (u32) output_fps;
deltaTime = RGFW_getTimeNS() - win->event.frameTime2; deltaTime = RGFW_getTimeNS() - win->event.frameTime2;
output_fps = (u64)round(1e+9 / deltaTime); output_fps = round(1e+9 / deltaTime);
win->event.frameTime2 = RGFW_getTimeNS(); win->event.frameTime2 = RGFW_getTimeNS();
return output_fps; return output_fps;
@ -2662,13 +2662,14 @@ Start of Linux / Unix defines
} }
if (args & RGFW_NO_RESIZE) { /* make it so the user can't resize the window*/ if (args & RGFW_NO_RESIZE) { /* make it so the user can't resize the window*/
XSizeHints* sh = XAllocSizeHints(); XSizeHints sh = {0};
sh->flags = (1L << 4) | (1L << 5); sh.flags = (1L << 4) | (1L << 5);
sh->min_width = sh->max_width = win->r.w; sh.min_width = sh.max_width = win->r.w;
sh->min_height = sh->max_height = win->r.h; sh.min_height = sh.max_height = win->r.h;
XSetWMSizeHints((Display*) win->src.display, (Drawable) win->src.window, sh, XA_WM_NORMAL_HINTS); XSetWMSizeHints((Display*) win->src.display, (Drawable) win->src.window, &sh, XA_WM_NORMAL_HINTS);
XFree(sh);
win->_winArgs |= RGFW_NO_RESIZE;
} }
if (args & RGFW_NO_BORDER) { if (args & RGFW_NO_BORDER) {
@ -3234,7 +3235,18 @@ Start of Linux / Unix defines
win->r.w = a.w; win->r.w = a.w;
win->r.h = a.h; win->r.h = a.h;
XResizeWindow((Display*) win->src.display, (Window) win->src.window, a.w, a.h); XResizeWindow((Display*) win->src.display, (Window) win->src.window, a.w, a.h);
if (!(win->_winArgs & RGFW_NO_RESIZE))
return;
XSizeHints sh = {0};
sh.flags = (1L << 4) | (1L << 5);
sh.min_width = sh.max_width = a.w;
sh.min_height = sh.max_height = a.h;
XSetWMSizeHints((Display*) win->src.display, (Drawable) win->src.window, &sh, XA_WM_NORMAL_HINTS);
} }
void RGFW_window_setMinSize(RGFW_window* win, RGFW_area a) { void RGFW_window_setMinSize(RGFW_window* win, RGFW_area a) {