forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a bit of general cleanup

This commit is contained in:
Adam D. Ruppe 2023-04-04 21:33:37 -04:00
parent 0d176dd6b9
commit 683db6fb8d
9 changed files with 115 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -36,6 +36,8 @@ minigui.d now also depends on a new textlayouter.d, bringing its total dependenc
Generally speaking, I am relaxing my dependency policy somewhat to permit a little more code sharing and interoperability throughout the modules. While I will make efforts to maintain some degree of stand-alone functionality, many new features and even some old features may be changed to use the new module. As such, I reserve to right to use core.d from any module from this point forward. You should be prepared to add it to your builds using any arsd component. Generally speaking, I am relaxing my dependency policy somewhat to permit a little more code sharing and interoperability throughout the modules. While I will make efforts to maintain some degree of stand-alone functionality, many new features and even some old features may be changed to use the new module. As such, I reserve to right to use core.d from any module from this point forward. You should be prepared to add it to your builds using any arsd component.
Note that arsd.core may require user32.lib on Windows. This is added automatically in most cases, and is a core component so it will be there, but if you see a linker error, this might be why.
I recommend you clone the repo and use `dmd -i` to let the compiler automatically included imported modules. It really is quite nice to use! But, of course, I don't require it and will call out other required cross-module dependencies in the future too. I recommend you clone the repo and use `dmd -i` to let the compiler automatically included imported modules. It really is quite nice to use! But, of course, I don't require it and will call out other required cross-module dependencies in the future too.
Also: Also:
@ -46,6 +48,21 @@ Also:
* Support for Windows XP has been dropped (though it may still work in certain places, there's no promises since arsd.core uses some Windows Vista features without fallback.) * Support for Windows XP has been dropped (though it may still work in certain places, there's no promises since arsd.core uses some Windows Vista features without fallback.)
* Support for older compilers has been dropped (arsd.core uses some newer druntime features). The new minimum version is likely gdc 10, the tester now runs gdc version 12. gdc 9 might still sometimes work but I'm going to be removing some of those compatibility branches soon anyway. * Support for older compilers has been dropped (arsd.core uses some newer druntime features). The new minimum version is likely gdc 10, the tester now runs gdc version 12. gdc 9 might still sometimes work but I'm going to be removing some of those compatibility branches soon anyway.
### Diagnostics
lld-link: error: undefined symbol: _MsgWaitForMultipleObjectsEx@20
>>> referenced by core.obj:(__D4arsd4core27CoreEventLoopImplementation7runOnceMFZv)
Indicates a missing `user32.lib`.
ACTUALLY WRONG: i need the right one
lld-link: error: undefined symbol: _D4arsd4core21AsyncOperationRequest5startMFZv
>> referenced by yourfile.obj:(_D4arsd4core21AsyncOperationRequest6__vtblZ)
Indicates a missing `core.d` in the build.
## 10.0 ## 10.0
Released: May 2021 Released: May 2021

2
archive.d
View File

@ -27,8 +27,6 @@ module arsd.archive;
import arsd.core; import arsd.core;
// FIXME: add a comparable decompressGzip function
version(WithoutLzmaDecoder) {} else version(WithoutLzmaDecoder) {} else
version=WithLzmaDecoder; version=WithLzmaDecoder;

16
color.d
View File

