Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
42e93346ab | ||
|
|
9ab26afc16 | ||
|
|
743974a0c1 | ||
|
|
9c6ec489e1 | ||
|
|
b2c7b31eb5 | ||
|
|
5670ad0e64 | ||
|
|
1540be3b79 | ||
|
|
88dd931cb4 | ||
|
|
70b83a5fec | ||
|
|
0682f2b875 | ||
|
|
5dea510bbc |
@@ -138,9 +138,22 @@ jobs:
|
||||
- name: Build the installer
|
||||
run: ./Packaging/build-installer.ps1 -Version ${{ steps.version.outputs.plain }}
|
||||
|
||||
# The artifact is where the package waits to be uploaded to Partner Center
|
||||
# The artifact is where the package waits to be uploaded to Partner Center.
|
||||
#
|
||||
# The action comes from this Gitea rather than from github.com, and it is
|
||||
# a fork of actions/upload-artifact with one line changed. Upstream reads
|
||||
# GITHUB_SERVER_URL, takes every host but github.com and its enterprise
|
||||
# ones for a GitHub Enterprise Server — where the v4 artifact backend does
|
||||
# not exist — and throws before it makes a request. Here that backend does
|
||||
# exist and answers, but the check runs on the runner ahead of the network
|
||||
# and never lets it prove itself; nor can the name be corrected from this
|
||||
# file, as the runner sets the GITHUB_ ones over the env of a step. The
|
||||
# fork carries the reasoning in full in its GITEA-PATCH.md.
|
||||
#
|
||||
# The tag is a fixed one. A floating tag is how this broke before: the
|
||||
# action is fetched at run time, and what arrives can change on its own
|
||||
- name: Keep the package
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: https://git.alrakis.kz/actions/upload-artifact@v4-gitea
|
||||
with:
|
||||
name: msix-${{ steps.version.outputs.version }}
|
||||
path: artifacts/packages/
|
||||
@@ -149,7 +162,7 @@ jobs:
|
||||
# The .wixpdb next to each installer is left out on purpose: it is of use
|
||||
# only when something has to be traced back to the WiX source
|
||||
- name: Keep the installer
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: https://git.alrakis.kz/actions/upload-artifact@v4-gitea
|
||||
with:
|
||||
name: installer-${{ steps.version.outputs.plain }}
|
||||
path: artifacts/installers/*.msi
|
||||
@@ -167,10 +180,8 @@ jobs:
|
||||
|
||||
# The GITHUB_ names are what Gitea itself hands to the workflow — its
|
||||
# actions repeat those of GitHub, and the addresses in them point at
|
||||
# this Gitea instance. GITHUB_API_URL used not to reach the steps at
|
||||
# all, so the address is put together from the server one when empty
|
||||
$root = if ($env:GITHUB_API_URL) { $env:GITHUB_API_URL } else { "$env:GITHUB_SERVER_URL/api/v1" }
|
||||
$api = "$root/repos/$env:GITHUB_REPOSITORY/releases"
|
||||
# this Gitea instance
|
||||
$api = "$env:GITHUB_API_URL/repos/$env:GITHUB_REPOSITORY/releases"
|
||||
$headers = @{ Authorization = "token $env:GITEA_TOKEN" }
|
||||
|
||||
# Gitea makes a release of its own for a pushed tag, so the release is
|
||||
|
||||
@@ -133,6 +133,34 @@ public sealed partial class EndToEndTests
|
||||
Assert.False(launch.Process.HasExited);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// "Exit" in the tray menu ends the application whole: the settings window goes with
|
||||
/// the agent instead of staying on the screen belonging to nothing.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The menu itself is out of reach of a test — it is a <c>TrackPopupMenuEx</c> menu
|
||||
/// with a modal loop of its own — so what is checked is the request the menu makes.
|
||||
/// The settings window here is the real one, started by the agent, and it must be
|
||||
/// listening by the time it is on the screen.
|
||||
/// </remarks>
|
||||
[Fact]
|
||||
public void The_agents_exit_closes_the_settings_window()
|
||||
{
|
||||
using Launch launch = Launch.Start();
|
||||
launch.WaitForSettingsWindow();
|
||||
|
||||
Process settings = Launch.SettingsProcesses().Single();
|
||||
try
|
||||
{
|
||||
Assert.True(SettingsCloseSignal.RequestClose(), "the settings window was not listening");
|
||||
Assert.True(settings.WaitForExit(ExitTimeout), "the settings window outlived the agent's exit");
|
||||
}
|
||||
finally
|
||||
{
|
||||
settings.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>A started application that shuts down together with the check.</summary>
|
||||
private sealed class Launch : IDisposable
|
||||
{
|
||||
|
||||
@@ -125,5 +125,12 @@ internal sealed class Agent : IDisposable
|
||||
|
||||
private void OnOpenRequested(object? sender, EventArgs e) => SettingsLauncher.Open();
|
||||
|
||||
private void OnExitRequested(object? sender, EventArgs e) => _window.Quit();
|
||||
// "Exit" means the application, not just the background half of it. A settings
|
||||
// window left open would outlive the tray icon it was opened from, so it is asked
|
||||
// to close first — it may be the very window the user is looking at
|
||||
private void OnExitRequested(object? sender, EventArgs e)
|
||||
{
|
||||
SettingsCloseSignal.RequestClose();
|
||||
_window.Quit();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
<PublishTrimmed>false</PublishTrimmed>
|
||||
<PublishReadyToRun Condition="'$(RuntimeIdentifier)' != ''">true</PublishReadyToRun>
|
||||
<Version>1.0.0</Version>
|
||||
<AssemblyVersion>1.0.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0.0</FileVersion>
|
||||
<AssemblyVersion>$(Version)</AssemblyVersion>
|
||||
<FileVersion>$(Version)</FileVersion>
|
||||
<Product>CursorLang</Product>
|
||||
<Company>Aleksandr Neichev</Company>
|
||||
<Description>Shows the keyboard layout at the cursor</Description>
|
||||
|
||||
@@ -68,42 +68,42 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
return;
|
||||
}
|
||||
|
||||
bool atFixedPoint = _settings.PlacementMode == PopupPlacementMode.FixedPoint;
|
||||
PopupWindowNative.Rect? anchor = TryGetAnchor();
|
||||
PopupModeSettings mode = ModeFor(anchor);
|
||||
|
||||
PopupWindowNative.Rect work = default;
|
||||
PopupWindowNative.Rect anchor = default;
|
||||
double scale;
|
||||
|
||||
if (atFixedPoint)
|
||||
if (anchor is { } at)
|
||||
{
|
||||
(work, scale) = PopupWindowNative.GetActiveMonitorWorkArea();
|
||||
scale = PopupWindowNative.GetScaleAt(new PopupWindowNative.Point { X = at.Left, Y = at.Top });
|
||||
}
|
||||
else
|
||||
{
|
||||
anchor = GetAnchor();
|
||||
scale = PopupWindowNative.GetScaleAt(new PopupWindowNative.Point { X = anchor.Left, Y = anchor.Top });
|
||||
(work, scale) = PopupWindowNative.GetActiveMonitorWorkArea();
|
||||
}
|
||||
|
||||
EnsureFont(scale);
|
||||
EnsureFont(mode, scale);
|
||||
|
||||
Size measured = MeasureText(text);
|
||||
int width = measured.Width + (2 * PopupLayout.ToPixels(PaddingX, scale));
|
||||
int height = measured.Height + (2 * PopupLayout.ToPixels(PaddingY, scale));
|
||||
|
||||
PopupWindowNative.Point position = atFixedPoint
|
||||
? PopupLayout.OnScreen(
|
||||
work,
|
||||
_settings.FixedPoint.Position,
|
||||
PopupLayout.ToPixels(_settings.FixedPoint.Offset, scale),
|
||||
PopupWindowNative.Point position = anchor is { } near
|
||||
? PopupLayout.NearAnchor(
|
||||
near,
|
||||
SideForMode(),
|
||||
PopupLayout.ToPixels(mode.Offset, scale),
|
||||
width,
|
||||
height)
|
||||
: PopupLayout.NearAnchor(
|
||||
anchor,
|
||||
SideForMode(),
|
||||
PopupLayout.ToPixels(_settings.Current.Offset, scale),
|
||||
: PopupLayout.OnScreen(
|
||||
work,
|
||||
_settings.FixedPoint.Position,
|
||||
PopupLayout.ToPixels(mode.Offset, scale),
|
||||
width,
|
||||
height);
|
||||
|
||||
if (!Draw(text, position, width, height, PopupLayout.ToPixels(CornerRadius, scale)))
|
||||
if (!Draw(mode, text, position, width, height, PopupLayout.ToPixels(CornerRadius, scale)))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -139,7 +139,8 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
/// kilobytes for the length of one call, the popup is shown rarely, and a cached one
|
||||
/// would have to be rebuilt on every change of size, colour or scale anyway.
|
||||
/// </remarks>
|
||||
private bool Draw(string text, PopupWindowNative.Point at, int width, int height, int radius)
|
||||
private bool Draw(
|
||||
PopupModeSettings mode, string text, PopupWindowNative.Point at, int width, int height, int radius)
|
||||
{
|
||||
IntPtr screen = GdiNative.GetDC(IntPtr.Zero);
|
||||
if (screen == IntPtr.Zero)
|
||||
@@ -166,8 +167,8 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
|
||||
GdiNative.SelectObject(memory, surface);
|
||||
|
||||
Fill(bits, width, height);
|
||||
DrawText(memory, text, width, height);
|
||||
Fill(mode, bits, width, height);
|
||||
DrawText(mode, memory, text, width, height);
|
||||
|
||||
// GDI writes nothing into the alpha channel, so the letters it just drew are
|
||||
// sitting at zero alpha and would come out invisible. The inside of the
|
||||
@@ -178,7 +179,7 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
RoundTheCorners(bits, width, height, radius);
|
||||
|
||||
var size = new WindowNative.Size { Width = width, Height = height };
|
||||
var alpha = (byte)Math.Clamp(Math.Round(_settings.Current.Opacity * 255), 0, 255);
|
||||
var alpha = (byte)Math.Clamp(Math.Round(mode.Opacity * 255), 0, 255);
|
||||
|
||||
return WindowNative.SetContent(Handle, at, size, memory, alpha);
|
||||
}
|
||||
@@ -200,9 +201,9 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
}
|
||||
}
|
||||
|
||||
private void Fill(IntPtr bits, int width, int height)
|
||||
private static void Fill(PopupModeSettings mode, IntPtr bits, int width, int height)
|
||||
{
|
||||
Color background = _settings.Current.BackgroundColor;
|
||||
Color background = mode.BackgroundColor;
|
||||
|
||||
// Straight into the bitmap rather than through a brush: the pixels have to be
|
||||
// written anyway to carry an alpha channel GDI would not touch
|
||||
@@ -216,7 +217,8 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
}
|
||||
}
|
||||
|
||||
private void DrawText(IntPtr deviceContext, string text, int width, int height)
|
||||
private void DrawText(
|
||||
PopupModeSettings mode, IntPtr deviceContext, string text, int width, int height)
|
||||
{
|
||||
if (_font == IntPtr.Zero || text.Length == 0)
|
||||
{
|
||||
@@ -227,7 +229,7 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
|
||||
IntPtr previousFont = GdiNative.SelectObject(deviceContext, _font);
|
||||
GdiNative.SetBkMode(deviceContext, GdiNative.TRANSPARENT);
|
||||
GdiNative.SetTextColor(deviceContext, GdiNative.ToColorRef(_settings.Current.ForegroundColor));
|
||||
GdiNative.SetTextColor(deviceContext, GdiNative.ToColorRef(mode.ForegroundColor));
|
||||
|
||||
GdiNative.DrawText(deviceContext, text, text.Length, ref bounds,
|
||||
GdiNative.DT_SINGLELINE | GdiNative.DT_CENTER | GdiNative.DT_VCENTER |
|
||||
@@ -329,18 +331,40 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
return (int)((alpha << 24) | (red << 16) | (green << 8) | blue);
|
||||
}
|
||||
|
||||
// The anchor point: the caret in the input field or the mouse cursor. The cursor
|
||||
// is a rectangle of zero size, so the corner computation is shared by both
|
||||
private PopupWindowNative.Rect GetAnchor()
|
||||
/// <summary>
|
||||
/// What the popup is placed next to, or <c>null</c> when there is nothing: the fixed
|
||||
/// point mode, and the caret mode where the application reports no caret.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The cursor is a rectangle of zero size, so the corner arithmetic is shared by it
|
||||
/// and the caret.
|
||||
/// </remarks>
|
||||
private PopupWindowNative.Rect? TryGetAnchor() => _settings.PlacementMode switch
|
||||
{
|
||||
if (_settings.PlacementMode == PopupPlacementMode.AtCaret &&
|
||||
CaretNative.TryGetCaretRect() is { } caret)
|
||||
{
|
||||
return caret;
|
||||
}
|
||||
PopupPlacementMode.FixedPoint => null,
|
||||
PopupPlacementMode.AtCaret => CaretNative.TryGetCaretRect(),
|
||||
_ => PopupLayout.AsAnchor(PopupWindowNative.GetCursorPosition()),
|
||||
};
|
||||
|
||||
return PopupLayout.AsAnchor(PopupWindowNative.GetCursorPosition());
|
||||
}
|
||||
/// <summary>
|
||||
/// The settings the popup is shown with: those of the mode chosen, or those of the
|
||||
/// fixed point when there is no anchor to stand next to.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The caret mode falls back to the fixed point rather than to the mouse cursor:
|
||||
/// the cursor is wherever it was last left — off to a side, on another monitor, or
|
||||
/// over the very text being typed — and a popup that lands there while the eyes are
|
||||
/// on the caret is one that is looked for and not found. The fixed point is always
|
||||
/// in the same place, so it is known where to look.
|
||||
///
|
||||
/// The look comes from the fixed point mode too, not just the place. The two are set
|
||||
/// up together for a reason: the popup by the caret is small and quiet because it
|
||||
/// sits inside a text being read, while the one in the corner of the monitor is
|
||||
/// looked for on purpose and is set larger. Keeping the caret look at the corner
|
||||
/// would put a popup meant to go unnoticed where nothing else draws the eye.
|
||||
/// </remarks>
|
||||
private PopupModeSettings ModeFor(PopupWindowNative.Rect? anchor) =>
|
||||
anchor is null ? _settings.FixedPoint : _settings.Current;
|
||||
|
||||
// The caret has two sides to choose from and the cursor has six, so each mode names
|
||||
// its own side in its own terms
|
||||
@@ -373,10 +397,10 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
// The font is rebuilt only when the size in the settings or the monitor scale
|
||||
// changes: it is the one expensive thing a show does. A switch of the placement
|
||||
// mode counts as a change of the size, since the size belongs to the mode
|
||||
private void EnsureFont(double scale)
|
||||
private void EnsureFont(PopupModeSettings mode, double scale)
|
||||
{
|
||||
if (_font != IntPtr.Zero &&
|
||||
Math.Abs(_fontSize - _settings.Current.FontSize) < 0.01 &&
|
||||
Math.Abs(_fontSize - mode.FontSize) < 0.01 &&
|
||||
Math.Abs(_fontScale - scale) < 0.01)
|
||||
{
|
||||
return;
|
||||
@@ -384,7 +408,7 @@ internal sealed class NativePopupWindow : NativeWindow, ILayoutPopupWindow
|
||||
|
||||
ReleaseFont();
|
||||
|
||||
_fontSize = _settings.Current.FontSize;
|
||||
_fontSize = mode.FontSize;
|
||||
_fontScale = scale;
|
||||
_font = GdiNative.CreateFont(_fontSize, scale);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
using System.Collections.Concurrent;
|
||||
using CursorLang.Core.Services;
|
||||
using CursorLang.Tests.Shared;
|
||||
|
||||
namespace CursorLang.Core.Tests.Services;
|
||||
|
||||
/// <summary>
|
||||
/// The one thing the agent says to the settings window: quit with me.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The event names here are the tests' own. The application's name is fixed, and a test
|
||||
/// listening on it would answer for a settings window someone is using — or, signalling,
|
||||
/// close it.
|
||||
/// </remarks>
|
||||
public sealed class SettingsCloseSignalTests
|
||||
{
|
||||
[Fact]
|
||||
public void The_request_reaches_the_settings_window()
|
||||
{
|
||||
string suffix = UniqueSuffix();
|
||||
var signal = new SettingsCloseSignal(suffix);
|
||||
|
||||
ConcurrentQueue<EventArgs> requests = new();
|
||||
signal.CloseRequested += (_, e) => requests.Enqueue(e);
|
||||
|
||||
try
|
||||
{
|
||||
signal.Listen();
|
||||
|
||||
Assert.True(RequestApart(suffix), "the request found nobody listening");
|
||||
Pump.WaitFor(() => !requests.IsEmpty, "the settings window got the request to close");
|
||||
}
|
||||
finally
|
||||
{
|
||||
signal.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
// The usual case: the user quits from the tray with no settings window on the screen
|
||||
[Fact]
|
||||
public void A_request_with_no_settings_window_open_passes_without_consequence()
|
||||
{
|
||||
Assert.False(RequestApart(UniqueSuffix()));
|
||||
}
|
||||
|
||||
// The window has closed on its own, and the process is on its way out anyway
|
||||
[Fact]
|
||||
public void No_request_arrives_after_the_window_is_gone()
|
||||
{
|
||||
string suffix = UniqueSuffix();
|
||||
var signal = new SettingsCloseSignal(suffix);
|
||||
|
||||
ConcurrentQueue<EventArgs> requests = new();
|
||||
signal.CloseRequested += (_, e) => requests.Enqueue(e);
|
||||
|
||||
signal.Listen();
|
||||
signal.Dispose();
|
||||
|
||||
RequestApart(suffix);
|
||||
Pump.Pause(TimeSpan.FromMilliseconds(80));
|
||||
|
||||
Assert.Empty(requests);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Listening_twice_leaves_one_listener()
|
||||
{
|
||||
string suffix = UniqueSuffix();
|
||||
var signal = new SettingsCloseSignal(suffix);
|
||||
|
||||
var requests = 0;
|
||||
signal.CloseRequested += (_, _) => Interlocked.Increment(ref requests);
|
||||
|
||||
try
|
||||
{
|
||||
signal.Listen();
|
||||
signal.Listen();
|
||||
|
||||
Assert.True(RequestApart(suffix));
|
||||
Pump.WaitFor(() => Volatile.Read(ref requests) > 0, "the request arrived");
|
||||
Pump.Pause(TimeSpan.FromMilliseconds(80));
|
||||
|
||||
Assert.Equal(1, Volatile.Read(ref requests));
|
||||
}
|
||||
finally
|
||||
{
|
||||
signal.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Closing_without_listening_passes_without_consequence()
|
||||
{
|
||||
var signal = new SettingsCloseSignal(UniqueSuffix());
|
||||
|
||||
signal.Dispose();
|
||||
signal.Dispose();
|
||||
}
|
||||
|
||||
// Every test gets a namespace of kernel objects of its own
|
||||
private static string UniqueSuffix() => "." + Guid.NewGuid().ToString("N");
|
||||
|
||||
/// <summary>
|
||||
/// Asks for the close the way the agent does it — from another process, and here
|
||||
/// from another thread, which is as foreign as a test can get.
|
||||
/// </summary>
|
||||
private static bool RequestApart(string suffix)
|
||||
{
|
||||
var heard = false;
|
||||
|
||||
Pump.RunApart(() => heard = SettingsCloseSignal.RequestClose(suffix));
|
||||
|
||||
return heard;
|
||||
}
|
||||
}
|
||||
@@ -113,7 +113,7 @@ internal static class CaretNative
|
||||
private static PopupWindowNative.Rect? TryGetAutomationCaret()
|
||||
{
|
||||
// A hung application must not hang the popup along with it: we wait for the
|
||||
// answer for a limited time, otherwise we show the popup at the cursor
|
||||
// answer for a limited time, otherwise the popup goes to the fixed point
|
||||
Task<PopupWindowNative.Rect?> query = Task.Run(QueryAutomationCaret);
|
||||
return query.Wait(AutomationTimeout) ? query.Result : null;
|
||||
}
|
||||
@@ -165,7 +165,7 @@ internal static class CaretNative
|
||||
}
|
||||
#else
|
||||
// Built without UI Automation: Chromium and Electron keep the system caret and MSAA
|
||||
// steps above, and where those stay silent the popup falls back to the cursor
|
||||
// steps above, and where those stay silent the popup falls back to the fixed point
|
||||
private static PopupWindowNative.Rect? TryGetAutomationCaret() => null;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -10,7 +10,8 @@ public enum PopupPlacementMode
|
||||
|
||||
/// <summary>
|
||||
/// Next to the caret in the active input field. When the application does not
|
||||
/// report its position, the popup is shown at the mouse cursor.
|
||||
/// report its position, the popup is shown as in <see cref="FixedPoint"/> — at the
|
||||
/// place and with the look that mode is set up with.
|
||||
/// </summary>
|
||||
AtCaret,
|
||||
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
namespace CursorLang.Core.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Tells the settings window that the agent is quitting and it is to close with it.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The one thing the agent says to the settings window, and the mirror image of
|
||||
/// <see cref="SettingsSignal"/>. "Exit" in the tray menu means the application is done
|
||||
/// with, and a settings window left alone on the screen after it is a window belonging
|
||||
/// to nothing: the tray icon it was opened from is gone, and closing it would be the
|
||||
/// user's only remaining move.
|
||||
///
|
||||
/// A named event rather than a window message, because the agent has no handle to send
|
||||
/// one to: the settings window lives in a process the agent starts and deliberately
|
||||
/// does not keep hold of. The name has no <c>Global</c> prefix, so it lives in the
|
||||
/// session namespace — same reasoning as <see cref="SingleInstanceGate"/>, and the same
|
||||
/// consequence: with fast user switching each user's halves talk to their own.
|
||||
///
|
||||
/// Only the settings window creates the object; the agent opens what is already there
|
||||
/// and stays silent when there is nothing. Were it the other way round, the request
|
||||
/// would sit in an auto-reset event waiting for the next settings window to open and
|
||||
/// close it the moment it did.
|
||||
/// </remarks>
|
||||
internal sealed class SettingsCloseSignal : IDisposable
|
||||
{
|
||||
private const string EventName = "CursorLang.CloseSettings";
|
||||
|
||||
private readonly string _eventName;
|
||||
|
||||
private EventWaitHandle? _request;
|
||||
private RegisteredWaitHandle? _wait;
|
||||
|
||||
/// <summary>
|
||||
/// Listens on the name the two halves agree on.
|
||||
/// </summary>
|
||||
/// <param name="nameSuffix">
|
||||
/// A namespace of its own. Empty for the application; the tests pass one so that
|
||||
/// they do not answer for — or worse, close — a settings window someone is using.
|
||||
/// </param>
|
||||
internal SettingsCloseSignal(string nameSuffix = "") => _eventName = EventName + nameSuffix;
|
||||
|
||||
/// <summary>The agent asks for the window to be closed.</summary>
|
||||
/// <remarks>
|
||||
/// Raised on a thread pool thread, wherever the wait happened to be answered — a
|
||||
/// window obeys only its own, so the handler has to get back to it.
|
||||
/// </remarks>
|
||||
internal event EventHandler? CloseRequested;
|
||||
|
||||
/// <summary>
|
||||
/// Asks the settings window of this session, if one is open, to close. Silence is
|
||||
/// a normal answer: most of the time the user quits with no window on the screen.
|
||||
/// </summary>
|
||||
/// <returns>Whether there was anybody to hear it.</returns>
|
||||
internal static bool RequestClose(string nameSuffix = "")
|
||||
{
|
||||
if (!EventWaitHandle.TryOpenExisting(EventName + nameSuffix, out EventWaitHandle? request))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
using (request)
|
||||
{
|
||||
return request.Set();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Starts waiting for the request. Called once, by the settings window.</summary>
|
||||
internal void Listen()
|
||||
{
|
||||
if (_request is not null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_request = new EventWaitHandle(false, EventResetMode.AutoReset, _eventName);
|
||||
|
||||
// As in the gate: the thread pool holds the wait, there is no reason to keep a
|
||||
// thread of our own for a request that may never come
|
||||
_wait = ThreadPool.RegisterWaitForSingleObject(
|
||||
_request,
|
||||
OnCloseSignalled,
|
||||
state: null,
|
||||
Timeout.Infinite,
|
||||
executeOnlyOnce: false);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_wait?.Unregister(null);
|
||||
_wait = null;
|
||||
|
||||
_request?.Dispose();
|
||||
_request = null;
|
||||
}
|
||||
|
||||
private void OnCloseSignalled(object? state, bool timedOut) =>
|
||||
CloseRequested?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
using CursorLang.Core.Models;
|
||||
using CursorLang.Core.Services;
|
||||
using CursorLang.Settings.Tests.Infrastructure;
|
||||
using CursorLang.Settings.ViewModels;
|
||||
using CursorLang.Tests.Shared;
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ public partial class App : Application
|
||||
{
|
||||
private ServiceProvider? _services;
|
||||
private SingleInstanceGate? _instanceGate;
|
||||
private SettingsCloseSignal? _closeSignal;
|
||||
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
{
|
||||
@@ -42,6 +43,10 @@ public partial class App : Application
|
||||
_instanceGate = gate;
|
||||
_instanceGate.ActivationRequested += OnActivationRequested;
|
||||
|
||||
_closeSignal = new SettingsCloseSignal();
|
||||
_closeSignal.CloseRequested += OnCloseRequested;
|
||||
_closeSignal.Listen();
|
||||
|
||||
var services = new ServiceCollection();
|
||||
ConfigureServices(services);
|
||||
_services = services.BuildServiceProvider();
|
||||
@@ -61,6 +66,12 @@ public partial class App : Application
|
||||
{
|
||||
_services?.Dispose();
|
||||
|
||||
if (_closeSignal is not null)
|
||||
{
|
||||
_closeSignal.CloseRequested -= OnCloseRequested;
|
||||
_closeSignal.Dispose();
|
||||
}
|
||||
|
||||
if (_instanceGate is not null)
|
||||
{
|
||||
_instanceGate.ActivationRequested -= OnActivationRequested;
|
||||
@@ -95,6 +106,27 @@ public partial class App : Application
|
||||
private void OnActivationRequested(object? sender, EventArgs e) =>
|
||||
Dispatcher.BeginInvoke(ShowMainWindow);
|
||||
|
||||
// The agent is quitting. Answered on a thread pool thread, and the window is closed
|
||||
// on its own one
|
||||
private void OnCloseRequested(object? sender, EventArgs e) =>
|
||||
Dispatcher.BeginInvoke(CloseMainWindow);
|
||||
|
||||
/// <summary>
|
||||
/// Closes the window the way the title bar button does, so that everything hanging
|
||||
/// off closing happens; <see cref="ShutdownMode.OnMainWindowClose"/> ends the process
|
||||
/// after it. Without a window there is nothing to close and the process simply ends.
|
||||
/// </summary>
|
||||
private void CloseMainWindow()
|
||||
{
|
||||
if (MainWindow is { } window)
|
||||
{
|
||||
window.Close();
|
||||
return;
|
||||
}
|
||||
|
||||
Shutdown();
|
||||
}
|
||||
|
||||
private void ShowMainWindow()
|
||||
{
|
||||
if (MainWindow is not { } window)
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
<PublishTrimmed>false</PublishTrimmed>
|
||||
<PublishReadyToRun Condition="'$(RuntimeIdentifier)' != ''">true</PublishReadyToRun>
|
||||
<Version>1.0.0</Version>
|
||||
<AssemblyVersion>1.0.0.0</AssemblyVersion>
|
||||
<FileVersion>1.0.0.0</FileVersion>
|
||||
<AssemblyVersion>$(Version)</AssemblyVersion>
|
||||
<FileVersion>$(Version)</FileVersion>
|
||||
<Product>CursorLang</Product>
|
||||
<Company>Aleksandr Neichev</Company>
|
||||
<Description>Settings window of CursorLang</Description>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
mc:Ignorable="d"
|
||||
d:DataContext="{d:DesignInstance Type=vm:SettingsViewModel}"
|
||||
Title="{Binding Title}"
|
||||
Width="1000" SizeToContent="Height" MaxHeight="900"
|
||||
Width="560" SizeToContent="Height" MaxHeight="940"
|
||||
ResizeMode="CanMinimize"
|
||||
Background="{DynamicResource Theme.WindowBackground}"
|
||||
Foreground="{DynamicResource Theme.Foreground}">
|
||||
@@ -59,19 +59,7 @@
|
||||
</Style>
|
||||
</Window.Resources>
|
||||
|
||||
<!-- The settings are laid out in two columns: this way the window fits on the
|
||||
screen entirely and does without scrolling. Scrolling is kept for the case of
|
||||
a large system font, with which the content is taller than the monitor after all.
|
||||
|
||||
The left column holds what the popup does; the right one holds the single
|
||||
section describing how and where the popup looks -->
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto" Padding="16">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<StackPanel>
|
||||
|
||||
<GroupBox Header="{Binding Localization[SectionInterface]}">
|
||||
@@ -104,105 +92,6 @@
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="{Binding Localization[SectionBehavior]}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="164" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Style="{StaticResource FieldLabel}"
|
||||
Text="{Binding Localization[DurationLabel]}" />
|
||||
<Slider Grid.Column="1" Minimum="200" Maximum="5000" TickFrequency="100"
|
||||
Value="{Binding Settings.DurationMilliseconds}" />
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FieldValue}"
|
||||
Text="{Binding Settings.DurationMilliseconds, StringFormat={}{0:F0}}" />
|
||||
<TextBlock Margin="4,0,0,0"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}"
|
||||
Text="{Binding Localization[MillisecondsSuffix]}" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Grid.Row="1" Margin="0,12,12,0"
|
||||
Style="{StaticResource FieldLabel}"
|
||||
Text="{Binding Localization[CapsLockLabel]}" />
|
||||
<CheckBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
|
||||
IsChecked="{Binding Settings.UseCapsLockHotkey}"
|
||||
Content="{Binding Localization[CapsLockHotkeyCheck]}" />
|
||||
|
||||
<TextBlock Grid.Row="2" Margin="0,12,12,0"
|
||||
Style="{StaticResource FieldLabel}"
|
||||
Text="{Binding Localization[CapsLockHoldLabel]}" />
|
||||
<Slider Grid.Row="2" Grid.Column="1" Margin="0,12,0,0"
|
||||
Minimum="150" Maximum="1500" TickFrequency="50"
|
||||
Value="{Binding Settings.CapsLockHoldMilliseconds}"
|
||||
IsEnabled="{Binding Settings.UseCapsLockHotkey}" />
|
||||
<StackPanel Grid.Row="2" Grid.Column="2" Margin="0,12,0,0"
|
||||
Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FieldValue}"
|
||||
Text="{Binding Settings.CapsLockHoldMilliseconds, StringFormat={}{0:F0}}" />
|
||||
<TextBlock Margin="4,0,0,0"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}"
|
||||
Text="{Binding Localization[MillisecondsSuffix]}" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
Margin="0,6,0,0" TextWrapping="Wrap"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}">
|
||||
<Run Text="{Binding Localization[CapsLockHoldHint], Mode=OneWay}" />
|
||||
<InlineUIContainer BaselineAlignment="Baseline">
|
||||
<!-- The elevation caveat lives in the tooltip to keep the section compact -->
|
||||
<TextBlock Text="{Binding Localization[MoreInfoLink]}"
|
||||
Foreground="{DynamicResource Theme.Accent}"
|
||||
TextDecorations="Underline"
|
||||
Cursor="Help"
|
||||
ToolTipService.InitialShowDelay="200"
|
||||
ToolTipService.ShowDuration="60000"
|
||||
Visibility="{Binding Settings.UseCapsLockHotkey, Converter={StaticResource BooleanToVisibility}}">
|
||||
<TextBlock.ToolTip>
|
||||
<ToolTip>
|
||||
<TextBlock TextWrapping="Wrap"
|
||||
Text="{Binding Localization[CapsLockElevationHint]}" />
|
||||
</ToolTip>
|
||||
</TextBlock.ToolTip>
|
||||
</TextBlock>
|
||||
</InlineUIContainer>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock Grid.Row="4" Margin="0,12,12,0"
|
||||
Style="{StaticResource FieldLabel}"
|
||||
Visibility="{Binding IsStartupAvailable, Converter={StaticResource BooleanToVisibility}}"
|
||||
Text="{Binding Localization[StartupLabel]}" />
|
||||
<CheckBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
|
||||
Visibility="{Binding IsStartupAvailable, Converter={StaticResource BooleanToVisibility}}"
|
||||
IsEnabled="{Binding CanChangeStartup}"
|
||||
IsChecked="{Binding RunAtStartup}"
|
||||
Content="{Binding Localization[StartupCheck]}" />
|
||||
|
||||
<TextBlock Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
Margin="0,6,0,0" TextWrapping="Wrap"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}"
|
||||
Visibility="{Binding IsStartupLocked, Converter={StaticResource BooleanToVisibility}}"
|
||||
Text="{Binding Localization[StartupLockedHint]}" />
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel Grid.Column="1" Margin="16,0,0,0">
|
||||
|
||||
<!-- Where the popup appears and how it looks are one question for the
|
||||
user, so both live in a single section: the rule is picked at the
|
||||
top and its result is seen in the preview at the bottom -->
|
||||
<GroupBox Header="{Binding Localization[SectionPopup]}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -358,8 +247,6 @@
|
||||
Converter={StaticResource EnumToVisibility},
|
||||
ConverterParameter=FixedPoint}" />
|
||||
|
||||
<!-- A hairline between the two halves of the section: the
|
||||
placement above, the look of the popup below -->
|
||||
<Border Grid.Row="7" Grid.ColumnSpan="3"
|
||||
Margin="0,16,0,0" Height="1"
|
||||
Background="{DynamicResource Theme.ControlBorder}" />
|
||||
@@ -422,7 +309,98 @@
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="{Binding Localization[SectionBehavior]}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="164" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<TextBlock Style="{StaticResource FieldLabel}"
|
||||
Text="{Binding Localization[DurationLabel]}" />
|
||||
<Slider Grid.Column="1" Minimum="200" Maximum="5000" TickFrequency="100"
|
||||
Value="{Binding Settings.DurationMilliseconds}" />
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FieldValue}"
|
||||
Text="{Binding Settings.DurationMilliseconds, StringFormat={}{0:F0}}" />
|
||||
<TextBlock Margin="4,0,0,0"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}"
|
||||
Text="{Binding Localization[MillisecondsSuffix]}" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Grid.Row="1" Margin="0,12,12,0"
|
||||
Style="{StaticResource FieldLabel}"
|
||||
Text="{Binding Localization[CapsLockLabel]}" />
|
||||
<CheckBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
|
||||
IsChecked="{Binding Settings.UseCapsLockHotkey}"
|
||||
Content="{Binding Localization[CapsLockHotkeyCheck]}" />
|
||||
|
||||
<TextBlock Grid.Row="2" Margin="0,12,12,0"
|
||||
Style="{StaticResource FieldLabel}"
|
||||
Text="{Binding Localization[CapsLockHoldLabel]}" />
|
||||
<Slider Grid.Row="2" Grid.Column="1" Margin="0,12,0,0"
|
||||
Minimum="150" Maximum="1500" TickFrequency="50"
|
||||
Value="{Binding Settings.CapsLockHoldMilliseconds}"
|
||||
IsEnabled="{Binding Settings.UseCapsLockHotkey}" />
|
||||
<StackPanel Grid.Row="2" Grid.Column="2" Margin="0,12,0,0"
|
||||
Orientation="Horizontal" VerticalAlignment="Center">
|
||||
<TextBlock Style="{StaticResource FieldValue}"
|
||||
Text="{Binding Settings.CapsLockHoldMilliseconds, StringFormat={}{0:F0}}" />
|
||||
<TextBlock Margin="4,0,0,0"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}"
|
||||
Text="{Binding Localization[MillisecondsSuffix]}" />
|
||||
</StackPanel>
|
||||
|
||||
<TextBlock Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
Margin="0,6,0,0" TextWrapping="Wrap"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}">
|
||||
<Run Text="{Binding Localization[CapsLockHoldHint], Mode=OneWay}" />
|
||||
<InlineUIContainer BaselineAlignment="Baseline">
|
||||
<!-- The elevation caveat lives in the tooltip to keep the section compact -->
|
||||
<TextBlock Text="{Binding Localization[MoreInfoLink]}"
|
||||
Foreground="{DynamicResource Theme.Accent}"
|
||||
TextDecorations="Underline"
|
||||
Cursor="Help"
|
||||
ToolTipService.InitialShowDelay="200"
|
||||
ToolTipService.ShowDuration="60000"
|
||||
Visibility="{Binding Settings.UseCapsLockHotkey, Converter={StaticResource BooleanToVisibility}}">
|
||||
<TextBlock.ToolTip>
|
||||
<ToolTip>
|
||||
<TextBlock TextWrapping="Wrap"
|
||||
Text="{Binding Localization[CapsLockElevationHint]}" />
|
||||
</ToolTip>
|
||||
</TextBlock.ToolTip>
|
||||
</TextBlock>
|
||||
</InlineUIContainer>
|
||||
</TextBlock>
|
||||
|
||||
<TextBlock Grid.Row="4" Margin="0,12,12,0"
|
||||
Style="{StaticResource FieldLabel}"
|
||||
Visibility="{Binding IsStartupAvailable, Converter={StaticResource BooleanToVisibility}}"
|
||||
Text="{Binding Localization[StartupLabel]}" />
|
||||
<CheckBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,12,0,0"
|
||||
Visibility="{Binding IsStartupAvailable, Converter={StaticResource BooleanToVisibility}}"
|
||||
IsEnabled="{Binding CanChangeStartup}"
|
||||
IsChecked="{Binding RunAtStartup}"
|
||||
Content="{Binding Localization[StartupCheck]}" />
|
||||
|
||||
<TextBlock Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
Margin="0,6,0,0" TextWrapping="Wrap"
|
||||
Foreground="{DynamicResource Theme.SecondaryForeground}"
|
||||
Visibility="{Binding IsStartupLocked, Converter={StaticResource BooleanToVisibility}}"
|
||||
Text="{Binding Localization[StartupLockedHint]}" />
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</Window>
|
||||
|
||||
@@ -16,12 +16,25 @@
|
||||
<OutputType>Package</OutputType>
|
||||
|
||||
<!--
|
||||
MSI validation still assumes an installation for the whole machine.
|
||||
Installing into the user's own profile trips three of its rules: a
|
||||
component whose key path is a file (ICE38), a folder it wants listed
|
||||
for removal (ICE64), and a warning that the files will not follow other
|
||||
users of the machine (ICE91). All three describe exactly what was
|
||||
intended here, so they are turned off rather than worked around.
|
||||
The ICE checks run inside the Windows Installer service, and a build
|
||||
agent has no access to it: every single check comes back as WIX0217,
|
||||
"The Windows Installer Service could not be accessed", and the build
|
||||
fails on close to a hundred of them. Since the release is built by the
|
||||
agent, validation cannot be part of it.
|
||||
|
||||
It stays switchable rather than deleted: -p:SuppressValidation=false
|
||||
turns it back on where the service does answer, which is any ordinary
|
||||
desktop machine.
|
||||
-->
|
||||
<SuppressValidation Condition="'$(SuppressValidation)' == ''">true</SuppressValidation>
|
||||
|
||||
<!--
|
||||
What validation says when it does run. MSI still assumes an
|
||||
installation for the whole machine, and installing into the user's own
|
||||
profile trips three of its rules: a component whose key path is a file
|
||||
(ICE38), a folder it wants listed for removal (ICE64), and a warning
|
||||
that the files will not follow other users of the machine (ICE91). All
|
||||
three describe exactly what was intended here.
|
||||
-->
|
||||
<SuppressIces>ICE38;ICE64;ICE91</SuppressIces>
|
||||
|
||||
|
||||
@@ -136,8 +136,8 @@
|
||||
Condition="REMOVE="ALL" AND NOT UPGRADINGPRODUCTCODE" />
|
||||
</InstallExecuteSequence>
|
||||
|
||||
<!-- Offered at the end of the wizard, the way an installer usually does -->
|
||||
<Property Id="WixShellExecTarget" Value="[#CursorLang.exe]" />
|
||||
<SetProperty Id="WixShellExecTarget" Value="[INSTALLFOLDER]CursorLang.exe"
|
||||
After="CostFinalize" Sequence="ui" />
|
||||
<CustomAction Id="LaunchApplication" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
|
||||
DllEntry="WixShellExec" Impersonate="yes" Return="ignore" />
|
||||
|
||||
|
||||
+48
-11
@@ -84,20 +84,28 @@ MSIX всегда выполняются в контексте вошедшег
|
||||
раскладкой. Без UI, и так должно остаться: всё, что попадёт туда, попадёт и
|
||||
в фоновый процесс.
|
||||
|
||||
Связь между ними — только `settings.json`. Окно пишет его целиком, во временный
|
||||
файл, который одним движением встаёт на место, и посылает агенту
|
||||
зарегистрированное оконное сообщение, по которому тот перечитывает файл.
|
||||
Всё, что окно сообщает агенту, идёт только через `settings.json`. Окно пишет его
|
||||
целиком, во временный файл, который одним движением встаёт на место, и посылает
|
||||
агенту зарегистрированное оконное сообщение, по которому тот перечитывает файл.
|
||||
Сообщение не несёт данных: пересылка самих изменений лишила бы файл роли
|
||||
единственного источника правды. Работающий агент необязателен — без него окно
|
||||
работает так же. За файлом никто не следит: писатель у него один, и он сам
|
||||
сообщает о записи.
|
||||
|
||||
В обратную сторону агент говорит одно слово, и то последнее: пункт «Выход» в меню
|
||||
трея просит открытое окно настроек закрыться, прежде чем агент уйдёт, — чтобы на
|
||||
экране не осталось окна, которому больше ничего не принадлежит. Просьба идёт
|
||||
именованным событием сессии, а не оконным сообщением: агент запускает этот процесс
|
||||
и намеренно не держит на него ссылки. Чаще всего слушать её некому, и это
|
||||
нормальный ответ.
|
||||
|
||||
## Трей
|
||||
|
||||
Окно настроек — гость на экране, а не само приложение: оно показывается после
|
||||
установки и всякий раз, когда его просят иконка или её меню. Обе кнопки в
|
||||
заголовке окна означают ровно то, что написано: окно закрывается, а его процесс
|
||||
завершается. Выход из самого приложения — пункт «Выход» в меню трея.
|
||||
завершается. Выход из самого приложения — пункт «Выход» в меню трея, и открытое
|
||||
окно настроек он закрывает вместе с агентом.
|
||||
|
||||
Меню иконки системное, его рисует Windows. Надписи по-прежнему следуют языку,
|
||||
выбранному в настройках, а тема до меню больше не дотягивается: меню на WPF
|
||||
@@ -161,6 +169,24 @@ MSIX всегда выполняются в контексте вошедшег
|
||||
на месте, а не исчезает из раздела — появляющаяся и исчезающая строка сдвигала бы
|
||||
всё, что ниже, при каждой смене места.
|
||||
|
||||
Положение каретки сообщает не всякое приложение, и тогда рядом с курсором ввода —
|
||||
нигде. Подсказка уходит на фиксированную точку: место, отступ и оформление берутся
|
||||
оттуда, из режима каретки не берётся ничего. Курсор мыши был бы запасным вариантом
|
||||
поближе — и неверным: он там, где его оставили, сбоку или на другом мониторе, тогда
|
||||
как смотрят на каретку. Фиксированная точка всегда на одном и том же месте, и потому
|
||||
известно, куда смотреть, — а вместе с местом должно приходить и оформление: подсказка,
|
||||
настроенная мелкой и незаметной для середины текста, в углу монитора останется
|
||||
незамеченной.
|
||||
|
||||
Какие-то приложения, решает не то, на чём они написаны, а то, что окно о себе
|
||||
сообщает. Обычный элемент Win32 заводит системную каретку, и её читают сразу;
|
||||
Chrome и Electron рисуют свою и сообщают о ней через интерфейсы доступности.
|
||||
Окну, которое рисует текст на голом холсте, сообщать нечего — и оба случая
|
||||
уживаются в одном приложении: редакторы JetBrains отвечают, потому что каретку
|
||||
для них держит их среда выполнения, а панель инструментов, нарисованная Compose,
|
||||
не содержит текстового элемента, который нашли бы UI Automation или Java Access
|
||||
Bridge. Ради такого окна фиксированная точка и нужна.
|
||||
|
||||
К какому режиму относится оформление, объясняет всплывающая подсказка рядом с самим
|
||||
режимом, а не строка текста в разделе: ползунки ниже показывают другие числа после
|
||||
переключения режима, и это вопрос, который задают один раз.
|
||||
@@ -333,10 +359,21 @@ pwsh -File Packaging\build-installer.ps1 -Version 1.0.1
|
||||
снимет: SmartScreen смотрит на репутацию, а у нового сертификата её нет, пока
|
||||
приложение не наберёт установок.
|
||||
|
||||
Про проект WiX стоит знать две вещи, прежде чем его править. Он закреплён на WiX
|
||||
5, а не на нынешней 7: начиная с шестой версии инструмент требует принимать
|
||||
лицензию Open Source Maintenance Fee — бесплатную при доходе меньше $10 000 в
|
||||
год, но принимать её должен человек, а не сборочный скрипт. И он отключает три
|
||||
проверки ICE: MSI по-прежнему исходит из установки на всю машину, а установка в
|
||||
профиль пользователя нарушает правила, которые описывают ровно то, что здесь и
|
||||
задумано.
|
||||
Про проект WiX стоит знать две вещи, прежде чем его править.
|
||||
|
||||
Он закреплён на WiX 5, а не на нынешней 7: начиная с шестой версии инструмент
|
||||
требует принимать лицензию Open Source Maintenance Fee — бесплатную при доходе
|
||||
меньше $10 000 в год, но принимать её должен человек, а не сборочный скрипт.
|
||||
|
||||
И он собирается без проверки MSI. Проверки ICE выполняются службой установщика
|
||||
Windows, до которой сборочному агенту не дотянуться: каждая возвращается
|
||||
ошибкой `WIX0217`, и сборка умирает на без малого сотне таких. На обычной
|
||||
машине служба отвечает, и проверка включается одним ключом:
|
||||
|
||||
```powershell
|
||||
dotnet build Packaging\Installer\CursorLang.wixproj -p:SuppressValidation=false
|
||||
```
|
||||
|
||||
Три правила остаются подавленными и тогда. MSI исходит из установки на всю
|
||||
машину, а установка в профиль пользователя нарушает правила, которые описывают
|
||||
ровно то, что здесь и задумано.
|
||||
|
||||
@@ -81,19 +81,26 @@ the next time the window is asked for.
|
||||
the layout tracking. No UI, and it must stay that way — whatever lands there lands
|
||||
in the background process.
|
||||
|
||||
The connection between the two is `settings.json` and nothing else. The window
|
||||
writes it — whole, into a temporary file moved into place in one step — and then
|
||||
Everything the window has to say to the agent goes through `settings.json` and
|
||||
nothing else. The window writes it — whole, into a temporary file moved into place in one step — and then
|
||||
posts a registered window message to the agent, which re-reads. The message carries
|
||||
no data: sending the changed values along would make the file stop being the only
|
||||
source of truth. An agent that is not running is a normal case — the window works the
|
||||
same. Nobody watches the file: it has one writer, and that writer speaks up.
|
||||
|
||||
The one word in the other direction is the last one: Exit in the tray menu asks an
|
||||
open settings window to close before the agent goes, so that no window is left
|
||||
belonging to nothing. It travels as a named event of the session rather than a
|
||||
window message — the agent starts that process and deliberately keeps no handle to
|
||||
it. Nobody listening is the usual case, and it is a normal answer.
|
||||
|
||||
## The tray
|
||||
|
||||
The settings window is a guest on the screen rather than the app itself: it shows
|
||||
up after the installation and whenever the icon or its menu is asked for. Both
|
||||
buttons in its title bar mean what they say — the window closes and its process
|
||||
ends. The way out of the app itself is the Exit item of the tray menu.
|
||||
ends. The way out of the app itself is the Exit item of the tray menu — and it
|
||||
closes an open settings window along with the agent.
|
||||
|
||||
The menu of the icon is a system one, drawn by Windows. Its captions still follow
|
||||
the language chosen in the settings, but the theme no longer reaches it: a WPF
|
||||
@@ -156,6 +163,24 @@ zero and the settings window shows it greyed out. It stays in place rather than
|
||||
leaving the section — a row that comes and goes would move everything below it on
|
||||
every switch of the place.
|
||||
|
||||
Not every application reports where its caret is, and next to the caret is then
|
||||
nowhere. The popup goes to the fixed point instead — the place, the offset and the
|
||||
look all from that mode, none of them from the caret one. The mouse cursor would be
|
||||
the nearer fallback and is the wrong one: it is wherever it was last left, off to a
|
||||
side or on another monitor, while the eyes are on the caret. The fixed point is
|
||||
always in the same place, so it is known where to look — and the look must come with
|
||||
it, since a popup set small and quiet for the middle of a text goes unnoticed in the
|
||||
corner of a monitor.
|
||||
|
||||
Some applications those are is decided by what a window exposes rather than by
|
||||
what it is written in. A Win32 control creates a system caret and is read at once;
|
||||
Chromium and Electron draw their own and report it over the accessibility
|
||||
interfaces. A window that paints its text into a bare canvas has nothing to report
|
||||
at all — and both kinds live in the same application: the editors of a JetBrains
|
||||
IDE answer, since the runtime keeps a caret for them, while a tool window whose
|
||||
interface is painted by Compose holds no text component for UI Automation or the
|
||||
Java Access Bridge to find. That window is where the fixed point earns its keep.
|
||||
|
||||
Which mode the look belongs to is explained in a tooltip next to the mode itself
|
||||
rather than by a line of text in the section: the sliders below show other numbers
|
||||
after a switch of the mode, and that is a question asked once.
|
||||
@@ -327,10 +352,21 @@ user has to insist. Buying a certificate would not silence it at once either:
|
||||
SmartScreen goes by reputation, and a fresh certificate has none until enough
|
||||
people have installed the application.
|
||||
|
||||
Two things about the WiX project are worth knowing before touching it. It pins
|
||||
WiX 5 rather than the current 7: from version 6 the toolset asks every build to
|
||||
accept the Open Source Maintenance Fee licence — free below $10,000 of yearly
|
||||
revenue, but a decision for a person rather than for a build script. And it turns
|
||||
off three ICE validation rules: MSI still assumes an installation for the whole
|
||||
machine, and installing into the user's own profile trips rules that describe
|
||||
exactly what was intended here.
|
||||
Two things about the WiX project are worth knowing before touching it.
|
||||
|
||||
It pins WiX 5 rather than the current 7: from version 6 the toolset asks every
|
||||
build to accept the Open Source Maintenance Fee licence — free below $10,000 of
|
||||
yearly revenue, but a decision for a person rather than for a build script.
|
||||
|
||||
And it builds without MSI validation. The ICE checks run inside the Windows
|
||||
Installer service, which a build agent cannot reach: every check comes back as
|
||||
`WIX0217` and the build dies on close to a hundred of them. On an ordinary
|
||||
desktop machine the service does answer, and validation is one switch away:
|
||||
|
||||
```powershell
|
||||
dotnet build Packaging\Installer\CursorLang.wixproj -p:SuppressValidation=false
|
||||
```
|
||||
|
||||
Three of its rules stay suppressed even then. MSI assumes an installation for the
|
||||
whole machine, and installing into the user's own profile trips rules that
|
||||
describe exactly what was intended here.
|
||||
|
||||
Reference in New Issue
Block a user