wip

apng.d

@@ -1,5 +1,5 @@
 /++
-	Support for [animated png|https://wiki.mozilla.org/APNG_Specification] files.
+	Support for [https://wiki.mozilla.org/APNG_Specification|animated png] files.
 +/
 module arsd.apng;
 

argon2.d

@@ -69,10 +69,15 @@ string encode(string password, SecurityParameters params = MediumSecurity) {
 		auto ret = read(fd, salt.ptr, salt.length);
 		assert(ret == salt.length);
 		close(fd);
+	}} else version(Windows) {{
+		// https://docs.microsoft.com/en-us/windows/win32/api/bcrypt/nf-bcrypt-bcryptgenrandom
+		static assert(0);
 	}} else {
 		import std.random;
 		foreach(ref s; salt)
 			s = cast(ubyte) uniform(0, 256);
+
+		static assert(0, "csrng not implemented");
 	}
 
 	auto ret = argon2id_hash_encoded(

cgi.d

@@ -376,7 +376,8 @@ void cloexec(Socket s) {
 
 version(embedded_httpd_hybrid) {
 	version=embedded_httpd_threads;
-	version=cgi_use_fork;
+	version(cgi_no_fork) {} else
+		version=cgi_use_fork;
 	version=cgi_use_fiber;
 }
 
@@ -3266,7 +3267,7 @@ mixin template CustomCgiMain(CustomCgi, alias fun, long maxContentLength = defau
 }
 
 version(embedded_httpd_processes)
-	int processPoolSize = 8;
+	__gshared int processPoolSize = 8;
 
 // Returns true if run. You should exit the program after that.
 bool tryAddonServers(string[] args) {
@@ -3275,10 +3276,16 @@ bool tryAddonServers(string[] args) {
 		switch(args[1]) {
 			case "--websocket-server":
 				version(with_addon_servers)
-					runWebsocketServer();
+					websocketServers[args[2]](args[3 .. $]);
 				else
 					printf("Add-on servers not compiled in.\n");
 				return true;
+			case "--websocket-servers":
+				import core.demangle;
+				version(with_addon_servers_connections)
+				foreach(k, v; websocketServers)
+					writeln(k, "\t", demangle(k));
+				return true;
 			case "--session-server":
 				version(with_addon_servers)
 					runSessionServer();
@@ -3335,7 +3342,7 @@ bool trySimulatedRequest(alias fun, CustomCgi = Cgi)(string[] args) if(is(Custom
 +/
 struct RequestServer {
 	///
-	string listeningHost;
+	string listeningHost = defaultListeningHost();
 	///
 	ushort listeningPort = defaultListeningPort();
 
@@ -3798,6 +3805,21 @@ ushort defaultListeningPort() {
 		return 0;
 }
 
+/// Default host for listening. 127.0.0.1 for scgi, null (aka all interfaces) for all others. If you want the server directly accessible from other computers on the network, normally use null. If not, 127.0.0.1 is a bit better. Settable with default handlers with --listening-host command line argument.
+string defaultListeningHost() {
+	version(netman_httpd)
+		return null;
+	else version(embedded_httpd_processes)
+		return null;
+	else version(embedded_httpd_threads)
+		return null;
+	else version(scgi)
+		return "127.0.0.1";
+	else
+		return null;
+
+}
+
 /++
 	This is the function [GenericMain] calls. View its source for some simple boilerplate you can copy/paste and modify, or you can call it yourself from your `main`.
 
@@ -6273,6 +6295,7 @@ unittest {
 interface SessionObject {}
 
 private immutable void delegate(string[])[string] scheduledJobHandlers;
+private immutable void delegate(string[])[string] websocketServers;
 
 version(with_breaking_cgi_features)
 mixin(q{

http2.d

@@ -3017,6 +3017,28 @@ class WebSocket {
 	}
 }
 
+template addToSimpledisplayEventLoop() {
+	import arsd.simpledisplay;
+	void addToSimpledisplayEventLoop(WebSocket ws, SimpleWindow window) {
+
+		void midprocess() {
+			if(!ws.lowLevelReceive()) {
+				ws.readyState_ = WebSocket.CLOSED;
+				WebSocket.unregisterActiveSocket(ws);
+				return;
+			}
+			while(ws.processOnce().populated) {}
+		}
+
+		version(linux) {
+			auto reader = new PosixFdReader(&midprocess, ws.socket.handle);
+		} else version(Windows) {
+			auto reader = new WindowsHandleReader(&midprocess, ws.socket.handle);
+		} else static assert(0, "unsupported OS");
+	}
+}
+
+
 /* copy/paste from cgi.d */
 public {
 	enum WebSocketOpcode : ubyte {

terminal.d

@@ -2657,8 +2657,11 @@ struct RealTimeConsoleInput {
 				terminal.tew.terminalEmulator.pendingForApplication = terminal.tew.terminalEmulator.pendingForApplication[1 .. $];
 				return a;
 			}
-		} else
-			return nextRaw_impl(interruptable);
+		} else {
+			auto got = nextRaw_impl(interruptable);
+			// import std.stdio; writeln(cast(int) got);
+			return got;
+		}
 	}
 	private int nextRaw_impl(bool interruptable = false) {
 		version(Posix) {
@@ -2838,8 +2841,8 @@ struct RealTimeConsoleInput {
 
 		INPUT_RECORD[32] buffer;
 		DWORD actuallyRead;
-			// FIXME: ReadConsoleInputW
 		auto success = ReadConsoleInputW(inputHandle, buffer.ptr, buffer.length, &actuallyRead);
+		import std.stdio; writeln(buffer[0 .. actuallyRead][0].KeyEvent, cast(int) buffer[0].KeyEvent.UnicodeChar);
 		if(success == 0)
 			throw new Exception("ReadConsoleInput");
 
@@ -2866,6 +2869,13 @@ struct RealTimeConsoleInput {
 							break;
 					}
 
+					if(ev.UnicodeChar == 0 && ev.wVirtualKeyCode == VK_SPACE && ev.bKeyDown == 1) {
+						ke.which = 0;
+						ke.modifierState = ev.dwControlKeyState;
+						newEvents ~= InputEvent(ke, terminal);
+						continue;
+					}
+
 					e.eventType = ke.pressed ? CharacterEvent.Type.Pressed : CharacterEvent.Type.Released;
 					ne.eventType = ke.pressed ? NonCharacterKeyEvent.Type.Pressed : NonCharacterKeyEvent.Type.Released;
 
@@ -3293,9 +3303,13 @@ struct RealTimeConsoleInput {
 
 						uint modifierState;
 
+						int keyGot;
+
 						int modGot;
 						if(parts.length > 1)
 							modGot = to!int(parts[1]);
+						if(parts.length > 2)
+							keyGot = to!int(parts[2]);
 						mod_switch: switch(modGot) {
 							case 2: modifierState |= ModifierState.shift; break;
 							case 3: modifierState |= ModifierState.alt; break;
@@ -3356,6 +3370,9 @@ struct RealTimeConsoleInput {
 									case "23": return keyPressAndRelease(NonCharacterKeyEvent.Key.F11, modifierState);
 									case "24": return keyPressAndRelease(NonCharacterKeyEvent.Key.F12, modifierState);
 
+									// xterm extension for arbitrary keys with arbitrary modifiers
+									case "27": return keyPressAndRelease2(keyGot, modifierState);
+
 									// starting at 70 i do some magic for like shift+enter etc.
 									// this only happens on my own terminal emulator.
 									case "70": return keyPressAndRelease(NonCharacterKeyEvent.Key.ScrollLock, modifierState);
@@ -3397,8 +3414,9 @@ struct RealTimeConsoleInput {
 		auto c = remainingFromLastTime == int.max ? nextRaw(true) : remainingFromLastTime;
 		if(c == -1)
 			return null; // interrupted; give back nothing so the other level can recheck signal flags
-		if(c == 0)
-			return [InputEvent(EndOfFileEvent(), terminal)];
+		// this conflicted with ctrl+space idk why it was ever there tbh
+		//if(c == 0)
+			//return [InputEvent(EndOfFileEvent(), terminal)];
 		if(c == '\033') {
 			if(timedCheckForInput_bypassingBuffer(50)) {
 				// escape sequence
@@ -3443,7 +3461,17 @@ struct RealTimeConsoleInput {
 	}
 }
 
-/// The new style of keyboard event
+/++
+	The new style of keyboard event
+
+	Worth noting some special cases terminals tend to do:
+
+	$(LIST
+		* Ctrl+space bar sends char 0.
+		* Ctrl+ascii characters send char 1 - 26 as chars on all systems.
+		* Other modifier+key combinations may send random other things or not be detected as it is configuration-specific with no way to detect. It is reasonably reliable for the non-character keys (arrows, F1-F12, Home/End, etc.) but not perfectly so. Some systems just don't send them.
+	)
++/
 struct KeyboardEvent {
 	bool pressed; ///
 	dchar which; ///
@@ -5110,6 +5138,13 @@ class LineGetter {
 						justHitTab = false;
 						// FIXME: find matching delimiter
 					break;
+					// FIXME: emacs style keys
+					//  alt-f/b navigates by word. ctrl-f/b navigates by char. history storing original pastes as blocks.
+
+					// FIXME: on tab complete let it filter by prefix
+					// FIXME: should be able to update the selection with shift+arrows as well as mouse
+					// if terminal emulator supports this, it can formally select it to the buffer for copy
+					// and sending to primary on X11 (do NOT do it on Windows though!!!)
 					case KeyboardEvent.Key.LeftArrow:
 						justHitTab = false;
 						if(cursorPosition)
@@ -6276,9 +6311,7 @@ version(TerminalDirectToEmulator) {
 					}, fds[0]);
 
 					readFd = fds[0];
-				}
-
-				version(Windows) {
+				} else version(CRuntime_Microsoft) {
 
 					CHAR[MAX_PATH] PipeNameBuffer;
 
@@ -6335,7 +6368,7 @@ version(TerminalDirectToEmulator) {
 					}
 
 					WindowsRead(0, 0, this.overlapped);
-				}
+				} else throw new Exception("pipeThroughStdOut not supported on this system currently. Use -m32mscoff instead.");
 			}
 		}
 
@@ -6765,8 +6798,10 @@ version(TerminalDirectToEmulator) {
 
 			if(integratedTerminalEmulatorConfiguration.fontName.length) {
 				this.font = new OperatingSystemFont(integratedTerminalEmulatorConfiguration.fontName, integratedTerminalEmulatorConfiguration.fontSize, FontWeight.medium);
-				this.fontWidth = font.averageWidth;
-				this.fontHeight = font.height;
+				if(!this.font.isNull) {
+					this.fontWidth = font.averageWidth;
+					this.fontHeight = font.height;
+				}
 			}
 
 
@@ -6944,8 +6979,10 @@ private version(Windows) {
 		LPSECURITY_ATTRIBUTES lpSecurityAttributes
 	);
 
-	extern(C) int _dup2(int, int);
-	extern(C) int _fileno(FILE*);
+	version(CRuntime_Microsoft) {
+		extern(C) int _dup2(int, int);
+		extern(C) int _fileno(FILE*);
+	}
 }
 
 

terminalemulator.d

@@ -559,6 +559,13 @@ class TerminalEmulator {
 			return true;
 		}
 
+		/*
+			So ctrl + A-Z, [, \, ], ^, and _ are all chars 1-31
+			ctrl+5 send ^]
+
+			FIXME: for alt+keys and the other ctrl+them, send the xterm ascii magc thing terminal.d knows how to use
+		*/
+
 		// scrollback controls. Unlike xterm, I only want to do this on the normal screen, since alt screen
 		// doesn't have scrollback anyway. Thus the key will be forwarded to the application.
 		if((!alternateScreenActive || scrollingBack) && key == TerminalKey.PageUp && (shift || scrollLock)) {
@@ -1552,6 +1559,8 @@ class TerminalEmulator {
 		normalScreen.length = screenWidth * screenHeight;
 		alternateScreen.length = screenWidth * screenHeight;
 		scrollZoneBottom = screenHeight - 1;
+		if(scrollZoneTop < 0 || scrollZoneTop >= scrollZoneBottom)
+			scrollZoneTop = 0;
 
 		// we need to make sure the state is sane all across the board, so first we'll clear everything...
 		TerminalCell plain;
@@ -1993,10 +2002,10 @@ class TerminalEmulator {
 							break;
 						alternateScreen[idx .. idx + screenWidth] = alternateScreen[idx + screenWidth .. idx + screenWidth * 2];
 					} else {
+						if(screenWidth <= 0)
+							break;
 						if(idx + screenWidth * 2 > normalScreen.length)
 							break;
-						// range violation in apt on debian
-						// FIXME
 						normalScreen[idx .. idx + screenWidth] = normalScreen[idx + screenWidth .. idx + screenWidth * 2];
 					}
 					idx += screenWidth;
@@ -2694,6 +2703,11 @@ P s = 2 3 ; 2 → Restore xterm window title from stack.
 							// FIXME: these are supposed to be per-buffer
 							scrollZoneTop = args[0] - 1;
 							scrollZoneBottom = args[1] - 1;
+
+							if(scrollZoneTop < 0)
+								scrollZoneTop = 0;
+							if(scrollZoneBottom > screenHeight)
+								scrollZoneBottom = screenHeight - 1;
 						} else {
 							// restore... something FIXME
 						}
@@ -4032,11 +4046,12 @@ mixin template SdpyDraw() {
 
 	void loadDefaultFont(int size = 14) {
 		static if(UsingSimpledisplayX11) {
-			font = new OperatingSystemFont("fixed", size, FontWeight.medium);
+			font = new OperatingSystemFont("core:fixed", size, FontWeight.medium);
+			//font = new OperatingSystemFont("monospace", size, FontWeight.medium);
 			if(font.isNull) {
 				// didn't work, it is using a
 				// fallback, prolly fixed-13 is best
-				font = new OperatingSystemFont("fixed", 13, FontWeight.medium);
+				font = new OperatingSystemFont("core:fixed", 13, FontWeight.medium);
 			}
 		} else version(Windows) {
 			this.font = new OperatingSystemFont("Courier New", size, FontWeight.medium);
@@ -4046,7 +4061,6 @@ mixin template SdpyDraw() {
 			// no way to really tell... just guess so it doesn't crash but like eeek.
 			fontWidth = size / 2;
 			fontHeight = size;
-
 		} else {
 			fontWidth = font.averageWidth;
 			fontHeight = font.height;