reflexion 0.6.0 → 0.7.0

data/src/osx/menu.mm

@@ -8,19 +8,13 @@
 #include "reflex/exception.h"
 #include "reflex/event.h"
 #include "reflex/view.h"
+#include "../rays.h"
 #include "window.h"
 #include "screen.h"
 #import "native_window.h"
 
 
-namespace Rays
-{
-	NSImage* Bitmap_get_nsimage (const Bitmap& bmp);
-}
-
-
 @interface ReflexMenuTarget : NSObject <NSMenuDelegate>
-	- (void) handleMenuItem: (NSMenuItem*) sender;
 @end
 
 
@@ -149,6 +143,126 @@ namespace Reflex
 		return new MenuData();
 	}
 
+	void
+	Menu_validate_shortcut_modifiers (uint modifiers)
+	{
+		static const uint SUPPORTED =
+			MOD_SHIFT | MOD_CONTROL | MOD_ALT | MOD_OPTION | MOD_COMMAND;
+
+		if (modifiers & ~SUPPORTED)
+		{
+			argument_error(
+				__FILE__, __LINE__,
+				"modifiers 0x%X can not be used for a shortcut on macOS.",
+				modifiers & ~SUPPORTED);
+		}
+	}
+
+	static NSString*
+	get_keyequivalent_string (int key)
+	{
+		using namespace Reflex;
+		switch (key)
+		{
+			#define KEY_STR(key) [NSString stringWithFormat: @"%C", (unichar) (key)]
+
+			case KEY_A: return @"a";
+			case KEY_B: return @"b";
+			case KEY_C: return @"c";
+			case KEY_D: return @"d";
+			case KEY_E: return @"e";
+			case KEY_F: return @"f";
+			case KEY_G: return @"g";
+			case KEY_H: return @"h";
+			case KEY_I: return @"i";
+			case KEY_J: return @"j";
+			case KEY_K: return @"k";
+			case KEY_L: return @"l";
+			case KEY_M: return @"m";
+			case KEY_N: return @"n";
+			case KEY_O: return @"o";
+			case KEY_P: return @"p";
+			case KEY_Q: return @"q";
+			case KEY_R: return @"r";
+			case KEY_S: return @"s";
+			case KEY_T: return @"t";
+			case KEY_U: return @"u";
+			case KEY_V: return @"v";
+			case KEY_W: return @"w";
+			case KEY_X: return @"x";
+			case KEY_Y: return @"y";
+			case KEY_Z: return @"z";
+
+			case KEY_0: return @"0";
+			case KEY_1: return @"1";
+			case KEY_2: return @"2";
+			case KEY_3: return @"3";
+			case KEY_4: return @"4";
+			case KEY_5: return @"5";
+			case KEY_6: return @"6";
+			case KEY_7: return @"7";
+			case KEY_8: return @"8";
+			case KEY_9: return @"9";
+
+			case KEY_MINUS:     return @"-";
+			case KEY_EQUAL:     return @"=";
+			case KEY_COMMA:     return @",";
+			case KEY_PERIOD:    return @".";
+			case KEY_SEMICOLON: return @";";
+			case KEY_QUOTE:     return @"'";
+			case KEY_SLASH:     return @"/";
+			case KEY_BACKSLASH: return @"\\";
+			case KEY_GRAVE:     return @"`";
+			case KEY_LBRACKET:  return @"[";
+			case KEY_RBRACKET:  return @"]";
+
+			case KEY_ENTER:     return @"\r";
+			case KEY_SPACE:     return @" ";
+			case KEY_TAB:       return @"\t";
+			case KEY_ESCAPE:    return @"\033";
+			case KEY_BACKSPACE: return @"\b";
+			case KEY_DELETE:    return KEY_STR(NSDeleteFunctionKey);
+			case KEY_INSERT:    return KEY_STR(NSInsertFunctionKey);
+
+			case KEY_LEFT:     return KEY_STR(NSLeftArrowFunctionKey);
+			case KEY_RIGHT:    return KEY_STR(NSRightArrowFunctionKey);
+			case KEY_UP:       return KEY_STR(NSUpArrowFunctionKey);
+			case KEY_DOWN:     return KEY_STR(NSDownArrowFunctionKey);
+			case KEY_HOME:     return KEY_STR(NSHomeFunctionKey);
+			case KEY_END:      return KEY_STR(NSEndFunctionKey);
+			case KEY_PAGEUP:   return KEY_STR(NSPageUpFunctionKey);
+			case KEY_PAGEDOWN: return KEY_STR(NSPageDownFunctionKey);
+
+			case KEY_F1:  return KEY_STR(NSF1FunctionKey);
+			case KEY_F2:  return KEY_STR(NSF2FunctionKey);
+			case KEY_F3:  return KEY_STR(NSF3FunctionKey);
+			case KEY_F4:  return KEY_STR(NSF4FunctionKey);
+			case KEY_F5:  return KEY_STR(NSF5FunctionKey);
+			case KEY_F6:  return KEY_STR(NSF6FunctionKey);
+			case KEY_F7:  return KEY_STR(NSF7FunctionKey);
+			case KEY_F8:  return KEY_STR(NSF8FunctionKey);
+			case KEY_F9:  return KEY_STR(NSF9FunctionKey);
+			case KEY_F10: return KEY_STR(NSF10FunctionKey);
+			case KEY_F11: return KEY_STR(NSF11FunctionKey);
+			case KEY_F12: return KEY_STR(NSF12FunctionKey);
+			case KEY_F13: return KEY_STR(NSF13FunctionKey);
+			case KEY_F14: return KEY_STR(NSF14FunctionKey);
+			case KEY_F15: return KEY_STR(NSF15FunctionKey);
+			case KEY_F16: return KEY_STR(NSF16FunctionKey);
+			case KEY_F17: return KEY_STR(NSF17FunctionKey);
+			case KEY_F18: return KEY_STR(NSF18FunctionKey);
+			case KEY_F19: return KEY_STR(NSF19FunctionKey);
+			case KEY_F20: return KEY_STR(NSF20FunctionKey);
+			case KEY_F21: return KEY_STR(NSF21FunctionKey);
+			case KEY_F22: return KEY_STR(NSF22FunctionKey);
+			case KEY_F23: return KEY_STR(NSF23FunctionKey);
+			case KEY_F24: return KEY_STR(NSF24FunctionKey);
+
+			#undef KEY_STR
+		}
+		return @"";
+	}
+
 	static NSEventModifierFlags
 	modifiers2mask (uint mods)
 	{
@@ -197,7 +311,7 @@ namespace Reflex
 		[self.nsitem setTitle: [NSString stringWithUTF8String: menu->label()]];
 		[self.nsitem setEnabled: menu->is_enabled() ? YES : NO];
 		[self.nsitem setState: menu->is_checked() ? NSControlStateValueOn : NSControlStateValueOff];
-		[self.nsitem setKeyEquivalent: [NSString stringWithUTF8String: menu->shortcut_key()]];
+		[self.nsitem setKeyEquivalent: get_keyequivalent_string(menu->shortcut_key())];
 		[self.nsitem setKeyEquivalentModifierMask: modifiers2mask(menu->shortcut_modifiers())];
 		[self.nsitem setImage: menu->image() ? Rays::Bitmap_get_nsimage(menu->image().bitmap()) : nil];
 		[self.nsitem setSubmenu: menu->empty() ? nil : self.nssubmenu];
@@ -206,6 +320,8 @@ namespace Reflex
 	void
 	Menu_popup (Menu* menu, View* view, coord x, coord y)
 	{
+		Menu_cancel_active_pointers_for_popup(view);
+
 		MenuData& self = get_data(menu);
 
 		if (!self.nssubmenu)
@@ -289,15 +405,57 @@ namespace Reflex
 }// Reflex
 
 
+static NSMenuItem*
+find_key_equivalent_item (NSMenu* nsmenu, NSEvent* event)
+{
+	static const NSEventModifierFlags KEY_EQUIVALENT_MODIFIER_MASK =
+		NSEventModifierFlagCommand |
+		NSEventModifierFlagShift   |
+		NSEventModifierFlagOption  |
+		NSEventModifierFlagControl;
+
+	if (event.type != NSEventTypeKeyDown)
+		return nil;
+
+	NSEventModifierFlags mods = event.modifierFlags & KEY_EQUIVALENT_MODIFIER_MASK;
+	NSString* chars           = event.charactersIgnoringModifiers;
+
+	for (NSMenuItem* nsitem in nsmenu.itemArray)
+	{
+		if (!nsitem.enabled) continue;
+
+		if (nsitem.hasSubmenu)
+		{
+			NSMenuItem* found = find_key_equivalent_item(nsitem.submenu, event);
+			if (found) return found;
+		}
+		else if (
+			nsitem.keyEquivalent.length > 0          &&
+			nsitem.keyEquivalentModifierMask == mods &&
+			[nsitem.keyEquivalent isEqualToString: chars])
+		{
+			return nsitem;
+		}
+	}
+	return nil;
+}
+
+
 @implementation ReflexMenuTarget
 
-	- (void) handleMenuItem: (NSMenuItem*) nsitem
+	- (void) handleMenuItem: (id) sender
 	{
+		NSMenuItem* nsitem = nil;
+		if ([sender isKindOfClass: NSMenuItem.class])
+			nsitem = (NSMenuItem*) sender;
+		else if ([sender isKindOfClass: NSMenu.class])
+			nsitem = find_key_equivalent_item((NSMenu*) sender, NSApp.currentEvent);
+
 		Reflex::Menu* menu = get_owner(nsitem);
 		if (!menu) return;
 
 		Reflex::Event e;
-		menu->on_click(&e);
+		Reflex::Menu_call_click_event(menu, &e);
 	}
 
 	- (void) menuWillOpen: (NSMenu*) nsmenu
@@ -308,7 +466,7 @@ namespace Reflex
 		if (!menu) return;
 
 		Reflex::Event e;
-		menu->on_open_submenu(&e);
+		Reflex::Menu_call_open_submenu_event(menu, &e);
 
 		for (NSMenuItem* nsitem in nsmenu.itemArray)
 		{
@@ -316,7 +474,7 @@ namespace Reflex
 			if (!child) continue;
 
 			Reflex::Event ce;
-			child->on_show(&ce);
+			Reflex::Menu_call_show_event(child, &ce);
 		}
 	}
 
