From 691b3a1a241a0b086a316506c068618b58bcd8c0 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Sun, 4 Jan 2026 16:04:49 +0100 Subject: Improve Homebrew output parsing It likes to output CSI 0 G in particular, expecting that it works (the coordinates are normally 1-based). --- LICENSE | 2 +- terminal.go | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 2f82d2f..3660f3c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2024 - 2025, Přemysl Eric Janouch +Copyright (c) 2024 - 2026, Přemysl Eric Janouch Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. diff --git a/terminal.go b/terminal.go index 9886ef0..68be363 100644 --- a/terminal.go +++ b/terminal.go @@ -206,17 +206,24 @@ func (tw *terminalWriter) processParsedCSI( } tw.column = 0 return true + case final == 'G': // Cursor Character Absolute + if len(params) == 0 { + tw.column = 0 + } else { + tw.column = max(params[0]-1, 0) + } + return true case final == 'H': // Cursor Position if len(params) == 0 { tw.line = tw.lineTop tw.column = 0 - } else if len(params) < 2 || params[0] <= 0 || params[1] <= 0 { + } else if len(params) < 2 { return false } else if params[0] >= 32766 && params[1] >= 32766 { // Ignore attempts to scan terminal bounds. } else { - tw.line = tw.lineTop + params[0] - 1 - tw.column = params[1] - 1 + tw.line = tw.lineTop + max(params[0]-1, 0) + tw.column = max(params[1]-1, 0) } return true case final == 'J': // Erase in Display -- cgit v1.2.3-70-g09d2