Add support manual font fallback

Author: akiyosi

editor/config.go

@@ -36,6 +36,7 @@ type editorConfig struct {
 	WindowSeparatorTheme                    string
 	NvimInWsl                               string
 	WSLDist                                 string
+	FontWeight                              string
 	ModeEnablingIME                         []string
 	IndentGuideIgnoreFtList                 []string
 	CharsScaledLineHeight                   []string
@@ -46,8 +47,9 @@ type editorConfig struct {
 	DiffChangePattern                       int
 	CacheSize                               int
 	Linespace                               int
-	Letterspace                             float64
+	Letterspace                             int
 	FontSize                                int
+	FontStretch                             int
 	Margin                                  int
 	Gap                                     int
 	Height                                  int
@@ -78,7 +80,7 @@ type editorConfig struct {
 	BorderlessWindow                        bool
 	RestoreWindowGeometry                   bool
 	ExtCmdline                              bool
-	NoFontMerge                             bool
+	ManualFontFallback                      bool
 	WindowGeometryBasedOnFontmetrics        bool
 	IgnoreFirstMouseClickWhenAppInactivated bool
 	HideTitlebar                            bool
@@ -316,6 +318,10 @@ func (c *gonvimConfig) init() {
 		c.Editor.MouseScrollingUnit = "line"
 	}
 	c.Editor.FontSize = 12
+	c.Editor.FontWeight = "normal"
+	// Horizontal stretch ratio
+	c.Editor.FontStretch = 100
+	c.Editor.FontSize = 12
 	c.Editor.Linespace = 6
 
 	c.Editor.ExtCmdline = false

editor/cursor.go

@@ -14,7 +14,9 @@ type Cursor struct {
 	widgets.QWidget
 	charCache            *Cache
 	font                 *Font
+	fallbackfonts        []*Font
 	fontwide             *Font
+	fallbackfontwides    []*Font
 	bg                   *RGBA
 	fg                   *RGBA
 	ws                   *Workspace
@@ -182,12 +184,12 @@ func (c *Cursor) drawForeground(p *gui.QPainter, sx, sy, dx, dy float64, text st
 		)
 	} else {
 		if !c.normalWidth && c.fontwide != nil {
-			p.SetFont(c.fontwide.fontNew)
+			p.SetFont(resolveFontFallback(c.fontwide, c.fallbackfontwides, text).qfont)
 			if c.fontwide.lineHeight > font.lineHeight {
 				shift += c.fontwide.ascent - font.ascent
 			}
 		} else {
-			p.SetFont(font.fontNew)
+			p.SetFont(resolveFontFallback(c.font, c.fallbackfonts, text).qfont)
 		}
 		p.SetPen2(c.fg.QColor())
 
@@ -206,6 +208,12 @@ func (c *Cursor) drawForeground(p *gui.QPainter, sx, sy, dx, dy float64, text st
 func (c *Cursor) newCharCache(text string, fg *RGBA, isNormalWidth bool) *gui.QImage {
 	font := c.font
 
+	if !isNormalWidth && c.fontwide != nil {
+		font = resolveFontFallback(c.fontwide, c.fallbackfontwides, text)
+	} else {
+		font = resolveFontFallback(c.font, c.fallbackfonts, text)
+	}
+
 	width := float64(len(text)) * font.italicWidth
 	if !isNormalWidth {
 		// width = math.Ceil(c.ws.screen.runeTextWidth(font, text))
@@ -216,20 +224,15 @@ func (c *Cursor) newCharCache(text string, fg *RGBA, isNormalWidth bool) *gui.QI
 	// So we set the correct device pixel ratio
 	image := gui.NewQImage3(
 		int(c.devicePixelRatio*width),
-		int(c.devicePixelRatio*float64(font.height)),
+		int(c.devicePixelRatio*float64(c.font.height)),
 		gui.QImage__Format_ARGB32_Premultiplied,
 	)
 	image.SetDevicePixelRatio(c.devicePixelRatio)
 	image.Fill3(core.Qt__transparent)
 
 	pi := gui.NewQPainter2(image)
 	pi.SetPen2(fg.QColor())
-
-	if !isNormalWidth && font == nil && c.fontwide != nil {
-		pi.SetFont(c.fontwide.fontNew)
-	} else {
-		pi.SetFont(font.fontNew)
-	}
+	pi.SetFont(font.qfont)
 
 	// TODO
 	// Set bold, italic styles
@@ -342,7 +345,7 @@ func (c *Cursor) move() {
 	c.Move2(iX, iY)
 }
 
-func (c *Cursor) updateFont(targetWin *Window, font *Font) {
+func (c *Cursor) updateFont(targetWin *Window, font *Font, fallbackfonts []*Font) {
 	win := targetWin
 	ok := false
 	if win == nil {
@@ -353,12 +356,16 @@ func (c *Cursor) updateFont(targetWin *Window, font *Font) {
 	}
 
 	if win == nil {
+		c.font = font
+		c.fallbackfonts = fallbackfonts
 		return
 	}
 	if win.font == nil {
 		c.font = font
+		c.fallbackfonts = fallbackfonts
 	} else {
 		c.font = win.font
+		c.fallbackfonts = win.fallbackfonts
 	}
 }
 

editor/editor.go

@@ -109,7 +109,7 @@ type Editor struct {
 	notifyStartPos         *core.QPoint
 	colors                 *ColorPalette
 	notify                 chan *Notify
-	fontCh                 chan *Font
+	fontCh                 chan []*Font
 	cbChan                 chan *string
 	chUiPrepared           chan bool
 	geometryUpdateTimer    *time.Timer
@@ -125,6 +125,7 @@ type Editor struct {
 	config                 gonvimConfig
 	opts                   Options
 	font                   *Font
+	fallbackfonts          []*Font
 	notifications          []*Notification
 	workspaces             []*Workspace
 	args                   []string
@@ -258,16 +259,16 @@ func InitEditor(options Options, args []string) {
 
 	e.extFontFamily = e.config.Editor.FontFamily
 	e.extFontSize = e.config.Editor.FontSize
-	e.fontCh = make(chan *Font, 2)
+	e.fontCh = make(chan []*Font, 100)
 	go func() {
-		font := initFontNew(
+		e.fontCh <- parseFont(
 			editor.extFontFamily,
-			float64(editor.extFontSize),
-			0,
+			editor.extFontSize,
+			e.config.Editor.FontWeight,
+			e.config.Editor.FontStretch,
+			e.config.Editor.Linespace,
 			e.config.Editor.Letterspace,
 		)
-
-		e.fontCh <- font
 	}()
 
 	e.initSVGS()
@@ -414,6 +415,38 @@ func (e *Editor) addDockMenu() {
 	menu.SetAsDockMenu()
 }
 
+func parseFont(families string, size int, weight string, stretch, linespace, letterspace int) (fonts []*Font) {
+	weight = strings.ToLower(weight)
+	var fontWeight gui.QFont__Weight
+	switch weight {
+	case "thin":
+		fontWeight = gui.QFont__Thin
+	case "extralight", "ultralight":
+		fontWeight = gui.QFont__ExtraLight
+	case "light":
+		fontWeight = gui.QFont__Light
+	case "normal", "regular":
+		fontWeight = gui.QFont__Normal
+	case "demibold", "semibold":
+		fontWeight = gui.QFont__DemiBold
+	case "bold":
+		fontWeight = gui.QFont__Bold
+	case "extrabold", "ultrabold":
+		fontWeight = gui.QFont__ExtraBold
+	case "black", "heavy":
+		fontWeight = gui.QFont__Black
+	}
+
+	for _, f := range strings.Split(families, ",") {
+		fonts = append(
+			fonts,
+			initFontNew(strings.TrimSpace(f), float64(size), fontWeight, stretch, linespace, letterspace),
+		)
+	}
+
+	return
+}
+
 // setAppDirPath
 // set application working directory path
 // TODO: This process is problematic and needs a better way to set up CWD
@@ -524,7 +557,11 @@ func (e *Editor) initWorkspaces(ctx context.Context, signal *neovimSignal, redra
 		ws.initUI()
 
 		if i == 0 {
-			e.font = <-e.fontCh
+			fonts := <-e.fontCh
+			e.font = fonts[0]
+			if len(fonts) > 1 {
+				e.fallbackfonts = fonts[1:]
+			}
 		}
 
 		ws.initFont()