b/minifb-zig-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from lkesteloot/master

Browse Source 
Fix size of window on MacOS.
This commit is contained in:
Carlos Aragonés 2020-04-22 15:28:56 +02:00 committed by GitHub
commit c381721dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 543 additions and 630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/macosx/MacMiniFB.m
View File

@ -10,8 +10,6 @@
#include <MetalKit/MetalKit.h> #include <MetalKit/MetalKit.h>
#endif #endif
#include <unistd.h> #include <unistd.h>
#include <sched.h>
#include <mach/mach_time.h>
void init_keycodes(); void init_keycodes();
@ -196,7 +194,8 @@ mfb_open_ex(const char *title, unsigned width, unsigned height, unsigned flags)
styles |= NSWindowStyleMaskResizable; styles |= NSWindowStyleMaskResizable;
NSRect rectangle = NSMakeRect(0, 0, width, height); NSRect rectangle = NSMakeRect(0, 0, width, height);
window_data_osx->window = [[OSXWindow alloc] initWithContentRect:rectangle styleMask:styles backing:NSBackingStoreBuffered defer:NO windowData:window_data]; NSRect frameRect = [NSWindow frameRectForContentRect:rectangle styleMask:styles];
window_data_osx->window = [[OSXWindow alloc] initWithContentRect:frameRect styleMask:styles backing:NSBackingStoreBuffered defer:NO windowData:window_data];
if (!window_data_osx->window) if (!window_data_osx->window)
return 0x0; return 0x0;
@ -252,7 +251,6 @@ mfb_open_ex(const char *title, unsigned width, unsigned height, unsigned flags)
[window_data_osx->window setAcceptsMouseMovedEvents:YES]; [window_data_osx->window setAcceptsMouseMovedEvents:YES];
[window_data_osx->window center]; [window_data_osx->window center];
window_data_osx->timer = mfb_timer_create();
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
@ -289,8 +287,6 @@ destroy_window_data(SWindowData *window_data)
[window removeWindowData]; [window removeWindowData];
[window performClose:nil]; [window performClose:nil];
mfb_timer_destroy(window_data_osx->timer);
memset(window_data_osx, 0, sizeof(SWindowData_OSX)); memset(window_data_osx, 0, sizeof(SWindowData_OSX));
free(window_data_osx); free(window_data_osx);
} }
@ -308,12 +304,14 @@ update_events(SWindowData *window_data)
NSEvent* event; NSEvent* event;
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
do { do
{
event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES]; event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
if (event) { if (event) {
[NSApp sendEvent:event]; [NSApp sendEvent:event];
} }
} while ((window_data->close == false) && event); }
while ((window_data->close == false) && event);
[pool release]; [pool release];
} }
@ -378,59 +376,6 @@ mfb_update_events(struct mfb_window *window)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
extern double g_time_for_frame;
bool
mfb_wait_sync(struct mfb_window *window)
{
NSEvent* event;
if(window == 0x0) {
return STATE_INVALID_WINDOW;
}
SWindowData *window_data = (SWindowData *) window;
if(window_data->close) {
destroy_window_data(window_data);
return false;
}
//NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
SWindowData_OSX *window_data_osx = (SWindowData_OSX *) window_data->specific;
double current;
uint32_t millis = 1;
while(1) {
event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
if (event) {
[NSApp sendEvent:event];
}
if(window_data->close) {
destroy_window_data(window_data);
return false;
}
current = mfb_timer_now(window_data_osx->timer);
if (current >= g_time_for_frame) {
mfb_timer_reset(window_data_osx->timer);
return true;
}
else if(current >= g_time_for_frame * 0.8) {
millis = 0;
}
usleep(millis * 1000);
//sched_yield();
}
//[pool release];
return true;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool bool
mfb_set_viewport(struct mfb_window *window, unsigned offset_x, unsigned offset_y, unsigned width, unsigned height) mfb_set_viewport(struct mfb_window *window, unsigned offset_x, unsigned offset_y, unsigned width, unsigned height)
{ {
@ -596,35 +541,3 @@ init_keycodes()
g_keycodes[0x43] = KB_KEY_KP_MULTIPLY; g_keycodes[0x43] = KB_KEY_KP_MULTIPLY;
g_keycodes[0x4E] = KB_KEY_KP_SUBTRACT; g_keycodes[0x4E] = KB_KEY_KP_SUBTRACT;
} }
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
extern double g_timer_frequency;
extern double g_timer_resolution;
uint64_t
mfb_timer_tick() {
static mach_timebase_info_data_t timebase = { 0 };
if (timebase.denom == 0) {
(void) mach_timebase_info(&timebase);
}
uint64_t time = mach_absolute_time();
//return (time * s_timebase_info.numer) / s_timebase_info.denom;
// Perform the arithmetic at 128-bit precision to avoid the overflow!
uint64_t high = (time >> 32) * timebase.numer;
uint64_t highRem = ((high % timebase.denom) << 32) / timebase.denom;
uint64_t low = (time & 0xFFFFFFFFull) * timebase.numer / timebase.denom;
high /= timebase.denom;
return (high << 32) + highRem + low;
}
void
mfb_timer_init() {
g_timer_frequency = 1e+9;
g_timer_resolution = 1.0 / g_timer_frequency;
}