@@ -331,11 +489,11 @@ namespace Reflex
 			if (!child) continue;
 
 			Reflex::Event ce;
-			child->on_hide(&ce);
+			Reflex::Menu_call_hide_event(child, &ce);
 		}
 
 		Reflex::Event e;
-		menu->on_close_submenu(&e);
+		Reflex::Menu_call_close_submenu_event(menu, &e);
 	}
 
 	- (BOOL) menuHasKeyEquivalent: (NSMenu*) nsmenu
@@ -346,27 +504,13 @@ namespace Reflex
 		// answer key equivalent matching ourselves: AppKit's own scanning of
 		// delegate-backed menus caches stale results across setMainMenu calls,
 		// leaving every shortcut dead until the menu bar is clicked once
-		static const NSEventModifierFlags MODIFIER_MASK =
-			NSEventModifierFlagCommand |
-			NSEventModifierFlagShift   |
-			NSEventModifierFlagOption  |
-			NSEventModifierFlagControl;
 
-		NSEventModifierFlags mods = event.modifierFlags & MODIFIER_MASK;
-		NSString* chars           = event.charactersIgnoringModifiers;
+		NSMenuItem* nsitem = find_key_equivalent_item(nsmenu, event);
+		if (!nsitem) return NO;
 
-		for (NSMenuItem* nsitem in nsmenu.itemArray)
-		{
-			if (nsitem.hasSubmenu || !nsitem.enabled)           continue;
-			if (nsitem.keyEquivalent.length == 0)               continue;
-			if (nsitem.keyEquivalentModifierMask != mods)       continue;
-			if (![nsitem.keyEquivalent isEqualToString: chars]) continue;
-
-			*target = nsitem.target;
-			*action = nsitem.action;
-			return YES;
-		}
-		return NO;
+		*target = nsitem.target;
+		*action = nsitem.action;
+		return YES;
 	}
 
 @end// ReflexMenuTarget

