Merge branch 'master' into ini

README.md

@@ -22,12 +22,24 @@ This only lists changes that broke things and got a major version bump. I didn't
 
 Please note that I DO consider changes to build process to be a breaking change, but I do NOT consider symbol additions, changes to undocumented members, or the occasional non-fatal deprecation to be breaking changes. Undocumented members may be changed at any time, whereas additions and/or deprecations will be a minor version change.
 
-## 12.0
+## 13.0
 
-Future release, likely May 2024 or later.
+Future release, likely May 2026 or later.
 
 Nothing is planned for it at this time.
 
+## 12.0
+
+Released: January 2025
+
+minigui's `defaultEventHandler_*` functions take more specific objects. So if you see errors like:
+
+```
+Error: function `void arsd.minigui.EditableTextWidget.defaultEventHandler_focusin(Event foe)` does not override any function, did you mean to override `void arsd.minigui.Widget.defaultEventHandler_focusin(arsd.minigui.FocusInEvent event)`?
+```
+
+Go to the file+line number from the error message and change `Event` to `FocusInEvent` (or whatever one it tells you in the "did you mean" part of the error) and recompile. No other changes should be necessary, however if you constructed your own `Event` object and dispatched it with the loosely typed `"focus"`, etc., strings, it may not trigger the default handlers anymore. To fix this, change any `new Event` to use the appropriate subclass, when available, like old `new Event("focus", widget);` changes to `new FocusEvent(widget)`. This only applies to ones that trigger default handlers present in `Widget` base class; your custom events still work the same way.
+
 arsd.pixmappresenter, arsd.pixmappaint and arsd.pixmaprecorder were added.
 
 ## 11.0

audio.d

@@ -67,7 +67,7 @@ class Audio{
 			active = false;
 			return;
 		}
-		if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 4096/2 /* the /2 is new */) != 0){
+		if(1) { // if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 4096/2 /* the /2 is new */) != 0){
 			active = false; //throw new Error;
 			error = true;
 			audioIsLoaded = false;

cgi.d

@@ -6929,12 +6929,14 @@ version(cgi_with_websocket) {
 				return true;
 			}
 
-			if(bfr.sourceClosed)
+			if(bfr.sourceClosed) {
 				return false;
+			}
 
 			bfr.popFront(0);
-			if(bfr.sourceClosed)
+			if(bfr.sourceClosed) {
 				return false;
+			}
 			goto top;
 		}
 

com.d

@@ -1159,7 +1159,7 @@ extern (D) void ObjectDestroyed()
 }
 
 
