beenull/browsh
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Panning working well. This is now very, very usable. Time to tidy up.

Browse source
This commit is contained in:
Thomas Buckley-Houston 2016-05-21 02:01:52 +09:00
parent 13d9fadf41
commit 653eb6b1d7
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
interfacer/interfacer.go
View file

@ -36,10 +36,9 @@ var roundedDesktopY int
var hipWidth int
var hipHeight int
var panning bool
var panNeedsSetup bool
var panCachedXOffset float32
var panCachedYOffset float32
var panStartingX float32
var panStartingY float32
func initialise() {
dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
@ -247,23 +246,26 @@ func mouseEvent() {
xdotool("mousemove", fmt.Sprintf("%d", roundedDesktopX), fmt.Sprintf("%d", roundedDesktopY))
if ctrlPressed() && mouseMotion() && lastMouseButton == "1" {
panning = true
if panNeedsSetup {
panCachedXOffset = float32(C.xgrab)
panCachedYOffset = float32(C.ygrab)
panNeedsSetup = false
}
C.xgrab = C.int(desktopXFloat - panCachedXOffset)
C.ygrab = C.int(desktopYFloat - panCachedYOffset)
pan()
} else {
panNeedsSetup = true
panning = false
if !ctrlPressed() {
xdotool(mouseButtonStr(curev.Key)...)
}
}
}
func pan() {
if panNeedsSetup {
panStartingX = desktopXFloat
panStartingY = desktopYFloat
panNeedsSetup = false
}
C.xgrab = C.int(float32(C.xgrab) + panStartingX - desktopXFloat)
C.ygrab = C.int(float32(C.ygrab) + panStartingY - desktopYFloat)
keepViewportInDesktop()
}
// Convert terminal coords into desktop coords
func setCurrentDesktopCoords() {
var xOffset float32
@ -274,16 +276,8 @@ func setCurrentDesktopCoords() {
eventY := float32(curev.MouseY)
width := float32(C.width[C.SRC])
height := float32(C.height[C.SRC])
if panning {
// When panning starts we want to do it all within the same viewport.
// Without the caching here, then the viewport would change for each
// mouse movement and panning becomes overly sensitive.
xOffset = panCachedXOffset
yOffset = panCachedYOffset
} else {
xOffset = float32(C.xgrab)
yOffset = float32(C.ygrab)
}
xOffset = float32(C.xgrab)
yOffset = float32(C.ygrab)
desktopXFloat = (eventX * (width / hipWidthFloat)) + xOffset
desktopYFloat = (eventY * (height / hipHeightFloat)) + yOffset
log(