reflexion 0.5.3 → 0.7.0

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

@@ -4,6 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "reflex/exception.h"
+#include "menu.h"
 #include "screen.h"
 #import "native_window.h"
 
@@ -35,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;
 	}
@@ -74,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
@@ -126,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
@@ -137,10 +141,20 @@ 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
+	Window_set_menu (Window* window, Menu* menu)
+	{
+		NativeWindow* native = get_native(window);
+		if (!native) return;
+
+		if (native.isMainWindow)
+			Menu_apply_to_main_menu(menu);
 	}
 
 	Screen
@@ -163,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
@@ -178,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/pin.cpp

@@ -0,0 +1,137 @@
+#include "reflex/pin.h"
+
+
+#include "reflex/exception.h"
+#include "view.h"
+#include "constraint.h"
+
+
+namespace Reflex
+{
+
+
+	struct Pin::Data
+	{
+
+		Xot::WeakRef<View> view;
+
+		std::unique_ptr<Point> pposition;
+
+	};// Pin::Data
+
+
+	template <typename T>
+	static T*
+	setup_constraint (
+		T* constraint,
+		View* view0, const Point* position0,
+		View* view1, const Point* position1)
+	{
+		if (!view0)
+			invalid_state_error(__FILE__, __LINE__, "the pin has no view");
+
+		Constraint_set_pins(constraint, view0, position0, view1, position1);
+		View_add_constraint(view0, constraint);
+		return constraint;
+	}
+
+
+	Pin::Pin ()
+	{
+	}
+
+	Pin::Pin (coord x, coord y)
+	:	Pin(NULL, Point(x, y))
+	{
+	}
+
+	Pin::Pin (const Point& position)
+	:	Pin(NULL, position)
+	{
+	}
+
+	Pin::Pin (View* view)
+	{
+		self->view = view;
+	}
+
+	Pin::Pin (View* view, coord x, coord y)
+	:	Pin(view, Point(x, y))
+	{
+	}
+
+	Pin::Pin (View* view, const Point& position)
+	{
+		self->view = view;
+		self->pposition.reset(new Point(position));
+	}
+
+	SnapConstraint*
+	Pin::snap (Pin target)
+	{
+		return setup_constraint(
+			Xot::Ref<SnapConstraint>(SnapConstraint_create()).get(),
+			view(), position(), target.view(), target.position());
+	}
+
+	LinkConstraint*
+	Pin::link (Pin target)
+	{
+		return setup_constraint(
+			Xot::Ref<LinkConstraint>(LinkConstraint_create()).get(),
+			view(), position(), target.view(), target.position());
+	}
+
+	WheelConstraint*
+	Pin::wheel (Pin target)
+	{
+		return setup_constraint(
+			Xot::Ref<WheelConstraint>(WheelConstraint_create()).get(),
+			view(), position(), target.view(), target.position());
+	}
+
+	ChaseConstraint*
+	Pin::chase (Pin target)
+	{
+		if (target.view() && target.view() == view())
+			argument_error(__FILE__, __LINE__, "can not chase itself");
+
+		ChaseConstraint* chase = setup_constraint(
+			Xot::Ref<ChaseConstraint>(ChaseConstraint_create()).get(),
+			view(), position(), NULL, NULL);
+		chase->set_target(target);
+		return chase;
+	}
+
+	View*
+	Pin::view ()
+	{
+		return self->view.get();
+	}
+
+	const View*
+	Pin::view () const
+	{
+		return const_cast<Pin*>(this)->view();
+	}
+
+	const Point*
+	Pin::position () const
+	{
+		return self->pposition ? self->pposition.get() : NULL;
+	}
+
+	Pin::operator bool () const
+	{
+		return true;
+	}
+
+	bool
+	Pin::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex
+

data/src/pointer.cpp

@@ -29,13 +29,11 @@ namespace Reflex
 
 			DRAG          = Xot::bit(0, TYPE_LAST),
 
-			ENTER         = Xot::bit(1, TYPE_LAST),
+			FLOATABLE     = Xot::bit(1, TYPE_LAST),
 
-			EXIT          = Xot::bit(2, TYPE_LAST),
+			HAS_SYSTEM_ID = Xot::bit(2, TYPE_LAST),
 
-			HAS_SYSTEM_ID = Xot::bit(3, TYPE_LAST),
-
-			HAS_PREV_POS  = Xot::bit(4, TYPE_LAST),
+			HAS_PREV_POS  = Xot::bit(3, TYPE_LAST),
 
 		};// Flag
 
