aboutsummaryrefslogtreecommitdiff
path: root/pugl
diff options
context:
space:
mode:
authorGravatar David Robillard <d@drobilla.net>2016-10-26 17:24:28 -0400
committerGravatar David Robillard <d@drobilla.net>2016-10-26 17:24:28 -0400
commit5afaf317c6380c4d950473408a94116a46f333cf (patch)
treec44705e4e3aa7930809a71e37258b11555f95ef0 /pugl
parent7da29d759ad71bcb667704a9f6d9e2894dad0167 (diff)
downloadsynthpod-5afaf317c6380c4d950473408a94116a46f333cf.zip
synthpod-5afaf317c6380c4d950473408a94116a46f333cf.tar.gz
synthpod-5afaf317c6380c4d950473408a94116a46f333cf.tar.bz2
synthpod-5afaf317c6380c4d950473408a94116a46f333cf.tar.xz
Fix OSX build
Diffstat (limited to 'pugl')
-rw-r--r--pugl/pugl_osx.m49
1 files changed, 29 insertions, 20 deletions
diff --git a/pugl/pugl_osx.m b/pugl/pugl_osx.m
index f495811..e8ecc98 100644
--- a/pugl/pugl_osx.m
+++ b/pugl/pugl_osx.m
@@ -109,14 +109,6 @@ struct PuglInternalsImpl {
@end
-static void
-puglDisplay(PuglView* view)
-{
- if (view->displayFunc) {
- view->displayFunc(view);
- }
-}
-
@interface PuglOpenGLView : NSOpenGLView
{
@public
@@ -211,7 +203,18 @@ puglDisplay(PuglView* view)
- (void) drawRect:(NSRect)rect
{
- puglDisplay(puglview);
+ const PuglEventExpose ev = {
+ PUGL_EXPOSE,
+ puglview,
+ 0,
+ rect.origin.x,
+ rect.origin.y,
+ rect.size.width,
+ rect.size.height,
+ 0
+ };
+
+ puglDispatchEvent(puglview, (const PuglEvent*)&ev);
#ifdef PUGL_HAVE_CAIRO
if (puglview->ctx_type & PUGL_CAIRO) {
@@ -219,8 +222,6 @@ puglDisplay(PuglView* view)
&puglview->impl->cairo_gl, puglview->width, puglview->height);
}
#endif
-
- [[self openGLContext] flushBuffer];
}
- (BOOL) acceptsFirstResponder
@@ -233,8 +234,6 @@ getModifiers(PuglView* view, NSEvent* ev)
{
const unsigned modifierFlags = [ev modifierFlags];
- view->event_timestamp_ms = fmod([ev timestamp] * 1000.0, UINT32_MAX);
-
unsigned mods = 0;
mods |= (modifierFlags & NSShiftKeyMask) ? PUGL_MOD_SHIFT : 0;
mods |= (modifierFlags & NSControlKeyMask) ? PUGL_MOD_CTRL : 0;
@@ -434,7 +433,8 @@ getModifiers(PuglView* view, NSEvent* ev)
- (void) flagsChanged:(NSEvent*)event
{
- if (puglview->specialFunc) {
+ // TODO: Is this a sensible way to handle special keys?
+ /*
const unsigned mods = getModifiers(puglview, event);
if ((mods & PUGL_MOD_SHIFT) != (puglview->mods & PUGL_MOD_SHIFT)) {
puglview->specialFunc(puglview, mods & PUGL_MOD_SHIFT, PUGL_KEY_SHIFT);
@@ -447,6 +447,7 @@ getModifiers(PuglView* view, NSEvent* ev)
}
puglview->mods = mods;
}
+ */
}
@end
@@ -585,13 +586,21 @@ puglWaitForEvent(PuglView* view)
PuglStatus
puglProcessEvents(PuglView* view)
{
- if (!view->impl->nextEvent) {
- view->impl->nextEvent = [view->impl->window
- nextEventMatchingMask: NSAnyEventMask];
- }
+ while (true) {
+ // Get the next event, or use the cached one from puglWaitForEvent
+ if (!view->impl->nextEvent) {
+ view->impl->nextEvent = [view->impl->window
+ nextEventMatchingMask: NSAnyEventMask];
+ }
+
+ if (!view->impl->nextEvent) {
+ break; // No events to process, done
+ }
- [view->impl->app sendEvent: view->impl->nextEvent];
- view->impl->nextEvent = NULL;
+ // Dispatch event
+ [view->impl->app sendEvent: view->impl->nextEvent];
+ view->impl->nextEvent = NULL;
+ }
return PUGL_SUCCESS;
}