github/natpass
4
0
Fork 0
mirror of https://github.com/lwch/natpass.git synced 2026-10-21 07:26:15 +00:00
Code Issues Projects Releases Wiki Activity

修改子区域计算方式

Browse Source
This commit is contained in:
lwch
2021-11-02 17:59:04 +08:00
parent 650ceda05e
commit bebc935628
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/pool/send_vnc.go
+1 -6
View File
@@ -9,11 +9,6 @@ import (
// SendVNCImage send vnc image data
func (conn *Conn) SendVNCImage(to string, toIdx uint32, id string, screen, rect image.Rectangle,
encode network.VncImageEncoding, data []byte) {
dup := func(data []byte) []byte {
ret := make([]byte, len(data))
copy(ret, data)
return ret
}
var msg network.Msg
msg.To = to
msg.ToIdx = toIdx
@@ -30,7 +25,7 @@ func (conn *Conn) SendVNCImage(to string, toIdx uint32, id string, screen, rect
RectHeight: uint32(rect.Dy()),
},
Encode: encode,
Data: dup(data),
Data: data,
},
}
select {
code/client/tunnel/vnc/link.go
+19 -6
View File
@@ -149,6 +149,19 @@ func (link *Link) close() {
link.remote.SendDisconnect(link.target, link.targetIdx, link.id)
}
func cut(src *image.RGBA, rect image.Rectangle) *image.RGBA {
size := rect.Size()
ret := image.NewRGBA(image.Rect(0, 0, rect.Max.X, rect.Max.Y))
sx := src.Bounds().Size().X * 4
dx := rect.Min.X * 4
idx := rect.Min.Y*sx + dx
for y := 0; y < size.Y; y++ {
copy(ret.Pix[y*size.X*4:], src.Pix[idx:idx+size.X*4-1])
idx += sx
}
return ret
}
func (link *Link) sendAll(img *image.RGBA) {
size := img.Bounds()
screen := image.Rect(0, 0, img.Rect.Dx(), img.Rect.Dy())
@@ -164,10 +177,10 @@ func (link *Link) sendAll(img *image.RGBA) {
height = zoneHeight
}
rect := image.Rect(x, y, x+width, y+height)
next := img.SubImage(rect)
next := cut(img, rect)
if link.quality == 100 {
link.remote.SendVNCImage(link.target, link.targetIdx, link.id,
screen, rect, network.VncImage_raw, next.(*image.RGBA).Pix)
screen, rect, network.VncImage_raw, next.Pix)
continue
}
buf.Reset()
@@ -177,7 +190,7 @@ func (link *Link) sendAll(img *image.RGBA) {
screen, rect, network.VncImage_jpeg, buf.Bytes())
} else {
link.remote.SendVNCImage(link.target, link.targetIdx, link.id,
screen, rect, network.VncImage_raw, next.(*image.RGBA).Pix)
screen, rect, network.VncImage_raw, next.Pix)
}
}
}
@@ -188,10 +201,10 @@ func (link *Link) sendDiff(img *image.RGBA) {
screen := image.Rect(0, 0, img.Rect.Dx(), img.Rect.Dy())
var buf bytes.Buffer
for _, block := range blocks {
next := img.SubImage(block)
next := cut(img, block)
if link.quality == 100 {
link.remote.SendVNCImage(link.target, link.targetIdx, link.id,
screen, block, network.VncImage_raw, next.(*image.RGBA).Pix)
screen, block, network.VncImage_raw, next.Pix)
continue
}
buf.Reset()
@@ -201,7 +214,7 @@ func (link *Link) sendDiff(img *image.RGBA) {
screen, block, network.VncImage_jpeg, buf.Bytes())
} else {
link.remote.SendVNCImage(link.target, link.targetIdx, link.id,
screen, block, network.VncImage_raw, next.(*image.RGBA).Pix)
screen, block, network.VncImage_raw, next.Pix)
}
}
}