reflexion 0.6.0 → 0.7.0

data/src/osx/opengl_view.mm

@@ -8,14 +8,25 @@
 #import "native_window.h"
 
 
-//#define TRANSPARENT_BACKGROUND
-
 
 @implementation OpenGLView
 
 	{
 		bool setup_context_done;
+		GLint surface_opacity;
 		NSTrackingArea* tracking_area;
+
+		// the text being composed by the input method
+		NSString* marked_text;
+
+		// the clause being converted, relative to marked_text
+		NSRange marked_selection;
+
+		// whether marked text existed when the current keyDown: started
+		BOOL was_marked;
+
+		// whether the input method handled the key in the current keyDown:
+		BOOL consumed_by_ime;
 	}
 
 	- (id) initWithFrame: (NSRect) frame
@@ -31,7 +42,12 @@
 		if (!self) return nil;
 
 		setup_context_done = false;
+		surface_opacity    = 1;
 		tracking_area      = nil;
+		marked_text        = nil;
+		marked_selection   = NSMakeRange(NSNotFound, 0);
+		was_marked         = NO;
+		consumed_by_ime    = NO;
 
 		return self;
 	}
@@ -47,12 +63,7 @@
 		[self setOpenGLContext: context];
 
 		GLint swapInterval = 1;
-		[context setValues: &swapInterval forParameter: NSOpenGLCPSwapInterval];
-
-#ifdef TRANSPARENT_BACKGROUND
-		GLint opacity = 0;
-		[context setValues: &opacity forParameter: NSOpenGLCPSurfaceOpacity];
-#endif
+		[context setValues: &swapInterval forParameter: NSOpenGLContextParameterSwapInterval];
 	}
 
 	- (void) activateContext
@@ -60,8 +71,22 @@
 		[self setupContext];
 
 		NSOpenGLContext* context = self.openGLContext;
-		if (context.view != self) [context setView: self];
+
+		// these have no replacement but Metal
+		#pragma GCC diagnostic push
+		#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+		BOOL moved = context.view != self;
+		if (moved) [context setView: self];
+		#pragma GCC diagnostic pop
+
 		[context makeCurrentContext];
+
+		GLint opacity = !self.window || self.window.isOpaque ? 1 : 0;
+		if (moved || opacity != surface_opacity)
+		{
+			surface_opacity = opacity;
+			[context setValues: &opacity forParameter: NSOpenGLContextParameterSurfaceOpacity];
+		}
 	}
 
 	- (BOOL) acceptsFirstResponder
@@ -74,32 +99,33 @@
 		return YES;
 	}
 
-#ifdef TRANSPARENT_BACKGROUND
 	- (BOOL) isOpaque
 	{
-		return YES;
+		return self.window ? self.window.isOpaque : YES;
+	}
+
+	- (BOOL) mouseDownCanMoveWindow
+	{
+		return NO;
 	}
-#endif
 
 	- (void) drawRect: (NSRect) rect
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[self activateContext];
 		[win draw];
 		[[NSOpenGLContext currentContext] flushBuffer];
+
+		if (!win.isOpaque && win.hasShadow)
+			[win invalidateShadow];// the shadow is made from what was drawn
 	}
 
 	- (void) viewDidMoveToWindow
 	{
-		[[self window] setAcceptsMouseMovedEvents: YES];
-		[[self window] makeFirstResponder: self];
-
-#ifdef TRANSPARENT_BACKGROUND
-		[[self window] setBackgroundColor: [NSColor clearColor]];
-		[[self window] setOpaque: NO];
-#endif
+		[self.window setAcceptsMouseMovedEvents: YES];
+		[self.window makeFirstResponder: self];
 	}
 
 	- (void) updateTrackingAreas
@@ -132,27 +158,28 @@
 			[tracking_area release];
 			tracking_area = nil;
 		}
+		[self clearMarkedText];
 		[super dealloc];
 	}
 