data/src/osx/native_window.h

@@ -4,10 +4,24 @@
 
 @interface NativeWindow : NSWindow <NSWindowDelegate>
 
-	- (void) draw;
+	- (void) setTitlebarBackgroundVisible: (BOOL) visible;
+
+	- (void) setTitlebarButtonsVisible: (BOOL) visible;
+
+	- (void) setTitlebarContainerVisible: (BOOL) visible;
+
+	- (void) setBackgroundTransparent: (BOOL) transparent;
 
 	- (BOOL) hasFullScreenFlag;
 
-	+ (NSRect) frameRectForContentRect: (NSRect) contentRect;
+	- (void) draw;
+
+	- (BOOL) isTextInputEnabled;
+
+	- (void) textPreedit: (NSString*) text selection: (NSRange) selection;
+
+	- (void) textCommit: (NSString*) text synthesizeKeyEvent: (BOOL) synthesize;
+
+	- (NSRect) textInputBounds;
 
 @end// NativeWindow

data/src/osx/native_window.mm

@@ -6,6 +6,7 @@
 #import <Cocoa/Cocoa.h>
 #include <rays/rays.h>
 #include "reflex/exception.h"
+#include "../application.h"
 #include "../view.h"
 #include "../pointer.h"
 #include "event.h"
@@ -19,7 +20,7 @@ default_style_mask ()
 {
 	return Reflex::Window_make_style_mask(
 		Reflex::Window_default_flags(),
-		NSTitledWindowMask | NSTexturedBackgroundWindowMask);
+		NSWindowStyleMaskTitled);
 }
 
 static void
