Merge branch 'develop' of https://github.com/giulianopz/newscanoe int…

…o develop
giulianopz · Jul 16, 2023 · 4d67abb · 4d67abb
2 parents b1a8113 + 1b089fa
commit 4d67abb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -23,7 +23,12 @@ jobs:
         with:
           go-version: '1.20'
           cache: false
+
       - uses: actions/checkout@v3
+
+      - name: generate version file
+        run: go generate ./...
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:

diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml
@@ -18,6 +18,9 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: '1.20'
+
+      - name: generate version file
+        run: go generate ./...
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4

diff --git a/pkg/display/display.go b/pkg/display/display.go
@@ -139,7 +139,7 @@ func (d *display) Quit(quitC chan bool) {
 	fmt.Fprint(os.Stdout, ansi.ShowCursor())
 	fmt.Fprint(os.Stdout, ansi.Erase(ansi.ERASE_ENTIRE_SCREEN))
 	fmt.Fprint(os.Stdout, ansi.MoveCursor(1, 1))
-	fmt.Fprint(os.Stdout, xterm.DISABLE_MOUSE_TRACKING)
+	fmt.Fprint(os.Stdout, xterm.ENABLE_MOUSE_TRACKING)
 	fmt.Fprint(os.Stdout, xterm.CLEAR_SCROLLBACK_BUFFER)
 	quitC <- true
 }
@@ -350,8 +350,7 @@ func (d *display) RefreshScreen() {
 
 	buf := &bytes.Buffer{}
 
-	buf.WriteString("\x1b[?1000h\x1b[?1002h\x1b[?1003h\x1b[?1006h")
-
+	buf.WriteString(xterm.DISABLE_MOUSE_TRACKING)
 	buf.WriteString(ansi.Erase(ansi.ERASE_ENTIRE_SCREEN))
 	buf.WriteString(ansi.HideCursor())
 	buf.WriteString(ansi.MoveCursor(1, 1))

diff --git a/pkg/xterm/control_sequences.go b/pkg/xterm/control_sequences.go
@@ -2,6 +2,7 @@
 package xterm
 
 const (
-	DISABLE_MOUSE_TRACKING  = "\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l"
+	ENABLE_MOUSE_TRACKING   = "\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l"
+	DISABLE_MOUSE_TRACKING  = "\x1b[?1000h\x1b[?1002h\x1b[?1003h\x1b[?1006h"
 	CLEAR_SCROLLBACK_BUFFER = "\033[3J"
 )