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

merge conflicts ugh

This commit is contained in:
Adam D. Ruppe 2022-11-15 13:01:40 -05:00
parent 95e3f0721c c982e8785e
commit 40de1759dc
5 changed files with 1141 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1011
game.d
View File

File diff suppressed because it is too large Load Diff

29
minigui.d
View File

@ -13495,8 +13495,12 @@ struct FileName(alias storage = previousFileReferenced, string[] filters = null,
/++
History:
onCancel was added November 6, 2021.
The dialog itself on Linux was modified on December 2, 2021 to include
a directory picker in addition to the command line completion view.
The `initialDirectory` argument was added November 9, 2022 (dub v10.10)
Future_directions:
I want to add some kind of custom preview and maybe thumbnail thing in the future,
at least on Linux, maybe on Windows too.
@ -13506,23 +13510,22 @@ void getOpenFileName(
string prefilledName = null,
string[] filters = null,
void delegate() onCancel = null,
string initialDirectory = null,
)
{
return getFileName(true, onOK, prefilledName, filters, onCancel);
return getFileName(true, onOK, prefilledName, filters, onCancel, initialDirectory);
}
/++
History:
onCancel was added November 6, 2021.
+/
/// ditto
void getSaveFileName(
void delegate(string) onOK,
string prefilledName = null,
string[] filters = null,
void delegate() onCancel = null,
string initialDirectory = null,
)
{
return getFileName(false, onOK, prefilledName, filters, onCancel);
return getFileName(false, onOK, prefilledName, filters, onCancel, initialDirectory);
}
void getFileName(
@ -13531,6 +13534,7 @@ void getFileName(
string prefilledName = null,
string[] filters = null, // format here is like ["Text files\0*.txt;*.text", "Image files\0*.png;*.jpg"]
void delegate() onCancel = null,
string initialDirectory = null,
)
{
@ -13566,6 +13570,13 @@ void getFileName(
}
ofn.lpstrFile = file.ptr;
ofn.nMaxFile = file.length;
wchar[1024] initialDir = 0;
if(initialDirectory !is null) {
makeWindowsString(initialDirectory, initialDir[]);
ofn.lpstrInitialDir = file.ptr;
}
if(openOrSave ? GetOpenFileName(&ofn) : GetSaveFileName(&ofn))
{
string okString = makeUtf8StringFromWindowsString(ofn.lpstrFile);
@ -13579,7 +13590,7 @@ void getFileName(
} else version(custom_widgets) {
if(filters.length == 0)
filters = ["All Files\0*.*"];
auto picker = new FilePicker(prefilledName, filters);
auto picker = new FilePicker(prefilledName, filters, initialDirectory);
picker.onOK = onOK;
picker.onCancel = onCancel;
picker.show();
@ -13724,7 +13735,7 @@ class FilePicker : Dialog {
string[] processedFilters;
//string[] filters = null, // format here is like ["Text files\0*.txt;*.text", "Image files\n*.png;*.jpg"]
this(string prefilledName, string[] filters, Window owner = null) {
this(string prefilledName, string[] filters, string initialDirectory, Window owner = null) {
super(300, 200, "Choose File..."); // owner);
foreach(filter; filters) {
@ -13747,7 +13758,7 @@ class FilePicker : Dialog {
}
}
currentDirectory = ".";
currentDirectory = initialDirectory is null ? "." : initialDirectory;
{
auto hl = new HorizontalLayout(this);

97
simpleaudio.d
View File

@ -225,6 +225,18 @@ interface SampleController {
Added May 26, 2021 (dub v10.0)
+/
bool paused();
/++
Sets a delegate that will be called on the audio thread when the sample is finished
playing; immediately after [finished] becomes `true`.
$(PITFALL
Very important: your callback is called on the audio thread. The safest thing
to do in it is to simply send a message back to your main thread where it deals
with whatever you want to do.
)
+/
//void onfinished(void delegate() shared callback);
}
private class DummySample : SampleController {
@ -377,8 +389,16 @@ struct AudioOutputThread {
else static assert(0);
}
// manual forward of thse since the opDispatch doesn't do the variadic
alias Sample = AudioPcmOutThreadImplementation.Sample;
void addSample(Sample[] samples...) {
if(impl !is null)
impl.addSample(samples);
}
// since these are templates, the opDispatch won't trigger them, so I have to do it differently.
// the dummysample is good anyway.
SampleController playEmulatedOpl3Midi()(string filename) {
if(impl)
return impl.playEmulatedOpl3Midi(filename);
@ -1210,21 +1230,77 @@ final class AudioPcmOutThreadImplementation : Thread {
return scf;
}
/++
A helper object.
Construct it with the [synth] function.
+/
static struct SynthBuilder {
private this(AudioPcmOutThreadImplementation ao) {
this.ao = ao;
}
private AudioPcmOutThreadImplementation ao;
}
/// ditto
SynthBuilder synth() {
return SynthBuilder(this);
}
static struct Sample {
enum Operation {
squareWave = 0,
noise = 1,
triangleWave = 2,
sawtoothWave = 3,
sineWave = 4,
customFunction = 5
}
/+
static Sample opDispatch(string operation)(int frequency) if(__traits(hasMember, Operation, operation)) {
Sample s;
s.operation = cast(int) __traits(getMember, Operation, operation);
s.frequency = frequency;
return s;
}
+/
struct Sample {
int operation;
int frequency; /* in samples */
int duration; /* in samples */
int volume; /* between 1 and 100. You should generally shoot for something lowish, like 20. */
int volume = DEFAULT_VOLUME; /* between 1 and 100. You should generally shoot for something lowish, like 20. */
int delay; /* in samples */
int balance = 50; /* between 0 and 100 */
/+
// volume envelope
int attack;
int decay;
int sustainLevel;
int release;
// change in frequency
int frequencyAttack;
int vibratoRange; // change of frequency as it sustains
int vibratoSpeed; // how fast it cycles through the vibratoRange
+/
int x;
short delegate(int x) f;
}
final void addSample(Sample currentSample) {
// FIXME: go ahead and make this return a SampleController too
final void addSample(Sample[] samples...) {
if(samples.length == 0)
return;
Sample currentSample = samples[0];
samples = samples[1 .. $];
if(samples.length)
samples = samples.dup; // ensure it isn't in stack memory that might get smashed when the delegate is passed to the other thread
int frequencyCounter;
short val = cast(short) (cast(int) short.max * currentSample.volume / 100);
@ -1235,6 +1311,7 @@ final class AudioPcmOutThreadImplementation : Thread {
addChannel(
delegate bool (short[] buffer) {
newsample:
if(currentSample.duration) {
size_t i = 0;
if(currentSample.delay) {
@ -1379,7 +1456,19 @@ final class AudioPcmOutThreadImplementation : Thread {
if(i < buffer.length)
buffer[i .. $] = 0;
return currentSample.duration > 0;
return currentSample.duration > 0 || samples.length;
} else if(samples.length) {
currentSample = samples[0];
samples = samples[1 .. $];
frequencyCounter = 0;
val = cast(short) (cast(int) short.max * currentSample.volume / 100);
leftMultiplier = 50 + (50 - currentSample.balance);
rightMultiplier = 50 + (currentSample.balance - 50);
left = true;
goto newsample;
} else {
return false;
}

103
simpledisplay.d
View File

@ -1768,11 +1768,11 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
+/
TrueColorImage takeScreenshot() {
version(Windows)
return trueColorImageFromNativeHandle(impl.hwnd, width, height);
return trueColorImageFromNativeHandle(impl.hwnd, _width, _height);
else version(OSXCocoa)
throw new NotYetImplementedException();
else
return trueColorImageFromNativeHandle(impl.window, width, height);
return trueColorImageFromNativeHandle(impl.window, _width, _height);
}
/++
@ -2022,9 +2022,14 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
this(int width = 640, int height = 480, string title = null, OpenGlOptions opengl = OpenGlOptions.no, Resizability resizable = Resizability.automaticallyScaleIfPossible, WindowTypes windowType = WindowTypes.normal, int customizationFlags = WindowFlags.normal, SimpleWindow parent = null) {
claimGuiThread();
version(sdpy_thread_checks) assert(thisIsGuiThread);
this._width = width;
this._height = height;
this._width = this._virtualWidth = width;
this._height = this._virtualHeight = height;
this.openglMode = opengl;
version(X11) {
// auto scale not implemented except with opengl and even there it is kinda weird
if(resizable == Resizability.automaticallyScaleIfPossible && opengl == OpenGlOptions.no)
resizable = Resizability.fixedSize;
}
this.resizability = resizable;
this.windowType = windowType;
this.customizationFlags = customizationFlags;
@ -2719,13 +2724,39 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
// you shouldn't need this, but it is public in case you do in a native event handler or something
public __gshared SimpleWindow[NativeWindowHandle] nativeMapping;
// the size the user requested in the constructor, in automatic scale modes it always pretends to be this size
private int _virtualWidth;
private int _virtualHeight;
/// Width of the window's drawable client area, in pixels.
@scriptable
final @property int width() const pure nothrow @safe @nogc { return _width; }
final @property int width() const pure nothrow @safe @nogc {
if(resizability == Resizability.automaticallyScaleIfPossible)
return _virtualWidth;
else
return _width;
}
/// Height of the window's drawable client area, in pixels.
@scriptable
final @property int height() const pure nothrow @safe @nogc { return _height; }
final @property int height() const pure nothrow @safe @nogc {
if(resizability == Resizability.automaticallyScaleIfPossible)
return _virtualHeight;
else
return _height;
}
/++
Returns the actual size of the window, bypassing the logical
illusions of [Resizability.automaticallyScaleIfPossible].
History:
Added November 11, 2022 (dub v10.10)
+/
final @property Size actualWindowSize() const pure nothrow @safe @nogc {
return Size(_width, _height);
}
private int _width;
private int _height;
@ -7092,11 +7123,28 @@ alias Resizablity = Resizability;
/// When you create a SimpleWindow, you can see its resizability to be one of these via the constructor...
enum Resizability {
fixedSize, /// the window cannot be resized
allowResizing, /// the window can be resized. The buffer (if there is one) will automatically adjust size, but not stretch the contents. the windowResized delegate will be called so you can respond to the new size yourself.
automaticallyScaleIfPossible, /// if possible, your drawing buffer will remain the same size and simply be automatically scaled to the new window size. If this is impossible, it will not allow the user to resize the window at all. Note: window.width and window.height WILL be adjusted, which might throw you off if you draw based on them, so keep track of your expected width and height separately. That way, when it is scaled, things won't be thrown off.
fixedSize, /// the window cannot be resized. If it is resized anyway, simpledisplay will position and truncate your drawn content without necessarily informing your program, maintaining the API illusion of a non-resizable window.
allowResizing, /// the window can be resized. The buffer (if there is one) will automatically adjust size, but not stretch the contents. the windowResized delegate will be called so you can respond to the new size yourself. This allows most control for both user and you as the library consumer, but you also have to do the most work to handle it well.
/++
$(PITFALL
Planned for the future but not implemented.
)
// FIXME: automaticallyScaleIfPossible should adjust the OpenGL viewport on resize events
Allow the user to resize the window, but try to maintain the original aspect ratio of the client area. The simpledisplay library may letterbox your content if necessary but will not stretch it. The windowResized delegate and width and height members will be updated with the size.
History:
Added November 11, 2022, but not yet implemented and may not be for some time.
+/
@future allowResizingMaintainingAspectRatio,
/++
If possible, your drawing buffer will remain the same size and simply be automatically scaled to the new window size, letterboxing if needed to keep the aspect ratio. If this is impossible, it will fallback to [fixedSize]. The simpledisplay library will always provide the illusion that your window is the same size you requested, even if it scales things for you, meaning [width] and [height] will never change.
History:
Prior to November 11, 2022, width and height would change, which made this mode harder to use than intended. While I had documented this as a possiblity, I still considered it a bug, a leaky abstraction, and changed the code to tighten it up. After that date, the width and height members, as well as mouse coordinates, are always scaled to maintain the illusion of a fixed canvas size.
Your programs should not be affected, as they will continue to function as if the user simply never resized the window at all.
+/
automaticallyScaleIfPossible,
}
@ -11566,7 +11614,11 @@ version(Windows) {
// FIXME: windowType and customizationFlags
final switch(windowType) {
case WindowTypes.normal:
style = WS_OVERLAPPEDWINDOW;
if(resizability == Resizability.fixedSize) {
style = WS_SYSMENU | WS_OVERLAPPED | WS_CAPTION;
} else {
style = WS_OVERLAPPEDWINDOW;
}
break;
case WindowTypes.undecorated:
style = WS_POPUP | WS_SYSMENU;
@ -11739,6 +11791,12 @@ version(Windows) {
x = cast(ushort) p.x;
y = cast(ushort) p.y;
}
if(wind.resizability == Resizability.automaticallyScaleIfPossible) {
x = cast(ushort)( x * wind._virtualWidth / wind._width );
y = cast(ushort)( y * wind._virtualHeight / wind._height );
}
mouse.x = x + offsetX;
mouse.y = y + offsetY;
@ -12063,7 +12121,7 @@ version(Windows) {
size_changed:
// nothing relevant changed, don't bother redrawing
if(oldWidth == width && oldHeight == height) {
if(oldWidth == _width && oldHeight == _height) {
break;
}
@ -12072,10 +12130,13 @@ version(Windows) {
if(openglMode == OpenGlOptions.no) { // && resizability == Resizability.allowResizing) {
// gotta get the double buffer bmp to match the window
// FIXME: could this be more efficient? it never relinquishes a large bitmap
if(width > bmpWidth || height > bmpHeight) {
// if it is auto-scaled, we keep the backing bitmap the same size all the time
if(resizability != Resizability.automaticallyScaleIfPossible)
if(_width > bmpWidth || _height > bmpHeight) {
auto hdc = GetDC(hwnd);
auto oldBuffer = buffer;
buffer = CreateCompatibleBitmap(hdc, width, height);
buffer = CreateCompatibleBitmap(hdc, _width, _height);
auto hdcBmp = CreateCompatibleDC(hdc);
auto oldBmp = SelectObject(hdcBmp, buffer);
@ -12097,8 +12158,8 @@ version(Windows) {
BitBlt(hdcBmp, 0, 0, bmpWidth, bmpHeight, hdcOldBmp, 0, 0, SRCCOPY);
bmpWidth = width;
bmpHeight = height;
bmpWidth = _width;
bmpHeight = _height;
SelectObject(hdcOldBmp, oldOldBmp);
DeleteDC(hdcOldBmp);
@ -12114,8 +12175,9 @@ version(Windows) {
updateOpenglViewportIfNeeded(width, height);
if(resizability != Resizability.automaticallyScaleIfPossible)
if(windowResized !is null)
windowResized(width, height);
windowResized(_width, _height);
if(inSizeMove) {
SimpleWindow.processAllCustomEvents();
@ -12126,8 +12188,8 @@ version(Windows) {
RedrawWindow(hwnd, null, null, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN);
}
oldWidth = this.width;
oldHeight = this.height;
oldWidth = this._width;
oldHeight = this._height;
break;
case WM_ERASEBKGND:
// call `visibleForTheFirstTime` here, so we can do initialization as early as possible
@ -12181,7 +12243,7 @@ version(Windows) {
// FIXME: only BitBlt the invalidated rectangle, not the whole thing
if(resizability == Resizability.automaticallyScaleIfPossible)
StretchBlt(hdc, 0, 0, this.width, this.height, hdcMem, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
StretchBlt(hdc, 0, 0, this._width, this._height, hdcMem, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY);
else
BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hdcMem, 0, 0, SRCCOPY);
//BitBlt(hdc, ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right - ps.rcPaint.left, ps.rcPaint.top - ps.rcPaint.bottom, hdcMem, 0, 0, SRCCOPY);
@ -14956,6 +15018,7 @@ version(X11) {
win.fixFixedSize(width, height); //k8: this does nothing on my FluxBox; wtf?!
if(resizability != Resizability.automaticallyScaleIfPossible)
if(win.windowResized !is null) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);

55
terminal.d
View File

@ -1710,6 +1710,8 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
}
private bool _underlined = false;
private bool _bolded = false;
private bool _italics = false;
/++
Outputs a hyperlink to my custom terminal (v0.0.7 or later) or to version
@ -1799,7 +1801,19 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
}
}
/// Note: the Windows console does not support underlining
/++
Sets or resets the terminal's text rendering options.
Note: the Windows console does not support these and many Unix terminals don't either.
Many will treat italic as blink and bold as brighter color. There is no way to know
what will happen. So I don't recommend you use these in general. They don't even work
with `-version=TerminalDirectToEmulator`.
History:
underline was added in March 2020. italic and bold were added November 1, 2022
since they are unreliable, i didnt want to add these but did for some special requests.
+/
void underline(bool set, ForceOption force = ForceOption.automatic) {
if(set == _underlined && force != ForceOption.alwaysSend)
return;
@ -1811,7 +1825,42 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
}
_underlined = set;
}
// FIXME: do I want to do bold and italic?
/// ditto
void italic(bool set, ForceOption force = ForceOption.automatic) {
if(set == _italics && force != ForceOption.alwaysSend)
return;
if(UseVtSequences) {
if(set)
writeStringRaw("\033[3m");
else
writeStringRaw("\033[23m");
}
_italics = set;
}
/// ditto
void bold(bool set, ForceOption force = ForceOption.automatic) {
if(set == _bolded && force != ForceOption.alwaysSend)
return;
if(UseVtSequences) {
if(set)
writeStringRaw("\033[1m");
else
writeStringRaw("\033[22m");
}
_bolded = set;
}
// FIXME: implement this in arsd terminalemulator too
// and make my vim use it. these are extensions in the iterm, etc
/+
void setUnderlineColor(Color colorIndex) {} // 58;5;n
void setUnderlineColor(int r, int g, int b) {} // 58;2;r;g;b
void setDefaultUnderlineColor() {} // 59
+/
/// Returns the terminal to normal output colors
void reset() {
@ -1823,6 +1872,8 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
writeStringRaw("\033[0m");
_underlined = false;
_italics = false;
_bolded = false;
_currentForeground = Color.DEFAULT;
_currentBackground = Color.DEFAULT;
reverseVideo = false;