mirror of https://github.com/adamdruppe/arsd.git
wip
This commit is contained in:
Adam D. Ruppe
parent
4e7c886b54
commit
1ea5517916
19
cgi.d
19
cgi.d
|
|
@ -478,9 +478,16 @@ void main() {
|
|||
cgi.d copyright 2008-2023, Adam D. Ruppe. Provided under the Boost Software License.
|
||||
|
||||
Yes, this file is old, and yes, it is still actively maintained and used.
|
||||
|
||||
History:
|
||||
An import of `arsd.core` was added on March 21, 2023 (dub v11.0). Prior to this, the module's default configuration was completely stand-alone. You must now include the `core.d` file in your builds with `cgi.d`.
|
||||
|
||||
This change is primarily to integrate the event loops across the library, allowing you to more easily use cgi.d along with my other libraries like simpledisplay and http2.d. Previously, you'd have to run separate helper threads. Now, they can all automatically work together.
|
||||
+/
|
||||
module arsd.cgi;
|
||||
|
||||
import arsd.core;
|
||||
|
||||
// FIXME: Nullable!T can be a checkbox that enables/disables the T on the automatic form
|
||||
// and a SumType!(T, R) can be a radio box to pick between T and R to disclose the extra boxes on the automatic form
|
||||
|
||||
|
|
@ -7120,18 +7127,6 @@ void runSessionServer()() {
|
|||
runAddonServer("/tmp/arsd_session_server", new BasicDataServerImplementation());
|
||||
}
|
||||
|
||||
version(Posix)
|
||||
private void makeNonBlocking(int fd) {
|
||||
import core.sys.posix.fcntl;
|
||||
auto flags = fcntl(fd, F_GETFL, 0);
|
||||
if(flags == -1)
|
||||
throw new Exception("fcntl get");
|
||||
flags |= O_NONBLOCK;
|
||||
auto s = fcntl(fd, F_SETFL, flags);
|
||||
if(s == -1)
|
||||
throw new Exception("fcntl set");
|
||||
}
|
||||
|
||||
import core.stdc.errno;
|
||||
|
||||
struct IoOp {
|
||||
|
|
|
|||
19
color.d
19
color.d
|
|
@ -6,6 +6,8 @@
|
|||
+/
|
||||
module arsd.color;
|
||||
|
||||
import arsd.core;
|
||||
|
||||
@safe:
|
||||
|
||||
// importing phobos explodes the size of this code 10x, so not doing it.
|
||||
|
|
@ -114,23 +116,6 @@ private {
|
|||
if(previous != a.length)
|
||||
dg(count++, a[previous .. $]);
|
||||
}
|
||||
nothrow @safe @nogc pure
|
||||
inout(char)[] stripInternal(return inout(char)[] s) {
|
||||
foreach(i, char c; s)
|
||||
if(c != ' ' && c != '\t' && c != '\n') {
|
||||
s = s[i .. $];
|
||||
break;
|
||||
}
|
||||
for(int a = cast(int)(s.length - 1); a > 0; a--) {
|
||||
char c = s[a];
|
||||
if(c != ' ' && c != '\t' && c != '\n') {
|
||||
s = s[0 .. a + 1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
// done with mini-phobos
|
||||
|
|
|
|||
18
dub.json
18
dub.json
|
|
@ -7,6 +7,16 @@
|
|||
"authors": ["Adam D. Ruppe"],
|
||||
"license":"BSL-1.0",
|
||||
"subPackages": [
|
||||
{
|
||||
"name":"core",
|
||||
"description": "Shared components across other arsd modules",
|
||||
"targetType": "library",
|
||||
"importPaths": ["."],
|
||||
"dflags-dmd": ["-mv=arsd.core=$PACKAGE_DIR/core.d"],
|
||||
"dflags-ldc": ["--mv=arsd.core=$PACKAGE_DIR/core.d"],
|
||||
"dflags-gdc": ["-fmodule-file=arsd.core=$PACKAGE_DIR/core.d"],
|
||||
"sourceFiles": ["core.d"]
|
||||
},
|
||||
{
|
||||
"name": "simpledisplay",
|
||||
"description": "Window creation and basic drawing",
|
||||
|
|
@ -16,7 +26,10 @@
|
|||
"dflags-ldc": ["--mv=arsd.simpledisplay=$PACKAGE_DIR/simpledisplay.d"],
|
||||
"dflags-gdc": ["-fmodule-file=arsd.simpledisplay=$PACKAGE_DIR/simpledisplay.d"],
|
||||
"lflags-osx": ["-L/usr/X11/lib"],
|
||||
"dependencies": {"arsd-official:color_base":"*"},
|
||||
"dependencies": {
|
||||
"arsd-official:core":"*",
|
||||
"arsd-official:color_base":"*"
|
||||
},
|
||||
"configurations": [
|
||||
{
|
||||
"name": "normal",
|
||||
|
|
@ -519,6 +532,9 @@
|
|||
"dflags-dmd": ["-mv=arsd.http2=$PACKAGE_DIR/http2.d"],
|
||||
"dflags-ldc": ["--mv=arsd.http2=$PACKAGE_DIR/http2.d"],
|
||||
"dflags-gdc": ["-fmodule-file=arsd.http2=$PACKAGE_DIR/http2.d"],
|
||||
"dependencies": {
|
||||
"arsd-official:core":"*"
|
||||
},
|
||||
"configurations": [
|
||||
{
|
||||
"name": "with_openssl",
|
||||
|
|
|
|||
10
exception.d
10
exception.d
|
|
@ -1,4 +1,12 @@
|
|||
/// A draft of a better way to do exceptions
|
||||
/++
|
||||
A draft of a better way to do exceptions
|
||||
|
||||
History:
|
||||
Originally written in May 2015 as a demo, but I never used it inside arsd.
|
||||
|
||||
Deprecated in March 2023 (dub v11.0), with the successful parts moved to [arsd.core]. It is unlikely to get any future updates.
|
||||
+/
|
||||
deprecated("This was just a proof of concept demo, the actual concepts are now implemented inside arsd.core")
|
||||
module arsd.exception;
|
||||
/*
|
||||
Exceptions 2.0
|
||||
|
|
|
|||
83
http2.d
83
http2.d
|
|
@ -24,9 +24,21 @@
|
|||
Automatic `100 Continue` handling was added on September 28, 2021. It doesn't
|
||||
set the Expect header, so it isn't supposed to happen, but plenty of web servers
|
||||
don't follow the standard anyway.
|
||||
|
||||
A dependency on [arsd.core] was added on March 19, 2023 (dub v11.0). Previously,
|
||||
module was stand-alone. You will have add the `core.d` file from the arsd repo
|
||||
to your build now if you are managing the files and builds yourself.
|
||||
|
||||
The benefits of this dependency include some simplified implementation code which
|
||||
makes it easier for me to add more api conveniences, better exceptions with more
|
||||
information, and better event loop integration with other arsd modules beyond
|
||||
just the simpledisplay adapters available previously. The new integration can
|
||||
also make things like heartbeat timers easier for you to code.
|
||||
+/
|
||||
module arsd.http2;
|
||||
|
||||
import arsd.core;
|
||||
|
||||
///
|
||||
unittest {
|
||||
import arsd.http2;
|
||||
|
|
@ -4909,9 +4921,13 @@ class WebSocket {
|
|||
|
||||
readyState_ = CLOSING;
|
||||
|
||||
closeCalled = true;
|
||||
|
||||
llclose();
|
||||
}
|
||||
|
||||
private bool closeCalled;
|
||||
|
||||
/++
|
||||
Sends a ping message to the server. This is done automatically by the library if you set a non-zero [Config.pingFrequency], but you can also send extra pings explicitly as well with this function.
|
||||
+/
|
||||
|
|
@ -5072,9 +5088,8 @@ class WebSocket {
|
|||
case WebSocketOpcode.close:
|
||||
|
||||
//import std.stdio; writeln("closed ", cast(string) m.data);
|
||||
readyState_ = CLOSED;
|
||||
|
||||
int code;
|
||||
ushort code = CloseEvent.StandardCloseCodes.noStatusCodePresent;
|
||||
const(char)[] reason;
|
||||
|
||||
if(m.data.length >= 2) {
|
||||
|
|
@ -5082,8 +5097,14 @@ class WebSocket {
|
|||
reason = (cast(char[]) m.data[2 .. $]);
|
||||
}
|
||||
|
||||
if(onclose_)
|
||||
onclose_(CloseEvent(code, reason));
|
||||
if(onclose)
|
||||
onclose(CloseEvent(code, reason, true));
|
||||
|
||||
// if we receive one and haven't sent one back we're supposed to echo it back and close.
|
||||
if(!closeCalled)
|
||||
close(code, reason.idup);
|
||||
|
||||
readyState_ = CLOSED;
|
||||
|
||||
unregisterActiveSocket(this);
|
||||
break;
|
||||
|
|
@ -5118,7 +5139,7 @@ class WebSocket {
|
|||
}
|
||||
|
||||
/++
|
||||
Arguments for the close event. The `code` and `reason` are provided from the close message on the websocket, if they are present. The spec says code 1000 indicates a normal, default reason close, but does not specify more. The `reason` should be user readable.
|
||||
Arguments for the close event. The `code` and `reason` are provided from the close message on the websocket, if they are present. The spec says code 1000 indicates a normal, default reason close, but reserves the code range from 3000-5000 for future definition; the 3000s can be registered with IANA and the 4000's are application private use. The `reason` should be user readable, but not displayed to the end user. `wasClean` is true if the server actually sent a close event, false if it just disconnected.
|
||||
|
||||
$(PITFALL
|
||||
The `reason` argument references a temporary buffer and there's no guarantee it will remain valid once your callback returns. It may be freed and will very likely be overwritten. If you want to keep the reason beyond the callback, make sure you `.idup` it.
|
||||
|
|
@ -5128,31 +5149,39 @@ class WebSocket {
|
|||
Added March 19, 2023 (dub v11.0).
|
||||
+/
|
||||
static struct CloseEvent {
|
||||
int code;
|
||||
ushort code;
|
||||
const(char)[] reason;
|
||||
bool wasClean;
|
||||
|
||||
/++
|
||||
See https://www.rfc-editor.org/rfc/rfc6455#section-7.4.1 for details.
|
||||
+/
|
||||
enum StandardCloseCodes {
|
||||
purposeFulfilled = 1000,
|
||||
goingAway = 1001,
|
||||
protocolError = 1002,
|
||||
unacceptableData = 1003, // e.g. got text message when you can only handle binary
|
||||
Reserved = 1004,
|
||||
noStatusCodePresent = 1005, // not set by endpoint.
|
||||
abnormalClosure = 1006, // not set by endpoint. closed without a Close control. FIXME: maybe keep a copy of errno around for these
|
||||
inconsistentData = 1007, // e.g. utf8 validation failed
|
||||
genericPolicyViolation = 1008,
|
||||
messageTooBig = 1009,
|
||||
clientRequiredExtensionMissing = 1010, // only the client should send this
|
||||
unnexpectedCondition = 1011,
|
||||
unverifiedCertificate = 1015, // not set by client
|
||||
}
|
||||
}
|
||||
|
||||
/++
|
||||
The `CloseEvent` you get references a temporary buffer that may be overwritten after your handler returns. If you want to keep it or the `event.reason` member, remember to `.idup` it.
|
||||
|
||||
History:
|
||||
The `CloseEvent` overload was added March 19, 2023 (dub v11.0). Before that, `onclose` was a public member of type `void delegate()`. This change keeps setting working, but the getter's type has changed.
|
||||
The `CloseEvent` was changed to a [arsd.core.FlexibleDelegate] on March 19, 2023 (dub v11.0). Before that, `onclose` was a public member of type `void delegate()`. This change means setters still work with or without the [CloseEvent] argument.
|
||||
|
||||
Your onclose method is now also called on abnormal terminations. Check the `wasClean` member of the `CloseEvent` to know if it came from a close frame or other cause.
|
||||
+/
|
||||
void onclose(void delegate(CloseEvent event) dg) {
|
||||
onclose_ = dg;
|
||||
}
|
||||
|
||||
/// ditto
|
||||
void onclose(void delegate() dg) {
|
||||
onclose_ = (CloseEvent ce) { dg(); };
|
||||
}
|
||||
|
||||
/// ditto
|
||||
void delegate(CloseEvent) onclose() {
|
||||
return onclose_;
|
||||
}
|
||||
|
||||
private void delegate(CloseEvent event) onclose_; ///
|
||||
FlexibleDelegate!(void delegate(CloseEvent event)) onclose;
|
||||
void delegate() onerror; ///
|
||||
void delegate(in char[]) ontextmessage; ///
|
||||
void delegate(in ubyte[]) onbinarymessage; ///
|
||||
|
|
@ -5223,6 +5252,9 @@ class WebSocket {
|
|||
if(sock.onerror)
|
||||
sock.onerror();
|
||||
|
||||
if(sock.onclose)
|
||||
sock.onclose(CloseEvent(CloseEvent.StandardCloseCodes.abnormalClosure, "Connection timed out", false, int.max));
|
||||
|
||||
sock.socket.close();
|
||||
sock.readyState_ = CLOSED;
|
||||
unregisterActiveSocket(sock);
|
||||
|
|
@ -5266,6 +5298,13 @@ class WebSocket {
|
|||
sock.timeoutFromInactivity = MonoTime.currTime + sock.config.timeoutFromInactivity;
|
||||
if(!sock.lowLevelReceive()) {
|
||||
sock.readyState_ = CLOSED;
|
||||
|
||||
if(sock.onerror)
|
||||
sock.onerror();
|
||||
|
||||
if(sock.onclose)
|
||||
sock.onclose(CloseEvent(CloseEvent.StandardCloseCodes.abnormalClosure, "Connection lost", false, lastSocketError()));
|
||||
|
||||
unregisterActiveSocket(sock);
|
||||
continue outermost;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8898,7 +8898,7 @@ class TableView : Widget {
|
|||
lvColumn.fmt = LVCFMT_LEFT;
|
||||
|
||||
if(SendMessage(hwnd, LVM_INSERTCOLUMN, cast(WPARAM) i, cast(LPARAM) &lvColumn) == -1)
|
||||
throw new WindowsApiException("Insert Column Fail");
|
||||
throw new WindowsApiException("Insert Column Fail", GetLastError());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -14567,7 +14567,7 @@ class FilePicker : Dialog {
|
|||
if(handle is INVALID_HANDLE_VALUE) {
|
||||
if(GetLastError() == ERROR_FILE_NOT_FOUND)
|
||||
return GetFilesResult.fileNotFound;
|
||||
throw new WindowsApiException("FindFirstFileW");
|
||||
throw new WindowsApiException("FindFirstFileW", GetLastError());
|
||||
}
|
||||
|
||||
try_more:
|
||||
|
|
@ -14580,7 +14580,7 @@ class FilePicker : Dialog {
|
|||
if(ret == 0) {
|
||||
if(GetLastError() == ERROR_NO_MORE_FILES)
|
||||
return GetFilesResult.success;
|
||||
throw new WindowsApiException("FindNextFileW");
|
||||
throw new WindowsApiException("FindNextFileW", GetLastError());
|
||||
}
|
||||
|
||||
goto try_more;
|
||||
|
|
|
|||
|
|
@ -2531,29 +2531,6 @@ B0 40 00 # sustain pedal off
|
|||
}
|
||||
}
|
||||
|
||||
version(Posix) {
|
||||
import core.sys.posix.signal;
|
||||
private sigaction_t oldSigIntr;
|
||||
void setSigIntHandler() {
|
||||
sigaction_t n;
|
||||
n.sa_handler = &interruptSignalHandlerSAudio;
|
||||
n.sa_mask = cast(sigset_t) 0;
|
||||
n.sa_flags = 0;
|
||||
sigaction(SIGINT, &n, &oldSigIntr);
|
||||
}
|
||||
void restoreSigIntHandler() {
|
||||
sigaction(SIGINT, &oldSigIntr, null);
|
||||
}
|
||||
|
||||
__gshared bool interrupted;
|
||||
|
||||
private
|
||||
extern(C)
|
||||
void interruptSignalHandlerSAudio(int sigNumber) nothrow {
|
||||
interrupted = true;
|
||||
}
|
||||
}
|
||||
|
||||
/// Gives MIDI output access.
|
||||
struct MidiOutput {
|
||||
version(ALSA) {
|
||||
|
|
|
|||
|
|
@ -4492,7 +4492,7 @@ struct EventLoopImpl {
|
|||
while(PeekMessage(&message, null, 0, 0, PM_NOREMOVE)) { // need to peek since sometimes MsgWaitForMultipleObjectsEx returns even though GetMessage can block. tbh i don't fully understand it but the docs say it is foreground activation
|
||||
ret = GetMessage(&message, null, 0, 0);
|
||||
if(ret == -1)
|
||||
throw new Exception("GetMessage failed");
|
||||
throw new WindowsApiException("GetMessage", GetLastError());
|
||||
TranslateMessage(&message);
|
||||
DispatchMessage(&message);
|
||||
|
||||
|
|
@ -4511,7 +4511,7 @@ struct EventLoopImpl {
|
|||
// timeout, should never happen since we aren't using it
|
||||
} else if(waitResult == 0xFFFFFFFF) {
|
||||
// failed
|
||||
throw new Exception("MsgWaitForMultipleObjectsEx failed");
|
||||
throw new WindowsApiException("MsgWaitForMultipleObjectsEx", GetLastError());
|
||||
} else {
|
||||
// idk....
|
||||
}
|
||||
|
|
@ -5017,13 +5017,13 @@ class NotificationAreaIcon : CapableOfHandlingNativeEvent {
|
|||
wc.lpfnWndProc = &WndProc;
|
||||
wc.lpszClassName = "arsd_simpledisplay_notification_icon"w.ptr;
|
||||
if(!RegisterClassExW(&wc))
|
||||
throw new WindowsApiException("RegisterClass");
|
||||
throw new WindowsApiException("RegisterClass", GetLastError());
|
||||
registered = true;
|
||||
}
|
||||
|
||||
this.hwnd = CreateWindowW("arsd_simpledisplay_notification_icon"w.ptr, "test"w.ptr /* name */, 0 /* dwStyle */, 0, 0, 0, 0, HWND_MESSAGE, null, hInstance, null);
|
||||
if(hwnd is null)
|
||||
throw new Exception("CreateWindow");
|
||||
throw new WindowsApiException("CreateWindow", GetLastError());
|
||||
|
||||
data.cbSize = data.sizeof;
|
||||
data.hWnd = hwnd;
|
||||
|
|
@ -5437,14 +5437,14 @@ class Timer {
|
|||
/*
|
||||
handle = SetTimer(null, handle, intervalInMilliseconds, &timerCallback);
|
||||
if(handle == 0)
|
||||
throw new Exception("SetTimer fail");
|
||||
throw new WindowsApiException("SetTimer", GetLastError());
|
||||
*/
|
||||
|
||||
// thanks to Archival 998 for the WaitableTimer blocks
|
||||
handle = CreateWaitableTimer(null, false, null);
|
||||
long initialTime = -intervalInMilliseconds;
|
||||
if(handle is null || !SetWaitableTimer(handle, cast(LARGE_INTEGER*)&initialTime, intervalInMilliseconds, &timerCallback, handle, false))
|
||||
throw new Exception("SetWaitableTimer Failed");
|
||||
throw new WindowsApiException("SetWaitableTimer", GetLastError());
|
||||
|
||||
mapping[handle] = this;
|
||||
|
||||
|
|
@ -5548,7 +5548,7 @@ class Timer {
|
|||
//handle = SetTimer(null, handle, intervalInMilliseconds, &timerCallback);
|
||||
long initialTime = -intervalInMilliseconds;
|
||||
if(handle is null || !SetWaitableTimer(handle, cast(LARGE_INTEGER*)&initialTime, intervalInMilliseconds, &timerCallback, handle, false))
|
||||
throw new Exception("couldn't change pulse timer");
|
||||
throw new WindowsApiException("couldn't change pulse timer", GetLastError());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5785,7 +5785,7 @@ void getClipboardText(SimpleWindow clipboardOwner, void delegate(in char[]) rece
|
|||
version(Windows) {
|
||||
HWND hwndOwner = clipboardOwner ? clipboardOwner.impl.hwnd : null;
|
||||
if(OpenClipboard(hwndOwner) == 0)
|
||||
throw new Exception("OpenClipboard");
|
||||
throw new WindowsApiException("OpenClipboard", GetLastError());
|
||||
scope(exit)
|
||||
CloseClipboard();
|
||||
// see: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getpriorityclipboardformat
|
||||
|
|
@ -5831,7 +5831,7 @@ void getClipboardImage()(SimpleWindow clipboardOwner, void delegate(MemoryImage)
|
|||
version(Windows) {
|
||||
HWND hwndOwner = clipboardOwner ? clipboardOwner.impl.hwnd : null;
|
||||
if(OpenClipboard(hwndOwner) == 0)
|
||||
throw new Exception("OpenClipboard");
|
||||
throw new WindowsApiException("OpenClipboard", GetLastError());
|
||||
scope(exit)
|
||||
CloseClipboard();
|
||||
if(auto dataHandle = GetClipboardData(CF_DIBV5)) {
|
||||
|
|
@ -5858,13 +5858,13 @@ void setClipboardText(SimpleWindow clipboardOwner, string text) {
|
|||
assert(clipboardOwner !is null);
|
||||
version(Windows) {
|
||||
if(OpenClipboard(clipboardOwner.impl.hwnd) == 0)
|
||||
throw new Exception("OpenClipboard");
|
||||
throw new WindowsApiException("OpenClipboard", GetLastError());
|
||||
scope(exit)
|
||||
CloseClipboard();
|
||||
EmptyClipboard();
|
||||
auto sz = sizeOfConvertedWstring(text, WindowsStringConversionFlags.convertNewLines | WindowsStringConversionFlags.zeroTerminate);
|
||||
auto handle = GlobalAlloc(GMEM_MOVEABLE, sz * 2); // zero terminated wchars
|
||||
if(handle is null) throw new Exception("GlobalAlloc");
|
||||
if(handle is null) throw new WindowsApiException("GlobalAlloc", GetLastError());
|
||||
if(auto data = cast(wchar*) GlobalLock(handle)) {
|
||||
auto slice = data[0 .. sz];
|
||||
scope(failure)
|
||||
|
|
@ -5886,7 +5886,7 @@ void setClipboardImage()(SimpleWindow clipboardOwner, MemoryImage img) {
|
|||
assert(clipboardOwner !is null);
|
||||
version(Windows) {
|
||||
if(OpenClipboard(clipboardOwner.impl.hwnd) == 0)
|
||||
throw new Exception("OpenClipboard");
|
||||
throw new WindowsApiException("OpenClipboard", GetLastError());
|
||||
scope(exit)
|
||||
CloseClipboard();
|
||||
EmptyClipboard();
|
||||
|
|
@ -5901,7 +5901,7 @@ void setClipboardImage()(SimpleWindow clipboardOwner, MemoryImage img) {
|
|||
writeBmpIndirect(img, &sink, false);
|
||||
|
||||
auto handle = GlobalAlloc(GMEM_MOVEABLE, mdata.length);
|
||||
if(handle is null) throw new Exception("GlobalAlloc");
|
||||
if(handle is null) throw new WindowsApiException("GlobalAlloc", GetLastError());
|
||||
if(auto data = cast(ubyte*) GlobalLock(handle)) {
|
||||
auto slice = data[0 .. mdata.length];
|
||||
scope(failure)
|
||||
|
|
@ -6589,7 +6589,7 @@ version(Windows) {
|
|||
}
|
||||
|
||||
if(SendInput(cast(int) inputs.length, inputs.ptr, INPUT.sizeof) != inputs.length) {
|
||||
throw new Exception("SendInput failed");
|
||||
throw new WindowsApiException("SendInput", GetLastError());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -6602,7 +6602,7 @@ version(Windows) {
|
|||
__gshared int hotkeyId = 0;
|
||||
int id = ++hotkeyId;
|
||||
if(!RegisterHotKey(window.impl.hwnd, id, modifiers, vk))
|
||||
throw new Exception("RegisterHotKey failed");
|
||||
throw new Exception("RegisterHotKey");
|
||||
|
||||
__gshared void delegate()[WPARAM][HWND] handlers;
|
||||
|
||||
|
|
@ -6639,7 +6639,7 @@ version(Windows) {
|
|||
/// Platform-specific for Windows. Unregisters a key. The id is the value returned by [registerHotKey].
|
||||
void unregisterHotKey(SimpleWindow window, int id) {
|
||||
if(!UnregisterHotKey(window.impl.hwnd, id))
|
||||
throw new Exception("UnregisterHotKey");
|
||||
throw new WindowsApiException("UnregisterHotKey", GetLastError());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -6743,7 +6743,7 @@ struct SyntheticInput {
|
|||
}
|
||||
|
||||
if(SendInput(cast(int) inputs.length, inputs.ptr, INPUT.sizeof) != inputs.length) {
|
||||
throw new Exception("SendInput failed");
|
||||
throw new WindowsApiException("SendInput", GetLastError());
|
||||
}
|
||||
} else version(X11) {
|
||||
int delay = 0;
|
||||
|
|
@ -6775,7 +6775,7 @@ struct SyntheticInput {
|
|||
input.ki.dwExtraInfo = GetMessageExtraInfo();
|
||||
|
||||
if(SendInput(1, &input, INPUT.sizeof) != 1) {
|
||||
throw new Exception("SendInput failed");
|
||||
throw new WindowsApiException("SendInput", GetLastError());
|
||||
}
|
||||
} else version(X11) {
|
||||
XTestFakeKeyEvent(XDisplayConnection.get, XKeysymToKeycode(XDisplayConnection.get, key), pressed, delay + pressed ? 0 : 5);
|
||||
|
|
@ -6819,7 +6819,7 @@ struct SyntheticInput {
|
|||
}
|
||||
|
||||
if(SendInput(1, &input, INPUT.sizeof) != 1) {
|
||||
throw new Exception("SendInput failed");
|
||||
throw new WindowsApiException("SendInput", GetLastError());
|
||||
}
|
||||
} else version(X11) {
|
||||
int btn;
|
||||
|
|
@ -6852,7 +6852,7 @@ struct SyntheticInput {
|
|||
input.mi.dwFlags = MOUSEEVENTF_MOVE;
|
||||
|
||||
if(SendInput(1, &input, INPUT.sizeof) != 1) {
|
||||
throw new Exception("SendInput failed");
|
||||
throw new WindowsApiException("SendInput", GetLastError());
|
||||
}
|
||||
} else version(X11) {
|
||||
auto disp = XDisplayConnection.get();
|
||||
|
|
@ -6872,7 +6872,7 @@ struct SyntheticInput {
|
|||
input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
|
||||
|
||||
if(SendInput(1, &input, INPUT.sizeof) != 1) {
|
||||
throw new Exception("SendInput failed");
|
||||
throw new WindowsApiException("SendInput", GetLastError());
|
||||
}
|
||||
} else version(X11) {
|
||||
auto disp = XDisplayConnection.get();
|
||||
|
|
@ -9085,7 +9085,7 @@ struct ScreenPainter {
|
|||
RECT uncovered;
|
||||
HRGN hrgn;
|
||||
if(!ScrollDC(impl.hdc, -dx, -dy, &scroll, &clip, hrgn, &uncovered))
|
||||
throw new Exception("ScrollDC");
|
||||
throw new WindowsApiException("ScrollDC", GetLastError());
|
||||
|
||||
} else version(X11) {
|
||||
// FIXME: clip stuff outside this rectangle
|
||||
|
|
@ -9491,7 +9491,7 @@ class Sprite : CapableOfBeingDrawnUpon {
|
|||
0);
|
||||
|
||||
if(handle is null)
|
||||
throw new Exception("couldn't create pixmap");
|
||||
throw new WindowsApiException("couldn't create pixmap", GetLastError());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -11002,7 +11002,7 @@ version(Windows) {
|
|||
|
||||
hIcon = CreateIconFromResourceEx(cast(ubyte*) &icon_win32, icon_len, true, 0x00030000, width, height, 0);
|
||||
|
||||
if(hIcon is null) throw new Exception("CreateIconFromResourceEx");
|
||||
if(hIcon is null) throw new WindowsApiException("CreateIconFromResourceEx", GetLastError());
|
||||
}
|
||||
|
||||
~this() {
|
||||
|
|
@ -11526,7 +11526,7 @@ version(Windows) {
|
|||
rect.right = w + x;
|
||||
rect.bottom = h + y;
|
||||
if(!AdjustWindowRect(&rect, GetWindowLong(hwnd, GWL_STYLE), GetMenu(hwnd) !is null))
|
||||
throw new Exception("AdjustWindowRect");
|
||||
throw new WindowsApiException("AdjustWindowRect", GetLastError());
|
||||
|
||||
MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, true);
|
||||
updateOpenglViewportIfNeeded(w, h);
|
||||
|
|
@ -11568,7 +11568,7 @@ version(Windows) {
|
|||
wc.hIconSm = null;
|
||||
wc.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
|
||||
if(!RegisterClassExW(&wc))
|
||||
throw new WindowsApiException("RegisterClassExW");
|
||||
throw new WindowsApiException("RegisterClassExW", GetLastError());
|
||||
knownWinClasses[cnamec] = true;
|
||||
}
|
||||
|
||||
|
|
@ -11644,10 +11644,10 @@ version(Windows) {
|
|||
auto pixelformat = ChoosePixelFormat(hdc, &pfd);
|
||||
|
||||
if (pixelformat == 0)
|
||||
throw new WindowsApiException("ChoosePixelFormat");
|
||||
throw new WindowsApiException("ChoosePixelFormat", GetLastError());
|
||||
|
||||
if (SetPixelFormat(hdc, pixelformat, &pfd) == 0)
|
||||
throw new WindowsApiException("SetPixelFormat");
|
||||
throw new WindowsApiException("SetPixelFormat", GetLastError());
|
||||
|
||||
if (sdpyOpenGLContextVersion && wglCreateContextAttribsARB is null) {
|
||||
// windoze is idiotic: we have to have OpenGL context to get function addresses
|
||||
|
|
@ -11676,7 +11676,7 @@ version(Windows) {
|
|||
ghRC = wglCreateContext(ghDC);
|
||||
}
|
||||
if (ghRC is null)
|
||||
throw new WindowsApiException("wglCreateContextAttribsARB");
|
||||
throw new WindowsApiException("wglCreateContextAttribsARB", GetLastError());
|
||||
} else {
|
||||
// try to do at least something
|
||||
if (sdpyOpenGLContextAllowFallback || sdpyOpenGLContextVersion == 0) {
|
||||
|
|
@ -11684,7 +11684,7 @@ version(Windows) {
|
|||
ghRC = wglCreateContext(ghDC);
|
||||
}
|
||||
if (ghRC is null)
|
||||
throw new WindowsApiException("wglCreateContext");
|
||||
throw new WindowsApiException("wglCreateContext", GetLastError());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -11785,7 +11785,7 @@ version(Windows) {
|
|||
rect.right = wind.minWidth + 100;
|
||||
rect.bottom = wind.minHeight + 100;
|
||||
if(!AdjustWindowRect(&rect, GetWindowLong(wind.hwnd, GWL_STYLE), GetMenu(wind.hwnd) !is null))
|
||||
throw new WindowsApiException("AdjustWindowRect");
|
||||
throw new WindowsApiException("AdjustWindowRect", GetLastError());
|
||||
|
||||
mmi.ptMinTrackSize.x = rect.right - rect.left;
|
||||
mmi.ptMinTrackSize.y = rect.bottom - rect.top;
|
||||
|
|
@ -11798,7 +11798,7 @@ version(Windows) {
|
|||
rect.right = wind.maxWidth + 100;
|
||||
rect.bottom = wind.maxHeight + 100;
|
||||
if(!AdjustWindowRect(&rect, GetWindowLong(wind.hwnd, GWL_STYLE), GetMenu(wind.hwnd) !is null))
|
||||
throw new WindowsApiException("AdjustWindowRect");
|
||||
throw new WindowsApiException("AdjustWindowRect", GetLastError());
|
||||
|
||||
mmi.ptMaxTrackSize.x = rect.right - rect.left;
|
||||
mmi.ptMaxTrackSize.y = rect.bottom - rect.top;
|
||||
|
|
@ -12351,7 +12351,7 @@ version(Windows) {
|
|||
null,
|
||||
0);
|
||||
if(handle is null)
|
||||
throw new WindowsApiException("create image failed");
|
||||
throw new WindowsApiException("create image failed", GetLastError());
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -21181,7 +21181,7 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
|
|||
|
||||
auto sz = handler.dataLength(format);
|
||||
auto handle = GlobalAlloc(GMEM_MOVEABLE, sz);
|
||||
if(handle is null) throw new Exception("GlobalAlloc");
|
||||
if(handle is null) throw new WindowsApiException("GlobalAlloc", GetLastError());
|
||||
if(auto data = cast(wchar*) GlobalLock(handle)) {
|
||||
auto slice = data[0 .. sz];
|
||||
scope(exit)
|
||||
|
|
@ -21395,7 +21395,7 @@ void enableDragAndDrop(SimpleWindow window, DropHandler handler) {
|
|||
GC.addRoot(cast(void*) dropTarget);
|
||||
|
||||
if(RegisterDragDrop(window.impl.hwnd, dropTarget) != S_OK)
|
||||
throw new Exception("register");
|
||||
throw new WindowsApiException("RegisterDragDrop", GetLastError());
|
||||
|
||||
window.dropHandler = handler;
|
||||
} else throw new NotYetImplementedException();
|
||||
|
|
|
|||
56
terminal.d
56
terminal.d
|
|
@ -1211,6 +1211,18 @@ struct Terminal {
|
|||
bool usingDirectEmulator;
|
||||
}
|
||||
|
||||
version(TerminalDirectToEmulator)
|
||||
/++
|
||||
When using the embedded terminal emulator build, closing the terminal signals that the main thread should exit
|
||||
by sending it a hang up event. If the main thread responds, no problem. But if it doesn't, it can keep a thing
|
||||
running in the background with no visible window. This timeout gives it a chance to exit cleanly, but if it
|
||||
doesn't by the end of the time, the program will be forcibly closed automatically.
|
||||
|
||||
History:
|
||||
Added March 14, 2023 (dub v10.10)
|
||||
+/
|
||||
static __gshared int terminateTimeoutMsecs = 3500;
|
||||
|
||||
version(TerminalDirectToEmulator)
|
||||
/++
|
||||
+/
|
||||
|
|
@ -1274,6 +1286,18 @@ struct Terminal {
|
|||
});
|
||||
tew = window.tew;
|
||||
window.loop();
|
||||
|
||||
// if the other thread doesn't terminate in a reasonable amount of time
|
||||
// after the window closes, we're gonna terminate it by force to avoid
|
||||
// leaving behind a background process with no obvious ui
|
||||
if(Terminal.terminateTimeoutMsecs >= 0) {
|
||||
auto murderThread = new Thread(() {
|
||||
Thread.sleep(terminateTimeoutMsecs.msecs);
|
||||
terminateTerminalProcess(threadId);
|
||||
});
|
||||
murderThread.isDaemon = true;
|
||||
murderThread.start();
|
||||
}
|
||||
} catch(Throwable t) {
|
||||
guiAbortProcess(t.toString());
|
||||
}
|
||||
|
|
@ -8425,6 +8449,24 @@ int approximate16Color(RGB color) {
|
|||
|
||||
version(TerminalDirectToEmulator) {
|
||||
|
||||
void terminateTerminalProcess(T)(T threadId) {
|
||||
version(Posix) {
|
||||
pthread_kill(threadId, SIGQUIT); // or SIGKILL even?
|
||||
|
||||
assert(0);
|
||||
//import core.sys.posix.pthread;
|
||||
//pthread_cancel(widget.term.threadId);
|
||||
//widget.term = null;
|
||||
} else version(Windows) {
|
||||
import core.sys.windows.windows;
|
||||
auto hnd = OpenProcess(SYNCHRONIZE | PROCESS_TERMINATE, TRUE, GetCurrentProcessId());
|
||||
TerminateProcess(hnd, -1);
|
||||
assert(0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/++
|
||||
Indicates the TerminalDirectToEmulator features
|
||||
are present. You can check this with `static if`.
|
||||
|
|
@ -8747,6 +8789,7 @@ version(TerminalDirectToEmulator) {
|
|||
|
||||
_dup2(_fileno(stdout), _fileno(stderr));
|
||||
setvbuf(stderr, null, _IOLBF, 128); // if I don't unbuffer this it can really confuse things
|
||||
assert(0);
|
||||
}
|
||||
|
||||
WindowsRead(0, 0, this.overlapped);
|
||||
|
|
@ -9369,18 +9412,9 @@ version(TerminalDirectToEmulator) {
|
|||
widget.parentWindow.close(); // I'm gonna let it segfault if this is null cuz like that isn't supposed to happen
|
||||
return;
|
||||
}
|
||||
pthread_kill(widget.term.threadId, SIGQUIT); // or SIGKILL even?
|
||||
|
||||
assert(0);
|
||||
//import core.sys.posix.pthread;
|
||||
//pthread_cancel(widget.term.threadId);
|
||||
//widget.term = null;
|
||||
} else version(Windows) {
|
||||
import core.sys.windows.windows;
|
||||
auto hnd = OpenProcess(SYNCHRONIZE | PROCESS_TERMINATE, TRUE, GetCurrentProcessId());
|
||||
TerminateProcess(hnd, -1);
|
||||
assert(0);
|
||||
}
|
||||
|
||||
terminateTerminalProcess(widget.term.threadId);
|
||||
} else if(c == 3) {// && !ev.shiftKey) /* ctrl+c, interrupt. But NOT ctrl+shift+c as that's a user-defined keystroke and/or "copy", but ctrl+shift+c never gets sent here.... thanks to the skipNextChar above */ {
|
||||
sendSigInt();
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue