lukajankovic/remote-touchpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor: Use switch statement

Browse source
This commit is contained in:
Unrud 2023-02-23 01:09:03 +01:00
parent 79a88dc676
commit 6f03281fc7
4 changed files with 52 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

9
inputcontrol/controller_portal.go
View file

@ -237,13 +237,14 @@ func (p *portalController) PointerButton(button PointerButton, press bool) error
return errors.New("dbus connection closed")
}
var btn int32
if button == PointerButtonLeft {
switch button {
case PointerButtonLeft:
btn = btnLeft
} else if button == PointerButtonMiddle {
case PointerButtonMiddle:
btn = btnMiddle
} else if button == PointerButtonRight {
case PointerButtonRight:
btn = btnRight
} else {
default:
return errors.New("unsupported pointer button")
}
state := btnReleased

39
inputcontrol/controller_windows.go
View file

@ -135,43 +135,44 @@ func (p *windowsController) KeyboardText(text string) error {
func (p *windowsController) KeyboardKey(key Key) error {
input := keybdInput{typ: inputKeyboard}
if key == KeyBackSpace {
switch key {
case KeyBackSpace:
input.wVk = vkBack
} else if key == KeyReturn {
case KeyReturn:
input.wVk = vkReturn
} else if key == KeyEnd {
case KeyEnd:
input.wVk = vkEnd
} else if key == KeyHome {
case KeyHome:
input.wVk = vkHome
} else if key == KeyLeft {
case KeyLeft:
input.wVk = vkLeft
} else if key == KeyUp {
case KeyUp:
input.wVk = vkUp
} else if key == KeyRight {
case KeyRight:
input.wVk = vkRight
} else if key == KeyDown {
case KeyDown:
input.wVk = vkDown
} else if key == KeyDelete {
case KeyDelete:
input.wVk = vkDelete
} else if key == KeySuper {
case KeySuper:
input.wVk = vkLwin
} else if key == KeyBrowserBack {
case KeyBrowserBack:
input.wVk = vkBrowserBack
} else if key == KeyBrowserForward {
case KeyBrowserForward:
input.wVk = vkBrowserForward
} else if key == KeyVolumeMute {
case KeyVolumeMute:
input.wVk = vkVolumeMute
} else if key == KeyVolumeDown {
case KeyVolumeDown:
input.wVk = vkVolumeDown
} else if key == KeyVolumeUp {
case KeyVolumeUp:
input.wVk = vkVolumeUp
} else if key == KeyMediaNextTrack {
case KeyMediaNextTrack:
input.wVk = vkMediaNextTrack
} else if key == KeyMediaPrevTrack {
case KeyMediaPrevTrack:
input.wVk = vkMediaPrevTrack
} else if key == KeyMediaPlayPause {
case KeyMediaPlayPause:
input.wVk = vkMediaPlayPause
} else {
default:
return errors.New("key not mapped to virtual-key code")
}
inputs := [...]keybdInput{input, input}

12
inputcontrol/controller_x11.go
View file

@ -301,16 +301,16 @@ func (p *x11Controller) sendButton(button uint, press bool) error {
}
func (p *x11Controller) PointerButton(button PointerButton, press bool) error {
if button == PointerButtonLeft {
switch button {
case PointerButtonLeft:
return p.sendButton(1, press)
}
if button == PointerButtonRight {
case PointerButtonRight:
return p.sendButton(3, press)
}
if button == PointerButtonMiddle {
case PointerButtonMiddle:
return p.sendButton(2, press)
default:
return errors.New("unsupported pointer button")
}
return errors.New("unsupported pointer button")
}
func (p *x11Controller) PointerMove(deltaX, deltaY int) error {

57
inputcontrol/keysyms.go
View file

@ -66,59 +66,44 @@ func RuneToKeysym(runeValue rune) (Keysym, error) {
}
func KeyToKeysym(key Key) (Keysym, error) {
if key == KeyBackSpace {
switch key {
case KeyBackSpace:
return xkBackSpace, nil
}
if key == KeyReturn {
case KeyReturn:
return xkReturn, nil
}
if key == KeyDelete {
case KeyDelete:
return xkDelete, nil
}
if key == KeyHome {
case KeyHome:
return xkHome, nil
}
if key == KeyLeft {
case KeyLeft:
return xkLeft, nil
}
if key == KeyUp {
case KeyUp:
return xkUp, nil
}
if key == KeyRight {
case KeyRight:
return xkRight, nil
}
if key == KeyDown {
case KeyDown:
return xkDown, nil
}
if key == KeyEnd {
case KeyEnd:
return xkEnd, nil
}
if key == KeySuper {
case KeySuper:
return xkSuperL, nil
}
if key == KeyVolumeMute {
case KeyVolumeMute:
return xf86xkAudioMute, nil
}
if key == KeyVolumeDown {
case KeyVolumeDown:
return xf86xkAudioLowerVolume, nil
}
if key == KeyVolumeUp {
case KeyVolumeUp:
return xf86xkAudioRaiseVolume, nil
}
if key == KeyMediaPlayPause {
case KeyMediaPlayPause:
return xf86xkAudioPlay, nil
}
if key == KeyMediaPrevTrack {
case KeyMediaPrevTrack:
return xf86xkAudioPrev, nil
}
if key == KeyMediaNextTrack {
case KeyMediaNextTrack:
return xf86xkAudioNext, nil
}
if key == KeyBrowserBack {
case KeyBrowserBack:
return xf86xkBack, nil
}
if key == KeyBrowserForward {
case KeyBrowserForward:
return xf86xkForward, nil
default:
return 0, errors.New("key not mapped to keysym")
}
return 0, errors.New("key not mapped to keysym")
}