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

omg awesome stuff

This commit is contained in:
Adam D. Ruppe 2020-11-12 15:45:04 -05:00
parent cf179cdd34
commit f1849ec580
4 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
http2.d
View File

@ -42,6 +42,10 @@ version(arsd_http_winhttp_implementation) {
import core.sys.windows.winhttp;
// FIXME: alter the dub package file too
// https://github.com/curl/curl/blob/master/lib/vtls/schannel.c
// https://docs.microsoft.com/en-us/windows/win32/secauthn/creating-an-schannel-security-context
// https://docs.microsoft.com/en-us/windows/win32/api/winhttp/nf-winhttp-winhttpreaddata
// https://docs.microsoft.com/en-us/windows/win32/api/winhttp/nf-winhttp-winhttpsendrequest
// https://docs.microsoft.com/en-us/windows/win32/api/winhttp/nf-winhttp-winhttpopenrequest
@ -926,6 +930,7 @@ class HttpRequest {
if(readSet is null)
readSet = new SocketSet();
readSet.reset();
assert(socket !is null);
assert(socket.handle() !is socket_t.init, socket is null ? "null" : socket.toString());
readSet.add(socket);
auto got = Socket.select(readSet, null, null, 5.msecs /* timeout */);

17
simpleaudio.d
View File

@ -16,12 +16,21 @@
being able to get/set the volume.
TODO:
* pre-resampler that loads a clip and prepares it for repeated fast use
* controls so you can tell a particular thing to keep looping until you tell it to stop, or stop after the next loop, etc (think a phaser sound as long as you hold the button down)
* playFile function that detects automatically. basically:
if(args[1].endsWith("ogg"))
a.playOgg(args[1]);
else if(args[1].endsWith("wav"))
a.playWav(args[1]);
else if(mp3)
a.playMp3(args[1]);
* play audio high level with options to wait until completion or return immediately
* midi mid-level stuff
* midi mid-level stuff but see [arsd.midi]!
* Windows support for mixer.
* I'll also write .mid and .wav functions at least eventually. Maybe in separate modules but probably here since they aren't that complex.
* some kind of encoder???????
I will probably NOT do OSS anymore, since my computer doesn't even work with it now.
Ditto for Macintosh, as I don't have one and don't really care about them.

14
terminal.d
View File

@ -469,6 +469,7 @@ enum ConsoleInputFlags {
allInputEventsWithRelease = allInputEvents|releasedKeys, /// subscribe to all input events, including (unreliable on Posix) key release events.
noEolWrap = 128,
selectiveMouse = 256, /// Uses arsd terminal emulator's proprietary extension to select mouse input only for special cases, intended to enhance getline while keeping default terminal mouse behavior in other places. If it is set, it overrides [mouse] event flag. If not using the arsd terminal emulator, this will disable application mouse input.
}
/// Defines how terminal output should be handled.
@ -2092,7 +2093,7 @@ struct Terminal {
if(prompt !is null)
lineGetter.prompt = prompt;
auto input = RealTimeConsoleInput(&this, ConsoleInputFlags.raw);
auto input = RealTimeConsoleInput(&this, ConsoleInputFlags.raw | ConsoleInputFlags.selectiveMouse | ConsoleInputFlags.paste | ConsoleInputFlags.size | ConsoleInputFlags.noEolWrap);
auto line = lineGetter.getline(&input);
// lineGetter leaves us exactly where it was when the user hit enter, giving best
@ -2307,7 +2308,13 @@ struct RealTimeConsoleInput {
}
if(UseVtSequences) {
if(flags & ConsoleInputFlags.mouse) {
if(flags & ConsoleInputFlags.selectiveMouse) {
// arsd terminal extension, but harmless on most other terminals
terminal.writeStringRaw("\033[?1014h");
destructor ~= { terminal.writeStringRaw("\033[?1014l"); };
} else if(flags & ConsoleInputFlags.mouse) {
// basic button press+release notification
// FIXME: try to get maximum capabilities from all terminals
@ -2320,6 +2327,7 @@ struct RealTimeConsoleInput {
// doesn't work there, breaking mouse support entirely. So by setting
// MOUSE_HACK=1002 it tells us to use the other mode for a fallback.
import std.process : environment;
if(terminal.terminalInFamily("xterm") && environment.get("MOUSE_HACK") != "1002") {
// this is vt200 mouse with full motion tracking, supported by xterm
terminal.writeStringRaw("\033[?1003h");
@ -4502,7 +4510,7 @@ class LineGetter {
public string getline(RealTimeConsoleInput* input = null) {
startGettingLine();
if(input is null) {
auto i = RealTimeConsoleInput(terminal, ConsoleInputFlags.raw | ConsoleInputFlags.allInputEvents | ConsoleInputFlags.noEolWrap);
auto i = RealTimeConsoleInput(terminal, ConsoleInputFlags.raw | ConsoleInputFlags.allInputEvents | ConsoleInputFlags.selectiveMouse | ConsoleInputFlags.noEolWrap);
//rtci = &i;
//scope(exit) rtci = null;
while(workOnLine(i.nextEvent(), &i)) {}

25
terminalemulator.d
View File

@ -304,7 +304,7 @@ class TerminalEmulator {
auto text = getSelectedText();
if(text.length) {
copyToPrimary(text);
} else if(!mouseButtonReleaseTracking || shift) {
} else if(!mouseButtonReleaseTracking || shift || (selectiveMouseTracking && termY != 0 && termY != cursorY)) {
// hyperlink check
int idx = termY * screenWidth + termX;
auto screen = (alternateScreenActive ? alternateScreen : normalScreen);
@ -422,6 +422,13 @@ class TerminalEmulator {
// end dbl click
if(!(shift) && mouseButtonTracking) {
if(selectiveMouseTracking && termY != 0 && termY != cursorY) {
if(button == MouseButton.left || button == MouseButton.right)
goto do_default_behavior;
if(!alternateScreenActive && (button == MouseButton.wheelUp || button.MouseButton.wheelDown))
goto do_default_behavior;
}
int b = baseEventCode;
int x = termX;
@ -436,6 +443,7 @@ class TerminalEmulator {
sendToApplication(buffer[]);
} else {
do_default_behavior:
if(button == MouseButton.middle) {
pasteFromPrimary(&sendPasteData);
}
@ -1636,6 +1644,7 @@ class TerminalEmulator {
private bool _mouseMotionTracking;
bool mouseButtonReleaseTracking;
bool mouseButtonMotionTracking;
bool selectiveMouseTracking;
bool mouseMotionTracking() {
return _mouseMotionTracking;
@ -1646,6 +1655,7 @@ class TerminalEmulator {
}
void allMouseTrackingOff() {
selectiveMouseTracking = false;
mouseMotionTracking = false;
mouseButtonTracking = false;
mouseButtonReleaseTracking = false;
@ -2816,6 +2826,18 @@ SGR (1006)
ings.
*/
break;
case 1014:
// ARSD extension: it is 1002 but selective, only
// on top row, row with cursor, or else if middle click/wheel.
//
// Quite specifically made for my getline function!
allMouseTrackingOff();
mouseButtonMotionTracking = true;
mouseButtonTracking = true;
mouseButtonReleaseTracking = true;
selectiveMouseTracking = true;
break;
case 1015:
/*
URXVT (1015)
@ -2928,6 +2950,7 @@ URXVT (1015)
case 1000:
case 1002:
case 1003:
case 1014: // arsd extension
allMouseTrackingOff();
break;
case 1005: