diff options
| author | theimpostor <sahirhoda@gmail.com> | 2023-07-13 08:31:57 -0500 |
|---|---|---|
| committer | theimpostor <sahirhoda@gmail.com> | 2023-07-13 08:31:57 -0500 |
| commit | f5f03ff3b3abdead67580677c4ba2742f0bdcc0b (patch) | |
| tree | 57c0336936f886c573e15a9843964bdfb0089652 | |
| parent | 09705bb0313861ee16c40a4bb39a131edbb09761 (diff) | |
WIP adding paste support
| -rw-r--r-- | go.mod | 12 | ||||
| -rw-r--r-- | go.sum | 41 | ||||
| -rw-r--r-- | main.go | 116 |
3 files changed, 153 insertions, 16 deletions
@@ -1,3 +1,15 @@ module github.com/theimpostor/osc52 go 1.17 + +require golang.org/x/sys v0.10.0 + +require ( + github.com/gdamore/encoding v1.0.0 // indirect + github.com/gdamore/tcell/v2 v2.6.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect + github.com/rivo/uniseg v0.4.3 // indirect + golang.org/x/term v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect +) @@ -0,0 +1,41 @@ +github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg= +github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= +github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +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/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/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.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.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 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +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 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +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/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -5,9 +5,12 @@ import ( "encoding/base64" "flag" "fmt" + "github.com/gdamore/tcell/v2" "io" "log" "os" + "syscall" + // "golang.org/x/sys/unix" ) func encode(fname string, encoder io.WriteCloser) { @@ -41,27 +44,108 @@ With no arguments, will read from stdin. fmt.Fprintf(flag.CommandLine.Output(), template, os.Args[0]) } + pasteFlag := flag.Bool("paste", false, "paste operation") + flag.Parse() - if len(flag.Args()) > 0 { - fnames = flag.Args() + if !*pasteFlag { + // copy + if len(flag.Args()) > 0 { + fnames = flag.Args() + } else { + fnames = []string{"-"} + } + + // Open buffered output, using default max OSC52 length as buffer size + out := bufio.NewWriterSize(os.Stdout, 1000000) + + // Start OSC52 + fmt.Fprintf(out, "\033]52;c;") + + b64 := base64.NewEncoder(base64.StdEncoding, out) + for _, fname := range fnames { + encode(fname, b64) + } + b64.Close() + + // End OSC52 + fmt.Fprintf(out, "\a") + + out.Flush() } else { - fnames = []string{"-"} - } + // paste - // Open buffered output, using default max OSC52 length as buffer size - out := bufio.NewWriterSize(os.Stdout, 1000000) + // Start OSC52 + fmt.Printf("\033]52;c;?\a") - // Start OSC52 - fmt.Fprintf(out, "\033]52;c;") + readFunc := func() (data []byte) { + var err error + tty, err := tcell.NewDevTty() + if err != nil { + fmt.Fprintln(os.Stderr, "ERROR: tcell.NewDevTty:", err) + return + } + defer func() { + if err = tty.Drain(); err != nil { + fmt.Fprintln(os.Stderr, "Drain error:", err) + } + if err = tty.Stop(); err != nil { + fmt.Fprintln(os.Stderr, "Drain error:", err) + } + if err = tty.Close(); err != nil { + fmt.Fprintln(os.Stderr, "Drain error:", err) + } + }() + if err = tty.Start(); err != nil { + fmt.Fprintln(os.Stderr, "Start error:", err) + } - b64 := base64.NewEncoder(base64.StdEncoding, out) - for _, fname := range fnames { - encode(fname, b64) - } - b64.Close() + ttyReader := bufio.NewReader(tty) + data, err = ttyReader.ReadBytes('\a') + if err != nil && err != syscall.EAGAIN { + fmt.Fprintln(os.Stderr, "Read error:", err) + return + } + return + } + buf := readFunc() + // fmt.Fprintln(os.Stderr, "Read", len(buf), "bytes") + fmt.Fprintf(os.Stderr, "Read %d bytes, %x\n", len(buf), buf) + // fmt.Fprintln(os.Stderr, "Read:", string(buf[:])) + + // tty, err := os.OpenFile("/dev/tty", os.O_RDONLY, 0) + // if err != nil { + // fmt.Fprintln(os.Stderr, "Error opening /dev/tty:", err) + // return + // } + // defer tty.Close() - // End OSC52 - fmt.Fprintf(out, "\a") + // // set nonblocking + // err = unix.SetNonblock(int(tty.Fd()), true) + // if err != nil { + // fmt.Fprintln(os.Stderr, "Error setting nonblock:", err) + // return + // } - out.Flush() + // // Create a byte slice to read into + // buf := make([]byte, 1) + + // for { + // // Try to read + // n, err := tty.Read(buf) + // if err != nil && err != syscall.EAGAIN { + // fmt.Fprintln(os.Stderr, "Read error:", err) + // return + // } + + // // If we got some data, print it + // if n > 0 { + // fmt.Fprintln(os.Stderr, "Read:", string(buf[:n])) + + // if buf[0] == byte('\a') { + // fmt.Fprintln(os.Stderr, "END") + // break + // } + // } + // } + } } |