-char[] oleCharsToString(char[] buffer, OLECHAR* chars) {
+char[] oleCharsToString(char[] buffer, OLECHAR* chars) @system {
 	auto c = cast(wchar*) chars;
 	auto orig = c;
 
@@ -1470,7 +1470,7 @@ BOOL SetKeyAndValue(LPCSTR pszKey, LPCSTR pszSubkey, LPCSTR pszValue)
     return result;
 }
 
-void unicode2ansi(char *s)
+void unicode2ansi(char *s) @system
 {
     wchar *w;
 

core.d

@@ -271,6 +271,16 @@ auto ref T castTo(T, S)(auto ref S v) {
 ///
 alias typeCast = castTo;
 
+/++
+	Treats the memory of one variable as if it is the type of another variable.
+
+	History:
+		Added January 20, 2025
++/
+ref T reinterpretCast(T, V)(return ref V value) @system {
+	return *cast(T*)& value;
+}
+
 /++
 	Determines whether `needle` is a slice of `haystack`.
 
@@ -8089,6 +8099,9 @@ unittest {
 	================
 +/
 /++
+	DO NOT USE THIS YET IT IS NOT FUNCTIONAL NOR STABLE
+
+
 	The arsd.core logger works differently than many in that it works as a ring buffer of objects that are consumed (or missed; buffer overruns are possible) by a different thread instead of as strings written to some file.
 
 	A library (or an application) defines a log source. They write to this source.
@@ -8108,24 +8121,66 @@ unittest {
 
 	Examples:
 	---
-		mixin LoggerOf!X mylogger;
+		auto logger = new shared LoggerOf!GenericEmbeddableInterpolatedSequence;
 
-		mylogger.log(i"$this heartbeat"); // creates an ad-hoc log message
+		mylogger.info(i"$this heartbeat");
 	---
 
 	History:
 		Added May 27, 2024
-+/
-mixin template LoggerOf(T) {
-	void log(LogLevel l, T message) {
 
+		Not actually implemented until February 6, 2025, when it changed from mixin template to class.
++/
+class LoggerOf(T, size_t bufferSize = 16) {
+	private LoggedMessage!T[bufferSize] ring;
+	private uint writeBufferPosition;
+
+	void log(LoggedMessage!T message) shared {
+		synchronized(this) {
+			auto unshared = cast() this;
+			unshared.ring[writeBufferPosition] = message;
+			unshared.writeBufferPosition += 1;
+
+			// import std.stdio; std.stdio.writeln(message);
+		}
+	}
+
+	void log(LogLevel level, T message, SourceLocation sourceLocation = SourceLocation(__FILE__, __LINE__)) shared {
+		log(LoggedMessage!T(LogLevel.Info, sourceLocation, 0, message));
+	}
+
+	void info(T message, SourceLocation sourceLocation = SourceLocation(__FILE__, __LINE__)) shared {
+		log(LogLevel.Info, message, sourceLocation);
 	}
 }
 
+struct SourceLocation {
+	string file;
+	size_t line;
+}
+
+struct LoggedMessage(T) {
+	LogLevel level;
+	SourceLocation sourceLocation;
+	ulong timestamp;
+	T message;
+
+	// process id?
+	// thread id?
+	// callstack?
+}
+
+//mixin LoggerOf!GenericEmbeddableInterpolatedSequence GeisLogger;
+
 enum LogLevel {
 	Info
 }
 
+unittest {
+	auto logger = new shared LoggerOf!GenericEmbeddableInterpolatedSequence;
+	logger.info(GenericEmbeddableInterpolatedSequence(i"hello world"));
+}
+
 /+
 	=====================
 	TRANSLATION FRAMEWORK

dom.d

@@ -2308,6 +2308,7 @@ class Element : DomParent {
 	// do nothing, this is primarily a virtual hook
 	// for links and forms
 	void setValue(string field, string value) { }
+	void setValue(string field, string[] value) { }
 
 
 	// this is a thing so i can remove observer support if it gets slow
@@ -3351,6 +3352,15 @@ class Element : DomParent {
 		return stealChildren(d.root);
 	}
 
+	/++
+		Returns `this` for use inside `with` expressions.
+
+		History:
+			Added December 20, 2024
+	+/
+	inout(Element) self() inout pure @nogc nothrow @safe scope return {
+		return this;
+	}
 
 	/++
 		Inserts a child under this element after the element `where`.
@@ -5750,6 +5760,10 @@ class Link : Element {
 		updateQueryString(vars);
 	}
 
+	override void setValue(string name, string[] variable) {
+		assert(0, "not implemented FIXME");
+	}
+
 	/// Removes the given variable from the query string
 	void removeValue(string name) {
 		auto vars = variablesHash();
@@ -5821,6 +5835,10 @@ class Form : Element {
 		setValue(field, value, true);
 	}
 
+	override void setValue(string name, string[] variable) {
+		assert(0, "not implemented FIXME");
+	}
+
 	// FIXME: doesn't handle arrays; multiple fields can have the same name
 
 	/// Set's the form field's value. For input boxes, this sets the value attribute. For

simpledisplay.d

@@ -813,8 +813,6 @@ interface->SetProgressValue(hwnd, 40, 100);
 +/
 module arsd.simpledisplay;
 
-import arsd.core;
-
 // FIXME: tetris demo
 // FIXME: space invaders demo
 // FIXME: asteroids demo
@@ -1162,6 +1160,8 @@ unittest {
 // FIXME: space invaders demo
 // FIXME: asteroids demo
 
+import arsd.core;
+
 version(OSX) version(DigitalMars) version=OSXCocoa;
 
 version(Emscripten) {

terminal.d

@@ -559,7 +559,7 @@ enum ConsoleOutputType {
 	cellular = 1, /// or do you want access to the terminal screen as a grid of characters?
 	//truncatedCellular = 3, /// cellular, but instead of wrapping output to the next line automatically, it will truncate at the edges
 
-	minimalProcessing = 255, /// do the least possible work, skips most construction and desturction tasks. Only use if you know what you're doing here
+	minimalProcessing = 255, /// do the least possible work, skips most construction and destruction tasks, does not query terminal in any way in favor of making assumptions about it. Only use if you know what you're doing here
 }
 
 alias ConsoleOutputMode = ConsoleOutputType;
@@ -710,16 +710,16 @@ struct Terminal {
 	version(Posix) {
 		private int fdOut;
 		private int fdIn;
-		private int[] delegate() getSizeOverride;
 		void delegate(in void[]) _writeDelegate; // used to override the unix write() system call, set it magically
 	}
+	private int[] delegate() getSizeOverride;
 
 	bool terminalInFamily(string[] terms...) {
 		version(Win32Console) if(UseWin32Console)
 			return false;
 
 		// we're not writing to a terminal at all!
-		if(!usingDirectEmulator)
+		if(!usingDirectEmulator && type != ConsoleOutputType.minimalProcessing)
 		if(!stdoutIsTerminal || !stdinIsTerminal)
 			return false;
 
@@ -728,7 +728,7 @@ struct Terminal {
 		version(TerminalDirectToEmulator)
 			auto term = "xterm";
 		else
-			auto term = environment.get("TERM");
+			auto term = type == ConsoleOutputType.minimalProcessing ? "xterm" : environment.get("TERM");
 
 		foreach(t; terms)
 			if(indexOf(term, t) != -1)
@@ -900,7 +900,7 @@ struct Terminal {
 
 	// Looks up a termcap item and tries to execute it. Returns false on failure
 	bool doTermcap(T...)(string key, T t) {
-		if(!usingDirectEmulator && !stdoutIsTerminal)
+		if(!usingDirectEmulator && type != ConsoleOutputType.minimalProcessing && !stdoutIsTerminal)
 			return false;
 
 		import std.conv;
@@ -1041,6 +1041,7 @@ struct Terminal {
 	private bool tcapsRequested;
 
 	uint tcaps() const {
+		if(type != ConsoleOutputType.minimalProcessing)
 		if(!tcapsRequested) {
 			Terminal* mutable = cast(Terminal*) &this;
 			version(Posix)
@@ -1453,7 +1454,7 @@ struct Terminal {
 		this.type = type;
 
 		if(type == ConsoleOutputType.minimalProcessing) {
-			readTermcap();
+			readTermcap("xterm");
 			_suppressDestruction = true;
 			return;
 		}
@@ -1468,6 +1469,7 @@ struct Terminal {
 			goCellular();
 		}
 
+		if(type != ConsoleOutputType.minimalProcessing)
 		if(terminalInFamily("xterm", "rxvt", "screen", "tmux")) {
 			writeStringRaw("\033[22;0t"); // save window title on a stack (support seems spotty, but it doesn't hurt to have it)
 		}
@@ -1475,7 +1477,7 @@ struct Terminal {
 	}
 
 	private void goCellular() {
-		if(!usingDirectEmulator && !Terminal.stdoutIsTerminal)
+		if(!usingDirectEmulator && !Terminal.stdoutIsTerminal && type != ConsoleOutputType.minimalProcessing)
 			throw new Exception("Cannot go to cellular mode with redirected output");
 
 		if(UseVtSequences) {
@@ -1737,7 +1739,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 
 	/// Changes the current color. See enum [Color] for the values and note colors can be [arsd.docs.general_concepts#bitmasks|bitwise-or] combined with [Bright].
 	void color(int foreground, int background, ForceOption force = ForceOption.automatic, bool reverseVideo = false) {
-		if(!usingDirectEmulator && !stdoutIsTerminal)
+		if(!usingDirectEmulator && !stdoutIsTerminal && type != ConsoleOutputType.minimalProcessing)
 			return;
 		if(force != ForceOption.neverSend) {
 			if(UseVtSequences) {
@@ -1967,7 +1969,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 
 	/// Returns the terminal to normal output colors
 	void reset() {
-		if(!usingDirectEmulator && stdoutIsTerminal) {
+		if(!usingDirectEmulator && stdoutIsTerminal && type != ConsoleOutputType.minimalProcessing) {
 			if(UseVtSequences)
 				writeStringRaw("\033[0m");
 			else version(Win32Console) if(UseWin32Console) {
@@ -2200,7 +2202,10 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 	}
 
 	private int[] getSizeInternal() {
-		if(!usingDirectEmulator && !stdoutIsTerminal)
+		if(getSizeOverride)
+			return getSizeOverride();
+
+		if(!usingDirectEmulator && !stdoutIsTerminal && type != ConsoleOutputType.minimalProcessing)
 			throw new Exception("unable to get size of non-terminal");
 		version(Windows) {
 			CONSOLE_SCREEN_BUFFER_INFO info;
@@ -2213,11 +2218,9 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 
 			return [cols, rows];
 		} else {
-			if(getSizeOverride is null) {
 			winsize w;
-				ioctl(0, TIOCGWINSZ, &w);
+			ioctl(1, TIOCGWINSZ, &w);
 			return [w.ws_col, w.ws_row];
-			} else return getSizeOverride();
 		}
 	}
 
@@ -2315,6 +2318,34 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 		if(s.length == 0)
 			return;
 
+		if(type == ConsoleOutputType.minimalProcessing) {
+			// need to still try to track a little, even if we can't
+			// talk to the terminal in minimal processing mode
+			auto height = this.height;
+			foreach(dchar ch; s) {
+				switch(ch) {
+					case '\n':
+						_cursorX = 0;
+						_cursorY++;
+					break;
+					case '\t':
+						int diff = 8 - (_cursorX % 8);
+						if(diff == 0)
+							diff = 8;
+						_cursorX += diff;
+					break;
+					default:
+						_cursorX++;
+				}
+
+				if(_wrapAround && _cursorX > width) {
+					_cursorX = 0;
+					_cursorY++;
+				}
+				if(_cursorY == height)
+					_cursorY--;
+			}
+		}
 
 		version(TerminalDirectToEmulator) {
 			// this breaks up extremely long output a little as an aid to the
@@ -2478,7 +2509,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 			On November 7, 2023 (dub v11.3), this function started returning stdin.readln in the event that the instance is not connected to a terminal.
 	+/
 	string getline(string prompt = null, dchar echoChar = dchar.init, string prefilledData = null) {
-		if(!usingDirectEmulator)
+		if(!usingDirectEmulator && type != ConsoleOutputType.minimalProcessing)
 		if(!stdoutIsTerminal || !stdinIsTerminal) {
 			import std.stdio;
 			import std.string;
@@ -2532,6 +2563,8 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 			Added January 8, 2023
 	+/
 	void updateCursorPosition() {
+		if(type == ConsoleOutputType.minimalProcessing)
+			return;
 		auto terminal = &this;
 
 		terminal.flush();
@@ -2560,7 +2593,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
                }
 	}
 	private void updateCursorPosition_impl() {
-		if(!usingDirectEmulator)
+		if(!usingDirectEmulator && type != ConsoleOutputType.minimalProcessing)
 		if(!stdinIsTerminal || !stdoutIsTerminal)
 			throw new Exception("cannot update cursor position on non-terminal");
 		auto terminal = &this;

terminalemulator.d

@@ -3544,7 +3544,7 @@ version(use_libssh2) {
 			throw new Exception("fingerprint");
 
 		import std.string : toStringz;
-		if(auto err = libssh2_userauth_publickey_fromfile_ex(session, username.ptr, username.length, toStringz(keyFile ~ ".pub"), toStringz(keyFile), null))
+		if(auto err = libssh2_userauth_publickey_fromfile_ex(session, username.ptr, cast(int) username.length, toStringz(keyFile ~ ".pub"), toStringz(keyFile), null))
 			throw new Exception("auth");
 
 

textlayouter.d

@@ -24,6 +24,9 @@
 +/
 module arsd.textlayouter;
 
+// see: https://harfbuzz.github.io/a-simple-shaping-example.html
+
+
 // FIXME: unicode private use area could be delegated out but it might also be used by something else.
 // just really want an encoding scheme for replaced elements that punt it outside..
 
@@ -347,6 +350,15 @@ public struct Selection {
 		return this;
 	}
 
+	/++
+		Gets the current user coordinate, the point where they explicitly want the caret to be near.
+
+		History:
+			Added January 24, 2025
+	+/
+	Point getUserCoordinate() {
+		return impl.virtualFocusPosition;
+	}
 
 	/+ Moving the internal position +/