Skip to content

Commit

Permalink
start refactoring / cleanup work for text selection
Browse files Browse the repository at this point in the history
  • Loading branch information
@doubleyewdee
doubleyewdee committed Dec 19, 2018
1 parent 0f59284 commit 1254bd7
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 74 deletions.
5 changes: 3 additions & 2 deletions src/condo/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:condo"
mc:Ignorable="d"
Title="MainWindow" SizeToContent="WidthAndHeight">
SizeToContent="WidthAndHeight"
Title="condo">
<Grid Name="grid">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<ScrollViewer Name="scrollViewer" Grid.Column="0" Grid.Row="0"
<ScrollViewer Name="scrollViewer" Grid.Column="1" Grid.Row="1"
CanContentScroll="true" IsDeferredScrollingEnabled="true" Focusable="False"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<local:Screen x:Name="screen" />
Expand Down
170 changes: 98 additions & 72 deletions src/condo/Screen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,19 @@ public ConsoleBuffer.Buffer Buffer
private double underlineY;
private double underlineHeight;
private GuidelineSet cellGuidelines;

private int horizontalCells, verticalCells;
private Character[,] characters;
bool cursorInverted;

private Point selectionStart;
private Point selectionEnd;

private volatile int shouldRedraw;
private int consoleBufferSize;
private readonly SolidBrushCache brushCache = new SolidBrushCache();

private static readonly TimeSpan BlinkFrequency = TimeSpan.FromMilliseconds(250);
private bool cursorInverted;
private readonly Stopwatch cursorBlinkWatch = new Stopwatch();

/// <summary>
Expand Down Expand Up @@ -108,6 +113,22 @@ public Screen(ConsoleBuffer.Buffer buffer)
}
};

this.MouseLeftButtonDown += (sender, args) =>
{
this.selectionStart = args.GetPosition(this);
args.Handled = true;
};
this.MouseLeftButtonUp += (sender, args) =>
{
this.selectionEnd = args.GetPosition(this);
Logger.Verbose($"sel: start:{this.selectionStart}, end:{this.selectionEnd}");
args.Handled = true;
};
this.MouseMove += (sender, args) =>
{
this.selectionEnd = args.GetPosition(this);
};

