[WIP] Proportional font: Rebase to master

+ minor changes

Author: thjbdvlt

editor/cursor.go

@@ -165,7 +165,7 @@ func (c *Cursor) drawForeground(p *gui.QPainter, sx, sy, dx, dy float64, text st
 		charCache := *c.charCache
 		imagev, err := charCache.get(HlTextKey{
 			text:   text,
-			fg:     c.fg,
+			fg:     *(c.fg),
 			italic: false,
 			bold:   false,
 		})
@@ -267,7 +267,7 @@ func (c *Cursor) setCharCache(text string, fg *RGBA, image *gui.QImage) {
 	c.charCache.set(
 		HlTextKey{
 			text:   text,
-			fg:     c.fg,
+			fg:     *(c.fg),
 			italic: false,
 			bold:   false,
 		},
@@ -505,12 +505,13 @@ func (c *Cursor) updateCursorShape(win *Window) {
 		}
 	case "vertical":
 		c.isTextDraw = true
-		if (c.font == nil || !c.font.proportional) {
+		c.horizontalShift = 0
+		font := win.font
+		if font == nil || !font.proportional {
 			width = int(math.Ceil(float64(width) * p))
 		} else {
-			width = int(c.font.cellwidth) / 10
+			width = int(font.cellwidth) / 10
 		}
-		c.horizontalShift = 0
 	default:
 		c.isTextDraw = true
 		c.horizontalShift = 0

editor/editor.go

@@ -3,7 +3,7 @@ package editor
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"os/exec"
@@ -867,31 +867,34 @@ func (e *Editor) setEnvironmentVariables() {
 	}
 
 	// If the OS is MacOS and the application is launched from an .app
-	if runtime.GOOS == "darwin" && e.ppid == 1 {
+	if runtime.GOOS == "darwin" && os.Getenv("TERM") == "" {
 		shell := os.Getenv("SHELL")
 		if shell == "" {
-			shell = os.Getenv("/bin/bash")
+			shell = "/bin/zsh" // fallback
 		}
-		cmd := exec.Command(shell, "-l", "-c", "env", "-i")
-		// cmd := exec.Command("printenv")
+
+		cmd := exec.Command(shell, "-l", "-c", "env")
 		stdout, err := cmd.StdoutPipe()
 		if err != nil {
 			e.putLog(err)
 			return
 		}
+
 		if err := cmd.Start(); err != nil {
 			e.putLog(err)
 			return
 		}
-		output, err := ioutil.ReadAll(stdout)
+
+		output, err := io.ReadAll(stdout)
+		stdout.Close()
 		if err != nil {
 			e.putLog(err)
-			stdout.Close()
 			return
 		}
-		for _, b := range strings.Split(string(output), "\n") {
-			splits := strings.SplitN(b, "=", 2)
-			if len(splits) > 1 {
+
+		for _, line := range strings.Split(string(output), "\n") {
+			splits := strings.SplitN(line, "=", 2)
+			if len(splits) == 2 {
 				_ = os.Setenv(splits[0], splits[1])
 			}
 		}
@@ -1100,11 +1103,18 @@ func (e *Editor) setWindowSizeFromOpts() {
 func (e *Editor) setWindowSize(s string) (int, int) {
 	var width, height int
 	var err error
-	width, err = strconv.Atoi(strings.SplitN(s, "x", 2)[0])
+
+	parsed_s := strings.SplitN(s, "x", 2)
+	if len(parsed_s) != 2 {
+		// TODO: Error message to user?
+		return 40, 30
+	}
+
+	width, err = strconv.Atoi(parsed_s[0])
 	if err != nil || width < 40 {
 		width = 40
 	}
-	height, err = strconv.Atoi(strings.SplitN(s, "x", 2)[1])
+	height, err = strconv.Atoi(parsed_s[1])
 	if err != nil || height < 30 {
 		height = 30
 	}

editor/screen.go

@@ -23,6 +23,7 @@ var globalOrder int
 // Screen is the main editor area
 type Screen struct {
 	cache             Cache
+	bgcache           Cache
 	tooltip           *IMETooltip
 	font              *Font
 	fallbackfonts     []*Font
@@ -57,6 +58,7 @@ func newScreen() *Screen {
 		cursor:         [2]int{0, 0},
 		highlightGroup: make(map[string]int),
 		cache:          newCache(),
+		bgcache:        newBrushCache(),
 	}
 
 	widget.ConnectMousePressEvent(screen.mousePressEvent)
@@ -354,6 +356,13 @@ func (s *Screen) gridFontAutomaticHeight(update interface{}) {
 		grid = s.ws.cursor.bufferGridid
 	}
 
+	// Workaround for autocmds triggered with BufEnter/BufWinEnter/...
+	// When a file is opened directly e.g. with `goneovim plainfile.txt`
+	// would end with applying the new font to the status line.
+	if grid == 1 {
+		grid = 2
+	}
+
 	win, ok := s.getWindow(grid)
 	if !ok {
 		return
@@ -369,6 +378,7 @@ func (s *Screen) gridFontAutomaticHeight(update interface{}) {
 	}
 
 	font := win.getFont()
+	oldCellWidth := font.cellwidth
 
 	// The font height we'll try to approximate with the new font
 	oldFontHeight := font.fontMetrics.Height()
@@ -404,12 +414,11 @@ func (s *Screen) gridFontAutomaticHeight(update interface{}) {
 	for newFontHeight > oldFontHeight {
 		updateFont(-1)
 	}
-	for newFontHeight < oldFontHeight {
-		updateFont(0.1)
-	}
-	for newFontHeight > oldFontHeight {
-		updateFont(-0.1)
-	}
+
+	// Refresh the screen while the font.cellwidth hasn't change.
+	// It avoids old text to stay forever, between windows.
+	// (Especially between window and statusbar.)
+	s.refresh()
 
 	// Build the new font
 	win.font = initFontNew(fontFamily, newFontSize, font.weight, font.stretch, font.lineSpace, font.letterSpace)
@@ -420,6 +429,13 @@ func (s *Screen) gridFontAutomaticHeight(update interface{}) {
 	win.fallbackfonts = nil
 	s.ws.cursor.fallbackfonts = win.fallbackfonts
 
+	// Keep the old cellwidth matters. Changing it would impact e.g.
+	// Window.paint(). Plus, proportional font doesn't have something
+	// such as a `cellwidth`.
+	win.font.cellwidth = oldCellWidth
+
+	// TODO: Resize Grid if enough space to add a row
+
 	// Cache
 	cache := win.cache
 	if cache == (Cache{}) {