-	- (void) insertText: (id) str
-	{
-		//NSLog(@"interText: %@", str);
-	}
-
 	- (void) keyDown: (NSEvent*) event
 	{
-		//[self interpretKeyEvents: [NSArray arrayWithObject: event]];
-
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
-		[win keyDown: event];
+		was_marked      = self.hasMarkedText;
+		consumed_by_ime = NO;
+
+		if (win.isTextInputEnabled)
+			[self interpretKeyEvents: [NSArray arrayWithObject: event]];
+
+		if (!consumed_by_ime)
+			[win keyDown: event];
 	}
 
 	- (void) keyUp: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win keyUp: event];
@@ -160,7 +187,7 @@
 
 	- (void) flagsChanged: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win flagsChanged: event];
@@ -168,7 +195,7 @@
 
 	- (void) mouseDown: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseDown: event];
@@ -176,7 +203,7 @@
 
 	- (void) mouseUp: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseUp: event];
@@ -184,7 +211,7 @@
 
 	- (void) mouseDragged: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseDragged: event];
@@ -192,7 +219,7 @@
 
 	- (void) rightMouseDown: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseDown: event];
@@ -200,7 +227,7 @@
 
 	- (void) rightMouseUp: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseUp: event];
@@ -208,7 +235,7 @@
 
 	- (void) rightMouseDragged: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseDragged: event];
@@ -216,7 +243,7 @@
 
 	- (void) otherMouseDown: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseDown: event];
@@ -224,7 +251,7 @@
 
 	- (void) otherMouseUp: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseUp: event];
@@ -232,7 +259,7 @@
 
 	- (void) otherMouseDragged: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseDragged: event];
@@ -240,7 +267,7 @@
 
 	- (void) mouseMoved: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseMoved: event];
@@ -248,7 +275,7 @@
 
 	- (void) mouseEntered: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseEntered: event];
@@ -256,10 +283,124 @@
 
 	- (void) mouseExited: (NSEvent*) event
 	{
-		NativeWindow* win = (NativeWindow*) [self window];
+		NativeWindow* win = (NativeWindow*) self.window;
 		if (!win) return;
 
 		[win mouseExited: event];
 	}
 
+	static NSString*
+	to_string (id str)
+	{
+		return [str isKindOfClass: NSAttributedString.class]
+			?	[(NSAttributedString*) str string]
+			:	(NSString*) str;
+	}
+
+	- (void) insertText: (id) string replacementRange: (NSRange) range
+	{
+		NativeWindow* win = (NativeWindow*) self.window;
+		if (!win) return;
+
+		// text committed from a composition session, or inserted without a key
+		// event (candidate window, emoji palette, dictation), has no key to
+		// report, so a key event is synthesized for it.
+		// otherwise, let keyDown: deliver the original key event.
+		BOOL synthesize = was_marked || NSApp.currentEvent.type != NSEventTypeKeyDown;
+		consumed_by_ime = synthesize;
+
+		[self clearMarkedText];
+		[win textCommit: to_string(string) synthesizeKeyEvent: synthesize];
+	}
+
+	- (void) setMarkedText: (id) string
+		selectedRange: (NSRange) selection
+		replacementRange: (NSRange) range
+	{
+		NativeWindow* win = (NativeWindow*) self.window;
+		if (!win) return;
+
+		NSString* text  = to_string(string);
+		consumed_by_ime = YES;
+
+		[self clearMarkedText];
+		if (text.length > 0)
+		{
+			marked_text      = [text retain];
+			marked_selection = selection;
+		}
+
+		[win textPreedit: text selection: selection];
+	}
+
+	- (void) unmarkText
+	{
+		if (!marked_text) return;
+
+		NativeWindow* win = (NativeWindow*) self.window;
+		if (!win) return;
+
+		[self clearMarkedText];
+		[win textPreedit: @"" selection: NSMakeRange(NSNotFound, 0)];
+	}
+
+	- (BOOL) hasMarkedText
+	{
+		return marked_text != nil;
+	}
+
+	- (NSRange) markedRange
+	{
+		return marked_text
+			?	NSMakeRange(0, marked_text.length)
+			:	NSMakeRange(NSNotFound, 0);
+	}
+
+	- (NSRange) selectedRange
+	{
+		return marked_selection;
+	}
+
+	- (void) clearMarkedText
+	{
+		if (marked_text)
+		{
+			[marked_text release];
+			marked_text = nil;
+		}
+		marked_selection = NSMakeRange(NSNotFound, 0);
+	}
+
+	- (NSRect) firstRectForCharacterRange: (NSRange) range
+		actualRange: (NSRangePointer) actual
+	{
+		NativeWindow* win = (NativeWindow*) self.window;
+		if (!win) return NSZeroRect;
+
+		NSRect rect = win.textInputBounds;
+		return [win convertRectToScreen: [self convertRect: rect toView: nil]];
+	}
+
+	- (NSAttributedString*) attributedSubstringForProposedRange: (NSRange) range
+		actualRange: (NSRangePointer) actual
+	{
+		return nil;
+	}
+
+	- (NSUInteger) characterIndexForPoint: (NSPoint) point
+	{
+		return NSNotFound;
+	}
+
+	- (NSArray*) validAttributesForMarkedText
+	{
+		return [NSArray array];
+	}
+
+	- (void) doCommandBySelector: (SEL) selector
+	{
+		// NSResponder's default beeps for unhandled selectors, and keyDown:
+		// delivers the event as a key event anyway.
+	}
+
 @end// OpenGLView

