mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 11:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set data size for SHM transmission as on some platforms the actual SHM size is not equal to the requested size

Browse Source
This commit is contained in:
Kovid Goyal
2023-01-01 12:57:41 +05:30
parent efdfaaec30
commit 24db38ba7e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/cmd/icat/transmit.go
View File

@@ -42,15 +42,16 @@ func gc_for_image(imgd *image_data, frame_num int, frame *image_frame) *graphics
func transmit_shm(imgd *image_data, frame_num int, frame *image_frame) (err error) { func transmit_shm(imgd *image_data, frame_num int, frame *image_frame) (err error) {
var mmap shm.MMap var mmap shm.MMap
var data_size int64
if frame.in_memory_bytes == nil { if frame.in_memory_bytes == nil {
f, err := os.Open(frame.filename) f, err := os.Open(frame.filename)
if err != nil { if err != nil {
return fmt.Errorf("Failed to open image data output file: %s with error: %w", frame.filename, err) return fmt.Errorf("Failed to open image data output file: %s with error: %w", frame.filename, err)
} }
defer f.Close() defer f.Close()
sz, _ := f.Seek(0, io.SeekEnd) data_size, _ = f.Seek(0, io.SeekEnd)
f.Seek(0, io.SeekStart) f.Seek(0, io.SeekStart)
mmap, err = shm.CreateTemp("icat-*", uint64(sz)) mmap, err = shm.CreateTemp("icat-*", uint64(data_size))
if err != nil { if err != nil {
return fmt.Errorf("Failed to create a SHM file for transmission: %w", err) return fmt.Errorf("Failed to create a SHM file for transmission: %w", err)
} }
@@ -68,7 +69,8 @@ func transmit_shm(imgd *image_data, frame_num int, frame *image_frame) (err erro
} }
} }
} else { } else {
mmap, err = shm.CreateTemp("icat-*", uint64(len(frame.in_memory_bytes))) data_size = int64(len(frame.in_memory_bytes))
mmap, err = shm.CreateTemp("icat-*", uint64(data_size))
if err != nil { if err != nil {
return fmt.Errorf("Failed to create a SHM file for transmission: %w", err) return fmt.Errorf("Failed to create a SHM file for transmission: %w", err)
} }
@@ -77,6 +79,7 @@ func transmit_shm(imgd *image_data, frame_num int, frame *image_frame) (err erro
} }
gc := gc_for_image(imgd, frame_num, frame) gc := gc_for_image(imgd, frame_num, frame)
gc.SetTransmission(graphics.GRT_transmission_sharedmem) gc.SetTransmission(graphics.GRT_transmission_sharedmem)
gc.SetDataSize(uint64(data_size))
gc.WriteWithPayloadToLoop(lp, utils.UnsafeStringToBytes(mmap.Name())) gc.WriteWithPayloadToLoop(lp, utils.UnsafeStringToBytes(mmap.Name()))
return nil return nil
@@ -85,6 +88,7 @@ func transmit_shm(imgd *image_data, frame_num int, frame *image_frame) (err erro
func transmit_file(imgd *image_data, frame_num int, frame *image_frame) (err error) { func transmit_file(imgd *image_data, frame_num int, frame *image_frame) (err error) {
is_temp := false is_temp := false
fname := "" fname := ""
var data_size int
if frame.in_memory_bytes == nil { if frame.in_memory_bytes == nil {
is_temp = frame.filename_is_temporary is_temp = frame.filename_is_temporary
fname, err = filepath.Abs(frame.filename) fname, err = filepath.Abs(frame.filename)
@@ -97,6 +101,7 @@ func transmit_file(imgd *image_data, frame_num int, frame *image_frame) (err err
if err != nil { if err != nil {
return fmt.Errorf("Failed to create a temp file for image data transmission: %w", err) return fmt.Errorf("Failed to create a temp file for image data transmission: %w", err)
} }
data_size = len(frame.in_memory_bytes)
_, err = bytes.NewBuffer(frame.in_memory_bytes).WriteTo(f) _, err = bytes.NewBuffer(frame.in_memory_bytes).WriteTo(f)
f.Close() f.Close()
if err != nil { if err != nil {
@@ -111,6 +116,9 @@ func transmit_file(imgd *image_data, frame_num int, frame *image_frame) (err err
} else { } else {
gc.SetTransmission(graphics.GRT_transmission_file) gc.SetTransmission(graphics.GRT_transmission_file)
} }
if data_size > 0 {
gc.SetDataSize(uint64(data_size))
}
gc.WriteWithPayloadToLoop(lp, utils.UnsafeStringToBytes(fname)) gc.WriteWithPayloadToLoop(lp, utils.UnsafeStringToBytes(fname))
return nil return nil
} }
@@ -129,7 +137,6 @@ func transmit_stream(imgd *image_data, frame_num int, frame *image_frame) (err e
} }
} }
gc := gc_for_image(imgd, frame_num, frame) gc := gc_for_image(imgd, frame_num, frame)
gc.SetDataSize(uint64(len(data))) // needed in case compression is used
gc.WriteWithPayloadToLoop(lp, data) gc.WriteWithPayloadToLoop(lp, data)
return nil return nil
} }

1
tools/tui/graphics/command.go
View File

@@ -545,6 +545,7 @@ func (self *GraphicsCommand) WriteWithPayloadTo(o io.StringWriter, payload []byt
compressed := compress_with_zlib(payload) compressed := compress_with_zlib(payload)
if len(compressed) < len(payload) { if len(compressed) < len(payload) {
gc.SetCompression(GRT_compression_zlib) gc.SetCompression(GRT_compression_zlib)
gc.SetDataSize(uint64(len(payload)))
payload = compressed payload = compressed
} }
data := base64.StdEncoding.EncodeToString(payload) data := base64.StdEncoding.EncodeToString(payload)