nomen-lang 0.11.0 → 0.12.0

package/core/System/Controls/Window.nm

@@ -19,6 +19,14 @@ pub mv struct Window: Control {
 		id app = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSApplication"), sel_registerName("sharedApplication"));
 		((void(*)(id, SEL, long))objc_msgSend)(app, sel_registerName("setActivationPolicy:"), 0);
 		((void(*)(id, SEL, BOOL))objc_msgSend)(app, sel_registerName("activateIgnoringOtherApps:"), 1);
+		// Install AppKit's default Apple Event handlers (Dock Quit and the
+		// rest): without finishLaunching there is no handler for the quit
+		// event, so Dock Quit is silently ignored (-1708). Once per process.
+		static BOOL nomen_finished_launching = 0;
+		if (!nomen_finished_launching) {
+			((void(*)(id, SEL))objc_msgSend)(app, sel_registerName("finishLaunching"));
+			nomen_finished_launching = 1;
+		}
 		// Create window
 		unsigned long style = 1 | 2 | 4 | 8;
 		id win = ((id(*)(id, SEL, double, double, double, double, unsigned long, unsigned long, BOOL))objc_msgSend)(
@@ -33,6 +41,10 @@ pub mv struct Window: Control {
 		((void(*)(id, SEL, double, double))objc_msgSend)(
 			win, sel_registerName("setFrameTopLeftPoint:"), 100.0, 100.0);
 		((void(*)(id, SEL, id))objc_msgSend)(win, sel_registerName("makeKeyAndOrderFront:"), (id)0);
+		// Survive close: on macOS the app outlives its last window and a
+		// Dock click reopens it, so a closed window's handle must stay
+		// valid (the default releases the NSWindow on close).
+		((void(*)(id, SEL, BOOL))objc_msgSend)(win, sel_registerName("setReleasedWhenClosed:"), 0);
 		// The content view must resize with the window and autoresize its
 		// subviews so each control's autoresizingMask takes effect during a
 		// live resize (AppKit's blocking drag loop bypasses our event loop).
@@ -48,6 +60,15 @@ pub mv struct Window: Control {
 		id app = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSApplication"), sel_registerName("sharedApplication"));
 		((void(*)(id, SEL, long))objc_msgSend)(app, sel_registerName("setActivationPolicy:"), 0);
 		((void(*)(id, SEL, BOOL))objc_msgSend)(app, sel_registerName("activateIgnoringOtherApps:"), 1);
+		// Install AppKit's default Apple Event handlers (Dock Quit and the
+		// rest): without finishLaunching there is no handler for the quit
+		// event, so Dock Quit is silently ignored (-1708). Once per process.
+		static BOOL nomen_finished_launching = 0;
+		if (!nomen_finished_launching) {
+			((void(*)(id, SEL))objc_msgSend)(app, sel_registerName("finishLaunching"));
+			nomen_finished_launching = 1;
+		}
+		((void(*)(id, SEL))objc_msgSend)(app, sel_registerName("finishLaunching"));
 		// Create window
 		unsigned long style = 1 | 2 | 4 | 8;
 		id win = ((id(*)(id, SEL, double, double, double, double, unsigned long, unsigned long, BOOL))objc_msgSend)(
@@ -62,6 +83,10 @@ pub mv struct Window: Control {
 		((void(*)(id, SEL, double, double))objc_msgSend)(
 			win, sel_registerName("setFrameTopLeftPoint:"), 100.0, 100.0);
 		((void(*)(id, SEL, id))objc_msgSend)(win, sel_registerName("makeKeyAndOrderFront:"), (id)0);
+		// Survive close: on macOS the app outlives its last window and a
+		// Dock click reopens it, so a closed window's handle must stay
+		// valid (the default releases the NSWindow on close).
+		((void(*)(id, SEL, BOOL))objc_msgSend)(win, sel_registerName("setReleasedWhenClosed:"), 0);
 		// The content view must resize with the window and autoresize its
 		// subviews so each control's autoresizingMask takes effect during a
 		// live resize (AppKit's blocking drag loop bypasses our event loop).
@@ -1078,6 +1103,140 @@ pub mv struct Window: Control {
 		```
 	}
 
+	// ── App lifetime ─────────────────────────────────────────────────────
+	// The macOS convention: closing the last window does NOT end the
+	// process — the app stays alive (Dock icon, app menu) until the user
+	// quits it (dock Quit; ⌘Q once an app menu exists). `run` keeps
+	// pumping after the last window closes via `keep_alive`; the process
+	// exits when macOS delivers a Quit, or when the app calls `quit()`.
+
+	// True when the app has been asked to quit (Window.quit()).
+	pub func quit_requested = (self, out bool) {
+		```
+		#arch: c
+		#platform: macos
+		extern int nomen_app_quit;
+		return nomen_app_quit != 0;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: macos
+		extern int nomen_app_quit;
+		return nomen_app_quit != 0;
+		```
+		```
+		#arch: c
+		#platform: ios
+		return 0;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: ios
+		return 0;
+		```
+	}
+
+	// The default Dock icon: the Nomen logo (core/assets/nomen.png, a
+	// full-bleed square rasterized from the SVG by the site's icon script)
+	// — embedded at library build time and laid out by set_icon. `run`
+	// applies it at startup; call this directly in manual-loop apps that
+	// don't go through run.
+	pub func apply_default_icon = () {
+		Window.set_icon(#embed_file("assets/nomen.png"))
+	}
+
+	// Quit the APP (not just the window): sets the app-quit flag and closes
+	// this window. `run`/`keep_alive` return once the flag is set, so main
+	// unwinds normally. This is the programmatic equivalent of the Dock's
+	// Quit — distinct from `close()`, which closes one window and leaves
+	// the process alive.
+	pub func quit = (self) {
+		self.set_quit_flag()
+		self.close()
+	}
+
+	// Sets the app-quit flag (raw-only body: aarch64 replaces the whole
+	// body with its raw blocks).
+	func set_quit_flag = (self) {
+		```
+		#arch: c
+		#platform: macos
+		extern int nomen_app_quit;
+		nomen_app_quit = 1;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: macos
+		extern int nomen_app_quit;
+		nomen_app_quit = 1;
+		```
+	}
+
+	// Pump events until the app quits. Called by `run` after the last
+	// window closes (macOS keeps the process alive), and available to
+	// manual-loop apps that want the same lifetime: after your
+	// `while win.is_visible()` ends, the app is still open in the
+	// platform's eyes — hand control to the pump so Dock Quit and other
+	// system interactions keep working.
+	pub func keep_alive = () {
+		while !Window.quit_flag() {
+			Window.process_events()
+		}
+	}
+
+	// True when the Dock was clicked while every window was closed —
+	// Window.run resumes the frame loop for the reopened window.
+	pub func reopen_flag = (out bool) {
+		```
+		#arch: c
+		#platform: macos
+		extern int nomen_app_reopen;
+		return nomen_app_reopen != 0;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: macos
+		extern int nomen_app_reopen;
+		return nomen_app_reopen != 0;
+		```
+		```
+		#arch: c
+		#platform: ios
+		return 0;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: ios
+		return 0;
+		```
+	}
+
+	// The raw app-quit flag behind `quit_requested`/`keep_alive`.
+	func quit_flag = (out bool) {
+		```
+		#arch: c
+		#platform: macos
+		extern int nomen_app_quit;
+		return nomen_app_quit != 0;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: macos
+		extern int nomen_app_quit;
+		return nomen_app_quit != 0;
+		```
+		```
+		#arch: c
+		#platform: ios
+		return 0;
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: ios
+		return 0;
+		```
+	}
+
 	// Returns the width of the window's content view.
 	pub func content_width = (self, out int) {
 		```
@@ -1313,6 +1472,136 @@ pub mv struct Window: Control {
 	// disarmed right after. Left armed it is process-global — every LATER
 	// red-button close (another window, a later run loop) would silently
 	// bypass App.close_requested forever.
+	// Replace the Dock icon with the app's own art (PNG bytes — usually an
+	// `#embed_file` literal). AppKit draws a runtime icon image as-is (Tahoe
+	// only masks its outer bounds), so full-bleed art renders edge-to-edge
+	// and looks oversized beside native icons. Normalise onto Apple's
+	// app-icon grid first: aspect-fit the art into an 824px squircle body
+	// centred on a transparent 1024px canvas. Any square source works; pass
+	// raw complete art, not a pre-masked icon. App-wide on macOS: every
+	// window shares the single Dock tile, so this is static for call-site
+	// ergonomics (`Window.set_icon(png)`).
+	pub func set_icon = (string png) {
+		```
+		#arch: c
+		#platform: macos
+		#include <math.h>
+		id data = ((id(*)(id, SEL, const void*, unsigned long))objc_msgSend)(
+			(id)objc_getClass("NSData"), sel_registerName("dataWithBytes:length:"),
+			(const void *)png.ptr, (unsigned long)png.len);
+		id source = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSImage"), sel_registerName("alloc"));
+		source = ((id(*)(id, SEL, id))objc_msgSend)(source, sel_registerName("initWithData:"), data);
+		if (!source) return;
+
+		const double canvas = 1024.0;
+		const double body = 824.0;
+		const double inset = (canvas - body) / 2.0;
+		id image = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSImage"), sel_registerName("alloc"));
+		image = ((id(*)(id, SEL, NSSize))objc_msgSend)(image, sel_registerName("initWithSize:"), NSMakeSize(canvas, canvas));
+		((void(*)(id, SEL))objc_msgSend)(image, sel_registerName("lockFocus"));
+		((void(*)(id, SEL))objc_msgSend)(
+			((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSColor"), sel_registerName("clearColor")),
+			sel_registerName("set"));
+		NSRectFill(NSMakeRect(0.0, 0.0, canvas, canvas));
+
+		// Squircle: a superellipse (n = 5) matching Apple's continuous
+		// corners, fitted to the 824px body.
+		id clip = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSBezierPath"), sel_registerName("bezierPath"));
+		for (int step = 0; step < 240; step++) {
+			const double angle = ((double)step / 240.0) * 6.283185307179586;
+			const double cos_angle = cos(angle);
+			const double sin_angle = sin(angle);
+			const double x = canvas / 2.0 + (body / 2.0) * (cos_angle < 0.0 ? -pow(-cos_angle, 0.4) : pow(cos_angle, 0.4));
+			const double y = canvas / 2.0 + (body / 2.0) * (sin_angle < 0.0 ? -pow(-sin_angle, 0.4) : pow(sin_angle, 0.4));
+			if (step == 0) {
+				((void(*)(id, SEL, NSPoint))objc_msgSend)(clip, sel_registerName("moveToPoint:"), NSMakePoint(x, y));
+			} else {
+				((void(*)(id, SEL, NSPoint))objc_msgSend)(clip, sel_registerName("lineToPoint:"), NSMakePoint(x, y));
+			}
+		}
+		((void(*)(id, SEL))objc_msgSend)(clip, sel_registerName("closePath"));
+		((void(*)(id, SEL))objc_msgSend)(clip, sel_registerName("addClip"));
+
+		// Aspect-fit the source art inside the body (square icons fill it).
+		const NSSize source_size = ((NSSize(*)(id, SEL))objc_msgSend)(source, sel_registerName("size"));
+		const double longest = source_size.width > source_size.height ? source_size.width : source_size.height;
+		const double scale = longest > 0.0 ? body / longest : 1.0;
+		const double width = source_size.width * scale;
+		const double height = source_size.height * scale;
+		((void(*)(id, SEL, NSRect))objc_msgSend)(
+			source, sel_registerName("drawInRect:"),
+			NSMakeRect(inset + (body - width) / 2.0, inset + (body - height) / 2.0, width, height));
+		((void(*)(id, SEL))objc_msgSend)(image, sel_registerName("unlockFocus"));
+
+		id nsapp = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSApplication"), sel_registerName("sharedApplication"));
+		((void(*)(id, SEL, id))objc_msgSend)(nsapp, sel_registerName("setApplicationIconImage:"), image);
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: macos
+		#include <math.h>
+		id data = ((id(*)(id, SEL, const void*, unsigned long))objc_msgSend)(
+			(id)objc_getClass("NSData"), sel_registerName("dataWithBytes:length:"),
+			(const void *)png.ptr, (unsigned long)png.len);
+		id source = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSImage"), sel_registerName("alloc"));
+		source = ((id(*)(id, SEL, id))objc_msgSend)(source, sel_registerName("initWithData:"), data);
+		if (!source) return;
+
+		const double canvas = 1024.0;
+		const double body = 824.0;
+		const double inset = (canvas - body) / 2.0;
+		id image = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSImage"), sel_registerName("alloc"));
+		image = ((id(*)(id, SEL, NSSize))objc_msgSend)(image, sel_registerName("initWithSize:"), NSMakeSize(canvas, canvas));
+		((void(*)(id, SEL))objc_msgSend)(image, sel_registerName("lockFocus"));
+		((void(*)(id, SEL))objc_msgSend)(
+			((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSColor"), sel_registerName("clearColor")),
+			sel_registerName("set"));
+		NSRectFill(NSMakeRect(0.0, 0.0, canvas, canvas));
+
+		// Squircle: a superellipse (n = 5) matching Apple's continuous
+		// corners, fitted to the 824px body.
+		id clip = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSBezierPath"), sel_registerName("bezierPath"));
+		for (int step = 0; step < 240; step++) {
+			const double angle = ((double)step / 240.0) * 6.283185307179586;
+			const double cos_angle = cos(angle);
+			const double sin_angle = sin(angle);
+			const double x = canvas / 2.0 + (body / 2.0) * (cos_angle < 0.0 ? -pow(-cos_angle, 0.4) : pow(cos_angle, 0.4));
+			const double y = canvas / 2.0 + (body / 2.0) * (sin_angle < 0.0 ? -pow(-sin_angle, 0.4) : pow(sin_angle, 0.4));
+			if (step == 0) {
+				((void(*)(id, SEL, NSPoint))objc_msgSend)(clip, sel_registerName("moveToPoint:"), NSMakePoint(x, y));
+			} else {
+				((void(*)(id, SEL, NSPoint))objc_msgSend)(clip, sel_registerName("lineToPoint:"), NSMakePoint(x, y));
+			}
+		}
+		((void(*)(id, SEL))objc_msgSend)(clip, sel_registerName("closePath"));
+		((void(*)(id, SEL))objc_msgSend)(clip, sel_registerName("addClip"));
+
+		// Aspect-fit the source art inside the body (square icons fill it).
+		const NSSize source_size = ((NSSize(*)(id, SEL))objc_msgSend)(source, sel_registerName("size"));
+		const double longest = source_size.width > source_size.height ? source_size.width : source_size.height;
+		const double scale = longest > 0.0 ? body / longest : 1.0;
+		const double width = source_size.width * scale;
+		const double height = source_size.height * scale;
+		((void(*)(id, SEL, NSRect))objc_msgSend)(
+			source, sel_registerName("drawInRect:"),
+			NSMakeRect(inset + (body - width) / 2.0, inset + (body - height) / 2.0, width, height));
+		((void(*)(id, SEL))objc_msgSend)(image, sel_registerName("unlockFocus"));
+
+		id nsapp = ((id(*)(id, SEL))objc_msgSend)((id)objc_getClass("NSApplication"), sel_registerName("sharedApplication"));
+		((void(*)(id, SEL, id))objc_msgSend)(nsapp, sel_registerName("setApplicationIconImage:"), image);
+		```
+		```
+		#arch: c
+		#platform: ios
+		/* TODO: iOS */
+		```
+		```
+		#arch: aarch64_use_c
+		#platform: ios
+		/* TODO: iOS */
+		```
+	}
+
 	pub func close = (self) {
 		```
 		#arch: c
@@ -1357,68 +1646,91 @@ pub mv struct Window: Control {
 		app.start(ref self)
 		Container.arm_resize_delegate(self)
 		self.arm_mouse_moves()
+		Window.apply_default_icon()
 		self.relayout(0)
 		self.show()
 		self.relayout(1)
 		var int prev_w = self.content_width()
 		var int prev_h = self.content_height()
 		var ev = FrameEvents()
-		while self.is_visible() {
-			// Close interception: the delegate refused the native close and
-			// set the pending flag; consult the app. Accept → forced close
-			// (bypasses the delegate); decline → window stays, flag cleared.
-			if self.close_pending() {
-				if app.close_requested(ref self) {
+		while true {
+			while self.is_visible() {
+				// App menu Quit / ⌘Q (or quit()): close the window — the
+				// quit flag then ends the app below.
+				if self.quit_flag() {
 					self.close()
 				}
-				self.clear_close_pending()
-			}
-			// An accepted close above releases the native window mid-frame;
-			// skip the rest of this iteration (the while re-checks and
-			// exits).
-			if self.is_visible() {
-				ev.click = Window.process_events()
-				ev.click_x = self.click_x()
-				ev.click_y = self.click_y()
-				ev.mouse_button = self.mouse_button()
-				ev.mouse_click_count = self.mouse_click_count()
-				ev.mouse_modifiers = self.mouse_modifiers()
-				ev.scroll_dx = self.scroll_dx()
-				ev.scroll_dy = self.scroll_dy()
-				ev.key_code = self.key_code()
-				ev.key_modifiers = self.key_modifiers()
-				ev.key_repeat = self.key_repeat()
-				ev.key_up_code = self.key_up_code()
-				ev.mouse_x = self.mouse_x()
-				ev.mouse_y = self.mouse_y()
-				ev.dt = self.dt()
-				ev.resized = false
-				self.stamp_resize(false, 0, 0)
-				var int cur_w = self.content_width()
-				var int cur_h = self.content_height()
-				if cur_w != prev_w {
-					ev.resized = true
+				// Close interception: the delegate refused the native close and
+				// set the pending flag; consult the app. Accept → forced close
+				// (bypasses the delegate); decline → window stays, flag cleared.
+				if self.close_pending() {
+					if app.close_requested(ref self) {
+						self.close()
+					}
+					self.clear_close_pending()
 				}
-				if cur_h != prev_h {
-					ev.resized = true
+				// An accepted close above releases the native window mid-frame;
+				// skip the rest of this iteration (the while re-checks and
+				// exits).
+				if self.is_visible() {
+					ev.click = Window.process_events()
+					ev.click_x = self.click_x()
+					ev.click_y = self.click_y()
+					ev.mouse_button = self.mouse_button()
+					ev.mouse_click_count = self.mouse_click_count()
+					ev.mouse_modifiers = self.mouse_modifiers()
+					ev.scroll_dx = self.scroll_dx()
+					ev.scroll_dy = self.scroll_dy()
+					ev.key_code = self.key_code()
+					ev.key_modifiers = self.key_modifiers()
+					ev.key_repeat = self.key_repeat()
+					ev.key_up_code = self.key_up_code()
+					ev.mouse_x = self.mouse_x()
+					ev.mouse_y = self.mouse_y()
+					ev.dt = self.dt()
+					ev.resized = false
+					self.stamp_resize(false, 0, 0)
+					var int cur_w = self.content_width()
+					var int cur_h = self.content_height()
+					if cur_w != prev_w {
+						ev.resized = true
+					}
+					if cur_h != prev_h {
+						ev.resized = true
+					}
+					if ev.resized {
+						prev_w = cur_w
+						prev_h = cur_h
+						ev.width = cur_w
+						ev.height = cur_h
+						self.stamp_resize(true, cur_w, cur_h)
+						self.relayout(0)
+					}
+					// The window refreshes the per-frame event sources (the
+					// first-responder snapshot feeds the focus/blur drains), then the
+					// app's synthesized `handle_events` pump drains registered
+					// handlers — conformers without registrations inherit the
+					// trait's empty default. One arm per registered control.
+					nomen_window_focus_poll(self.handle)
+					app.handle_events(ref self)
+					app.frame(ref self, ev)
 				}
-				if ev.resized {
-					prev_w = cur_w
-					prev_h = cur_h
-					ev.width = cur_w
-					ev.height = cur_h
-					self.stamp_resize(true, cur_w, cur_h)
-					self.relayout(0)
-				}
-				// The window refreshes the per-frame event sources (the
-				// first-responder snapshot feeds the focus/blur drains), then the
-				// app's synthesized `handle_events` pump drains registered
-				// handlers — conformers without registrations inherit the
-				// trait's empty default. One arm per registered control.
-				nomen_window_focus_poll(self.handle)
-				app.handle_events(ref self)
-				app.frame(ref self, ev)
 			}
+			// macOS convention: the app stays alive after the last window
+			// closes — pump until Dock Quit (or quit()) ends the process, or
+			// a Dock click reopens the window and the frame loop resumes.
+			while !self.quit_flag() && !Window.reopen_flag() {
+				Window.process_events()
+			}
+			if self.quit_flag() {
+				return
+			}
+			// Reopened from the Dock: re-show and resume frames. start() runs
+			// once — layout roots and handlers are already registered.
+			self.show()
+			self.relayout(1)
+			prev_w = self.content_width()
+			prev_h = self.content_height()
 		}
 	}