data/src/osx/reflex.mm

@@ -4,6 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "reflex/exception.h"
+#include "../vk.h"
 
 
 namespace Reflex
@@ -37,5 +38,42 @@ namespace Reflex
 		global::pool = nil;
 	}
 
+	static void
+	activate_app ()
+	{
+		NSApplication* app = NSApplication.sharedApplication;
+		if (app.activationPolicy == NSApplicationActivationPolicyProhibited)
+			[app setActivationPolicy: NSApplicationActivationPolicyRegular];
+
+		[app activateIgnoringOtherApps: YES];
+	}
+
+	void
+	alert (const char* message, const char* title)
+	{
+		if (!message)
+			argument_error(__FILE__, __LINE__);
+
+		activate_app();
+
+		NSAlert* alert = [[[NSAlert alloc] init] autorelease];
+		NSString* text = [NSString stringWithUTF8String: message];
+		if (title && *title)
+		{
+			alert.messageText     = [NSString stringWithUTF8String: title];
+			alert.informativeText = text;
+		}
+		else
+			alert.messageText = text;
+
+		// in front of the other apps once runModal shows it, as macOS 14 or
+		// later lets no app launched from a terminal take the focus from it
+		[alert.window
+			performSelector: @selector(orderFrontRegardless)
+			withObject: nil afterDelay: 0 inModes: @[NSModalPanelRunLoopMode]];
+
+		[alert runModal];
+	}
+
 
 }// Reflex

data/src/osx/screen.mm

@@ -2,6 +2,7 @@
 #include "screen.h"
 
 
+#import <AppKit/AppKit.h>
 #include "reflex/exception.h"
 
 
@@ -43,6 +44,19 @@ namespace Reflex
 	{
 	}
 
+	String
+	Screen::name () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		const char* name = NULL;
+		if (@available(macOS 10.15, *))
+			name = self->screen.localizedName.UTF8String;
+
+		return name ? name : "";
+	}
+
 	Bounds
 	Screen::frame () const
 	{
@@ -57,6 +71,15 @@ namespace Reflex
 			f.size.height);
 	}
 
+	float
+	Screen::pixel_density () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		return self->screen.backingScaleFactor;
+	}
+
 	Screen::operator bool () const
 	{
 		return self->screen;
@@ -68,5 +91,18 @@ namespace Reflex
 		return !operator bool();
 	}
 
+	Screen::List
+	Screen::all ()
+	{
+		List list;
+		for (NSScreen* screen in NSScreen.screens)
+		{
+			Screen s;
+			Screen_initialize(&s, screen);
+			list.emplace_back(s);
+		}
+		return list;
+	}
+
 
 }// Reflex

data/src/osx/window.mm

