From c20c9685aae51deeeef560d16bcf6e6039438b6c Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Wed, 30 Aug 2023 23:04:24 -0700 Subject: icat: a program to print images in the terminal. Thanks to WizardCoder for implementing the first version of this code. I had to clean it up quite a bit though. --- .gitignore | 1 + flake.lock | 25 ++++++++++++++++++++ flake.nix | 17 +++++++++++++ go.mod | 7 ++++++ go.sum | 4 ++++ icat.go | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 134 insertions(+) create mode 100644 .gitignore create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 go.mod create mode 100644 go.sum create mode 100644 icat.go diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c4a847d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/result diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..775df95 --- /dev/null +++ b/flake.lock @@ -0,0 +1,25 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1693355128, + "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..81b7d36 --- /dev/null +++ b/flake.nix @@ -0,0 +1,17 @@ +{ + outputs = { self, nixpkgs }: + let pkgs = nixpkgs.legacyPackages.x86_64-linux; in + rec { + + packages.x86_64-linux.icat = pkgs.buildGoModule { + pname = "icat"; + version = "1.0"; + + src = self; + + vendorHash = "sha256-WiEK8nq13mdTFnyxDiMRWM1tb60mlZY0fVmtlH5ZWgw="; + }; + + defaultPackage.x86_64-linux = packages.x86_64-linux.icat; + }; +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..f2b8f47 --- /dev/null +++ b/go.mod @@ -0,0 +1,7 @@ +module icat + +go 1.20 + +require golang.org/x/term v0.11.0 + +require golang.org/x/sys v0.11.0 // indirect diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..6aed7b2 --- /dev/null +++ b/go.sum @@ -0,0 +1,4 @@ +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= diff --git a/icat.go b/icat.go new file mode 100644 index 0000000..2b2a847 --- /dev/null +++ b/icat.go @@ -0,0 +1,80 @@ +package main + +import ( + "fmt" + "golang.org/x/term" + "image" + _ "image/jpeg" + _ "image/png" + "os" +) + +func load(filename string) (image.Image, error) { + file := os.Stdin + if filename != "-" { + var err error + file, err = os.Open(filename) + if err != nil { + return nil, err + } + defer file.Close() + } + + img, _, err := image.Decode(file) + if err != nil { + return nil, fmt.Errorf("decode %q: %s", filename, err) + } + + return img, nil +} + +func printImg(filename string) error { + img, err := load(filename) + if err != nil { + return err + } + + cols, lines, err := term.GetSize(1) + if err != nil { + return fmt.Errorf("terminal size: %s", err) + } + lines-- // Leave a line for the status bar. + + // Try not to stretch the image. + if img.Bounds().Dy()*cols <= img.Bounds().Dx()*lines*5/2 { + lines = img.Bounds().Dy() * cols / (img.Bounds().Dx() * 5 / 2) + } else { + cols = img.Bounds().Dx() * lines * 5 / 2 / img.Bounds().Dy() + } + + // nearest-neighbor interpolation + for y := 0; y < lines; y++ { + for x := 0; x < cols; x++ { + sx := x*img.Bounds().Dx()/cols + img.Bounds().Min.X + sy := y*img.Bounds().Dy()/lines + img.Bounds().Min.Y + r, g, b, _ := img.At(sx, sy).RGBA() + fmt.Printf("\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) + } + fmt.Println("\033[49m") + } + return nil +} + +func icat(args []string) error { + if len(args) == 0 { + args = []string{"-"} + } + for _, f := range args { + if err := printImg(f); err != nil { + return err + } + } + return nil +} + +func main() { + if err := icat(os.Args[1:]); err != nil { + fmt.Fprintf(os.Stderr, "Failed: %s\n", err) + os.Exit(1) + } +} -- cgit v1.3.1 From 3d0c7978699c1280fd830324326c675e6570ed55 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Wed, 30 Aug 2023 23:16:50 -0700 Subject: Load terminal size once at the beginning. --- icat.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/icat.go b/icat.go index 2b2a847..c26d0d2 100644 --- a/icat.go +++ b/icat.go @@ -28,18 +28,12 @@ func load(filename string) (image.Image, error) { return img, nil } -func printImg(filename string) error { +func printImg(filename string, cols, lines int) error { img, err := load(filename) if err != nil { return err } - cols, lines, err := term.GetSize(1) - if err != nil { - return fmt.Errorf("terminal size: %s", err) - } - lines-- // Leave a line for the status bar. - // Try not to stretch the image. if img.Bounds().Dy()*cols <= img.Bounds().Dx()*lines*5/2 { lines = img.Bounds().Dy() * cols / (img.Bounds().Dx() * 5 / 2) @@ -61,11 +55,17 @@ func printImg(filename string) error { } func icat(args []string) error { + cols, lines, err := term.GetSize(1) + if err != nil { + return fmt.Errorf("terminal size: %s", err) + } + lines-- // Leave a line for the status bar. + if len(args) == 0 { args = []string{"-"} } for _, f := range args { - if err := printImg(f); err != nil { + if err := printImg(f, cols, lines); err != nil { return err } } -- cgit v1.3.1 From c1159e5f8434ffb4e98c950f45cd682d73933534 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 31 Aug 2023 08:45:10 -0700 Subject: Use the draw package for resizing the image. This allows me to use the approximate bilinear interpolation, which looks a lot better than my brain-dead nearest-neighbor. --- flake.nix | 2 +- go.mod | 5 ++++- go.sum | 33 +++++++++++++++++++++++++++++++++ icat.go | 9 +++++---- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 81b7d36..2a263d8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ src = self; - vendorHash = "sha256-WiEK8nq13mdTFnyxDiMRWM1tb60mlZY0fVmtlH5ZWgw="; + vendorHash = "sha256-v47V+DNmAImNZy/TXEuX1b4IVp960QPk0Lb+T4e6brI="; }; defaultPackage.x86_64-linux = packages.x86_64-linux.icat; diff --git a/go.mod b/go.mod index f2b8f47..94d1016 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,9 @@ module icat go 1.20 -require golang.org/x/term v0.11.0 +require ( + golang.org/x/image v0.11.0 + golang.org/x/term v0.11.0 +) require golang.org/x/sys v0.11.0 // indirect diff --git a/go.sum b/go.sum index 6aed7b2..212c42b 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,37 @@ +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo= +golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/icat.go b/icat.go index c26d0d2..ae1b7a0 100644 --- a/icat.go +++ b/icat.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "golang.org/x/image/draw" "golang.org/x/term" "image" _ "image/jpeg" @@ -41,12 +42,12 @@ func printImg(filename string, cols, lines int) error { cols = img.Bounds().Dx() * lines * 5 / 2 / img.Bounds().Dy() } - // nearest-neighbor interpolation + dst := image.NewRGBA(image.Rect(0, 0, cols, lines)) + draw.ApproxBiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) + for y := 0; y < lines; y++ { for x := 0; x < cols; x++ { - sx := x*img.Bounds().Dx()/cols + img.Bounds().Min.X - sy := y*img.Bounds().Dy()/lines + img.Bounds().Min.Y - r, g, b, _ := img.At(sx, sy).RGBA() + r, g, b, _ := dst.At(x, y).RGBA() fmt.Printf("\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) } fmt.Println("\033[49m") -- cgit v1.3.1 From 3d875397ab4f21f06bc490982a62fdd62aa76a91 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 31 Aug 2023 08:46:26 -0700 Subject: Use bufio for output. This is a lot faster for a large image. --- icat.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/icat.go b/icat.go index ae1b7a0..f2c3f08 100644 --- a/icat.go +++ b/icat.go @@ -1,6 +1,7 @@ package main import ( + "bufio" "fmt" "golang.org/x/image/draw" "golang.org/x/term" @@ -45,12 +46,14 @@ func printImg(filename string, cols, lines int) error { dst := image.NewRGBA(image.Rect(0, 0, cols, lines)) draw.ApproxBiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) + buf := bufio.NewWriter(os.Stdout) + defer buf.Flush() for y := 0; y < lines; y++ { for x := 0; x < cols; x++ { r, g, b, _ := dst.At(x, y).RGBA() - fmt.Printf("\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) + fmt.Fprintf(buf, "\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) } - fmt.Println("\033[49m") + fmt.Fprintln(buf, "\033[49m") } return nil } -- cgit v1.3.1 From 2ef107aee0b4e88b3335b04418ec0e27ad8ebbfc Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 31 Aug 2023 09:50:17 -0700 Subject: Use one stdout buffer for the whole program. --- icat.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/icat.go b/icat.go index f2c3f08..1a8dd8a 100644 --- a/icat.go +++ b/icat.go @@ -11,6 +11,8 @@ import ( "os" ) +var stdout = bufio.NewWriter(os.Stdout) + func load(filename string) (image.Image, error) { file := os.Stdin if filename != "-" { @@ -46,14 +48,12 @@ func printImg(filename string, cols, lines int) error { dst := image.NewRGBA(image.Rect(0, 0, cols, lines)) draw.ApproxBiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) - buf := bufio.NewWriter(os.Stdout) - defer buf.Flush() for y := 0; y < lines; y++ { for x := 0; x < cols; x++ { r, g, b, _ := dst.At(x, y).RGBA() - fmt.Fprintf(buf, "\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) + fmt.Fprintf(stdout, "\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) } - fmt.Fprintln(buf, "\033[49m") + fmt.Fprintln(stdout, "\033[49m") } return nil } @@ -68,6 +68,8 @@ func icat(args []string) error { if len(args) == 0 { args = []string{"-"} } + + defer stdout.Flush() for _, f := range args { if err := printImg(f, cols, lines); err != nil { return err -- cgit v1.3.1 From 8896fdcf2c049a5b428ca1c49bf28fc2702c0ae1 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Mon, 17 Mar 2025 16:38:36 -0700 Subject: Print in double resolution using ▀ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- icat.go | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 94d1016..9019d01 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module icat +module gitlab.com/rhogenson/icat go 1.20 diff --git a/icat.go b/icat.go index 1a8dd8a..15f10d1 100644 --- a/icat.go +++ b/icat.go @@ -3,12 +3,13 @@ package main import ( "bufio" "fmt" - "golang.org/x/image/draw" - "golang.org/x/term" "image" _ "image/jpeg" _ "image/png" "os" + + "golang.org/x/image/draw" + "golang.org/x/term" ) var stdout = bufio.NewWriter(os.Stdout) @@ -45,16 +46,20 @@ func printImg(filename string, cols, lines int) error { cols = img.Bounds().Dx() * lines * 5 / 2 / img.Bounds().Dy() } - dst := image.NewRGBA(image.Rect(0, 0, cols, lines)) - draw.ApproxBiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) + dst := image.NewRGBA(image.Rect(0, 0, cols, 2*lines)) + draw.CatmullRom.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) - for y := 0; y < lines; y++ { + for y := 0; y < 2*lines; y += 2 { for x := 0; x < cols; x++ { - r, g, b, _ := dst.At(x, y).RGBA() - fmt.Fprintf(stdout, "\033[48;2;%d;%d;%dm ", r>>8, g>>8, b>>8) + hiR, hiG, hiB, _ := dst.At(x, y).RGBA() + loR, loG, loB, _ := dst.At(x, y+1).RGBA() + fmt.Fprintf(stdout, "\033[38;2;%d;%d;%dm\033[48;2;%d;%d;%dm▀", + hiR>>8, hiG>>8, hiB>>8, + loR>>8, loG>>8, loB>>8) } fmt.Fprintln(stdout, "\033[49m") } + fmt.Fprint(stdout, "\033[39m") return nil } -- cgit v1.3.1 From c62789a6c3c2998cdc94d60166a0d269dce8db68 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Mon, 17 Mar 2025 16:44:56 -0700 Subject: Use bilinear scaling --- icat.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icat.go b/icat.go index 15f10d1..01f0400 100644 --- a/icat.go +++ b/icat.go @@ -47,7 +47,7 @@ func printImg(filename string, cols, lines int) error { } dst := image.NewRGBA(image.Rect(0, 0, cols, 2*lines)) - draw.CatmullRom.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) + draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) for y := 0; y < 2*lines; y += 2 { for x := 0; x < cols; x++ { -- cgit v1.3.1 From 3035d583d32e5129d3bae256dc692888c55701f2 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Mon, 17 Mar 2025 17:03:16 -0700 Subject: Bump deps --- .gitignore | 2 +- flake.lock | 25 ------------------------- flake.nix | 17 ----------------- go.mod | 10 ++++++---- go.sum | 43 ++++++------------------------------------- 5 files changed, 13 insertions(+), 84 deletions(-) delete mode 100644 flake.lock delete mode 100644 flake.nix diff --git a/.gitignore b/.gitignore index c4a847d..b979372 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/result +/icat diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 775df95..0000000 --- a/flake.lock +++ /dev/null @@ -1,25 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1693355128, - "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 2a263d8..0000000 --- a/flake.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - outputs = { self, nixpkgs }: - let pkgs = nixpkgs.legacyPackages.x86_64-linux; in - rec { - - packages.x86_64-linux.icat = pkgs.buildGoModule { - pname = "icat"; - version = "1.0"; - - src = self; - - vendorHash = "sha256-v47V+DNmAImNZy/TXEuX1b4IVp960QPk0Lb+T4e6brI="; - }; - - defaultPackage.x86_64-linux = packages.x86_64-linux.icat; - }; -} diff --git a/go.mod b/go.mod index 9019d01..b4f245f 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ module gitlab.com/rhogenson/icat -go 1.20 +go 1.23.0 + +toolchain go1.24.1 require ( - golang.org/x/image v0.11.0 - golang.org/x/term v0.11.0 + golang.org/x/image v0.25.0 + golang.org/x/term v0.30.0 ) -require golang.org/x/sys v0.11.0 // indirect +require golang.org/x/sys v0.31.0 // indirect diff --git a/go.sum b/go.sum index 212c42b..113e948 100644 --- a/go.sum +++ b/go.sum @@ -1,37 +1,6 @@ -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/image v0.11.0 h1:ds2RoQvBvYTiJkwpSFDwCcDFNX7DqjL2WsUgTNk0Ooo= -golang.org/x/image v0.11.0/go.mod h1:bglhjqbqVuEb9e9+eNR45Jfu7D+T4Qan+NhQk8Ck2P8= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= +golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= -- cgit v1.3.1 From 5924ab4508d90f074157888899ac52c2af57090a Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Mon, 17 Mar 2025 20:22:28 -0700 Subject: Improve usage --- README.md | 3 +++ icat.go | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..0dc67b9 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# The worst terminal image viewer + +seriously just use img2sixel diff --git a/icat.go b/icat.go index 01f0400..4bcfb45 100644 --- a/icat.go +++ b/icat.go @@ -2,6 +2,8 @@ package main import ( "bufio" + "errors" + "flag" "fmt" "image" _ "image/jpeg" @@ -12,8 +14,6 @@ import ( "golang.org/x/term" ) -var stdout = bufio.NewWriter(os.Stdout) - func load(filename string) (image.Image, error) { file := os.Stdin if filename != "-" { @@ -33,12 +33,7 @@ func load(filename string) (image.Image, error) { return img, nil } -func printImg(filename string, cols, lines int) error { - img, err := load(filename) - if err != nil { - return err - } - +func printImg(img image.Image, cols, lines int) error { // Try not to stretch the image. if img.Bounds().Dy()*cols <= img.Bounds().Dx()*lines*5/2 { lines = img.Bounds().Dy() * cols / (img.Bounds().Dx() * 5 / 2) @@ -49,42 +44,55 @@ func printImg(filename string, cols, lines int) error { dst := image.NewRGBA(image.Rect(0, 0, cols, 2*lines)) draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) + w := bufio.NewWriter(os.Stdout) + defer w.Flush() for y := 0; y < 2*lines; y += 2 { for x := 0; x < cols; x++ { hiR, hiG, hiB, _ := dst.At(x, y).RGBA() loR, loG, loB, _ := dst.At(x, y+1).RGBA() - fmt.Fprintf(stdout, "\033[38;2;%d;%d;%dm\033[48;2;%d;%d;%dm▀", + fmt.Fprintf(w, "\033[38;2;%d;%d;%dm\033[48;2;%d;%d;%dm▀", hiR>>8, hiG>>8, hiB>>8, loR>>8, loG>>8, loB>>8) } - fmt.Fprintln(stdout, "\033[49m") + fmt.Fprintln(w, "\033[49m") } - fmt.Fprint(stdout, "\033[39m") + fmt.Fprint(w, "\033[39m") return nil } func icat(args []string) error { + if len(args) == 0 { + return errors.New("missing positional argument") + } + if len(args) > 1 { + return errors.New("too many positional arguments") + } + file := args[0] + cols, lines, err := term.GetSize(1) if err != nil { return fmt.Errorf("terminal size: %s", err) } lines-- // Leave a line for the status bar. - if len(args) == 0 { - args = []string{"-"} + img, err := load(file) + if err != nil { + return err } - defer stdout.Flush() - for _, f := range args { - if err := printImg(f, cols, lines); err != nil { - return err - } + if err := printImg(img, cols, lines); err != nil { + return err } return nil } func main() { - if err := icat(os.Args[1:]); err != nil { + flag.Usage = func() { + fmt.Fprintf(os.Stderr, "Usage: icat FILE\n") + } + flag.Parse() + + if err := icat(flag.Args()); err != nil { fmt.Fprintf(os.Stderr, "Failed: %s\n", err) os.Exit(1) } -- cgit v1.3.1 From 2d057d030f81069a3bc4e6e4c0317dcd68534e78 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Mon, 17 Mar 2025 20:57:00 -0700 Subject: Add more file formats --- icat.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/icat.go b/icat.go index 4bcfb45..56ab95a 100644 --- a/icat.go +++ b/icat.go @@ -6,11 +6,15 @@ import ( "flag" "fmt" "image" + _ "image/gif" _ "image/jpeg" _ "image/png" "os" + _ "golang.org/x/image/bmp" "golang.org/x/image/draw" + _ "golang.org/x/image/tiff" + _ "golang.org/x/image/webp" "golang.org/x/term" ) -- cgit v1.3.1 From 747045a5bf87bc762db9ef20343acac18ede3a96 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 12 Apr 2025 21:36:51 -0700 Subject: GitHub --- go.mod | 8 ++++---- go.sum | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b4f245f..fdcae13 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ -module gitlab.com/rhogenson/icat +module github.com/rhogenson/icat go 1.23.0 toolchain go1.24.1 require ( - golang.org/x/image v0.25.0 - golang.org/x/term v0.30.0 + golang.org/x/image v0.26.0 + golang.org/x/term v0.31.0 ) -require golang.org/x/sys v0.31.0 // indirect +require golang.org/x/sys v0.32.0 // indirect diff --git a/go.sum b/go.sum index 113e948..c68db5e 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,12 @@ golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= +golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY= +golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c= golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= +golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= +golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= -- cgit v1.3.1 From 923290a1bf8a6129075465891d14deaaeb96318f Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 12 Apr 2025 21:37:35 -0700 Subject: GPL --- COPYING | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- cgit v1.3.1 From c423ae65575a984a4c1ca1af51ab8c1f3ceac7d9 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Wed, 8 Oct 2025 17:34:23 -0700 Subject: Update import path --- go.mod | 10 +++++----- go.sum | 18 ++++++------------ icat.go | 21 ++++++++++++++++----- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index fdcae13..3ed9d4d 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ -module github.com/rhogenson/icat +module roseh.moe/cmd/icat -go 1.23.0 +go 1.24.0 toolchain go1.24.1 require ( - golang.org/x/image v0.26.0 - golang.org/x/term v0.31.0 + golang.org/x/image v0.32.0 + golang.org/x/term v0.36.0 ) -require golang.org/x/sys v0.32.0 // indirect +require golang.org/x/sys v0.37.0 // indirect diff --git a/go.sum b/go.sum index c68db5e..e9c590b 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,6 @@ -golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= -golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= -golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY= -golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= -golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= -golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= -golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= -golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= +golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= diff --git a/icat.go b/icat.go index 56ab95a..8faf85f 100644 --- a/icat.go +++ b/icat.go @@ -1,3 +1,4 @@ +// The icat command displays an image to the terminal using block characters. package main import ( @@ -18,6 +19,11 @@ import ( "golang.org/x/term" ) +var ( + x = flag.Int("x", 0, "set image width in columns") + y = flag.Int("y", 0, "set image height in rows") +) + func load(filename string) (image.Image, error) { file := os.Stdin if filename != "-" { @@ -39,7 +45,7 @@ func load(filename string) (image.Image, error) { func printImg(img image.Image, cols, lines int) error { // Try not to stretch the image. - if img.Bounds().Dy()*cols <= img.Bounds().Dx()*lines*5/2 { + if lines == 0 || cols != 0 && img.Bounds().Dy()*cols <= img.Bounds().Dx()*lines*5/2 { lines = img.Bounds().Dy() * cols / (img.Bounds().Dx() * 5 / 2) } else { cols = img.Bounds().Dx() * lines * 5 / 2 / img.Bounds().Dy() @@ -73,11 +79,16 @@ func icat(args []string) error { } file := args[0] - cols, lines, err := term.GetSize(1) - if err != nil { - return fmt.Errorf("terminal size: %s", err) + cols := *x + lines := *y + if cols == 0 && lines == 0 { + var err error + cols, lines, err = term.GetSize(1) + if err != nil { + return fmt.Errorf("terminal size: %s", err) + } + lines-- // Leave a line for the status bar. } - lines-- // Leave a line for the status bar. img, err := load(file) if err != nil { -- cgit v1.3.1 From 3ac0a6b87c04374777d9405e3bddc1b29f337886 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 28 May 2026 16:28:19 -0700 Subject: Use the sixel package --- go.mod | 8 ++--- go.sum | 4 +-- icat.go | 109 +++++++++++++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 89 insertions(+), 32 deletions(-) diff --git a/go.mod b/go.mod index 3ed9d4d..36cf1c7 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,10 @@ module roseh.moe/cmd/icat -go 1.24.0 - -toolchain go1.24.1 +go 1.26.3 require ( golang.org/x/image v0.32.0 - golang.org/x/term v0.36.0 + roseh.moe/pkg/sixel v0.0.0-20260528225709-a6d059daa153 ) -require golang.org/x/sys v0.37.0 // indirect +require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index e9c590b..e7f3a84 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q= -golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= +roseh.moe/pkg/sixel v0.0.0-20260528225709-a6d059daa153 h1:Jq7Yv9BeWwBPA5BY238i0SpXDqKudsqvlTZUvbi6ZMg= +roseh.moe/pkg/sixel v0.0.0-20260528225709-a6d059daa153/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= diff --git a/icat.go b/icat.go index 8faf85f..a1922f1 100644 --- a/icat.go +++ b/icat.go @@ -2,7 +2,6 @@ package main import ( - "bufio" "errors" "flag" "fmt" @@ -16,14 +15,61 @@ import ( "golang.org/x/image/draw" _ "golang.org/x/image/tiff" _ "golang.org/x/image/webp" - "golang.org/x/term" + "golang.org/x/sys/unix" + "roseh.moe/pkg/sixel" ) var ( x = flag.Int("x", 0, "set image width in columns") y = flag.Int("y", 0, "set image height in rows") + m = flagPrintMode(flag.CommandLine, "m", modeSixel, "one of 'block', 'block24', or 'sixel'") ) +type printMode int + +const ( + modeInvalid printMode = iota + modeBlock + modeBlock24 + modeSixel +) + +type printModeValue printMode + +func (m *printModeValue) String() string { + switch printMode(*m) { + case modeBlock: + return "block" + case modeBlock24: + return "block24" + case modeSixel: + return "sixel" + default: + return "invalid" + } +} + +func (m *printModeValue) Set(s string) error { + var mode printMode + switch s { + case "block": + mode = modeBlock + case "block24": + mode = modeBlock24 + case "sixel": + mode = modeSixel + default: + return fmt.Errorf("bad mode type %q, should be one of 'block', 'block24', or 'sixel'", s) + } + *m = printModeValue(mode) + return nil +} + +func flagPrintMode(fs *flag.FlagSet, name string, value printMode, usage string) *printMode { + fs.Var((*printModeValue)(&value), name, usage) + return &value +} + func load(filename string) (image.Image, error) { file := os.Stdin if filename != "-" { @@ -43,30 +89,26 @@ func load(filename string) (image.Image, error) { return img, nil } -func printImg(img image.Image, cols, lines int) error { +func printImg(img image.Image, x, y, pixelX, pixelY int) error { // Try not to stretch the image. - if lines == 0 || cols != 0 && img.Bounds().Dy()*cols <= img.Bounds().Dx()*lines*5/2 { - lines = img.Bounds().Dy() * cols / (img.Bounds().Dx() * 5 / 2) + if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { + y = img.Bounds().Dy() * x / (img.Bounds().Dx() * pixelY / pixelX) } else { - cols = img.Bounds().Dx() * lines * 5 / 2 / img.Bounds().Dy() + x = img.Bounds().Dx() * y * pixelY / pixelX / img.Bounds().Dy() } - dst := image.NewRGBA(image.Rect(0, 0, cols, 2*lines)) - draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Over, nil) - - w := bufio.NewWriter(os.Stdout) - defer w.Flush() - for y := 0; y < 2*lines; y += 2 { - for x := 0; x < cols; x++ { - hiR, hiG, hiB, _ := dst.At(x, y).RGBA() - loR, loG, loB, _ := dst.At(x, y+1).RGBA() - fmt.Fprintf(w, "\033[38;2;%d;%d;%dm\033[48;2;%d;%d;%dm▀", - hiR>>8, hiG>>8, hiB>>8, - loR>>8, loG>>8, loB>>8) - } - fmt.Fprintln(w, "\033[49m") + dst := image.NewRGBA(image.Rect(0, 0, x, y)) + draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Src, nil) + + switch *m { + case modeBlock: + sixel.PrintXTerm16(os.Stdout, dst) + case modeBlock24: + sixel.PrintBlock(os.Stdout, dst) + case modeSixel: + sixel.Print(os.Stdout, dst) } - fmt.Fprint(w, "\033[39m") + fmt.Println() return nil } @@ -81,13 +123,30 @@ func icat(args []string) error { cols := *x lines := *y + pixelX := 2 + pixelY := 5 if cols == 0 && lines == 0 { - var err error - cols, lines, err = term.GetSize(1) + ws, err := unix.IoctlGetWinsize(int(os.Stdout.Fd()), unix.TIOCGWINSZ) if err != nil { - return fmt.Errorf("terminal size: %s", err) + return err } + cols = int(ws.Col) + lines = int(ws.Row) lines-- // Leave a line for the status bar. + cellX, cellY := int(ws.Xpixel)/int(ws.Col), int(ws.Ypixel)/int(ws.Row) + if *m == modeSixel { + cols *= cellX + lines *= cellY + } else { + pixelX, pixelY = cellX, cellY + } + } + switch *m { + case modeSixel: + pixelX, pixelY = 1, 1 + case modeBlock24: + lines *= 2 + pixelX *= 2 } img, err := load(file) @@ -95,7 +154,7 @@ func icat(args []string) error { return err } - if err := printImg(img, cols, lines); err != nil { + if err := printImg(img, cols, lines, pixelX, pixelY); err != nil { return err } return nil -- cgit v1.3.1 From 7c5f38d06afc4041261379ce69fa5df2442ea24e Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 28 May 2026 16:48:49 -0700 Subject: Change to block24 mode by default This will have better compatibility, e.g. with tmux. I also added handling for when Xpixel and Ypixel are zero. --- icat.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/icat.go b/icat.go index a1922f1..a8768b3 100644 --- a/icat.go +++ b/icat.go @@ -22,7 +22,7 @@ import ( var ( x = flag.Int("x", 0, "set image width in columns") y = flag.Int("y", 0, "set image height in rows") - m = flagPrintMode(flag.CommandLine, "m", modeSixel, "one of 'block', 'block24', or 'sixel'") + m = flagPrintMode(flag.CommandLine, "m", modeBlock24, "one of 'block', 'block24', or 'sixel'") ) type printMode int @@ -134,6 +134,9 @@ func icat(args []string) error { lines = int(ws.Row) lines-- // Leave a line for the status bar. cellX, cellY := int(ws.Xpixel)/int(ws.Col), int(ws.Ypixel)/int(ws.Row) + if cellX == 0 && cellY == 0 { + cellX, cellY = 10, 20 + } if *m == modeSixel { cols *= cellX lines *= cellY -- cgit v1.3.1 From 701f6d535a8024e168d2ccc2d2cd100f4331b0e0 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 28 May 2026 19:59:45 -0700 Subject: Upgrade sixel --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 36cf1c7..5e5c7fd 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.3 require ( golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.0.0-20260528225709-a6d059daa153 + roseh.moe/pkg/sixel v0.1.0 ) require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index e7f3a84..cccc7a6 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.0.0-20260528225709-a6d059daa153 h1:Jq7Yv9BeWwBPA5BY238i0SpXDqKudsqvlTZUvbi6ZMg= -roseh.moe/pkg/sixel v0.0.0-20260528225709-a6d059daa153/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +roseh.moe/pkg/sixel v0.1.0 h1:cITZaYDf9CUK37DiUznx7Tnf8zcAkmWN806Sd1R7egk= +roseh.moe/pkg/sixel v0.1.0/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= -- cgit v1.3.1 From c86996f0faa0a10d378cc4803da7d919a57f6ee9 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 28 May 2026 20:17:40 -0700 Subject: Upgrade sixel --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5e5c7fd..c34030f 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.3 require ( golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.1.0 + roseh.moe/pkg/sixel v0.1.1-0.20260529031610-dcae1c9d1400 ) require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index cccc7a6..ad896ba 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.1.0 h1:cITZaYDf9CUK37DiUznx7Tnf8zcAkmWN806Sd1R7egk= -roseh.moe/pkg/sixel v0.1.0/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +roseh.moe/pkg/sixel v0.1.1-0.20260529031610-dcae1c9d1400 h1:CcZKo8QUETHOPZ1y7Rwj1cFlvgc/haH3wAQgVpmbbOA= +roseh.moe/pkg/sixel v0.1.1-0.20260529031610-dcae1c9d1400/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= -- cgit v1.3.1 From 414a1956b6a3361190adf20c03552ec45a334dc0 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 28 May 2026 21:50:44 -0700 Subject: Upgrade sixel --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c34030f..190ef6e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.3 require ( golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.1.1-0.20260529031610-dcae1c9d1400 + roseh.moe/pkg/sixel v0.1.1-0.20260529044947-f7d3521b78ec ) require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index ad896ba..b806498 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.1.1-0.20260529031610-dcae1c9d1400 h1:CcZKo8QUETHOPZ1y7Rwj1cFlvgc/haH3wAQgVpmbbOA= -roseh.moe/pkg/sixel v0.1.1-0.20260529031610-dcae1c9d1400/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +roseh.moe/pkg/sixel v0.1.1-0.20260529044947-f7d3521b78ec h1:/P22SD/EHqfdhuaemTUfqOjsSOdEjpw20t6wMu9SqRw= +roseh.moe/pkg/sixel v0.1.1-0.20260529044947-f7d3521b78ec/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= -- cgit v1.3.1 From 18c5d6d570f9c316d2ff0b319eb6d2500a7e7b0b Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Fri, 29 May 2026 06:49:47 -0700 Subject: Upgrade sixel --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 190ef6e..fe7ffd9 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.3 require ( golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.1.1-0.20260529044947-f7d3521b78ec + roseh.moe/pkg/sixel v0.1.1 ) require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index b806498..e85ed40 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.1.1-0.20260529044947-f7d3521b78ec h1:/P22SD/EHqfdhuaemTUfqOjsSOdEjpw20t6wMu9SqRw= -roseh.moe/pkg/sixel v0.1.1-0.20260529044947-f7d3521b78ec/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +roseh.moe/pkg/sixel v0.1.1 h1:F7N7ssbRz8i1pmY1Yz1CIw6dfLl64A+QsXaiufZbQTM= +roseh.moe/pkg/sixel v0.1.1/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= -- cgit v1.3.1 From 9bd2edbf80b3005f796df5907c1545911028c253 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Fri, 29 May 2026 17:48:22 -0700 Subject: Upgrade sixel --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fe7ffd9..0d8e407 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.3 require ( golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.1.1 + roseh.moe/pkg/sixel v0.1.2 ) require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index e85ed40..ff70566 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.1.1 h1:F7N7ssbRz8i1pmY1Yz1CIw6dfLl64A+QsXaiufZbQTM= -roseh.moe/pkg/sixel v0.1.1/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +roseh.moe/pkg/sixel v0.1.2 h1:dSRcqJ+sw8g3UdzFyGT+s9IZsWoR/bOBHoNuQh8HfsI= +roseh.moe/pkg/sixel v0.1.2/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= -- cgit v1.3.1 From 0c6cb370056bdef55fdfef8d543ee4daf2dadf8a Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 30 May 2026 11:10:44 -0700 Subject: Move median cut into icat --- go.mod | 2 +- go.sum | 4 +-- icat.go | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 118 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 0d8e407..2af2e32 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.3 require ( golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.1.2 + roseh.moe/pkg/sixel v0.2.0 ) require golang.org/x/sys v0.37.0 diff --git a/go.sum b/go.sum index ff70566..d9e7b04 100644 --- a/go.sum +++ b/go.sum @@ -2,5 +2,5 @@ golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.1.2 h1:dSRcqJ+sw8g3UdzFyGT+s9IZsWoR/bOBHoNuQh8HfsI= -roseh.moe/pkg/sixel v0.1.2/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +roseh.moe/pkg/sixel v0.2.0 h1:WkDXFmX7qk40fd870tsSTbFyKW5WUOy7h9FzXu6Q+xY= +roseh.moe/pkg/sixel v0.2.0/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= diff --git a/icat.go b/icat.go index a8768b3..592a714 100644 --- a/icat.go +++ b/icat.go @@ -6,10 +6,14 @@ import ( "flag" "fmt" "image" + "image/color" _ "image/gif" _ "image/jpeg" _ "image/png" + "math" + "math/rand/v2" "os" + "slices" _ "golang.org/x/image/bmp" "golang.org/x/image/draw" @@ -89,6 +93,116 @@ func load(filename string) (image.Image, error) { return img, nil } +func partition[S ~[]E, E any](a S, i, j, pivotIndex int, cmp func(E, E) int) int { + pivot := a[pivotIndex] + for { + for ; cmp(a[i], pivot) < 0; i++ { + } + for ; cmp(a[j], pivot) > 0; j-- { + } + if i >= j { + return j + } + a[i], a[j] = a[j], a[i] + i++ + j-- + } +} + +func quickSelect[S ~[]E, E any](list S, k int, cmp func(E, E) int) { + left, right := 0, len(list)-1 + for { + if left == right { + return + } + pivotIndex := left + rand.IntN(right-left+1) + pivotIndex = partition(list, left, right, pivotIndex, cmp) + if k <= pivotIndex { + right = pivotIndex + } else { + left = pivotIndex + 1 + } + } +} + +func bucketRange(colors []color.RGBA) color.RGBA { + if len(colors) == 0 { + return color.RGBA{} + } + var minR, minG, minB uint8 = math.MaxUint8, math.MaxUint8, math.MaxUint8 + var maxR, maxG, maxB uint8 + for _, c := range colors { + minR, maxR = min(minR, c.R), max(maxR, c.R) + minG, maxG = min(minG, c.G), max(maxG, c.G) + minB, maxB = min(minB, c.B), max(maxB, c.B) + } + return color.RGBA{R: maxR - minR, G: maxG - minG, B: maxB - minB} +} + +func cutOnce(colors []color.RGBA, bucketRange color.RGBA) [2][]color.RGBA { + if len(colors) == 0 { + return [...][]color.RGBA{colors, colors} + } + rRange, gRange, bRange := bucketRange.R, bucketRange.G, bucketRange.B + if rRange >= gRange && rRange >= bRange { + quickSelect(colors, len(colors)/2, func(x, y color.RGBA) int { return int(x.R) - int(y.R) }) + } else if gRange >= rRange && gRange >= bRange { + quickSelect(colors, len(colors)/2, func(x, y color.RGBA) int { return int(x.G) - int(y.G) }) + } else { + quickSelect(colors, len(colors)/2, func(x, y color.RGBA) int { return int(x.B) - int(y.B) }) + } + return [...][]color.RGBA{colors[:len(colors)/2], colors[len(colors)/2:]} +} + +func colorAvg(colors []color.RGBA) color.RGBA { + var r, g, b int64 + for _, c := range colors { + r += int64(c.R) + g += int64(c.G) + b += int64(c.B) + } + n := int64(len(colors)) + return color.RGBA{R: uint8(r / n), G: uint8(g / n), B: uint8(b / n), A: 0xff} +} + +func medianCut(img image.Image) color.Palette { + var colors []color.RGBA + for y := img.Bounds().Min.Y; y < img.Bounds().Max.Y; y++ { + for x := img.Bounds().Min.X; x < img.Bounds().Max.X; x++ { + r, g, b, a := img.At(x, y).RGBA() + if a > 0 { + colors = append(colors, color.RGBA{R: uint8(r >> 8), G: uint8(g >> 8), B: uint8(b >> 8), A: 0xff}) + } + } + } + buckets := [][]color.RGBA{colors} + bucketRanges := []color.RGBA{{}} + for { + var bestRange uint8 + var bestIdx int + for i, rng := range bucketRanges { + r := max(rng.R, rng.G, rng.B) + if r >= bestRange { + bestRange = r + bestIdx = i + } + } + split := cutOnce(buckets[bestIdx], bucketRanges[bestIdx]) + buckets = slices.Replace(buckets, bestIdx, bestIdx+1, split[:]...) + if len(buckets) == 255 { + break + } + bucketRanges = slices.Replace(bucketRanges, bestIdx, bestIdx+1, bucketRange(split[0]), bucketRange(split[1])) + } + palette := color.Palette{color.Transparent} + for _, b := range buckets { + if len(b) > 0 { + palette = append(palette, colorAvg(b)) + } + } + return palette +} + func printImg(img image.Image, x, y, pixelX, pixelY int) error { // Try not to stretch the image. if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { @@ -106,7 +220,7 @@ func printImg(img image.Image, x, y, pixelX, pixelY int) error { case modeBlock24: sixel.PrintBlock(os.Stdout, dst) case modeSixel: - sixel.Print(os.Stdout, dst) + sixel.Print(os.Stdout, dst, medianCut(dst)) } fmt.Println() return nil -- cgit v1.3.1 From 3730a6e124fd0ce550501dff0367cacfcacb83d9 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 30 May 2026 13:32:08 -0700 Subject: Add a benchmark for quickSelect --- bench_test.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 bench_test.go diff --git a/bench_test.go b/bench_test.go new file mode 100644 index 0000000..1047865 --- /dev/null +++ b/bench_test.go @@ -0,0 +1,22 @@ +package main + +import ( + "cmp" + "math/rand/v2" + "testing" +) + +func BenchmarkQuickSelect(b *testing.B) { + r := rand.New(rand.NewPCG(0, 0)) + testSlice := make([]int, 3840*2160) + for i := range testSlice { + testSlice[i] = r.Int() + } + myTestSlice := make([]int, len(testSlice)) + for b.Loop() { + b.StopTimer() + copy(myTestSlice, testSlice) + b.StartTimer() + quickSelect(myTestSlice, len(myTestSlice)/2, cmp.Compare) + } +} -- cgit v1.3.1 From a36546ca9b75ca829464ce1eebeeae12fdb194a5 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 30 May 2026 13:39:26 -0700 Subject: Floyd-Rivest --- bench_test.go | 14 +++++------- icat.go | 72 +++++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/bench_test.go b/bench_test.go index 1047865..1e79a10 100644 --- a/bench_test.go +++ b/bench_test.go @@ -7,16 +7,14 @@ import ( ) func BenchmarkQuickSelect(b *testing.B) { - r := rand.New(rand.NewPCG(0, 0)) - testSlice := make([]int, 3840*2160) - for i := range testSlice { - testSlice[i] = r.Int() - } - myTestSlice := make([]int, len(testSlice)) + rng := rand.New(rand.NewPCG(0, 0)) + myTestCase := make([]int, 3840*2160) for b.Loop() { b.StopTimer() - copy(myTestSlice, testSlice) + for i := range myTestCase { + myTestCase[i] = rng.Int() + } b.StartTimer() - quickSelect(myTestSlice, len(myTestSlice)/2, cmp.Compare) + quickSelect(myTestCase, len(myTestCase)/2, cmp.Compare) } } diff --git a/icat.go b/icat.go index 592a714..3fe9a35 100644 --- a/icat.go +++ b/icat.go @@ -11,7 +11,6 @@ import ( _ "image/jpeg" _ "image/png" "math" - "math/rand/v2" "os" "slices" @@ -93,38 +92,63 @@ func load(filename string) (image.Image, error) { return img, nil } -func partition[S ~[]E, E any](a S, i, j, pivotIndex int, cmp func(E, E) int) int { - pivot := a[pivotIndex] - for { - for ; cmp(a[i], pivot) < 0; i++ { - } - for ; cmp(a[j], pivot) > 0; j-- { - } - if i >= j { - return j - } - a[i], a[j] = a[j], a[i] - i++ - j-- +func sign(n int) float64 { + if n < 0 { + return -1 } + if n > 0 { + return 1 + } + return 0 } -func quickSelect[S ~[]E, E any](list S, k int, cmp func(E, E) int) { - left, right := 0, len(list)-1 - for { - if left == right { - return +func floydRivest[S ~[]E, E any](array S, left, right, k int, cmp func(E, E) int) { + for right > left { + if right-left > 600 { + n := right - left + 1 + i := k - left + 1 + z := math.Log(float64(n)) + s := .5 * math.Exp(2*z/3) + sd := .5 * math.Sqrt(z*s*(float64(n)-s)/float64(n)) * sign(i-n/2) + newLeft := max(left, int(float64(k)-float64(i)*s/float64(n)+sd)) + newRight := min(right, int(float64(k)+float64(n-i)*s/float64(n)+sd)) + floydRivest(array, newLeft, newRight, k, cmp) + } + t := array[k] + i := left + j := right + array[left], array[k] = array[k], array[left] + if cmp(array[right], t) > 0 { + array[right], array[left] = array[left], array[right] } - pivotIndex := left + rand.IntN(right-left+1) - pivotIndex = partition(list, left, right, pivotIndex, cmp) - if k <= pivotIndex { - right = pivotIndex + for i < j { + array[i], array[j] = array[j], array[i] + i++ + j-- + for ; cmp(array[i], t) < 0; i++ { + } + for ; cmp(array[j], t) > 0; j-- { + } + } + if cmp(array[left], t) == 0 { + array[left], array[j] = array[j], array[left] } else { - left = pivotIndex + 1 + j++ + array[j], array[right] = array[right], array[j] + } + if j <= k { + left = j + 1 + } + if k <= j { + right = j - 1 } } } +func quickSelect[S ~[]E, E any](list S, k int, cmp func(E, E) int) { + floydRivest(list, 0, len(list)-1, k, cmp) +} + func bucketRange(colors []color.RGBA) color.RGBA { if len(colors) == 0 { return color.RGBA{} -- cgit v1.3.1 From 96d706946e17e1ffbd81762175fd932f9dbe9a9d Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Sat, 30 May 2026 16:34:01 -0700 Subject: Bump deps --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 2af2e32..03814b0 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module roseh.moe/cmd/icat go 1.26.3 require ( - golang.org/x/image v0.32.0 - roseh.moe/pkg/sixel v0.2.0 + golang.org/x/image v0.41.0 + roseh.moe/pkg/sixel v0.2.1 ) -require golang.org/x/sys v0.37.0 +require golang.org/x/sys v0.45.0 diff --git a/go.sum b/go.sum index d9e7b04..f1bd094 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ -golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ= -golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc= -golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= -golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -roseh.moe/pkg/sixel v0.2.0 h1:WkDXFmX7qk40fd870tsSTbFyKW5WUOy7h9FzXu6Q+xY= -roseh.moe/pkg/sixel v0.2.0/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= +golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo= +golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +roseh.moe/pkg/sixel v0.2.1 h1:Njzw2wWOdyrIn+SEJ8Gir6qD8uzgJ7UuHL4em0k5Q3A= +roseh.moe/pkg/sixel v0.2.1/go.mod h1:DX/c+l3VYm+yXoACY+HXl2gLV5o5iAG6gkHeDddTSrQ= -- cgit v1.3.1 From 5efde7b99a748cae7989f1f6e022bfced4a4b841 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Tue, 9 Jun 2026 22:20:08 -0700 Subject: Apply some rounding --- icat.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/icat.go b/icat.go index 3fe9a35..9382332 100644 --- a/icat.go +++ b/icat.go @@ -73,6 +73,10 @@ func flagPrintMode(fs *flag.FlagSet, name string, value printMode, usage string) return &value } +func divRound[N ~int64 | ~int](n, d N) N { + return (n + d/2) / d +} + func load(filename string) (image.Image, error) { file := os.Stdin if filename != "-" { @@ -186,7 +190,7 @@ func colorAvg(colors []color.RGBA) color.RGBA { b += int64(c.B) } n := int64(len(colors)) - return color.RGBA{R: uint8(r / n), G: uint8(g / n), B: uint8(b / n), A: 0xff} + return color.RGBA{R: uint8(divRound(r, n)), G: uint8(divRound(g, n)), B: uint8(divRound(b, n)), A: 0xff} } func medianCut(img image.Image) color.Palette { @@ -230,9 +234,9 @@ func medianCut(img image.Image) color.Palette { func printImg(img image.Image, x, y, pixelX, pixelY int) error { // Try not to stretch the image. if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { - y = img.Bounds().Dy() * x / (img.Bounds().Dx() * pixelY / pixelX) + y = divRound(img.Bounds().Dy()*x*pixelX, img.Bounds().Dx()*pixelY) } else { - x = img.Bounds().Dx() * y * pixelY / pixelX / img.Bounds().Dy() + x = divRound(img.Bounds().Dx()*y*pixelY, pixelX*img.Bounds().Dy()) } dst := image.NewRGBA(image.Rect(0, 0, x, y)) -- cgit v1.3.1 From b2b0ff935fa517fd235887ad66b55c07ff0994f9 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 11 Jun 2026 21:14:40 -0700 Subject: Don't resize up every image --- icat.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/icat.go b/icat.go index 9382332..f7f31df 100644 --- a/icat.go +++ b/icat.go @@ -231,7 +231,9 @@ func medianCut(img image.Image) color.Palette { return palette } -func printImg(img image.Image, x, y, pixelX, pixelY int) error { +func printImg(img image.Image, maxX, maxY, pixelX, pixelY int) error { + x := min(img.Bounds().Dx(), maxX) + y := min(img.Bounds().Dy(), maxY) // Try not to stretch the image. if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { y = divRound(img.Bounds().Dy()*x*pixelX, img.Bounds().Dx()*pixelY) -- cgit v1.3.1 From 38b5c1a8ab5a6e9c1eadc4ebb56b4af9dc0cb7c6 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 11 Jun 2026 21:35:19 -0700 Subject: Don't resize unless necessary --- icat.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/icat.go b/icat.go index f7f31df..d1f7388 100644 --- a/icat.go +++ b/icat.go @@ -234,23 +234,26 @@ func medianCut(img image.Image) color.Palette { func printImg(img image.Image, maxX, maxY, pixelX, pixelY int) error { x := min(img.Bounds().Dx(), maxX) y := min(img.Bounds().Dy(), maxY) - // Try not to stretch the image. - if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { - y = divRound(img.Bounds().Dy()*x*pixelX, img.Bounds().Dx()*pixelY) - } else { - x = divRound(img.Bounds().Dx()*y*pixelY, pixelX*img.Bounds().Dy()) - } + if x != img.Bounds().Dx() || y != img.Bounds().Dy() { + // Try not to stretch the image. + if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { + y = divRound(img.Bounds().Dy()*x*pixelX, img.Bounds().Dx()*pixelY) + } else { + x = divRound(img.Bounds().Dx()*y*pixelY, pixelX*img.Bounds().Dy()) + } - dst := image.NewRGBA(image.Rect(0, 0, x, y)) - draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Src, nil) + dst := image.NewRGBA(image.Rect(0, 0, x, y)) + draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Src, nil) + img = dst + } switch *m { case modeBlock: - sixel.PrintXTerm16(os.Stdout, dst) + sixel.PrintXTerm16(os.Stdout, img) case modeBlock24: - sixel.PrintBlock(os.Stdout, dst) + sixel.PrintBlock(os.Stdout, img) case modeSixel: - sixel.Print(os.Stdout, dst, medianCut(dst)) + sixel.Print(os.Stdout, img, medianCut(img)) } fmt.Println() return nil -- cgit v1.3.1 From 6dba3cc038d8adfc35d893a4ed94aa001fe9c0b0 Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 11 Jun 2026 23:31:49 -0700 Subject: Fix a bug where image is stretched with -m block --- icat.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/icat.go b/icat.go index d1f7388..2b69170 100644 --- a/icat.go +++ b/icat.go @@ -234,14 +234,15 @@ func medianCut(img image.Image) color.Palette { func printImg(img image.Image, maxX, maxY, pixelX, pixelY int) error { x := min(img.Bounds().Dx(), maxX) y := min(img.Bounds().Dy(), maxY) - if x != img.Bounds().Dx() || y != img.Bounds().Dy() { - // Try not to stretch the image. - if y == 0 || x != 0 && img.Bounds().Dy()*x <= img.Bounds().Dx()*y*pixelY/pixelX { - y = divRound(img.Bounds().Dy()*x*pixelX, img.Bounds().Dx()*pixelY) - } else { - x = divRound(img.Bounds().Dx()*y*pixelY, pixelX*img.Bounds().Dy()) - } + // Try not to stretch the image. + if y == 0 || x != 0 && img.Bounds().Dy()*x*pixelX <= img.Bounds().Dx()*y*pixelY { + y = divRound(img.Bounds().Dy()*x*pixelX, img.Bounds().Dx()*pixelY) + } else { + x = divRound(img.Bounds().Dx()*y*pixelY, pixelX*img.Bounds().Dy()) + } + + if x != img.Bounds().Dx() || y != img.Bounds().Dy() { dst := image.NewRGBA(image.Rect(0, 0, x, y)) draw.BiLinear.Scale(dst, dst.Bounds(), img, img.Bounds(), draw.Src, nil) img = dst -- cgit v1.3.1