Make sixel output flicker free #1943
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,69 +1,69 @@ | ||||||
| package main | ||||||
|
|
||||||
| import ( | ||||||
| "log" | ||||||
| "os" | ||||||
| "strconv" | ||||||
|
|
||||||
| "github.com/gdamore/tcell/v2" | ||||||
| ) | ||||||
|
|
||||||
| const ( | ||||||
| gSixelBegin = "\033P" | ||||||
| ) | ||||||
|
|
||||||
| type sixelScreen struct { | ||||||
| lastFile string | ||||||
| lastSxW int | ||||||
| lastSxH int | ||||||
| lastWinW int | ||||||
| lastWinH int | ||||||
| } | ||||||
|
|
||||||
| func (sxs *sixelScreen) unlockSixel(win *win, screen tcell.Screen, filePath string) { | ||||||
| if filePath != "" && (filePath != sxs.lastFile || win.w != sxs.lastWinW || win.h != sxs.lastWinH) { | ||||||
|
There was a problem hiding this comment. The check should be
Suggested change
|
||||||
| screen.LockRegion(win.x, win.y, sxs.lastSxW, sxs.lastSxH, false) | ||||||
|
|
||||||
| } | ||||||
|
|
||||||
| } | ||||||
|
|
||||||
| func (sxs *sixelScreen) printSixel(win *win, screen tcell.Screen, reg *reg) { | ||||||
|
|
||||||
| if reg.path == sxs.lastFile && win.w == sxs.lastWinW && win.h == sxs.lastWinH { | ||||||
| return | ||||||
| } | ||||||
| if reg.sixel == nil { | ||||||
| sxs.lastFile = "" | ||||||
| return | ||||||
| } | ||||||
| tty, ok := screen.Tty() | ||||||
| if !ok { | ||||||
| log.Printf("returning underlying tty failed during sixel render") | ||||||
| return | ||||||
| } | ||||||
| ti, err := tcell.LookupTerminfo(os.Getenv("TERM")) | ||||||
| if err != nil { | ||||||
| log.Printf("terminal lookup failed during sixel render %s", err) | ||||||
Kuchteq marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| return | ||||||
| } | ||||||
| v, _ := tty.WindowSize() | ||||||
|
There was a problem hiding this comment. I think |
||||||
| w, h := v.CellDimensions() | ||||||
|
There was a problem hiding this comment. I would use the same variable names as the sixel demo:
|
||||||
| matches := reSixelSize.FindStringSubmatch(*reg.sixel) | ||||||
| if matches == nil { | ||||||
| log.Printf("sixel dimensions cannot be looked up") | ||||||
| return | ||||||
| } | ||||||
| iw, _ := strconv.Atoi(matches[1]) | ||||||
| ih, _ := strconv.Atoi(matches[2]) | ||||||
|
|
||||||
| // width and height are -1 to avoid showing half filled sixels | ||||||
| screen.LockRegion(win.x, win.y, iw/w-1, ih/h-1, true) | ||||||
| ti.TPuts(tty, ti.TGoto(win.x, win.y)) | ||||||
| ti.TPuts(tty, *reg.sixel) | ||||||
| sxs.lastFile = reg.path | ||||||
| sxs.lastSxW = iw | ||||||
| sxs.lastSxH = ih | ||||||
|
Comment on lines
+65
to
+66
There was a problem hiding this comment. This is incorrect, So I did some more investigation on my side, and I think what happens is this:
So I would make the following changes:
|
||||||
| sxs.lastWinW = win.w | ||||||
| sxs.lastWinH = win.h | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this might have to stay. I tried running the
redrawcommand manually (or alternatively press<c-l>), and found that the sixel image got removed instead of being redrawn.It might be good to check what happens when you try toggling other options that affect sixel images and their sizes, such as
sixel/preview/ratios/drawbox.