File tree Expand file tree Collapse file tree 6 files changed +7
-56
lines changed
Terminal.Gui/ConsoleDrivers Expand file tree Collapse file tree 6 files changed +7
-56
lines changed Original file line number Diff line number Diff line change @@ -452,7 +452,7 @@ public void ClearContents ()
452
452
/// Sets <see cref="Contents"/> as dirty for situations where views
453
453
/// don't need layout and redrawing, but just refresh the screen.
454
454
/// </summary>
455
- public void SetContentsAsDirty ( )
455
+ protected void SetContentsAsDirty ( )
456
456
{
457
457
lock ( Contents ! )
458
458
{
@@ -480,10 +480,6 @@ public void SetContentsAsDirty ()
480
480
481
481
#region Cursor Handling
482
482
483
- /// <summary>Determines if the terminal cursor should be visible or not and sets it accordingly.</summary>
484
- /// <returns><see langword="true"/> upon success</returns>
485
- public abstract bool EnsureCursorVisibility ( ) ;
486
-
487
483
/// <summary>Gets the terminal cursor visibility.</summary>
488
484
/// <param name="visibility">The current <see cref="CursorVisibility"/></param>
489
485
/// <returns><see langword="true"/> upon success</returns>
Original file line number Diff line number Diff line change @@ -507,21 +507,19 @@ private static ColorName16 CursesColorNumberToColorName16 (short color)
507
507
private CursorVisibility ? _currentCursorVisibility ;
508
508
private CursorVisibility ? _initialCursorVisibility ;
509
509
510
- /// <inheritdoc/>
511
- public override bool EnsureCursorVisibility ( )
510
+
511
+ private void EnsureCursorVisibility ( )
512
512
{
513
513
if ( ! ( Col >= 0 && Row >= 0 && Col < Cols && Row < Rows ) )
514
514
{
515
515
GetCursorVisibility ( out CursorVisibility cursorVisibility ) ;
516
516
_currentCursorVisibility = cursorVisibility ;
517
517
SetCursorVisibility ( CursorVisibility . Invisible ) ;
518
518
519
- return false ;
519
+ return ;
520
520
}
521
521
522
522
SetCursorVisibility ( _currentCursorVisibility ?? CursorVisibility . Default ) ;
523
-
524
- return _currentCursorVisibility == CursorVisibility . Default ;
525
523
}
526
524
527
525
/// <inheritdoc/>
Original file line number Diff line number Diff line change @@ -377,7 +377,7 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
377
377
}
378
378
379
379
/// <inheritdoc/>
380
- public override bool EnsureCursorVisibility ( )
380
+ private bool EnsureCursorVisibility ( )
381
381
{
382
382
if ( ! ( Col >= 0 && Row >= 0 && Col < Cols && Row < Rows ) )
383
383
{
Original file line number Diff line number Diff line change @@ -200,18 +200,6 @@ public interface IConsoleDriver
200
200
/// </summary>
201
201
event EventHandler < EventArgs > ? ClearedContents ;
202
202
203
- // BUGBUG: This is not referenced. Can it be removed?
204
- /// <summary>
205
- /// Sets <see cref="ConsoleDriver.Contents"/> as dirty for situations where views
206
- /// don't need layout and redrawing, but just refresh the screen.
207
- /// </summary>
208
- void SetContentsAsDirty ( ) ;
209
-
210
- // BUGBUG: This is not referenced. Can it be removed?
211
- /// <summary>Determines if the terminal cursor should be visible or not and sets it accordingly.</summary>
212
- /// <returns><see langword="true"/> upon success</returns>
213
- bool EnsureCursorVisibility ( ) ;
214
-
215
203
/// <summary>Gets the terminal cursor visibility.</summary>
216
204
/// <param name="visibility">The current <see cref="CursorVisibility"/></param>
217
205
/// <returns><see langword="true"/> upon success</returns>
Original file line number Diff line number Diff line change @@ -496,20 +496,18 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
496
496
return visibility == CursorVisibility . Default ;
497
497
}
498
498
499
- public override bool EnsureCursorVisibility ( )
499
+ private void EnsureCursorVisibility ( )
500
500
{
501
501
if ( ! ( Col >= 0 && Row >= 0 && Col < Cols && Row < Rows ) )
502
502
{
503
503
GetCursorVisibility ( out CursorVisibility cursorVisibility ) ;
504
504
_cachedCursorVisibility = cursorVisibility ;
505
505
SetCursorVisibility ( CursorVisibility . Invisible ) ;
506
506
507
- return false ;
507
+ return ;
508
508
}
509
509
510
510
SetCursorVisibility ( _cachedCursorVisibility ?? CursorVisibility . Default ) ;
511
-
512
- return _cachedCursorVisibility == CursorVisibility . Default ;
513
511
}
514
512
515
513
#endregion
Original file line number Diff line number Diff line change @@ -293,35 +293,6 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
293
293
return WinConsole ? . WriteANSI ( sb . ToString ( ) ) ?? false ;
294
294
}
295
295
}
296
-
297
- /// <inheritdoc/>
298
- public override bool EnsureCursorVisibility ( )
299
- {
300
- if ( Force16Colors )
301
- {
302
- return WinConsole is null || WinConsole . EnsureCursorVisibility ( ) ;
303
- }
304
- else
305
- {
306
- var sb = new StringBuilder ( ) ;
307
- sb . Append ( _cachedCursorVisibility != CursorVisibility . Invisible ? EscSeqUtils . CSI_ShowCursor : EscSeqUtils . CSI_HideCursor ) ;
308
- return WinConsole ? . WriteANSI ( sb . ToString ( ) ) ?? false ;
309
- }
310
-
311
- //if (!(Col >= 0 && Row >= 0 && Col < Cols && Row < Rows))
312
- //{
313
- // GetCursorVisibility (out CursorVisibility cursorVisibility);
314
- // _cachedCursorVisibility = cursorVisibility;
315
- // SetCursorVisibility (CursorVisibility.Invisible);
316
-
317
- // return false;
318
- //}
319
-
320
- //SetCursorVisibility (_cachedCursorVisibility ?? CursorVisibility.Default);
321
-
322
- //return _cachedCursorVisibility == CursorVisibility.Default;
323
- }
324
-
325
296
#endregion Cursor Handling
326
297
327
298
public override bool UpdateScreen ( )
You can’t perform that action at this time.
0 commit comments