Skip to content

Commit

Permalink
imp - Refresh improvements for the text viewer
Browse files Browse the repository at this point in the history 
---

We've made several improvements to the text viewer.

---

Type: imp
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
  • Loading branch information
@AptiviCEO
AptiviCEO committed Jan 7, 2025
1 parent 731b24a commit c11711f
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 58 deletions.
83 changes: 44 additions & 39 deletions public/Terminaux/Inputs/Styles/Editor/TextViewInteractive.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static void OpenInteractive(List<string> lines, InteractiveTuiSettings? s
// Wait for a keypress
ScreenTools.Render(screen);
var keypress = Input.ReadKey();
HandleKeypress(keypress, lines, settings);
HandleKeypress(ref screen, fullscreen, keypress, lines, settings);

// Reset, in case selection changed
screen.RemoveBufferedParts();
Expand Down Expand Up @@ -205,15 +205,15 @@ private static void RenderContentsWithSelection(int lineIdx, ref Screen screen,
part.AddDynamicText(() =>
{
// Get the widths and heights
int SeparatorConsoleWidthInterior = ConsoleWrapper.WindowWidth - 2;
int SeparatorConsoleWidthInterior = fullscreen ? ConsoleWrapper.WindowWidth : ConsoleWrapper.WindowWidth - 2;
int SeparatorMinimumHeightInterior = fullscreen ? 0 : 2;

// Get the colors
var unhighlightedColorBackground = settings.BackgroundColor;
var highlightedColorBackground = settings.PaneSelectedItemBackColor;

// Get the start and the end indexes for lines
int lineLinesPerPage = ConsoleWrapper.WindowHeight - 4 + SeparatorMinimumHeightInterior;
int lineLinesPerPage = ConsoleWrapper.WindowHeight - 4 + (2 - SeparatorMinimumHeightInterior) + (fullscreen ? 1 : 0);
int currentPage = lineIdx / lineLinesPerPage;
int startIndex = lineLinesPerPage * currentPage + 1;
int endIndex = lineLinesPerPage * (currentPage + 1);
Expand Down Expand Up @@ -270,7 +270,7 @@ private static void RenderContentsWithSelection(int lineIdx, ref Screen screen,
{
bool overflown = lineColIdx >= lines[i - 1].Length;
int adjustedIdx = lineColIdx % SeparatorConsoleWidthInterior;
int finalPos = 1;
int finalPos = fullscreen ? 0 : 1;
for (int a = adjustedIdx; a > 0 && !overflown; a--)
finalPos += TextTools.GetCharWidth(lines[i - 1][lineColIdx - a]);
lineBuilder.Append(CsiSequences.GenerateCsiCursorPosition(finalPos + 1, SeparatorMinimumHeightInterior + count + 1));
Expand All @@ -288,7 +288,7 @@ private static void RenderContentsWithSelection(int lineIdx, ref Screen screen,

// Change the color depending on the highlighted line and column
sels.Append(
$"{CsiSequences.GenerateCsiCursorPosition(2, SeparatorMinimumHeightInterior + count + 1)}" +
$"{CsiSequences.GenerateCsiCursorPosition(fullscreen ? 1 : 2, SeparatorMinimumHeightInterior + count + 1)}" +
$"{ColorTools.RenderSetConsoleColor(highlightedColorBackground)}" +
$"{ColorTools.RenderSetConsoleColor(unhighlightedColorBackground, true)}" +
lineBuilder
Expand All @@ -300,43 +300,45 @@ private static void RenderContentsWithSelection(int lineIdx, ref Screen screen,
screen.AddBufferedPart("Text editor interactive - Contents", part);
}

private static void HandleKeypress(ConsoleKeyInfo key, List<string> lines, InteractiveTuiSettings settings)
private static void HandleKeypress(ref Screen screen, bool fullscreen, ConsoleKeyInfo key, List<string> lines, InteractiveTuiSettings settings)
{
switch (key.Key)
{
case ConsoleKey.LeftArrow:
MoveBackward(lines);
MoveBackward(lines, ref screen);
return;
case ConsoleKey.RightArrow:
MoveForward(lines);
MoveForward(lines, ref screen);
return;
case ConsoleKey.UpArrow:
MoveUp(lines);
MoveUp(lines, ref screen);
return;
case ConsoleKey.DownArrow:
MoveDown(lines);
MoveDown(lines, ref screen);
return;
case ConsoleKey.PageUp:
PreviousPage(lines);
PreviousPage(lines, ref screen, fullscreen);
return;
case ConsoleKey.PageDown:
NextPage(lines);
NextPage(lines, ref screen, fullscreen);
return;
case ConsoleKey.Home:
Beginning(lines);
Beginning(lines, ref screen);
return;
case ConsoleKey.End:
End(lines);
End(lines, ref screen);
return;
case ConsoleKey.Escape:
bail = true;
return;
case ConsoleKey.K:
RenderKeybindingsBox(lines, settings);
screen.RequireRefresh();
return;
case ConsoleKey.Oem2:
case ConsoleKey.Divide:
FindNext(ref lines, settings);
FindNext(ref lines, settings, ref screen);
screen.RequireRefresh();
break;
}
}
Expand All @@ -353,19 +355,19 @@ private static List<string> RenderKeybindingsBox(List<string> lines, Interactive
return lines;
}

private static void MoveBackward(List<string> lines) =>
UpdateColumnIndex(lineColIdx - 1, lines);
private static void MoveBackward(List<string> lines, ref Screen screen) =>
UpdateColumnIndex(lineColIdx - 1, lines, ref screen);

private static void MoveForward(List<string> lines) =>
UpdateColumnIndex(lineColIdx + 1, lines);
private static void MoveForward(List<string> lines, ref Screen screen) =>
UpdateColumnIndex(lineColIdx + 1, lines, ref screen);

private static void MoveUp(List<string> lines) =>
UpdateLineIndex(lineIdx - 1, lines);
private static void MoveUp(List<string> lines, ref Screen screen) =>
UpdateLineIndex(lineIdx - 1, lines, ref screen);

private static void MoveDown(List<string> lines) =>
UpdateLineIndex(lineIdx + 1, lines);
private static void MoveDown(List<string> lines, ref Screen screen) =>
UpdateLineIndex(lineIdx + 1, lines, ref screen);

private static void FindNext(ref List<string> lines, InteractiveTuiSettings settings)
private static void FindNext(ref List<string> lines, InteractiveTuiSettings settings, ref Screen screen)
{
// Check the lines
if (lines.Count == 0)
Expand Down Expand Up @@ -439,8 +441,8 @@ private static void FindNext(ref List<string> lines, InteractiveTuiSettings sett
// Update line index and column index if found. Otherwise, show a message
if (found)
{
UpdateLineIndex(r, lines);
UpdateColumnIndex(c, lines);
UpdateLineIndex(r, lines, ref screen);
UpdateColumnIndex(c, lines, ref screen);
cachedFind = text;
}
else
Expand Down Expand Up @@ -469,43 +471,45 @@ private static void StatusTextInfo(List<string> lines)
status += $" | Tab: {(int)currChar[0]}";
}

private static void PreviousPage(List<string> lines)
private static void PreviousPage(List<string> lines, ref Screen screen, bool fullscreen)
{
int lineLinesPerPage = ConsoleWrapper.WindowHeight - 4;
int SeparatorMinimumHeightInterior = fullscreen ? 0 : 2;
int lineLinesPerPage = ConsoleWrapper.WindowHeight - 4 + (2 - SeparatorMinimumHeightInterior) + (fullscreen ? 1 : 0);
int currentPage = lineIdx / lineLinesPerPage;
int startIndex = lineLinesPerPage * currentPage;
if (startIndex > lines.Count)
startIndex = lines.Count;
UpdateLineIndex(startIndex - 1 < 0 ? 0 : startIndex - 1, lines);
UpdateLineIndex(startIndex - 1 < 0 ? 0 : startIndex - 1, lines, ref screen);
}

private static void NextPage(List<string> lines)
private static void NextPage(List<string> lines, ref Screen screen, bool fullscreen)
{
int lineLinesPerPage = ConsoleWrapper.WindowHeight - 4;
int SeparatorMinimumHeightInterior = fullscreen ? 0 : 2;
int lineLinesPerPage = ConsoleWrapper.WindowHeight - 4 + (2 - SeparatorMinimumHeightInterior) + (fullscreen ? 1 : 0);
int currentPage = lineIdx / lineLinesPerPage;
int endIndex = lineLinesPerPage * (currentPage + 1);
if (endIndex > lines.Count - 1)
endIndex = lines.Count - 1;
UpdateLineIndex(endIndex, lines);
UpdateLineIndex(endIndex, lines, ref screen);
}

private static void Beginning(List<string> lines) =>
UpdateLineIndex(0, lines);
private static void Beginning(List<string> lines, ref Screen screen) =>
UpdateLineIndex(0, lines, ref screen);

private static void End(List<string> lines) =>
UpdateLineIndex(lines.Count - 1, lines);
private static void End(List<string> lines, ref Screen screen) =>
UpdateLineIndex(lines.Count - 1, lines, ref screen);

private static void UpdateLineIndex(int lnIdx, List<string> lines)
private static void UpdateLineIndex(int lnIdx, List<string> lines, ref Screen screen)
{
lineIdx = lnIdx;
if (lineIdx > lines.Count - 1)
lineIdx = lines.Count - 1;
if (lineIdx < 0)
lineIdx = 0;
UpdateColumnIndex(lineColIdx, lines);
UpdateColumnIndex(lineColIdx, lines, ref screen);
}

private static void UpdateColumnIndex(int clIdx, List<string> lines)
private static void UpdateColumnIndex(int clIdx, List<string> lines, ref Screen screen)
{
lineColIdx = clIdx;
if (lines.Count == 0)
Expand All @@ -519,6 +523,7 @@ private static void UpdateColumnIndex(int clIdx, List<string> lines)
lineColIdx = maxLen;
if (lineColIdx < 0)
lineColIdx = 0;
screen.RequireRefresh();
}

private static string[] GetAbsoluteSequences(string source, (VtSequenceType type, Match[] sequences)[] sequencesCollections)
Expand Down
35 changes: 16 additions & 19 deletions public/Terminaux/Writer/ConsoleWriters/WrappedWriter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,29 +62,26 @@ public static void WriteWrapped(string text, Color color, bool force = false, pa
/// <param name="args">Arguments to format the text</param>
public static void WriteWrapped(string text, Color foregroundColor, Color backgroundColor, bool force = false, params object?[]? args)
{
lock (TextWriterRaw.WriteLock)
try
{
try
// Use the text viewer to avoid code repetition
text = text.FormatString(args);
var lines = ConsoleMisc.GetWrappedSentencesByWords(text, ConsoleWrapper.WindowWidth).ToList();
if (force || lines.Count >= ConsoleWrapper.WindowHeight)
{
// Use the text viewer to avoid code repetition
text = text.FormatString(args);
var lines = ConsoleMisc.GetWrappedSentencesByWords(text, ConsoleWrapper.WindowWidth).ToList();
if (force || lines.Count >= ConsoleWrapper.WindowHeight)
TextViewInteractive.OpenInteractive(lines, new()
{
TextViewInteractive.OpenInteractive(lines, new()
{
PaneSelectedItemBackColor = foregroundColor,
BackgroundColor = backgroundColor,
}, true);
}
else
TextWriterColor.WriteColorBack(text, foregroundColor, backgroundColor);
}
catch (Exception ex)
{
Debug.WriteLine(ex.StackTrace);
Debug.WriteLine($"There is a serious error when printing text. {ex.Message}");
PaneSelectedItemBackColor = foregroundColor,
BackgroundColor = backgroundColor,
}, true);
}
else
TextWriterColor.WriteColorBack(text, foregroundColor, backgroundColor);
}
catch (Exception ex)
{
Debug.WriteLine(ex.StackTrace);
Debug.WriteLine($"There is a serious error when printing text. {ex.Message}");
}
}
}
Expand Down

0 comments on commit c11711f

Please sign in to comment.