@@ -36,20 +36,18 @@ namespace Reflex
 	NSWindowStyleMask
 	Window_make_style_mask (uint flags, NSWindowStyleMask styleMask)
 	{
-		if (Xot::has_flag(flags, Window::FLAG_CLOSABLE))
-			styleMask |=  NSWindowStyleMaskClosable;
-		else
-			styleMask &= ~NSWindowStyleMaskClosable;
-
-		if (Xot::has_flag(flags, Window::FLAG_MINIMIZABLE))
-			styleMask |=  NSWindowStyleMaskMiniaturizable;
-		else
-			styleMask &= ~NSWindowStyleMaskMiniaturizable;
-
-		if (Xot::has_flag(flags, Window::FLAG_RESIZABLE))
-			styleMask |=  NSWindowStyleMaskResizable;
-		else
-			styleMask &= ~NSWindowStyleMaskResizable;
+		Xot::update_flag(
+			&styleMask, NSWindowStyleMaskClosable,
+			Xot::has_flag(flags, Window::FLAG_CLOSABLE));
+		Xot::update_flag(
+			&styleMask, NSWindowStyleMaskMiniaturizable,
+			Xot::has_flag(flags, Window::FLAG_MINIMIZABLE));
+		Xot::update_flag(
+			&styleMask, NSWindowStyleMaskResizable,
+			Xot::has_flag(flags, Window::FLAG_RESIZABLE));
+		Xot::update_flag(
+			&styleMask, NSWindowStyleMaskFullSizeContentView,
+			!Xot::has_flag(flags, Window::FLAG_TITLEBAR_BACKGROUND));
 
 		return styleMask;
 	}
@@ -75,9 +73,12 @@ namespace Reflex
 	Window_default_flags ()
 	{
 		return
-			Window::FLAG_CLOSABLE  |
-			Window::FLAG_RESIZABLE |
-			Window::FLAG_MINIMIZABLE;
+			Window::FLAG_CLOSABLE            |
+			Window::FLAG_MINIMIZABLE         |
+			Window::FLAG_RESIZABLE           |
+			Window::FLAG_TITLEBAR_BUTTONS    |
+			Window::FLAG_TITLEBAR_BACKGROUND |
+			Window::FLAG_SHADOW;
 	}
 
 	void
@@ -127,10 +128,12 @@ namespace Reflex
 	void
 	Window_set_frame (Window* window, coord x, coord y, coord w, coord h)
 	{
-		NSRect f   = [NativeWindow frameRectForContentRect: NSMakeRect(x, y, w, h)];
-		f.origin.y = primary_screen_height() - (f.origin.y + h);
+		NativeWindow* native = get_native(window);
 
-		[get_native(window) setFrame: f display: NO animate: NO];
+		NSRect r   = [native frameRectForContentRect: NSMakeRect(x, y, w, h)];
+		r.origin.y = primary_screen_height() - (y + h);
+
+		[native setFrame: r display: NO animate: NO];
 	}
 
 	Bounds
@@ -138,10 +141,10 @@ namespace Reflex
 	{
 		NativeWindow* native = get_native(&window);
 
-		NSRect f   = [native contentRectForFrameRect: native.frame];
-		f.origin.y = primary_screen_height() - (f.origin.y + f.size.height);
+		NSRect r   = [native contentRectForFrameRect: native.frame];
+		r.origin.y = primary_screen_height() - (r.origin.y + r.size.height);
 
-		return Bounds(f.origin.x, f.origin.y, f.size.width, f.size.height);
+		return Bounds(r.origin.x, r.origin.y, r.size.width, r.size.height);
 	}
 
 	void
@@ -174,13 +177,47 @@ namespace Reflex
 
 		NativeWindow* native        = get_native(window);
 		NSWindowStyleMask styleMask =
-			Window_make_style_mask(window->self->flags, native.styleMask);
+			Window_make_style_mask(flags, native.styleMask);
 
 		if (styleMask != native.styleMask)