@ -221,7 +221,6 @@ struct Color {
if(g > 1) g = 1; if(g > 1) g = 1;
if(b > 1) b = 1; if(b > 1) b = 1;
/* /*
import std.conv;
assert(r >= 0.0 && r <= 1.0, to!string(r)); assert(r >= 0.0 && r <= 1.0, to!string(r));
assert(g >= 0.0 && g <= 1.0, to!string(g)); assert(g >= 0.0 && g <= 1.0, to!string(g));
assert(b >= 0.0 && b <= 1.0, to!string(b)); assert(b >= 0.0 && b <= 1.0, to!string(b));
@ -848,9 +847,15 @@ double srgbToLinearRgb(double u) {
if(u < 0.4045) if(u < 0.4045)
return u / 12.92; return u / 12.92;
else else
return ((u + 0.055) / 1.055) ^^ 2.4; return pow((u + 0.055) / 1.055, 2.4);
// return ((u + 0.055) / 1.055) ^^ 2.4;
} }
// could use the ^^ operator but that drags in some phobos. In this case, the import is
// actually insignificant, it doesn't really impact compile time, but it does complicate
// the dmd -v | grep std check to confirm i didn't miss any.
private extern(C) nothrow pure @safe @nogc double pow(double, double);
/// Converts an RGB color into an HSL triplet. useWeightedLightness will try to get a better value for luminosity for the human eye, which is more sensitive to green than red and more to red than blue. If it is false, it just does average of the rgb. /// Converts an RGB color into an HSL triplet. useWeightedLightness will try to get a better value for luminosity for the human eye, which is more sensitive to green than red and more to red than blue. If it is false, it just does average of the rgb.
double[3] toHsl(Color c, bool useWeightedLightness = false) nothrow pure @trusted @nogc { double[3] toHsl(Color c, bool useWeightedLightness = false) nothrow pure @trusted @nogc {
double r1 = cast(double) c.r / 255; double r1 = cast(double) c.r / 255;
@ -1116,7 +1121,6 @@ Color colorFromString(string s) {
/* /*
import browser.window; import browser.window;
import std.conv;
void main() { void main() {
import browser.document; import browser.document;
foreach(ele; document.querySelectorAll("input")) { foreach(ele; document.querySelectorAll("input")) {
@ -1518,7 +1522,7 @@ do {
struct ColorUse { struct ColorUse {
Color c; Color c;
int uses; int uses;
//string toString() { import std.conv; return c.toCssString() ~ " x " ~ to!string(uses); } //string toString() { return c.toCssString() ~ " x " ~ to!string(uses); }
int opCmp(ref const ColorUse co) const { int opCmp(ref const ColorUse co) const {
return co.uses - uses; return co.uses - uses;
} }
@ -1650,9 +1654,9 @@ struct P {
} }
P range; P range;
import std.algorithm; import std.algorithm; // commented out
import std.stdio; import std.stdio; // commented out
writePngLazy(range, pngFromBytes(File("/home/me/nyesha.png").byChunk(4096)).byRgbaScanline.map!((line) { writePngLazy(range, pngFromBytes(File("/home/me/nyesha.png").byChunk(4096)).byRgbaScanline.map!((line) {
foreach(ref pixel; line.pixels) { foreach(ref pixel; line.pixels) {
continue; continue;

1
dub.json
View File

@ -12,6 +12,7 @@
"description": "Shared components across other arsd modules", "description": "Shared components across other arsd modules",
"targetType": "library", "targetType": "library",
"importPaths": ["."], "importPaths": ["."],
"libs-windows": ["user32"],
"dflags-dmd": ["-mv=arsd.core=$PACKAGE_DIR/core.d"], "dflags-dmd": ["-mv=arsd.core=$PACKAGE_DIR/core.d"],
"dflags-ldc": ["--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"], "dflags-gdc": ["-fmodule-file=arsd.core=$PACKAGE_DIR/core.d"],

4
http2.d
View File

@ -37,7 +37,7 @@
+/ +/
module arsd.http2; module arsd.http2;
import arsd.core; static import arsd.core;
/// ///
unittest { unittest {
@ -5183,7 +5183,7 @@ class WebSocket {
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. 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.
+/ +/
FlexibleDelegate!(void delegate(CloseEvent event)) onclose; arsd.core.FlexibleDelegate!(void delegate(CloseEvent event)) onclose;
void delegate() onerror; /// void delegate() onerror; ///
void delegate(in char[]) ontextmessage; /// void delegate(in char[]) ontextmessage; ///
void delegate(in ubyte[]) onbinarymessage; /// void delegate(in ubyte[]) onbinarymessage; ///

113
minigui.d
View File

@ -749,7 +749,7 @@ class Widget : ReflectableProperties {
assert(sw !is null); assert(sw !is null);
if(!sw.eventQueued!RecomputeEvent) { if(!sw.eventQueued!RecomputeEvent) {
sw.postEvent(rce); sw.postEvent(rce);
// import std.stdio; writeln("redraw requested from ", file,":",line," ", this.parentWindow.win.impl.window); // writeln("redraw requested from ", file,":",line," ", this.parentWindow.win.impl.window);
} }
} }
@ -1848,7 +1848,7 @@ class Widget : ReflectableProperties {
const clip = containment.intersectionOf(Rectangle(Point(lox + paintX, loy + paintY), Size(width, height))); const clip = containment.intersectionOf(Rectangle(Point(lox + paintX, loy + paintY), Size(width, height)));
if(clip == Rectangle.init) { if(clip == Rectangle.init) {
//import std.stdio; writeln(this, " clipped out"); // writeln(this, " clipped out");
return; return;
} }
@ -1912,7 +1912,7 @@ class Widget : ReflectableProperties {
assert(sw !is null); assert(sw !is null);
if(!sw.eventQueued!RedrawEvent) { if(!sw.eventQueued!RedrawEvent) {
sw.postEvent(re); sw.postEvent(re);
// import std.stdio; writeln("redraw requested from ", file,":",line," ", this.parentWindow.win.impl.window); // writeln("redraw requested from ", file,":",line," ", this.parentWindow.win.impl.window);
} }
} }
} }
@ -3284,13 +3284,13 @@ version(win32_widgets) {
// I don't think those messages are ever actually sent normally by the widget itself, // I don't think those messages are ever actually sent normally by the widget itself,
// they are more used for the keyboard interface. methinks. // they are more used for the keyboard interface. methinks.
case SB_BOTTOM: case SB_BOTTOM:
//import std.stdio; writeln("end"); // writeln("end");
auto event = new Event("scrolltoend", *widgetp); auto event = new Event("scrolltoend", *widgetp);
event.dispatch(); event.dispatch();
//if(!event.defaultPrevented) //if(!event.defaultPrevented)
break; break;
case SB_TOP: case SB_TOP:
//import std.stdio; writeln("top"); // writeln("top");
auto event = new Event("scrolltobeginning", *widgetp); auto event = new Event("scrolltobeginning", *widgetp);
event.dispatch(); event.dispatch();
break; break;
@ -3397,7 +3397,7 @@ version(win32_widgets) {
// this is called by native child windows, whereas the other hook is done by simpledisplay windows // this is called by native child windows, whereas the other hook is done by simpledisplay windows
// but can i merge them?! // but can i merge them?!
LRESULT HookedWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) nothrow { LRESULT HookedWndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) nothrow {
//import std.stdio; try { writeln(iMessage); } catch(Exception e) {}; // try { writeln(iMessage); } catch(Exception e) {};
if(auto te = hWnd in Widget.nativeMapping) { if(auto te = hWnd in Widget.nativeMapping) {
try { try {
@ -3426,7 +3426,7 @@ version(win32_widgets) {
auto pos = getChildPositionRelativeToParentOrigin(*te); auto pos = getChildPositionRelativeToParentOrigin(*te);
lastDefaultPrevented = false; lastDefaultPrevented = false;
// try {import std.stdio; writeln(typeid(*te)); } catch(Exception e) {} // try { writeln(typeid(*te)); } catch(Exception e) {}
if(SimpleWindow.triggerEvents(hWnd, iMessage, wParam, lParam, pos[0], pos[1], (*te).parentWindow.win) || !lastDefaultPrevented) if(SimpleWindow.triggerEvents(hWnd, iMessage, wParam, lParam, pos[0], pos[1], (*te).parentWindow.win) || !lastDefaultPrevented)
return CallWindowProcW((*te).originalWindowProcedure, hWnd, iMessage, wParam, lParam); return CallWindowProcW((*te).originalWindowProcedure, hWnd, iMessage, wParam, lParam);
else { else {
@ -3438,7 +3438,6 @@ version(win32_widgets) {
return 0; return 0;
} }
assert(0, "shouldn't be receiving messages for this window...."); assert(0, "shouldn't be receiving messages for this window....");
//import std.conv;
//assert(0, to!string(hWnd) ~ " :: " ~ to!string(TextEdit.nativeMapping)); // not supposed to happen //assert(0, to!string(hWnd) ~ " :: " ~ to!string(TextEdit.nativeMapping)); // not supposed to happen
} }
@ -4446,7 +4445,7 @@ class NestedChildWindowWidget : Widget {
parentWindow.dispatchMouseEvent(e); parentWindow.dispatchMouseEvent(e);
}, },
(KeyEvent e) { (KeyEvent e) {
//import std.stdio; writefln("%s %x %s", cast(void*) win, cast(uint) e.key, e.key); //writefln("%s %x %s", cast(void*) win, cast(uint) e.key, e.key);
parentWindow.dispatchKeyEvent(e); parentWindow.dispatchKeyEvent(e);
}, },
(dchar e) { (dchar e) {
@ -4472,7 +4471,7 @@ class NestedChildWindowWidget : Widget {
/// When an opengl widget is laid out, it will adjust the glViewport for you automatically. /// When an opengl widget is laid out, it will adjust the glViewport for you automatically.
/// Keep in mind that events like mouse coordinates are still relative to your size. /// Keep in mind that events like mouse coordinates are still relative to your size.
override void registerMovement() { override void registerMovement() {
//import std.stdio; writefln("%d %d %d %d", x,y,width,height); // writefln("%d %d %d %d", x,y,width,height);
version(win32_widgets) version(win32_widgets)
auto pos = getChildPositionRelativeToParentHwnd(this); auto pos = getChildPositionRelativeToParentHwnd(this);
else else
@ -5437,7 +5436,7 @@ class ScrollableContainerWidget : ContainerWidget {
if(hsb is null || vsb is null || container is null) return; if(hsb is null || vsb is null || container is null) return;
/+ /+
import std.stdio; writeln(x, " ", y , " ", width, " ", height); writeln(x, " ", y , " ", width, " ", height);
writeln(this.ContainerWidget.minWidth(), "x", this.ContainerWidget.minHeight()); writeln(this.ContainerWidget.minWidth(), "x", this.ContainerWidget.minHeight());
+/ +/
@ -7340,7 +7339,7 @@ LRESULT CustomDrawWindowProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lPa
if(auto te = hWnd in Widget.nativeMapping) { if(auto te = hWnd in Widget.nativeMapping) {
try { try {
//te.redraw(); //te.redraw();
import std.stdio; writeln(te, " drawing"); writeln(te, " drawing");
} catch(Exception) {} } catch(Exception) {}
} }
return DefWindowProc(hWnd, iMessage, wParam, lParam); return DefWindowProc(hWnd, iMessage, wParam, lParam);
@ -7761,7 +7760,7 @@ class ScrollMessageWidget : Widget {
void scrollIntoView(Rectangle rect) { void scrollIntoView(Rectangle rect) {
Rectangle viewRectangle = Rectangle(position, Size(hsb.viewableArea_, vsb.viewableArea_)); Rectangle viewRectangle = Rectangle(position, Size(hsb.viewableArea_, vsb.viewableArea_));
// import std.stdio; writeln(viewRectangle, " ", rect, " ", viewRectangle.contains(rect.lowerRight)); // writeln(viewRectangle, " ", rect, " ", viewRectangle.contains(rect.lowerRight));
if(!viewRectangle.contains(rect.lowerRight)) if(!viewRectangle.contains(rect.lowerRight))
setPosition(rect.upperLeft.tupleof); setPosition(rect.upperLeft.tupleof);
@ -8032,7 +8031,7 @@ class Window : Widget {
win.addEventListener((Widget.RedrawEvent) { win.addEventListener((Widget.RedrawEvent) {
if(win.eventQueued!RecomputeEvent) { if(win.eventQueued!RecomputeEvent) {
// import std.stdio; writeln("skipping"); // writeln("skipping");
return; // let the recompute event do the actual redraw return; // let the recompute event do the actual redraw
} }
this.actualRedraw(); this.actualRedraw();
@ -8043,7 +8042,7 @@ class Window : Widget {
if(win.eventQueued!RedrawEvent) if(win.eventQueued!RedrawEvent)
return; // let the queued one do it return; // let the queued one do it
else { else {
// import std.stdio; writeln("drawing"); // writeln("drawing");
this.actualRedraw(); // if not queued, it needs to be done now anyway this.actualRedraw(); // if not queued, it needs to be done now anyway
} }
}); });
@ -8103,7 +8102,6 @@ class Window : Widget {
dispatchMouseEvent(e); dispatchMouseEvent(e);
}, },
(KeyEvent e) { (KeyEvent e) {
//import std.stdio;
//writefln("%x %s", cast(uint) e.key, e.key); //writefln("%x %s", cast(uint) e.key, e.key);
dispatchKeyEvent(e); dispatchKeyEvent(e);
}, },
@ -8242,7 +8240,7 @@ class Window : Widget {
} }
if(recipient !is null) { if(recipient !is null) {
// import std.stdio; writeln(typeid(recipient)); // writeln(typeid(recipient));
recipient.focus(); recipient.focus();
skipNextChar = true; skipNextChar = true;
@ -8286,7 +8284,7 @@ class Window : Widget {
auto inputProxy = XCreateSimpleWindow(display, win.window, -1, -1, 1, 1, 0, 0, 0); auto inputProxy = XCreateSimpleWindow(display, win.window, -1, -1, 1, 1, 0, 0, 0);
XSelectInput(display, inputProxy, EventMask.KeyPressMask | EventMask.KeyReleaseMask | EventMask.FocusChangeMask); XSelectInput(display, inputProxy, EventMask.KeyPressMask | EventMask.KeyReleaseMask | EventMask.FocusChangeMask);
XMapWindow(display, inputProxy); XMapWindow(display, inputProxy);
//import std.stdio; writefln("input proxy: 0x%0x", inputProxy); // writefln("input proxy: 0x%0x", inputProxy);
this.inputProxy = new SimpleWindow(inputProxy); this.inputProxy = new SimpleWindow(inputProxy);
XEvent lastEvent; XEvent lastEvent;
@ -8299,7 +8297,6 @@ class Window : Widget {
dispatchMouseEvent(e); dispatchMouseEvent(e);
}, },
(KeyEvent e) { (KeyEvent e) {
//import std.stdio;
//writefln("%x %s", cast(uint) e.key, e.key); //writefln("%x %s", cast(uint) e.key, e.key);
if(dispatchKeyEvent(e)) { if(dispatchKeyEvent(e)) {
// FIXME: i should trap error // FIXME: i should trap error
@ -8307,7 +8304,7 @@ class Window : Widget {
auto thing = nw.focusableWindow(); auto thing = nw.focusableWindow();
if(thing && thing.window) { if(thing && thing.window) {
lastEvent.xkey.window = thing.window; lastEvent.xkey.window = thing.window;
// import std.stdio; writeln("sending event ", lastEvent.xkey); // writeln("sending event ", lastEvent.xkey);
trapXErrors( { trapXErrors( {
XSendEvent(XDisplayConnection.get, thing.window, false, 0, &lastEvent); XSendEvent(XDisplayConnection.get, thing.window, false, 0, &lastEvent);
}); });
@ -9906,7 +9903,7 @@ private class ClientAreaWidget : Widget {
else { else {
sa.addChild(w, position); sa.addChild(w, position);
sa.setContentSize(this.minWidth + 1, this.minHeight); sa.setContentSize(this.minWidth + 1, this.minHeight);
import std.stdio; writeln(sa.contentWidth, "x", sa.contentHeight); writeln(sa.contentWidth, "x", sa.contentHeight);
} }
} }
*/ */
@ -11900,7 +11897,7 @@ class TextDisplayHelper : Widget {
} }
protected void scrollForCaret() { protected void scrollForCaret() {
// import std.stdio; writeln(l.width, "x", l.height); writeln(this.width - this.paddingLeft - this.paddingRight, " ", this.height - this.paddingTop - this.paddingBottom); // writeln(l.width, "x", l.height); writeln(this.width - this.paddingLeft - this.paddingRight, " ", this.height - this.paddingTop - this.paddingBottom);
smw.scrollIntoView(l.selection.focusBoundingBox()); smw.scrollIntoView(l.selection.focusBoundingBox());
} }
@ -12085,7 +12082,6 @@ class TextDisplayHelper : Widget {
} else if(ce.button == MouseButton.right) { } else if(ce.button == MouseButton.right) {
this.showContextMenu(ce.clientX, ce.clientY); this.showContextMenu(ce.clientX, ce.clientY);
} }
//import std.stdio;
//writeln(ce.clientX, ", ", ce.clientY, " = ", l.offsetOfClick(Point(ce.clientX, ce.clientY))); //writeln(ce.clientX, ", ", ce.clientY, " = ", l.offsetOfClick(Point(ce.clientX, ce.clientY)));
}); });
@ -12164,7 +12160,6 @@ class TextDisplayHelper : Widget {
stopAutoscrollTimer(); stopAutoscrollTimer();
this.redraw(); this.redraw();
} }
//import std.stdio;
//writeln(ce.clientX, ", ", ce.clientY, " = ", l.offsetOfClick(Point(ce.clientX, ce.clientY))); //writeln(ce.clientX, ", ", ce.clientY, " = ", l.offsetOfClick(Point(ce.clientX, ce.clientY)));
}); });
@ -12180,7 +12175,7 @@ class TextDisplayHelper : Widget {
doStateCheckpoint(); doStateCheckpoint();
char[4] buffer; char[4] buffer;
import std.utf; import std.utf; // FIXME: i should remove this. compile time not significant but the logs get spammed with phobos' import web
auto stride = encode(buffer, ce.character); auto stride = encode(buffer, ce.character);
l.selection.replaceContent(buffer[0 .. stride]); l.selection.replaceContent(buffer[0 .. stride]);
l.selection.setUserXCoordinate(); l.selection.setUserXCoordinate();
@ -12231,7 +12226,7 @@ class TextDisplayHelper : Widget {
scope(exit) painter.setClipRectangle(old); scope(exit) painter.setClipRectangle(old);
l.getDrawableText(delegate bool(txt, style, info, carets...) { l.getDrawableText(delegate bool(txt, style, info, carets...) {
//import std.stdio; writeln("Segment: ", txt); //writeln("Segment: ", txt);
assert(style !is null); assert(style !is null);
auto myStyle = cast(MyTextStyle) style; auto myStyle = cast(MyTextStyle) style;
@ -12261,9 +12256,8 @@ class TextDisplayHelper : Widget {
); );
} }
import std.string; if(txt.stripInternal.length)
if(txt.strip.length) drawTextSegment(painter, info.boundingBox.upperLeft - smw.position() + bounds.upperLeft, txt.stripRightInternal);
drawTextSegment(painter, info.boundingBox.upperLeft - smw.position() + bounds.upperLeft, txt.stripRight);
if(info.boundingBox.upperLeft.y - smw.position().y > this.height) if(info.boundingBox.upperLeft.y - smw.position().y > this.height)
return false; return false;
@ -12323,7 +12317,6 @@ class TextWidget : Widget {
this.height - this.paddingTop - this.paddingBottom); this.height - this.paddingTop - this.paddingBottom);
/+ /+
import std.stdio;
writeln(l.width, "x", l.height); writeln(l.width, "x", l.height);
+/ +/
} }
@ -14166,7 +14159,7 @@ private:
ic.dwSize = cast(DWORD) ic.sizeof; ic.dwSize = cast(DWORD) ic.sizeof;
ic.dwICC = ICC_UPDOWN_CLASS | ICC_WIN95_CLASSES | ICC_BAR_CLASSES | ICC_PROGRESS_CLASS | ICC_COOL_CLASSES | ICC_STANDARD_CLASSES | ICC_USEREX_CLASSES; ic.dwICC = ICC_UPDOWN_CLASS | ICC_WIN95_CLASSES | ICC_BAR_CLASSES | ICC_PROGRESS_CLASS | ICC_COOL_CLASSES | ICC_STANDARD_CLASSES | ICC_USEREX_CLASSES;
if(!InitCommonControlsEx(&ic)) { if(!InitCommonControlsEx(&ic)) {
//import std.stdio; writeln("ICC failed"); //writeln("ICC failed");
} }
} }
@ -14558,64 +14551,6 @@ class FilePicker : Dialog {
void delegate() onCancel; void delegate() onCancel;
LineEdit lineEdit; LineEdit lineEdit;
enum GetFilesResult {
success,
fileNotFound
}
static GetFilesResult getFiles(string cwd, scope void delegate(string name, bool isDirectory) dg) {
version(Windows) {
WIN32_FIND_DATA data;
WCharzBuffer search = WCharzBuffer(cwd ~ "/*");
auto handle = FindFirstFileW(search.ptr, &data);
scope(exit) if(handle !is INVALID_HANDLE_VALUE) FindClose(handle);
if(handle is INVALID_HANDLE_VALUE) {
if(GetLastError() == ERROR_FILE_NOT_FOUND)
return GetFilesResult.fileNotFound;
throw new WindowsApiException("FindFirstFileW", GetLastError());
}
try_more:
string name = makeUtf8StringFromWindowsString(data.cFileName[0 .. findIndexOfZero(data.cFileName[])]);
dg(name, (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? true : false);
auto ret = FindNextFileW(handle, &data);
if(ret == 0) {
if(GetLastError() == ERROR_NO_MORE_FILES)
return GetFilesResult.success;
throw new WindowsApiException("FindNextFileW", GetLastError());
}
goto try_more;
} else version(Posix) {
import core.sys.posix.dirent;
import core.stdc.errno;
auto dir = opendir((cwd ~ "\0").ptr);
scope(exit)
if(dir) closedir(dir);
if(dir is null)
throw new ErrnoApiException("opendir [" ~ cwd ~ "]", errno);
auto dirent = readdir(dir);
if(dirent is null)
return GetFilesResult.fileNotFound;
try_more:
string name = dirent.d_name[0 .. findIndexOfZero(dirent.d_name[])].idup;
dg(name, dirent.d_type == DT_DIR);
dirent = readdir(dir);
if(dirent is null)
return GetFilesResult.success;
goto try_more;
} else static assert(0);
}
// returns common prefix // returns common prefix
string loadFiles(string cwd, string[] filters...) { string loadFiles(string cwd, string[] filters...) {
string[] files; string[] files;

106
simpledisplay.d
View File

@ -1896,13 +1896,13 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
); );
+/ +/
} }
// import std.stdio; writeln("Here", MonitorInfo.info); // writeln("Here", MonitorInfo.info);
} }
} }
if(XRandrLibrary.loadSuccessful) { if(XRandrLibrary.loadSuccessful) {
updateActualDpi(true); updateActualDpi(true);
//import std.stdio; writeln("updated"); // writeln("updated");
if(!requestedInput) { if(!requestedInput) {
// this is what requests live updates should the configuration change // this is what requests live updates should the configuration change
@ -1911,7 +1911,7 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
// and reselecting input... // and reselecting input...
requestedInput = true; requestedInput = true;
XRRSelectInput(display, impl.window, RRScreenChangeNotifyMask); XRRSelectInput(display, impl.window, RRScreenChangeNotifyMask);
//import std.stdio; writeln("requested input"); // writeln("requested input");
} }
} else { } else {
fallback: fallback:
@ -1949,7 +1949,7 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
if(m.position.contains(Point(screenPositionX + this.width / 2, screenPositionY + this.height / 2))) { if(m.position.contains(Point(screenPositionX + this.width / 2, screenPositionY + this.height / 2))) {
bool changed = actualDpi_ && actualDpi_ != m.dpi; bool changed = actualDpi_ && actualDpi_ != m.dpi;
actualDpi_ = m.dpi; actualDpi_ = m.dpi;
//import std.stdio; writeln("monitor ", idx); // writeln("monitor ", idx);
if(changed && onDpiChanged) if(changed && onDpiChanged)
onDpiChanged(); onDpiChanged();
break; break;
@ -3772,7 +3772,7 @@ private:
version(without_opengl) {} else version(without_opengl) {} else
if(openglMode == OpenGlOptions.yes && resizability == Resizability.automaticallyScaleIfPossible) { if(openglMode == OpenGlOptions.yes && resizability == Resizability.automaticallyScaleIfPossible) {
import std.stdio; writeln(width, " ", height); // writeln(width, " ", height);
setAsCurrentOpenGlContextNT(); setAsCurrentOpenGlContextNT();
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
} }
@ -4096,7 +4096,6 @@ struct EventLoopImpl {
{ import core.stdc.string : memset; memset(&ev, 0, ev.sizeof); } // this makes valgrind happy { import core.stdc.string : memset; memset(&ev, 0, ev.sizeof); } // this makes valgrind happy
ev.events = ep.EPOLLIN; ev.events = ep.EPOLLIN;
ev.data.fd = display.fd; ev.data.fd = display.fd;
//import std.conv;
if(ep.epoll_ctl(epollFd, ep.EPOLL_CTL_ADD, display.fd, &ev) == -1) if(ep.epoll_ctl(epollFd, ep.EPOLL_CTL_ADD, display.fd, &ev) == -1)
throw new Exception("add x fd");// ~ to!string(epollFd)); throw new Exception("add x fd");// ~ to!string(epollFd));
displayFd = display.fd; displayFd = display.fd;
@ -4209,7 +4208,6 @@ struct EventLoopImpl {
{ import core.stdc.string : memset; memset(&ev, 0, ev.sizeof); } // this makes valgrind happy { import core.stdc.string : memset; memset(&ev, 0, ev.sizeof); } // this makes valgrind happy
ev.events = ep.EPOLLIN; ev.events = ep.EPOLLIN;
ev.data.fd = displayFd; ev.data.fd = displayFd;
//import std.conv;
ep.epoll_ctl(epollFd, ep.EPOLL_CTL_DEL, displayFd, &ev); ep.epoll_ctl(epollFd, ep.EPOLL_CTL_DEL, displayFd, &ev);
displayFd = -1; displayFd = -1;
} }
@ -4285,7 +4283,7 @@ struct EventLoopImpl {
} }
SimpleWindow.processAllCustomEvents(); // anyway SimpleWindow.processAllCustomEvents(); // anyway
//version(sdddd) { import std.stdio; writeln("nfds=", nfds, "; [0]=", events[0].data.fd); } //version(sdddd) { writeln("nfds=", nfds, "; [0]=", events[0].data.fd); }
foreach(idx; 0 .. nfds) { foreach(idx; 0 .. nfds) {
if(done) break; if(done) break;
auto fd = events[idx].data.fd; auto fd = events[idx].data.fd;
@ -4308,7 +4306,7 @@ struct EventLoopImpl {
} }
} }
} else if(fd == display.fd) { } else if(fd == display.fd) {
version(sdddd) { import std.stdio; writeln("X EVENT PENDING!"); } version(sdddd) { writeln("X EVENT PENDING!"); }
this.mtLock(); this.mtLock();
scope(exit) this.mtUnlock(); scope(exit) this.mtUnlock();
while(!done && XPending(display)) { while(!done && XPending(display)) {
@ -4338,7 +4336,7 @@ struct EventLoopImpl {
//SimpleWindow.processAllCustomEvents(); //SimpleWindow.processAllCustomEvents();
} else { } else {
// some other timer // some other timer
version(sdddd) { import std.stdio; writeln("unknown fd: ", fd); } version(sdddd) { writeln("unknown fd: ", fd); }
if(Timer* t = fd in Timer.mapping) if(Timer* t = fd in Timer.mapping)
(*t).trigger(); (*t).trigger();
@ -4592,7 +4590,6 @@ class NotificationAreaIcon : CapableOfHandlingNativeEvent {
break; break;
case EventType.ClientMessage: case EventType.ClientMessage:
version(sddddd) { version(sddddd) {
import std.stdio;
writeln("\t", e.xclient.message_type == GetAtom!("_XEMBED")(XDisplayConnection.get)); writeln("\t", e.xclient.message_type == GetAtom!("_XEMBED")(XDisplayConnection.get));
writeln("\t", e.xclient.format); writeln("\t", e.xclient.format);
writeln("\t", e.xclient.data.l); writeln("\t", e.xclient.data.l);
@ -4636,7 +4633,7 @@ class NotificationAreaIcon : CapableOfHandlingNativeEvent {
auto event = e.xconfigure; auto event = e.xconfigure;
this.width = event.width; this.width = event.width;
this.height = event.height; this.height = event.height;
//import std.stdio; writeln(width, " x " , height, " @ ", event.x, " ", event.y); // writeln(width, " x " , height, " @ ", event.x, " ", event.y);
redraw(); redraw();
break; break;
default: return 1; default: return 1;
@ -4771,7 +4768,6 @@ class NotificationAreaIcon : CapableOfHandlingNativeEvent {
if(got !is null) { if(got !is null) {
if(returned == 1) { if(returned == 1) {
v = got.visual; v = got.visual;
import std.stdio;
writeln("using special visual ", *got); writeln("using special visual ", *got);
} }
XFree(got); XFree(got);
@ -5115,7 +5111,7 @@ class NotificationAreaIcon : CapableOfHandlingNativeEvent {
if (i !is null) { if (i !is null) {
this.img = Image.fromMemoryImage(i); this.img = Image.fromMemoryImage(i);
this.clippixmap = transparencyMaskFromMemoryImage(i, nativeHandle); this.clippixmap = transparencyMaskFromMemoryImage(i, nativeHandle);
//import std.stdio; writeln("using pixmap ", clippixmap); // writeln("using pixmap ", clippixmap);
updateNetWmIcon(); updateNetWmIcon();
redraw(); redraw();
} else { } else {
@ -5698,7 +5694,7 @@ class PosixFdReader {
static import ep = core.sys.linux.epoll; static import ep = core.sys.linux.epoll;
ep.epoll_event ev = void; ep.epoll_event ev = void;
ev.events = (captureReads ? ep.EPOLLIN : 0) | (captureWrites ? ep.EPOLLOUT : 0); ev.events = (captureReads ? ep.EPOLLIN : 0) | (captureWrites ? ep.EPOLLOUT : 0);
//import std.stdio; writeln("enable ", fd, " ", captureReads, " ", captureWrites); // writeln("enable ", fd, " ", captureReads, " ", captureWrites);
ev.data.fd = fd; ev.data.fd = fd;
ep.epoll_ctl(epollFd, ep.EPOLL_CTL_ADD, fd, &ev); ep.epoll_ctl(epollFd, ep.EPOLL_CTL_ADD, fd, &ev);
} else { } else {
@ -5717,7 +5713,7 @@ class PosixFdReader {
static import ep = core.sys.linux.epoll; static import ep = core.sys.linux.epoll;
ep.epoll_event ev = void; ep.epoll_event ev = void;
ev.events = (captureReads ? ep.EPOLLIN : 0) | (captureWrites ? ep.EPOLLOUT : 0); ev.events = (captureReads ? ep.EPOLLIN : 0) | (captureWrites ? ep.EPOLLOUT : 0);
//import std.stdio; writeln("disable ", fd, " ", captureReads, " ", captureWrites); // writeln("disable ", fd, " ", captureReads, " ", captureWrites);
ev.data.fd = fd; ev.data.fd = fd;
ep.epoll_ctl(epollFd, ep.EPOLL_CTL_DEL, fd, &ev); ep.epoll_ctl(epollFd, ep.EPOLL_CTL_DEL, fd, &ev);
} }
@ -6125,7 +6121,7 @@ version(X11) {
//after(); //after();
} else { } else {
debug(sdpy_clip) { debug(sdpy_clip) {
import std.stdio; writeln("Unsupported data ", getAtomName(event.target, display)); writeln("Unsupported data ", getAtomName(event.target, display));
} }
selectionEvent.property = None; // I don't know how to handle this type... selectionEvent.property = None; // I don't know how to handle this type...
XSendEvent(display, selectionEvent.requestor, false, EventMask.NoEventMask, cast(XEvent*) &selectionEvent); XSendEvent(display, selectionEvent.requestor, false, EventMask.NoEventMask, cast(XEvent*) &selectionEvent);
@ -8425,7 +8421,7 @@ class OperatingSystemFont : MeasurableFont {
xfontstr = "-*-"~name~"-"~weightstr~"-"~(italic ? "i" : "r")~"-*-*-"~sizestr~"-*-*-*-*-*-*-*\0"; xfontstr = "-*-"~name~"-"~weightstr~"-"~(italic ? "i" : "r")~"-*-*-"~sizestr~"-*-*-*-*-*-*-*\0";
} }
//import std.stdio; writeln(xfontstr); // writeln(xfontstr);
auto display = XDisplayConnection.get; auto display = XDisplayConnection.get;
@ -8624,7 +8620,7 @@ class OperatingSystemFont : MeasurableFont {
//return xftFont.max_advance_width; //return xftFont.max_advance_width;
XGlyphInfo extents; XGlyphInfo extents;
XftTextExtentsUtf8(XDisplayConnection.get, xftFont, s.ptr, cast(int) s.length, &extents); XftTextExtentsUtf8(XDisplayConnection.get, xftFont, s.ptr, cast(int) s.length, &extents);
//import std.stdio; writeln(extents); // writeln(extents);
return extents.xOff; return extents.xOff;
} }
if(font is null) if(font is null)
@ -8879,7 +8875,7 @@ struct ScreenPainter {
impl.referenceCount = 1; impl.referenceCount = 1;
impl.manualInvalidations = manualInvalidations; impl.manualInvalidations = manualInvalidations;
window.activeScreenPainter = impl; window.activeScreenPainter = impl;
//import std.stdio; writeln("constructed"); // writeln("constructed");
} }
copyActiveOriginals(); copyActiveOriginals();
@ -8936,10 +8932,10 @@ struct ScreenPainter {
impl.referenceCount--; impl.referenceCount--;
//writeln("refcount -- ", impl.referenceCount); //writeln("refcount -- ", impl.referenceCount);
if(impl.referenceCount == 0) { if(impl.referenceCount == 0) {
//import std.stdio; writeln("destructed"); // writeln("destructed");
impl.dispose(); impl.dispose();
*window.activeScreenPainter = ScreenPainterImplementation.init; *window.activeScreenPainter = ScreenPainterImplementation.init;
//import std.stdio; writeln("paint finished"); // writeln("paint finished");
} else { } else {
// there is still an active reference, reset stuff so the // there is still an active reference, reset stuff so the
// next user doesn't get weirdness via the reference // next user doesn't get weirdness via the reference
@ -12072,7 +12068,7 @@ version(Windows) {
break; break;
/+ /+
case WM_SIZING: case WM_SIZING:
import std.stdio; writeln("size"); writeln("size");
break; break;
+/ +/
// I don't like the tearing I get when redrawing on WM_SIZE // I don't like the tearing I get when redrawing on WM_SIZE
@ -14205,7 +14201,7 @@ mixin DynamicLoad!(XRandr, "Xrandr", 2, XRandrLibrarySuccessfullyLoaded) XRandrL
_xshmAvailable = false; // don't try again in the future _xshmAvailable = false; // don't try again in the future
//import std.stdio; writeln("fallingback"); // writeln("fallingback");
goto fallback; goto fallback;
@ -14967,7 +14963,7 @@ version(X11) {
if(width != win.width || height != win.height) { if(width != win.width || height != win.height) {
// import std.stdio; writeln("RESIZE: ", width, "x", height, " was ", win._width, "x", win._height, " window: ", win.windowType, "-", win.title, " ", win.window); // writeln("RESIZE: ", width, "x", height, " was ", win._width, "x", win._height, " window: ", win.windowType, "-", win.title, " ", win.window);
win._width = width; win._width = width;
win._height = height; win._height = height;
@ -15035,7 +15031,6 @@ version(X11) {
XEvent e; XEvent e;
XNextEvent(display, &e); XNextEvent(display, &e);
version(sddddd) { version(sddddd) {
import std.stdio, std.conv : to;
if(auto win = e.xany.window in CapableOfHandlingNativeEvent.nativeHandleMapping) { if(auto win = e.xany.window in CapableOfHandlingNativeEvent.nativeHandleMapping) {
if(typeid(cast(Object) *win) == NotificationAreaIcon.classinfo) if(typeid(cast(Object) *win) == NotificationAreaIcon.classinfo)
writeln("event for: ", e.xany.window, "; type is ", to!string(cast(EventType)e.type)); writeln("event for: ", e.xany.window, "; type is ", to!string(cast(EventType)e.type));
@ -15094,21 +15089,21 @@ version(X11) {
case EventType.SelectionClear: case EventType.SelectionClear:
if(auto win = e.xselectionclear.window in SimpleWindow.nativeMapping) { if(auto win = e.xselectionclear.window in SimpleWindow.nativeMapping) {
// FIXME so it is supposed to finish any in progress transfers... but idk... // FIXME so it is supposed to finish any in progress transfers... but idk...
//import std.stdio; writeln("SelectionClear"); // writeln("SelectionClear");
SimpleWindow.impl.setSelectionHandlers.remove(e.xselectionclear.selection); SimpleWindow.impl.setSelectionHandlers.remove(e.xselectionclear.selection);
} }
break; break;
case EventType.SelectionRequest: case EventType.SelectionRequest:
if(auto win = e.xselectionrequest.owner in SimpleWindow.nativeMapping) if(auto win = e.xselectionrequest.owner in SimpleWindow.nativeMapping)
if(auto ssh = e.xselectionrequest.selection in SimpleWindow.impl.setSelectionHandlers) { if(auto ssh = e.xselectionrequest.selection in SimpleWindow.impl.setSelectionHandlers) {
// import std.stdio; printf("SelectionRequest %s\n", XGetAtomName(e.xselectionrequest.display, e.xselectionrequest.target)); // printf("SelectionRequest %s\n", XGetAtomName(e.xselectionrequest.display, e.xselectionrequest.target));
XUnlockDisplay(display); XUnlockDisplay(display);
scope(exit) XLockDisplay(display); scope(exit) XLockDisplay(display);
(*ssh).handleRequest(e); (*ssh).handleRequest(e);
} }
break; break;
case EventType.PropertyNotify: case EventType.PropertyNotify:
// import std.stdio; printf("PropertyNotify %s %d\n", XGetAtomName(e.xproperty.display, e.xproperty.atom), e.xproperty.state); // printf("PropertyNotify %s %d\n", XGetAtomName(e.xproperty.display, e.xproperty.atom), e.xproperty.state);
foreach(ssh; SimpleWindow.impl.setSelectionHandlers) { foreach(ssh; SimpleWindow.impl.setSelectionHandlers) {
if(ssh.matchesIncr(e.xproperty.window, e.xproperty.atom) && e.xproperty.state == PropertyNotification.PropertyDelete) if(ssh.matchesIncr(e.xproperty.window, e.xproperty.atom) && e.xproperty.state == PropertyNotification.PropertyDelete)
@ -15226,7 +15221,7 @@ version(X11) {
if(auto win = event.window in SimpleWindow.nativeMapping) { if(auto win = event.window in SimpleWindow.nativeMapping) {
if(win.windowType == WindowTypes.minimallyWrapped) if(win.windowType == WindowTypes.minimallyWrapped)
break; break;
//version(sdddd) { import std.stdio; writeln(" w=", event.width, "; h=", event.height); } //version(sdddd) { writeln(" w=", event.width, "; h=", event.height); }
/+ /+
The ICCCM says window managers must send a synthetic event when the window The ICCCM says window managers must send a synthetic event when the window
@ -15287,8 +15282,8 @@ version(X11) {
void info(string detail) { void info(string detail) {
string s; string s;
import std.conv; // import std.conv;
import std.datetime; // import std.datetime;
s ~= to!string(Clock.currTime); s ~= to!string(Clock.currTime);
s ~= " "; s ~= " ";
s ~= e.type == EventType.FocusIn ? "in " : "out"; s ~= e.type == EventType.FocusIn ? "in " : "out";
@ -15374,7 +15369,7 @@ version(X11) {
} }
} else if(e.xclient.data.l[0] == GetAtom!"WM_TAKE_FOCUS"(e.xany.display)) { } else if(e.xclient.data.l[0] == GetAtom!"WM_TAKE_FOCUS"(e.xany.display)) {
//import std.stdio; writeln("HAPPENED"); // writeln("HAPPENED");
// user clicked the close button on the window manager // user clicked the close button on the window manager
if(auto win = e.xclient.window in SimpleWindow.nativeMapping) { if(auto win = e.xclient.window in SimpleWindow.nativeMapping) {
XUnlockDisplay(display); XUnlockDisplay(display);
@ -15403,7 +15398,7 @@ version(X11) {
bool xDragWindow = true; bool xDragWindow = true;
if(xDragWindow && e.xclient.message_type == GetAtom!"XdndStatus"(e.xany.display)) { if(xDragWindow && e.xclient.message_type == GetAtom!"XdndStatus"(e.xany.display)) {
//XDefineCursor(display, xDragWindow.impl.window, //XDefineCursor(display, xDragWindow.impl.window,
//import std.stdio; writeln("XdndStatus ", e.xclient.data.l); //writeln("XdndStatus ", e.xclient.data.l);
} }
if(auto dh = win.dropHandler) { if(auto dh = win.dropHandler) {
@ -15467,7 +15462,7 @@ version(X11) {
} else if(e.xclient.message_type == GetAtom!"XdndLeave"(e.xany.display)) { } else if(e.xclient.message_type == GetAtom!"XdndLeave"(e.xany.display)) {
//import std.stdio; writeln("XdndLeave"); //writeln("XdndLeave");
// drop cancelled. // drop cancelled.
// data.l[0] is the source window // data.l[0] is the source window
dh.dragLeave(); dh.dragLeave();
@ -15475,7 +15470,7 @@ version(X11) {
resetXFormats(); resetXFormats();
} else if(e.xclient.message_type == GetAtom!"XdndDrop"(e.xany.display)) { } else if(e.xclient.message_type == GetAtom!"XdndDrop"(e.xany.display)) {
// drop happening, should fetch data, then send finished // drop happening, should fetch data, then send finished
//import std.stdio; writeln("XdndDrop"); // writeln("XdndDrop");
auto pkg = DropPackage(*win, e.xclient.data.l[0], e.xclient.data.l[2], xFormats); auto pkg = DropPackage(*win, e.xclient.data.l[0], e.xclient.data.l[2], xFormats);
@ -15483,7 +15478,7 @@ version(X11) {
resetXFormats(); resetXFormats();
} else if(e.xclient.message_type == GetAtom!"XdndFinished"(e.xany.display)) { } else if(e.xclient.message_type == GetAtom!"XdndFinished"(e.xany.display)) {
// import std.stdio; writeln("XdndFinished"); // writeln("XdndFinished");
dh.finish(); dh.finish();
} }
@ -15649,7 +15644,7 @@ version(X11) {
ke.modifierState = e.xkey.state; ke.modifierState = e.xkey.state;
// import std.stdio; writefln("%x", sym); // writefln("%x", sym);
wchar_t[128] charbuf = void; // buffer for XwcLookupString; composed value can consist of many chars! wchar_t[128] charbuf = void; // buffer for XwcLookupString; composed value can consist of many chars!
int charbuflen = 0; // return value of XwcLookupString int charbuflen = 0; // return value of XwcLookupString
if (ke.pressed) { if (ke.pressed) {
@ -17745,9 +17740,9 @@ version(OSXCocoa) {
// and it is about time I merged it in here. It is available with -version=OSXCocoa until someone tests it for me! // and it is about time I merged it in here. It is available with -version=OSXCocoa until someone tests it for me!
// Probably won't even fully compile right now // Probably won't even fully compile right now
import std.math : PI; import std.math : PI; // OSX Only
import std.algorithm : map; import std.algorithm : map; // OSX Only
import std.array : array; import std.array : array; // OSX Only
alias SimpleWindow NativeWindowHandle; alias SimpleWindow NativeWindowHandle;
alias void delegate(id) NativeEventHandler; alias void delegate(id) NativeEventHandler;
@ -18219,7 +18214,7 @@ extern(System) nothrow @nogc {
_glx_swapInterval_fn = cast(glXSwapIntervalEXT)1; _glx_swapInterval_fn = cast(glXSwapIntervalEXT)1;
return; return;
} }
version(sdddd) { import std.stdio; debug writeln("glXSwapIntervalEXT found!"); } version(sdddd) { debug writeln("glXSwapIntervalEXT found!"); }
} }
if(glXSwapIntervalMESA is null) { if(glXSwapIntervalMESA is null) {
@ -19438,7 +19433,7 @@ class ExperimentalTextComponent2 {
} }
} }
// import std.stdio; writeln(iterations) // writeln(iterations)
} }
@ -20715,7 +20710,7 @@ class GenericDropHandlerBase : DropHandler {
protected abstract FormatHandler[] formatHandlers(); protected abstract FormatHandler[] formatHandlers();
DragAndDropAction dragEnter(DropPackage* pkg) { DragAndDropAction dragEnter(DropPackage* pkg) {
debug(sdpy_dnd) { import std.stdio; foreach(fmt; pkg.availableFormats()) writeln(fmt, " ", DraggableData.getFormatName(fmt)); } debug(sdpy_dnd) { foreach(fmt; pkg.availableFormats()) writeln(fmt, " ", DraggableData.getFormatName(fmt)); }
foreach(fmt; formatHandlers()) foreach(fmt; formatHandlers())
foreach(f; pkg.availableFormats()) foreach(f; pkg.availableFormats())
if(f == fmt.format) { if(f == fmt.format) {
@ -20731,7 +20726,7 @@ class GenericDropHandlerBase : DropHandler {
void drop(scope DropPackage* dropPackage) { void drop(scope DropPackage* dropPackage) {
if(!acceptedFormat || acceptedHandler is null) { if(!acceptedFormat || acceptedHandler is null) {
debug(sdpy_dnd) { import std.stdio; writeln("drop called w/ handler ", acceptedHandler, " and format ", acceptedFormat); } debug(sdpy_dnd) { writeln("drop called w/ handler ", acceptedHandler, " and format ", acceptedFormat); }
return; // prolly shouldn't happen anyway... return; // prolly shouldn't happen anyway...
} }
@ -21067,14 +21062,14 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
} }
HRESULT DAdvise(FORMATETC* pformatetc, DWORD advf, IAdviseSink pAdvSink, DWORD* pdwConnection) { HRESULT DAdvise(FORMATETC* pformatetc, DWORD advf, IAdviseSink pAdvSink, DWORD* pdwConnection) {
// import std.stdio; writeln("Advise"); // writeln("Advise");
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT DUnadvise(DWORD dwConnection) { HRESULT DUnadvise(DWORD dwConnection) {
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT EnumDAdvise(IEnumSTATDATA* ppenumAdvise) { HRESULT EnumDAdvise(IEnumSTATDATA* ppenumAdvise) {
// import std.stdio; writeln("EnumDAdvise"); // writeln("EnumDAdvise");
return OLE_E_ADVISENOTSUPPORTED; return OLE_E_ADVISENOTSUPPORTED;
} }
// tell what formats it supports // tell what formats it supports
@ -21124,7 +21119,7 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
} }
HRESULT Clone(IEnumFORMATETC* ppenum) { HRESULT Clone(IEnumFORMATETC* ppenum) {
// import std.stdio; writeln("clone"); // writeln("clone");
return E_NOTIMPL; // FIXME return E_NOTIMPL; // FIXME
} }
@ -21142,7 +21137,7 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
if(pceltFetched !is null) if(pceltFetched !is null)
*pceltFetched = 1; *pceltFetched = 1;
// import std.stdio; writeln("ok celt ", celt); // writeln("ok celt ", celt);
return S_OK; return S_OK;
} }
@ -21167,7 +21162,7 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
// given a format, return the format you'd prefer to use cuz it is identical // given a format, return the format you'd prefer to use cuz it is identical
HRESULT GetCanonicalFormatEtc(FORMATETC* pformatectIn, FORMATETC* pformatetcOut) { HRESULT GetCanonicalFormatEtc(FORMATETC* pformatectIn, FORMATETC* pformatetcOut) {
// FIXME: prolly could be better but meh // FIXME: prolly could be better but meh
// import std.stdio; writeln("gcf: ", *pformatectIn); // writeln("gcf: ", *pformatectIn);
*pformatetcOut = *pformatectIn; *pformatetcOut = *pformatectIn;
return S_OK; return S_OK;
} }
@ -21175,7 +21170,7 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
foreach(ty; types) { foreach(ty; types) {
if(ty == *pformatetcIn) { if(ty == *pformatetcIn) {
auto format = ty.cfFormat; auto format = ty.cfFormat;
// import std.stdio; writeln("A: ", *pformatetcIn, "\nB: ", ty); // writeln("A: ", *pformatetcIn, "\nB: ", ty);
STGMEDIUM medium; STGMEDIUM medium;
medium.tymed = TYMED.TYMED_HGLOBAL; medium.tymed = TYMED.TYMED_HGLOBAL;
@ -21199,7 +21194,7 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
return DV_E_FORMATETC; return DV_E_FORMATETC;
} }
HRESULT GetDataHere(FORMATETC* pformatetcIn, STGMEDIUM* pmedium) { HRESULT GetDataHere(FORMATETC* pformatetcIn, STGMEDIUM* pmedium) {
// import std.stdio; writeln("GDH: ", *pformatetcIn); // writeln("GDH: ", *pformatetcIn);
return E_NOTIMPL; // FIXME return E_NOTIMPL; // FIXME
} }
HRESULT QueryGetData(FORMATETC* pformatetc) { HRESULT QueryGetData(FORMATETC* pformatetc) {
@ -21207,16 +21202,16 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
search.tymed &= TYMED.TYMED_HGLOBAL; search.tymed &= TYMED.TYMED_HGLOBAL;
foreach(ty; types) foreach(ty; types)
if(ty == search) { if(ty == search) {
// import std.stdio; writeln("QueryGetData ", search, " ", types[0]); // writeln("QueryGetData ", search, " ", types[0]);
return S_OK; return S_OK;
} }
if(pformatetc.cfFormat==CF_UNICODETEXT) { if(pformatetc.cfFormat==CF_UNICODETEXT) {
//import std.stdio; writeln("QueryGetData FALSE ", search, " ", types[0]); //writeln("QueryGetData FALSE ", search, " ", types[0]);
} }
return S_FALSE; return S_FALSE;
} }
HRESULT SetData(FORMATETC* pformatetc, STGMEDIUM* pmedium, BOOL fRelease) { HRESULT SetData(FORMATETC* pformatetc, STGMEDIUM* pmedium, BOOL fRelease) {
// import std.stdio; writeln("SetData: "); // writeln("SetData: ");
return E_NOTIMPL; return E_NOTIMPL;
} }
}; };
@ -21270,7 +21265,6 @@ private int doDragDropWindows(SimpleWindow window, DraggableData handler, DragAn
auto ret = DoDragDrop(obj, src, de, &effect); auto ret = DoDragDrop(obj, src, de, &effect);
/+ /+
import std.stdio;
if(ret == DRAGDROP_S_DROP) if(ret == DRAGDROP_S_DROP)
writeln("drop ", effect); writeln("drop ", effect);
else if(ret == DRAGDROP_S_CANCEL) else if(ret == DRAGDROP_S_CANCEL)

69
terminalemulator.d
View File

@ -3721,75 +3721,8 @@ version(Windows) {
/// startChild!something("plink.exe", "plink.exe user@server -i key.ppk \"/home/user/terminal-emulator/serverside\""); /// startChild!something("plink.exe", "plink.exe user@server -i key.ppk \"/home/user/terminal-emulator/serverside\"");
void startChild(alias masterFunc)(string program, string commandLine) { void startChild(alias masterFunc)(string program, string commandLine) {
import core.sys.windows.windows; import core.sys.windows.windows;
// thanks for a random person on stack overflow for this function
static BOOL MyCreatePipeEx(
PHANDLE lpReadPipe,
PHANDLE lpWritePipe,
LPSECURITY_ATTRIBUTES lpPipeAttributes,
DWORD nSize,
DWORD dwReadMode,
DWORD dwWriteMode
)
{
HANDLE ReadPipeHandle, WritePipeHandle;
DWORD dwError;
CHAR[MAX_PATH] PipeNameBuffer;
if (nSize == 0) {
nSize = 4096;
}
static int PipeSerialNumber = 0;
import core.stdc.string;
import core.stdc.stdio;
sprintf(PipeNameBuffer.ptr,
"\\\\.\\Pipe\\TerminalEmulatorPipe.%08x.%08x".ptr,
GetCurrentProcessId(),
PipeSerialNumber++
);
ReadPipeHandle = CreateNamedPipeA(
PipeNameBuffer.ptr,
1/*PIPE_ACCESS_INBOUND*/ | dwReadMode,
0/*PIPE_TYPE_BYTE*/ | 0/*PIPE_WAIT*/,
1, // Number of pipes
nSize, // Out buffer size
nSize, // In buffer size
120 * 1000, // Timeout in ms
lpPipeAttributes
);
if (! ReadPipeHandle) {
return FALSE;
}
WritePipeHandle = CreateFileA(
PipeNameBuffer.ptr,
GENERIC_WRITE,
0, // No sharing
lpPipeAttributes,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL | dwWriteMode,
null // Template file
);
if (INVALID_HANDLE_VALUE == WritePipeHandle) {
dwError = GetLastError();
CloseHandle( ReadPipeHandle );
SetLastError(dwError);
return FALSE;
}
*lpReadPipe = ReadPipeHandle;
*lpWritePipe = WritePipeHandle;
return( TRUE );
}
import arsd.core : MyCreatePipeEx;
import std.conv; import std.conv;

22
textlayouter.d
View File

@ -535,7 +535,6 @@ public struct Selection {
However, the algorithm for default style in the new zone is a bit different: if at index 0 or right after a \n, it uses the next style. otherwise it uses the previous one. However, the algorithm for default style in the new zone is a bit different: if at index 0 or right after a \n, it uses the next style. otherwise it uses the previous one.
+/ +/
//import std.stdio;
//writeln(removeBegin, " ", removeEnd); //writeln(removeBegin, " ", removeEnd);
//foreach(st; layouter.styles) writeln("B: ", st.offset, "..", st.offset + st.length, " ", st.styleInformationIndex); //foreach(st; layouter.styles) writeln("B: ", st.offset, "..", st.offset + st.length, " ", st.styleInformationIndex);
@ -694,7 +693,7 @@ public struct Selection {
layouter.styles = layouter.styles[0 .. i + 1] ~ toInsert1 ~ toInsert2 ~ layouter.styles[i + 1 .. $]; layouter.styles = layouter.styles[0 .. i + 1] ~ toInsert1 ~ toInsert2 ~ layouter.styles[i + 1 .. $];
// import std.stdio; writeln(*s); writeln(toInsert1); writeln(toInsert2); // writeln(*s); writeln(toInsert1); writeln(toInsert2);
break; // no need to continue processing as the other offsets are unaffected break; // no need to continue processing as the other offsets are unaffected
} }
@ -723,13 +722,12 @@ public struct Selection {
else { else {
// this should be impossible as i think i covered all the cases above // this should be impossible as i think i covered all the cases above
// as we iterate through // as we iterate through
// import std.stdio; writeln(oldStyleBegin, "..", oldStyleEnd, " -- ", newStyleBegin, "..", newStyleEnd); // writeln(oldStyleBegin, "..", oldStyleEnd, " -- ", newStyleBegin, "..", newStyleEnd);
assert(0); assert(0);
} }
} }
} }
// import std.stdio;
// foreach(st; layouter.styles) writeln("A: ", st.offset, "..", st.offset + st.length, " ", st.styleInformationIndex); // foreach(st; layouter.styles) writeln("A: ", st.offset, "..", st.offset + st.length, " ", st.styleInformationIndex);
} }
@ -781,7 +779,7 @@ public struct Selection {
int bestHit = -1; int bestHit = -1;
int bestHitDistance = int.max; int bestHitDistance = int.max;
// import std.stdio; writeln(targetLineNumber, " ", segmentIndex, " ", layouter.segments.length); // writeln(targetLineNumber, " ", segmentIndex, " ", layouter.segments.length);
segmentLoop: while(segmentIndex >= 0 && segmentIndex < layouter.segments.length) { segmentLoop: while(segmentIndex >= 0 && segmentIndex < layouter.segments.length) {
segment = layouter.segments[segmentIndex]; segment = layouter.segments[segmentIndex];
@ -1347,7 +1345,7 @@ class TextLayouter {
int searchPoint = maximum / 2; int searchPoint = maximum / 2;
keepSearching: keepSearching:
//import std.stdio; writeln(searchPoint); //writeln(searchPoint);
if(segments[searchPoint].upperLeft.y > box.top) { if(segments[searchPoint].upperLeft.y > box.top) {
// we're too far ahead to find the box // we're too far ahead to find the box
maximum = searchPoint; maximum = searchPoint;
@ -1716,7 +1714,7 @@ class TextLayouter {
// basically it would keep going until a segment after the invalidated end area was in the state before and after. // basically it would keep going until a segment after the invalidated end area was in the state before and after.
debug(text_layouter_bench) { debug(text_layouter_bench) {
import std.stdio; // writeln("relayouting"); // writeln("relayouting");
import core.time; import core.time;
auto start = MonoTime.currTime; auto start = MonoTime.currTime;
scope(exit) { scope(exit) {
@ -1933,7 +1931,7 @@ class TextLayouter {
deltaLineNumber = 1; deltaLineNumber = 1;
previousOldSavedSegment.upperLeft.y += deltaY; previousOldSavedSegment.upperLeft.y += deltaY;
previousOldSavedSegment.displayLineNumber += deltaLineNumber; previousOldSavedSegment.displayLineNumber += deltaLineNumber;
import std.stdio; writeln("trying deltaY = ", deltaY); writeln("trying deltaY = ", deltaY);
writeln(previousOldSavedSegment); writeln(previousOldSavedSegment);
writeln(segments[$-1]); writeln(segments[$-1]);
} }
@ -1968,8 +1966,8 @@ class TextLayouter {
return true; return true;
} else { } else {
// import std.stdio; writeln("not matched"); // writeln("not matched");
// import std.stdio; writeln(previousOldSavedWidths != segmentsWidths[$-1]); // writeln(previousOldSavedWidths != segmentsWidths[$-1]);
} }
} }
@ -2102,7 +2100,7 @@ class TextLayouter {
if(lastWidthDistance == 1) { if(lastWidthDistance == 1) {
auto width = font.stringWidth(text[previousIndex .. idx + stride(text[idx])]); auto width = font.stringWidth(text[previousIndex .. idx + stride(text[idx])]);
thisWidth = width - lastWidth; thisWidth = width - lastWidth;
// import std.stdio; writeln(text[previousIndex .. idx + stride(text[idx])], " ", width, "-", lastWidth); // writeln(text[previousIndex .. idx + stride(text[idx])], " ", width, "-", lastWidth);
} else { } else {
auto width = font.stringWidth(text[idx .. idx + stride(text[idx])]); auto width = font.stringWidth(text[idx .. idx + stride(text[idx])]);
thisWidth = width; thisWidth = width;
@ -2149,7 +2147,7 @@ class TextLayouter {
//return widths; //return widths;
// import std.stdio; writefln("%(%s\n%)", segments[0 .. 10]); // writefln("%(%s\n%)", segments[0 .. 10]);
} }
private { private {