@@ -56,23 +54,15 @@ namespace Reflex
 		Data (
 			ID id = -1, uint types = TYPE_NONE, Action action = ACTION_NONE,
 			const Point& position = 0, uint modifiers = 0, uint click_count = 0,
-			bool drag = false, bool enter = false, bool exit = false,
+			bool drag = false,
 			double time = 0)
 		:	id(id), types(types), action(action),
 			position(position), modifiers(modifiers), click_count(click_count),
-			flags(make_flags(drag, enter, exit)),
+			flags(drag ? DRAG : 0),
 			time(time)
 		{
 		}
 
-		uint make_flags (bool drag, bool enter, bool exit)
-		{
-			return
-				(drag  ? DRAG  : 0) |
-				(enter ? ENTER : 0) |
-				(exit  ? EXIT  : 0);
-		}
-
 		bool is_valid () const
 		{
 			return id >= 0 && types != TYPE_NONE && action != ACTION_NONE;
@@ -96,6 +86,36 @@ 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)
+	{
+		Xot::update_flag(&it->self->flags, Pointer::Data::FLOATABLE, floatable);
+	}
+
+	bool
+	Pointer_is_floatable (const Pointer& it)
+	{
+		return Xot::has_flag(it.self->flags, Pointer::Data::FLOATABLE);
+	}
+
 	void
 	Pointer_add_flag (Pointer* it, uint flag)
 	{
@@ -167,7 +187,7 @@ namespace Reflex
 		double time)
 	:	self(new Data(
 			id, types, action,
-			position, modifiers, click_count, drag, false, false,
+			position, modifiers, click_count, drag,
 			time))
 	{
 	}

data/src/pointer.h

@@ -16,6 +16,16 @@ namespace Reflex
 
 	void Pointer_set_id (Pointer* it, Pointer::ID id);
 
+	void Pointer_set_types (Pointer* it, uint types);
+
+	void Pointer_set_action (Pointer* it, Pointer::Action action);
+
+	void Pointer_set_time (Pointer* it, double time);
+
+	void Pointer_set_floatable (Pointer* it, bool floatable);
+
+	bool Pointer_is_floatable (const Pointer& it);
+
 	void Pointer_add_flag (Pointer* it, uint flag);
 
 	void Pointer_remove_flag (Pointer* it, uint flag);

data/src/rays.h

@@ -0,0 +1,46 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_RAYS_H__
+#define __REFLEX_SRC_RAYS_H__
+
+
+#include <rays/color.h>
+#include <rays/bitmap.h>
+#include <rays/painter.h>
+
+#if defined(OSX) && defined(__OBJC__)
+	@class NSImage;
+#elif defined(WIN32)
+	#include <xot/windows.h>
+#endif
+
+
+namespace Rays
+{
+
+
+	bool Painter_get_pixel (Color* color, Painter* painter, coord x, coord y);
+
+
+#if defined(OSX) && defined(__OBJC__)
+
+	NSImage* Bitmap_get_nsimage (const Bitmap& bitmap);
+
+#endif
+
+
+#ifdef WIN32
+
+	void Rays_set_pre_init_fun (void (*)());
+
+	HBITMAP Bitmap_get_hbitmap (const Bitmap& bitmap);
+
+	const PIXELFORMATDESCRIPTOR* OpenGL_get_pixel_format_descriptor ();
+
+#endif
+
+
+}// Rays
+
+
+#endif//EOH