this.SetFontSize(14);
this.Resize();
}
Expand Down Expand Up @@ -297,98 +318,103 @@ private Character.ColorInfo GetColorInfoFromBasicColor(ConsoleBuffer.Commands.Se
private void Redraw()
{
var dv = this.children[0] as DrawingVisual;
var glyphChars = new List<ushort>(this.horizontalCells);
var advanceWidths = new List<double>(this.horizontalCells);

using (var dc = dv.RenderOpen())
{
dc.PushGuidelineSet(this.cellGuidelines);

// Render line by line, attempting to render as long as properties remain the same or we reach the end of the line.
for (var y = 0; y < this.verticalCells; ++y)
this.RedrawText(dc);

dc.Pop();
}
}

private void RedrawText(DrawingContext dc)
{
var glyphChars = new List<ushort>(this.horizontalCells);
var advanceWidths = new List<double>(this.horizontalCells);
// Render line by line, attempting to render as long as properties remain the same or we reach the end of the line.
for (var y = 0; y < this.verticalCells; ++y)
{
var runStart = 0;
var x = 0;
var allNull = true;
var allEmpty = true;

while (x < this.horizontalCells)
{
var runStart = 0;
var x = 0;
var allNull = true;
var allEmpty = true;

while (x < this.horizontalCells)
var currentGlyph = this.characters[x, y].Glyph;
allNull &= currentGlyph == 0x0;
allEmpty &= (currentGlyph == 0x0 || currentGlyph == 0x20);
++x;

// Properties that can change and cause a run stop + render:
// - Any of the basic character properties (bright/inverse/colors/etc)
// - Hitting a visible cursor (as we may need to invert it explicitly -- we have to stop both at the cursor and immediately before it.)
// - Hitting a "null" character (this may be a terminator for certain properties such as underlining/inverse/etc)
if (x == this.horizontalCells
|| !this.characters[runStart, y].PropertiesEqual(this.characters[x, y])
|| (this.RenderCursor && ((runStart, y) == this.Buffer.CursorPosition) || (x, y) == this.Buffer.CursorPosition)
|| (this.characters[x, y].Glyph == 0x0 && this.characters[runStart, y].Glyph != 0x0))
{
var currentGlyph = this.characters[x, y].Glyph;
allNull &= currentGlyph == 0x0;
allEmpty &= (currentGlyph == 0x0 || currentGlyph == 0x20);
++x;

// Properties that can change and cause a run stop + render:
// - Any of the basic character properties (bright/inverse/colors/etc)
// - Hitting a visible cursor (as we may need to invert it explicitly -- we have to stop both at the cursor and immediately before it.)
// - Hitting a "null" character (this may be a terminator for certain properties such as underlining/inverse/etc)
if ( x == this.horizontalCells
|| !this.characters[runStart, y].PropertiesEqual(this.characters[x, y])
|| (this.RenderCursor && ((runStart, y) == this.Buffer.CursorPosition) || (x, y) == this.Buffer.CursorPosition)
|| (this.characters[x, y].Glyph == 0x0 && this.characters[runStart, y].Glyph != 0x0))
{
var charCount = x - runStart;
var startChar = this.characters[runStart, y];
var invert = startChar.Inverse && startChar.Glyph != 0x0;
var charCount = x - runStart;
var startChar = this.characters[runStart, y];
var invert = startChar.Inverse && startChar.Glyph != 0x0;

// this isn't super intuitive from the above but we'll stop a run if the cursor is visible so we can render it specially,
// here that means potentially inverting it depending on our own 'blink' state.
if (this.RenderCursor && charCount == 1 && (runStart, y) == this.Buffer.CursorPosition && this.cursorInverted)
{
invert = !invert;
}
// this isn't super intuitive from the above but we'll stop a run if the cursor is visible so we can render it specially,
// here that means potentially inverting it depending on our own 'blink' state.
if (this.RenderCursor && charCount == 1 && (runStart, y) == this.Buffer.CursorPosition && this.cursorInverted)
{
invert = !invert;
}

Character.ColorInfo fg, bg;
if (!invert) (fg, bg) = this.GetCharacterColors(startChar);
else (bg, fg) = this.GetCharacterColors(startChar);
Character.ColorInfo fg, bg;
if (!invert) (fg, bg) = this.GetCharacterColors(startChar);
else (bg, fg) = this.GetCharacterColors(startChar);

var backgroundBrush = this.brushCache.GetBrush(bg.R, bg.G, bg.B);
var foregroundBrush = this.brushCache.GetBrush(fg.R, fg.G, fg.B);
var backgroundBrush = this.brushCache.GetBrush(bg.R, bg.G, bg.B);
var foregroundBrush = this.brushCache.GetBrush(fg.R, fg.G, fg.B);

dc.DrawRectangle(backgroundBrush, null, new Rect(runStart * this.CellWidth, y * this.CellHeight, charCount * this.CellWidth, this.CellHeight));
dc.DrawRectangle(backgroundBrush, null, new Rect(runStart * this.CellWidth, y * this.CellHeight, charCount * this.CellWidth, this.CellHeight));

// if all characters are null and we're at EOL stop after rendering only the background
// XXX: this feels REALLY hacky to me
if (x == this.horizontalCells && allNull)
{
continue;
}
// if all characters are null and we're at EOL stop after rendering only the background
// XXX: this feels REALLY hacky to me
if (x == this.horizontalCells && allNull)
{
continue;
}

var glyphOrigin = new Point((runStart * this.CellWidth) + this.baselineOrigin.X, (y * this.CellHeight) + this.baselineOrigin.Y);
if (startChar.Underline)
{
var underlineRectangle = new Rect(glyphOrigin.X, y * this.CellHeight + this.underlineY, charCount * this.CellWidth, this.underlineHeight);
dc.DrawRectangle(foregroundBrush, null, underlineRectangle);
}
var glyphOrigin = new Point((runStart * this.CellWidth) + this.baselineOrigin.X, (y * this.CellHeight) + this.baselineOrigin.Y);
if (startChar.Underline)
{
var underlineRectangle = new Rect(glyphOrigin.X, y * this.CellHeight + this.underlineY, charCount * this.CellWidth, this.underlineHeight);
dc.DrawRectangle(foregroundBrush, null, underlineRectangle);
}

glyphChars.Clear();
advanceWidths.Clear();
for (var c = runStart; c < x; ++c)
glyphChars.Clear();
advanceWidths.Clear();
for (var c = runStart; c < x; ++c)
{
if (!this.glyphTypeface.CharacterToGlyphMap.TryGetValue((char)this.characters[c, y].Glyph, out var glyphIndex))
{
if (!this.glyphTypeface.CharacterToGlyphMap.TryGetValue((char)this.characters[c, y].Glyph, out var glyphIndex))
{
glyphIndex = 0;
}
glyphChars.Add(glyphIndex);
advanceWidths.Add(this.glyphTypeface.AdvanceWidths[glyphIndex] * this.fontSizeEm);
glyphIndex = 0;
}
glyphChars.Add(glyphIndex);
advanceWidths.Add(this.glyphTypeface.AdvanceWidths[glyphIndex] * this.fontSizeEm);
}

if (!allEmpty)
{
var gr = new GlyphRun(this.glyphTypeface, 0, false, this.fontSizeEm, (float)this.dpiInfo.PixelsPerDip, new List<ushort>(glyphChars),
glyphOrigin, new List<double>(advanceWidths), null, null, null, null, null, null);

dc.DrawGlyphRun(foregroundBrush, gr);
}
if (!allEmpty)
{
var gr = new GlyphRun(this.glyphTypeface, 0, false, this.fontSizeEm, (float)this.dpiInfo.PixelsPerDip, new List<ushort>(glyphChars),
glyphOrigin, new List<double>(advanceWidths), null, null, null, null, null, null);

runStart = x;
allNull = allEmpty = true;
dc.DrawGlyphRun(foregroundBrush, gr);
}

runStart = x;
allNull = allEmpty = true;
}
}

dc.Pop();
}
}

Expand Down

0 comments on commit 1254bd7

Please sign in to comment.