+		{
+			NSRect content   = [native contentRectForFrameRect: native.frame];
 			native.styleMask = styleMask;
+			[native setFrame: [native frameRectForContentRect: content] display: YES];
+		}
+
+		bool buttons    = Xot::has_flag(flags, Window::FLAG_TITLEBAR_BUTTONS);
+		bool background = Xot::has_flag(flags, Window::FLAG_TITLEBAR_BACKGROUND);
+		[native setTitlebarButtonsVisible:    buttons];
+		[native setTitlebarBackgroundVisible: background];
+		[native setTitlebarContainerVisible:  buttons || background];
+
+		NSWindowCollectionBehavior behavior = native.collectionBehavior;
+		if (Xot::has_flag(flags, Window::FLAG_UNLISTED))
+		{
+			behavior &= ~NSWindowCollectionBehaviorManaged;
+			behavior |=  NSWindowCollectionBehaviorTransient;
+		}
+		else
+		{
+			behavior &= ~NSWindowCollectionBehaviorTransient;
+			behavior |=  NSWindowCollectionBehaviorManaged;
+		}
+		native.collectionBehavior = behavior;
+
+		native.hasShadow = Xot::has_flag(flags, Window::FLAG_SHADOW);
+
+		[native setBackgroundTransparent: Xot::has_flag(flags, Window::FLAG_TRANSPARENT)];
 
 		if (native.hasFullScreenFlag != Xot::has_flag(flags, Window::FLAG_FULLSCREEN))
 			[native toggleFullScreen: native];
+
+		if (Xot::has_flag(flags, Window::FLAG_ALWAYS_ON_TOP))
+			native.level = NSFloatingWindowLevel;
+		else if (Xot::has_flag(flags, Window::FLAG_ALWAYS_ON_BOTTOM))
+			native.level = NSNormalWindowLevel - 1;
+		else
+			native.level = NSNormalWindowLevel;
 	}
 
 	float
@@ -189,5 +226,50 @@ namespace Reflex
 		return get_native(&window).backingScaleFactor;
 	}
 
+	void
+	Window_set_pointer_through (Window* window, bool through)
+	{
+		get_native(window).ignoresMouseEvents = through ? YES : NO;
+	}
+
+	static bool
+	is_covered_by_another_window (NativeWindow* native, NSPoint screen_pos)
+	{
+		// only a window that takes mouse events counts as covering. when
+		// the frontmost window at the point is also the frontmost behind
+		// this window, nothing sits between them, so nothing is in front
+		// of this window. this holds while the window ignores mouse events
+		// too, since the hit test then skips the window itself
+
+		NSInteger hit = [NSWindow
+			windowNumberAtPoint: screen_pos
+			belowWindowWithWindowNumber: 0];
+		if (hit == 0 || hit == native.windowNumber)
+			return false;
+
+		NSInteger behind = [NSWindow
+			windowNumberAtPoint: screen_pos
+			belowWindowWithWindowNumber: native.windowNumber];
+		return hit != behind;
+	}
+
+	bool
+	Window_is_pointer_over_and_uncovered (Point* position, const Window& window)
+	{
+		NativeWindow* native = get_native(&window);
+		NSPoint screen_pos   = [NSEvent mouseLocation];
+		if (!NSPointInRect(screen_pos, native.frame))
+			return false;
+		if (is_covered_by_another_window(native, screen_pos))
+			return false;
+
+		NSRect screen_rect = NSMakeRect(screen_pos.x, screen_pos.y, 0, 0);
+		NSRect window_rect = [native convertRectFromScreen: screen_rect];
+		NSView* view       = native.contentView;
+		NSPoint view_pos   = [view convertPoint: window_rect.origin fromView: nil];
+		position->reset(view_pos.x, view.bounds.size.height - view_pos.y);
+		return true;
+	}
+
 
 }// Reflex

data/src/pointer.cpp

@@ -86,19 +86,28 @@ namespace Reflex
 		it->self->id = id;
 	}
 
+	void
+	Pointer_set_types (Pointer* it, uint types)
+	{
+		it->self->types = types;
+	}
+
 	void
 	Pointer_set_action (Pointer* it, Pointer::Action action)
 	{
 		it->self->action = action;
 	}
 
+	void
+	Pointer_set_time (Pointer* it, double time)
+	{
+		it->self->time = time;
+	}
+
 	void
 	Pointer_set_floatable (Pointer* it, bool floatable)
 	{
-		if (floatable)
-			Xot::add_flag(&it->self->flags, Pointer::Data::FLOATABLE);
-		else
-			Xot::remove_flag(&it->self->flags, Pointer::Data::FLOATABLE);
+		Xot::update_flag(&it->self->flags, Pointer::Data::FLOATABLE, floatable);
 	}
 
 	bool