Compare commits

..

No commits in common. "ee4b04c24d3b79c499f962692bdd34a3b93dcdbe" and "b65153d13dade1e43b753063d6af6883e4bdc3b3" have entirely different histories.

15 changed files with 34 additions and 534 deletions

View File

@ -9,6 +9,7 @@ import (
func Execute(ctx context.Context) int {
var cli Root
pst := kong.Parse(&cli)
// Call the Run() method of the selected parsed command.
err := pst.Run(&Context{Context: ctx})
if err != nil {
pst.FatalIfErrorf(err)

View File

@ -2,43 +2,20 @@ package cmd
import (
"fmt"
"os"
"sort"
"text/tabwriter"
"tuxpa.in/t/erm/app/fontinfo"
"github.com/liamg/fontinfo"
)
type ListFonts struct {
Styles []string `name:"styles" default:"regular"`
}
func (r *ListFonts) Run(ctx *Context) error {
matchers := []fontinfo.Matcher{}
for _, v := range r.Styles {
matchers = append(matchers, fontinfo.MatchStyle(v))
}
fonts, err := fontinfo.Match(matchers...)
fonts, err := fontinfo.Match(fontinfo.MatchStyle("Regular"))
if err != nil {
return err
}
sort.SliceStable(fonts, func(i, j int) bool {
if fonts[i].Style == fonts[j].Style {
return fonts[i].Family < fonts[j].Family
}
return fonts[i].Style < fonts[j].Style
})
w := tabwriter.NewWriter(os.Stdout, 0, 0, 0, ' ',
tabwriter.Debug)
fmt.Fprintln(w, "family\tstyle\tpath")
fmt.Fprintln(w, "---\t---\t---")
for _, font := range fonts {
fmt.Fprintf(w, "%s\t%s\t%s\n",
font.Style,
font.Family,
font.Path,
)
w.Flush()
fmt.Println(font.Family)
}
return nil
}

View File

@ -15,24 +15,34 @@ import (
"tuxpa.in/t/erm/app/darktile/version"
)
func getImageFromFilePath(filePath string) (image.Image, error) {
f, err := os.Open(filePath)
if err != nil {
return nil, err
}
defer f.Close()
image, _, err := image.Decode(f)
return image, err
}
type Context struct {
context.Context
}
type Root struct {
Term Term `cmd:"" aliases:"t" default:"1" help:"launch term"`
ListFonts ListFonts `cmd:"" aliases:"lf" name:"list-fonts" help:"list fonts"`
Term Term `cmd:"" default:"1" help:"launch term"`
ListFonts ListFonts `cmd:"" name:"list-fonts" help:"list fonts"`
}
type Term struct {
ShowVersion bool `name:"version" help:"Show erm version information and exit"`
RewriteConfig bool `name:"rewrite-config" help:"Write the resultant config after parsing config files and merging with defauls back to the config file"`
LogFile string `name:"log-file" help:"Debug log file"`
Shell string `name:"shell" short:"s" help:"Shell to launch terminal with - defaults to configured user shell"`
Command string `name:"command" short:"c" help:"Command to run when shell starts - use this with caution"`
ScreenshotAfterMs int `name:"screenshot-after-ms" help:"Take a screenshot after this many milliseconds"`
ScreenshotFilename string `name:"screenshot-filename" help:"Filename to store screenshot taken by --screenshot-after-ms"`
ThemePath string `name:"theme-path" help:"Path to a theme file to use instead of the default"`
ShowVersion bool `cmd:"version" help:"Show darktile version information and exit"`
RewriteConfig bool `cmd:"rewrite-config" help:"Write the resultant config after parsing config files and merging with defauls back to the config file"`
LogFile string `cmd:"log-file" help:"Debug log file"`
Shell string `cmd:"shell" short:"s" help:"Shell to launch terminal with - defaults to configured user shell"`
Command string `cmd:"command" short:"c" help:"Command to run when shell starts - use this with caution"`
ScreenshotAfterMs int `cmd:"screenshot-after-ms" help:"Take a screenshot after this many milliseconds"`
ScreenshotFilename string `cmd:"screenshot-filename" help:"Filename to store screenshot taken by --screenshot-after-ms"`
ThemePath string `cmd:"theme-path" help:"Path to a theme file to use instead of the default"`
}
func (r *Term) Run(ctx *Context) error {
@ -136,12 +146,3 @@ func (r *Term) Run(ctx *Context) error {
return g.Run()
}
func getImageFromFilePath(filePath string) (image.Image, error) {
f, err := os.Open(filePath)
if err != nil {
return nil, err
}
defer f.Close()
image, _, err := image.Decode(f)
return image, err
}

View File

@ -17,7 +17,6 @@ type Config struct {
type Font struct {
Family string `json:"family"`
Style string `json:"style"`
Size float64 `json:"size"`
DPI float64 `json:"dpi"`
Ligatures bool `json:"ligatures"`

View File

@ -4,7 +4,6 @@ import (
"encoding/hex"
"fmt"
"image/color"
termutil2 "tuxpa.in/t/erm/app/darktile/termutil"
)
@ -12,7 +11,6 @@ var defaultConfig = Config{
Opacity: 1.0,
Font: Font{
Family: "", // internally packed font will be loaded by default
Style: "Regular",
Size: 18.0,
DPI: 72.0,
Ligatures: true,

View File

@ -6,10 +6,10 @@ import (
"math"
"os"
"github.com/liamg/fontinfo"
"golang.org/x/image/font"
"golang.org/x/image/font/opentype"
"tuxpa.in/t/erm/app/darktile/packed"
"tuxpa.in/t/erm/app/fontinfo"
)
type Style uint8
@ -25,7 +25,6 @@ type StyleName string
const (
StyleRegular StyleName = "Regular"
StyleMedium StyleName = "Medium"
StyleBold StyleName = "Bold"
StyleItalic StyleName = "Italic"
StyleBoldItalic StyleName = "Bold Italic"
@ -110,24 +109,26 @@ func (m *Manager) createFace(f *opentype.Font) (font.Face, error) {
})
}
func (m *Manager) SetFontStyle(style string) error {
return nil
}
func (m *Manager) SetFontByFamilyName(name string) error {
m.family = name
if name == "" {
return m.loadDefaultFonts()
}
fonts, err := fontinfo.Match(fontinfo.MatchFamily(name))
if err != nil {
return err
}
if len(fonts) == 0 {
return fmt.Errorf("could not find font with family '%s'", name)
}
for _, fontMeta := range fonts {
switch StyleName(fontMeta.Style) {
case StyleRegular, StyleMedium:
case StyleRegular:
m.regularFace, err = m.loadFontFace(fontMeta.Path)
if err != nil {
return err

View File

@ -14,12 +14,6 @@ func WithFontFamily(family string) func(g *GUI) error {
}
}
func WithFontStyle(style string) func(g *GUI) error {
return func(g *GUI) error {
return g.fontManager.SetFontStyle(style)
}
}
func WithOpacity(opacity float64) func(g *GUI) error {
return func(g *GUI) error {
g.opacity = opacity

View File

@ -1,201 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -1,2 +0,0 @@
taken from https://github.com/liamg/fontinfo

View File

@ -1,6 +0,0 @@
package fontinfo
// List all otf/ttf fonts installed on the system
func List() ([]Font, error) {
return Match()
}

View File

@ -1,103 +0,0 @@
package fontinfo
import (
"fmt"
"io/fs"
"os"
"os/user"
"path/filepath"
"strings"
)
// Font represents a font file on disk
type Font struct {
Family string
Style string
Path string
}
var validExtensions = map[string]FontParser{
".ttf": &TruetypeParser{},
".otf": &TruetypeParser{},
//".bdf": &TruetypeParser{},
//".pcf": &TruetypeParser{},
}
var fontDirs = []string{
"~/.fonts",
"~/.local/share/fonts",
"/usr/local/share/fonts",
"/usr/share/fonts",
filepath.Join(os.Getenv("XDG_DATA_HOME"), "fonts"),
}
func init() {
dataDirs := strings.Split(os.Getenv("XDG_DATA_DIRS"), string(os.PathListSeparator))
for _, dir := range dataDirs {
if dir == "" {
continue
}
fontDirs = append(fontDirs, filepath.Join(dir, "fonts"))
}
}
// Match finds all fonts installed on the system which match the provided matchers
func Match(matchers ...Matcher) ([]Font, error) {
var fonts []Font
meta := make(map[string]*FontMetadata)
var home string
if usr, _ := user.Current(); usr != nil {
home = usr.HomeDir
}
for _, dir := range fontDirs {
if home != "" && strings.HasPrefix(dir, "~/") {
dir = filepath.Join(home, dir[2:])
}
if info, err := os.Stat(dir); os.IsNotExist(err) {
continue
} else if !info.IsDir() {
continue
}
err := filepath.WalkDir(dir, func(path string, info fs.DirEntry, err error) error {
if _, ok := meta[path]; ok {
return nil
}
ext := filepath.Ext(path)
if parser, ok := validExtensions[strings.ToLower(ext)]; ok {
f, err := os.Open(path)
if err != nil {
return err
}
defer f.Close()
metadata, err := parser.Parse(f)
if err != nil {
fmt.Printf("could not parse %s: %s\n", path, err)
return nil
}
for _, match := range matchers {
if match(metadata) {
meta[path] = metadata
break
}
}
return nil
}
return nil
})
if err != nil {
return nil, err
}
}
for path, metadata := range meta {
fonts = append(fonts, Font{
Family: metadata.FontFamily,
Style: metadata.FontStyle,
Path: path,
})
}
return fonts, nil
}

View File

@ -1,26 +0,0 @@
package fontinfo
import (
"strings"
)
type Matcher func(m *FontMetadata) bool
// MatchFamily is a matcher which matches fonts with the specified font family (case insensitive)
func MatchFamily(family string) Matcher {
return func(m *FontMetadata) bool {
return strings.EqualFold(m.FontFamily, family)
}
}
// MatchStyle is a matcher which matches fonts with the specified font family (case insensitive)
func MatchStyle(style string) Matcher {
if style == "*" {
return func(m *FontMetadata) bool {
return true
}
}
return func(m *FontMetadata) bool {
return strings.EqualFold(m.FontStyle, style)
}
}

View File

@ -1,135 +0,0 @@
package fontinfo
import (
"bytes"
"fmt"
"io"
"unicode/utf8"
"golang.org/x/text/encoding/unicode"
)
func read(r io.Reader, length int) ([]byte, error) {
buf := make([]byte, length)
if n, err := r.Read(buf); err != nil {
return nil, err
} else if n < length {
return nil, fmt.Errorf("invalid length")
}
return buf, nil
}
func u16(buf []byte) uint16 {
return (uint16(buf[0]) << 8) + uint16(buf[1])
}
func u32(buf []byte) uint32 {
return (uint32(buf[0]) << 24) + (uint32(buf[1]) << 16) + (uint32(buf[2]) << 8) + uint32(buf[3])
}
type FontMetadata struct {
FontFamily string
FontStyle string
}
type FontParser interface {
Parse(r io.ReadSeeker) (*FontMetadata, error)
}
// for ttf and otf files
type TruetypeParser struct {
}
func (t *TruetypeParser) Parse(r io.ReadSeeker) (*FontMetadata, error) {
buf, err := read(r, 12)
if err != nil {
return nil, err
}
tableCount := u16(buf[4:6])
for i := 0; i < int(tableCount); i++ {
if _, err := r.Seek(12+(int64(i)*16), 0); err != nil {
return nil, err
}
table, err := read(r, 16)
if err != nil {
return nil, err
}
if string(table[0:4]) != "name" {
continue
}
offset := u32(table[8:12])
return t.readNameTable(r, offset)
}
return nil, fmt.Errorf("name table not found")
}
func (t *TruetypeParser) readNameTable(r io.ReadSeeker, offset uint32) (*FontMetadata, error) {
if _, err := r.Seek(int64(offset), 0); err != nil {
return nil, fmt.Errorf("invalid font file")
}
nameTable, err := read(r, 6)
if err != nil {
return nil, err
}
nameCount := u16(nameTable[2:4])
stringOffset := int64(u16(nameTable[4:6])) + int64(offset)
var done uint8
var metadata FontMetadata
nameRecordStart := offset + 6
for j := 0; j < int(nameCount); j++ {
recordOffset := nameRecordStart + uint32(12*j)
if _, err := r.Seek(int64(recordOffset), 0); err != nil {
return nil, err
}
buf, err := read(r, 12)
if err != nil {
return nil, err
}
language := u16(buf[4:6])
if language != 0 && language != 1033 { // not english or english us
continue
}
nameID := u16(buf[6:8])
switch nameID {
case 1, 2: //family, style
if _, err := r.Seek(int64(stringOffset)+int64(u16(buf[10:12])), 0); err != nil {
return nil, err
}
raw, err := read(r, int(u16(buf[8:10])))
if err != nil {
return nil, err
}
if nameID == 1 {
done |= 1
metadata.FontFamily = lazyUnicode(raw)
} else {
done |= 2
metadata.FontStyle = lazyUnicode(raw)
}
if done == 3 { // bail early if we have what we need
return &metadata, nil
}
}
}
return &metadata, nil
}
func lazyUnicode(r []byte) string {
var back bool
if bytes.HasSuffix(r, []byte{0}) {
r = bytes.TrimSuffix(r, []byte{0})
back = true
}
if utf8.Valid(r) && (!bytes.Contains(r, []byte{0})) {
return string(r)
}
if back {
r = append(r, 0)
}
dec := unicode.UTF16(unicode.BigEndian, unicode.UseBOM).NewDecoder()
ans, err := dec.String(string(r))
if err != nil {
return "Invalid_UTF16_Encoding"
}
return ans
}

2
go.mod
View File

@ -8,6 +8,7 @@ require (
github.com/d-tsuji/clipboard v0.0.3
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be // indirect
github.com/hajimehoshi/ebiten/v2 v2.2.0-alpha.11.0.20210724070913-1706d9436a78
github.com/liamg/fontinfo v0.1.3
github.com/mvdan/xurls v1.1.0 // indirect
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
github.com/stretchr/testify v1.7.0
@ -15,7 +16,6 @@ require (
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
golang.org/x/text v0.3.6
gopkg.in/yaml.v2 v2.4.0 // indirect
mvdan.cc/xurls v1.1.0
sigs.k8s.io/yaml v1.1.0

2
go.sum
View File

@ -168,6 +168,8 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/liamg/fontinfo v0.1.3 h1:R3b2lEAQNwaNJv1jD8B30SUWHkOmzbk7KpKdLrNx+tk=
github.com/liamg/fontinfo v0.1.3/go.mod h1:6REdGXLC8yXmxpX31DDwjjzT06g1c7UcvY75AGf9sH4=
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1 h1:/QwQcwWVOQXcoNuV9tHx30gQ3q7jCE/rKcGjwzsa5tg=