From 079cf341a9f8813bce9eefd33e584ca445562a8f Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Sun, 5 Feb 2023 21:28:39 -0500 Subject: [PATCH 1/5] call on cancel when x a dialog --- minigui.d | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/minigui.d b/minigui.d index 723ceee..d658dd8 100644 --- a/minigui.d +++ b/minigui.d @@ -14999,6 +14999,11 @@ class AutomaticDialog(T) : Dialog { } }); + this.addEventListener((scope ClosedEvent ce) { + if(onCancel) + onCancel(); + }); + //this.children[0].focus(); } From 918268356a6d50dffdeec60d7fdda58e7f361781 Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Sun, 5 Feb 2023 21:43:20 -0500 Subject: [PATCH 2/5] fix #363 - dialog box stopped working for strings because the change event never fired with the new text system --- minigui.d | 19 +++++++++++++++---- textlayouter.d | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/minigui.d b/minigui.d index d658dd8..a037d23 100644 --- a/minigui.d +++ b/minigui.d @@ -11754,6 +11754,19 @@ class TextDisplayHelper : Widget { return ctx; } + override void defaultEventHandler_blur(Event ev) { + super.defaultEventHandler_blur(ev); + if(l.wasMutated()) { + auto evt = new ChangeEvent!string(this, &this.content); + evt.dispatch(); + l.clearWasMutatedFlag(); + } + } + + private string content() { + return l.getTextString(); + } + void undo() { if(undoStack.length) { auto state = undoStack[$-1]; @@ -12347,9 +12360,9 @@ abstract class EditableTextWidget : EditableTextWidgetParent { else return null; } else version(custom_widgets) { - version(use_new_text_system) + version(use_new_text_system) { return textLayout.getTextString(); - else + } else return textLayout.getPlainText(); } else static assert(false); } @@ -12505,10 +12518,8 @@ abstract class EditableTextWidget : EditableTextWidgetParent { } else static assert(false); - version(trash_text) { - version(custom_widgets) override void defaultEventHandler_mousedown(MouseDownEvent ev) { super.defaultEventHandler_mousedown(ev); diff --git a/textlayouter.d b/textlayouter.d index 00b6ff3..b90d170 100644 --- a/textlayouter.d +++ b/textlayouter.d @@ -474,6 +474,7 @@ public struct Selection { FIXME: what if i want to replace it with some multiply styled text? Could probably call it in sequence actually. +/ Selection replaceContent(scope const(char)[] newText, TextLayouter.StyleHandle style = TextLayouter.StyleHandle.init) { + layouter.wasMutated_ = true; if(style == TextLayouter.StyleHandle.init) style = layouter.getInsertionStyleAt(impl.focus); @@ -1068,6 +1069,19 @@ class TextLayouter { WrappedAround = 2 } + private bool wasMutated_ = false; + /++ + The layouter maintains a flag to tell if the content has been changed. + +/ + public bool wasMutated() { + return wasMutated_; + } + + /// ditto + public void clearWasMutatedFlag() { + wasMutated_ = false; + } + /++ Represents a possible registered style for a segment of text. +/ @@ -1090,6 +1104,7 @@ class TextLayouter { Appends text at the end, without disturbing user selection. +/ public void appendText(scope const(char)[] text, StyleHandle style = StyleHandle.init) { + wasMutated_ = true; auto before = this.text; this.text.length += text.length; this.text[before.length-1 .. before.length-1 + text.length] = text[]; @@ -1117,7 +1132,7 @@ class TextLayouter { FIXME: have some kind of index stuff so you can select some text found in here (think regex search) +/ void getText(scope void delegate(scope const(char)[] segment, TextStyle style) handler) { - handler(text, null); + handler(text[0 .. $-1], null); // cut off the null terminator } /++ From bd524763fcd8789f6cf070c35c39e38c1e642bf7 Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Sun, 5 Feb 2023 21:46:51 -0500 Subject: [PATCH 3/5] fix #363 on Windows too --- minigui.d | 59 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/minigui.d b/minigui.d index a037d23..57821d6 100644 --- a/minigui.d +++ b/minigui.d @@ -12518,8 +12518,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent { } else static assert(false); - version(trash_text) { - + version(trash_text) version(custom_widgets) override void defaultEventHandler_mousedown(MouseDownEvent ev) { super.defaultEventHandler_mousedown(ev); @@ -12543,12 +12542,14 @@ abstract class EditableTextWidget : EditableTextWidgetParent { } } + version(trash_text) version(custom_widgets) override void defaultEventHandler_mouseup(MouseUpEvent ev) { //this.parentWindow.win.releaseInputGrab(); super.defaultEventHandler_mouseup(ev); } + version(trash_text) version(custom_widgets) override void defaultEventHandler_mousemove(MouseMoveEvent ev) { super.defaultEventHandler_mousemove(ev); @@ -12558,6 +12559,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent { } } + version(trash_text) version(custom_widgets) override void defaultEventHandler_focus(Event ev) { super.defaultEventHandler_focus(ev); @@ -12593,28 +12595,46 @@ abstract class EditableTextWidget : EditableTextWidgetParent { }); } - private string lastContentBlur; + version(trash_text) { + private string lastContentBlur; - override void defaultEventHandler_blur(Event ev) { - super.defaultEventHandler_blur(ev); - if(parentWindow.win.closed) return; - version(custom_widgets) { - auto painter = this.draw(); - textLayout.eraseCaret(painter); - static if(SimpledisplayTimerAvailable) - if(caretTimer) { - caretTimer.destroy(); - caretTimer = null; + override void defaultEventHandler_blur(Event ev) { + super.defaultEventHandler_blur(ev); + if(parentWindow.win.closed) return; + version(custom_widgets) { + auto painter = this.draw(); + textLayout.eraseCaret(painter); + static if(SimpledisplayTimerAvailable) + if(caretTimer) { + caretTimer.destroy(); + caretTimer = null; + } } - } - if(this.content != lastContentBlur) { - auto evt = new ChangeEvent!string(this, &this.content); - evt.dispatch(); - lastContentBlur = this.content; + if(this.content != lastContentBlur) { + auto evt = new ChangeEvent!string(this, &this.content); + evt.dispatch(); + lastContentBlur = this.content; + } } } + version(win32_widgets) { + private string lastContentBlur; + + override void defaultEventHandler_blur(Event ev) { + super.defaultEventHandler_blur(ev); + + if(this.content != lastContentBlur) { + auto evt = new ChangeEvent!string(this, &this.content); + evt.dispatch(); + lastContentBlur = this.content; + } + } + } + + + version(trash_text) version(custom_widgets) override void defaultEventHandler_char(CharEvent ev) { super.defaultEventHandler_char(ev); @@ -12625,6 +12645,7 @@ abstract class EditableTextWidget : EditableTextWidgetParent { auto cbb = textLayout.contentBoundingBox(); setContentSize(cbb.width, cbb.height); } + version(trash_text) version(custom_widgets) override void defaultEventHandler_keydown(KeyDownEvent ev) { //super.defaultEventHandler_keydown(ev); @@ -12680,8 +12701,6 @@ abstract class EditableTextWidget : EditableTextWidgetParent { ensureVisibleInScroll(textLayout.caretBoundingBox()); } - } - version(use_new_text_system) { bool showingVerticalScroll() { return true; } bool showingHorizontalScroll() { return true; } From e1a575f39043c874b3a63a4ae41bec61c03183d6 Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Mon, 6 Feb 2023 09:40:11 -0500 Subject: [PATCH 4/5] fix issues #364 since postgres still calls it libpq on windows and the linker doesnt add the lib prefix automatically there --- dub.json | 3 ++- postgres.d | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index b921b56..ebb23e1 100644 --- a/dub.json +++ b/dub.json @@ -474,7 +474,8 @@ "description": "Postgresql client library. Wraps the libpq C library with my database.d interface.", "targetType": "library", "dependencies": {"arsd-official:database_base":"*"}, - "libs": ["pq"], + "libs-posix": ["pq"], + "libs-windows": ["libpq"], "sourceFiles": ["postgres.d"], "importPaths": ["."], "dflags-dmd": ["-mv=arsd.postgres=$PACKAGE_DIR/postgres.d"], diff --git a/postgres.d b/postgres.d index 1cddf14..a58b8e1 100644 --- a/postgres.d +++ b/postgres.d @@ -23,7 +23,11 @@ should be found in the PostgreSQL lib and/or bin folders (check them both!). +/ module arsd.postgres; -pragma(lib, "pq"); + +version(Windows) + pragma(lib, "libpq"); +else + pragma(lib, "pq"); public import arsd.database; From 853835196e8eb2b05c94cf244ee45941a3fdc8f8 Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Fri, 10 Feb 2023 17:32:08 -0500 Subject: [PATCH 5/5] stop segfault on mac --- cgi.d | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cgi.d b/cgi.d index a430539..4ac1c60 100644 --- a/cgi.d +++ b/cgi.d @@ -3513,7 +3513,11 @@ string toHexUpper(long num) { // the generic mixins -/// Use this instead of writing your own main +/++ + Use this instead of writing your own main + + It ultimately calls [cgiMainImpl] which creates a [RequestServer] for you. ++/ mixin template GenericMain(alias fun, long maxContentLength = defaultMaxContentLength) { mixin CustomCgiMain!(Cgi, fun, maxContentLength); } @@ -5478,7 +5482,8 @@ class ListeningConnectionManager { fd_set read_fds; FD_ZERO(&read_fds); FD_SET(listener.handle, &read_fds); - FD_SET(cancelfd, &read_fds); + if(cancelfd != -1) + FD_SET(cancelfd, &read_fds); auto max = listener.handle > cancelfd ? listener.handle : cancelfd; auto ret = select(max + 1, &read_fds, null, null, null); if(ret == -1) { @@ -5489,7 +5494,7 @@ class ListeningConnectionManager { throw new Exception("wtf select"); } - if(FD_ISSET(cancelfd, &read_fds)) { + if(cancelfd != -1 && FD_ISSET(cancelfd, &read_fds)) { return null; } @@ -9480,8 +9485,10 @@ css"; Element htmlContainer() { auto document = new Document(q"html - + + + D Application