@@ -199,6 +200,49 @@ move_to_main_screen_origin (NativeWindow* window)
 		timer = nil;
 	}
 
+	- (void) setTitlebarBackgroundVisible: (BOOL) visible
+	{
+		self.titlebarAppearsTransparent = !visible;
+		self.titleVisibility            =
+			visible ? NSWindowTitleVisible : NSWindowTitleHidden;
+	}
+
+	- (void) setTitlebarButtonsVisible: (BOOL) visible
+	{
+		NSWindowButton buttons[] = {
+			NSWindowCloseButton,
+			NSWindowMiniaturizeButton,
+			NSWindowZoomButton
+		};
+		for (auto button : buttons)
+			[self standardWindowButton: button].hidden = !visible;
+	}
+
+	- (void) setTitlebarContainerVisible: (BOOL) visible
+	{
+		// the titlebar keeps a backdrop that a see-through window shows as a shadow
+		NSView* container =
+			[self standardWindowButton: NSWindowCloseButton].superview.superview;
+		if ([container isKindOfClass: NSClassFromString(@"NSTitlebarContainerView")])
+			container.hidden = !visible;
+	}
+
+	- (void) setBackgroundTransparent: (BOOL) transparent
+	{
+		if (transparent == !self.opaque) return;
+
+		self.opaque          = !transparent;
+		self.backgroundColor =
+			transparent ? NSColor.clearColor : NSColor.windowBackgroundColor;
+
+		[self invalidateShadow];
+	}
+
+	- (BOOL) hasFullScreenFlag
+	{
+		return self.styleMask & NSWindowStyleMaskFullScreen;
+	}
+
 	- (void) update: (NSTimer*) t
 	{
 		Reflex::Window* win = self.window;
@@ -208,39 +252,35 @@ move_to_main_screen_origin (NativeWindow* window)
 
 		Window_call_update_event(win);
 
-		if (win->self->redraw)
-		{
+		if (Xot::check_and_remove_flag(&win->self->flags, Reflex::Window::Data::REDRAW))
 			view.needsDisplay = YES;
-			win->self->redraw = false;
-		}
 	}
 
 	- (void) draw
 	{
-		Reflex::Window* win = self.window;
-		if (!win) return;
+		// guarded here too, since rays can throw before the draw event
+		Reflex::Application_guard([&]()
+		{
+			Reflex::Window* win = self.window;
+			if (!win) return;
 
-		update_pixel_density(win);
+			update_pixel_density(win);
 
-		if (update_count == 0)
-			[self update];
+			if (update_count == 0)
+				[self update];
 
-		double now = Xot::time();
-		double dt  = now - win->self->prev_time_draw;
-		double fps = 1. / dt;
+			double now = Xot::time();
+			double dt  = now - win->self->prev_time_draw;
+			double fps = 1. / dt;
 
-		fps = win->self->prev_fps * 0.9 + fps * 0.1;// LPF
+			fps = win->self->prev_fps * 0.9 + fps * 0.1;// LPF
 
-		win->self->prev_time_draw = now;
-		win->self->prev_fps       = fps;
+			win->self->prev_time_draw = now;
+			win->self->prev_fps       = fps;
 
-		Reflex::DrawEvent e(dt, fps);
-		Window_call_draw_event(win, &e);
-	}
-
-	- (BOOL) hasFullScreenFlag
-	{
-		return self.styleMask & NSWindowStyleMaskFullScreen;
+			Reflex::DrawEvent e(dt, fps);
+			Window_call_draw_event(win, &e);
+		});
 	}
 
 	- (BOOL) windowShouldClose: (id) sender
@@ -248,7 +288,7 @@ move_to_main_screen_origin (NativeWindow* window)
 		Reflex::Window* win = self.window;
 		if (!win) return YES;
 
-		win->close();
+		Window_call_close(win);
 		return NO;
 	}
 
@@ -300,32 +340,7 @@ move_to_main_screen_origin (NativeWindow* window)
 
 	- (void) frameChanged
 	{
-		Reflex::Window* win = self.window;
-		if (!win) return;
-
-		Rays::Bounds b           = win->frame();
-		Rays::Point dpos         = b.position() - win->self->prev_position;
-		Rays::Point dsize        = b.size()     - win->self->prev_size;
-		win->self->prev_position = b.position();
-		win->self->prev_size     = b.size();
-
-		if (dpos == 0 && dsize == 0) return;
-
-		Reflex::FrameEvent e(b, dpos.x, dpos.y, 0, dsize.x, dsize.y, 0);
-		if (dpos  != 0) win->on_move(&e);
-		if (dsize != 0)
-		{
-			Rays::Bounds b = win->frame();
-			b.move_to(0, 0);
-
-			if (win->painter())
-				win->painter()->canvas(b, win->painter()->pixel_density());
-
-			if (win->root())
-				View_set_frame(win->root(), b);
-
-			win->on_resize(&e);
-		}
+		Window_call_frame_event(self.window);
 	}
 
 	- (void) windowWillEnterFullScreen: (NSNotification*) notification
@@ -409,6 +424,49 @@ move_to_main_screen_origin (NativeWindow* window)
 		Window_call_key_event(win, &e);
 	}
 
+	- (BOOL) isTextInputEnabled
+	{
+		Reflex::Window* win = self.window;
+		if (!win) return NO;
+
+		const Reflex::View* focus = win->focus();
+		return focus && focus->accepts_text_input();
+	}
+
+	- (void) textPreedit: (NSString*) text selection: (NSRange) selection
+	{
+		Reflex::Window* win = self.window;
+		if (!win) return;
+
+		Reflex::NativeTextEvent e(Reflex::TextEvent::PREEDIT, text, selection);
+		Window_call_text_event(win, &e);
+	}
+
+	- (void) textCommit: (NSString*) text synthesizeKeyEvent: (BOOL) synthesize
+	{
+		Reflex::Window* win = self.window;
+		if (!win) return;
+
+		Reflex::NativeTextEvent e(
+			Reflex::TextEvent::COMMIT, text, NSMakeRange(NSNotFound, 0));
+		Window_call_text_event(win, &e, synthesize);
+	}
+
+	- (NSRect) textInputBounds
+	{
+		Reflex::Window* win = self.window;
+		if (!win) return NSZeroRect;
+
+		const Reflex::View* focus = win->focus();
+		if (!focus) return NSZeroRect;
+
+		Reflex::Bounds b = focus->text_input_bounds();
+		Reflex::Point p1 = focus->to_window(b.position());
+		Reflex::Point p2 = focus->to_window(b.position() + b.size());
+
+		return NSMakeRect(p1.x, view.bounds.size.height - p2.y, p2.x - p1.x, p2.y - p1.y);
+	}
+
 	- (void) mouseDown: (NSEvent*) event
 	{
 		Reflex::Window* win = self.window;
@@ -449,6 +507,12 @@ move_to_main_screen_origin (NativeWindow* window)
 		Reflex::Window* win = self.window;
 		if (!win) return;
 
+		// macos delivers hover moves to the key window even outside its
+		// bounds, but no other platform can see them, so a cross-platform
+		// app must not either
+		NSPoint pos = [view convertPoint: event.locationInWindow fromView: nil];
+		if (!NSPointInRect(pos, view.bounds)) return;
+
 		Reflex::NativePointerEvent e(event, view, Reflex::Pointer::MOVE);
 		Window_call_pointer_event(win, &e);
 	}
@@ -480,11 +544,4 @@ move_to_main_screen_origin (NativeWindow* window)
 		Window_call_wheel_event(win, &e);
 	}
 
-	+ (NSRect) frameRectForContentRect: (NSRect) contentRect
-	{
-		return [NSWindow
-			frameRectForContentRect: contentRect
-			styleMask: default_style_mask()];
-	}
-
 @end// NativeWindow

data/src/osx/opengl_view.h

@@ -1,8 +1,9 @@
 // -*- objc -*-
 #import <AppKit/NSOpenGLView.h>
+#import <AppKit/NSTextInputClient.h>
 
 
-@interface OpenGLView : NSOpenGLView
+@interface OpenGLView : NSOpenGLView <NSTextInputClient>
 
 	- (id) initWithFrame: (NSRect) frame;