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") return errors.New("dbus connection closed")
} }
var btn int32 var btn int32
if button == PointerButtonLeft { switch button {
case PointerButtonLeft:
btn = btnLeft btn = btnLeft
} else if button == PointerButtonMiddle { case PointerButtonMiddle:
btn = btnMiddle btn = btnMiddle
} else if button == PointerButtonRight { case PointerButtonRight:
btn = btnRight btn = btnRight
} else { default:
return errors.New("unsupported pointer button") return errors.New("unsupported pointer button")
} }
state := btnReleased 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 { func (p *windowsController) KeyboardKey(key Key) error {
input := keybdInput{typ: inputKeyboard} input := keybdInput{typ: inputKeyboard}
if key == KeyBackSpace { switch key {
case KeyBackSpace:
input.wVk = vkBack input.wVk = vkBack
} else if key == KeyReturn { case KeyReturn:
input.wVk = vkReturn input.wVk = vkReturn
} else if key == KeyEnd { case KeyEnd:
input.wVk = vkEnd input.wVk = vkEnd
} else if key == KeyHome { case KeyHome:
input.wVk = vkHome input.wVk = vkHome
} else if key == KeyLeft { case KeyLeft:
input.wVk = vkLeft input.wVk = vkLeft
} else if key == KeyUp { case KeyUp:
input.wVk = vkUp input.wVk = vkUp
} else if key == KeyRight { case KeyRight:
input.wVk = vkRight input.wVk = vkRight
} else if key == KeyDown { case KeyDown:
input.wVk = vkDown input.wVk = vkDown
} else if key == KeyDelete { case KeyDelete:
input.wVk = vkDelete input.wVk = vkDelete
} else if key == KeySuper { case KeySuper:
input.wVk = vkLwin input.wVk = vkLwin
} else if key == KeyBrowserBack { case KeyBrowserBack:
input.wVk = vkBrowserBack input.wVk = vkBrowserBack
} else if key == KeyBrowserForward { case KeyBrowserForward:
input.wVk = vkBrowserForward input.wVk = vkBrowserForward
} else if key == KeyVolumeMute { case KeyVolumeMute:
input.wVk = vkVolumeMute input.wVk = vkVolumeMute
} else if key == KeyVolumeDown { case KeyVolumeDown:
input.wVk = vkVolumeDown input.wVk = vkVolumeDown
} else if key == KeyVolumeUp { case KeyVolumeUp:
input.wVk = vkVolumeUp input.wVk = vkVolumeUp
} else if key == KeyMediaNextTrack { case KeyMediaNextTrack:
input.wVk = vkMediaNextTrack input.wVk = vkMediaNextTrack
} else if key == KeyMediaPrevTrack { case KeyMediaPrevTrack:
input.wVk = vkMediaPrevTrack input.wVk = vkMediaPrevTrack
} else if key == KeyMediaPlayPause { case KeyMediaPlayPause:
input.wVk = vkMediaPlayPause input.wVk = vkMediaPlayPause
} else { default:
return errors.New("key not mapped to virtual-key code") return errors.New("key not mapped to virtual-key code")
} }
inputs := [...]keybdInput{input, input} 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 { func (p *x11Controller) PointerButton(button PointerButton, press bool) error {
if button == PointerButtonLeft { switch button {
case PointerButtonLeft:
return p.sendButton(1, press) return p.sendButton(1, press)
} case PointerButtonRight:
if button == PointerButtonRight {
return p.sendButton(3, press) return p.sendButton(3, press)
} case PointerButtonMiddle:
if button == PointerButtonMiddle {
return p.sendButton(2, press) 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 { 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) { func KeyToKeysym(key Key) (Keysym, error) {
if key == KeyBackSpace { switch key {
case KeyBackSpace:
return xkBackSpace, nil return xkBackSpace, nil
} case KeyReturn:
if key == KeyReturn {
return xkReturn, nil return xkReturn, nil
} case KeyDelete:
if key == KeyDelete {
return xkDelete, nil return xkDelete, nil
} case KeyHome:
if key == KeyHome {
return xkHome, nil return xkHome, nil
} case KeyLeft:
if key == KeyLeft {
return xkLeft, nil return xkLeft, nil
} case KeyUp:
if key == KeyUp {
return xkUp, nil return xkUp, nil
} case KeyRight:
if key == KeyRight {
return xkRight, nil return xkRight, nil
} case KeyDown:
if key == KeyDown {
return xkDown, nil return xkDown, nil
} case KeyEnd:
if key == KeyEnd {
return xkEnd, nil return xkEnd, nil
} case KeySuper:
if key == KeySuper {
return xkSuperL, nil return xkSuperL, nil
} case KeyVolumeMute:
if key == KeyVolumeMute {
return xf86xkAudioMute, nil return xf86xkAudioMute, nil
} case KeyVolumeDown:
if key == KeyVolumeDown {
return xf86xkAudioLowerVolume, nil return xf86xkAudioLowerVolume, nil
} case KeyVolumeUp:
if key == KeyVolumeUp {
return xf86xkAudioRaiseVolume, nil return xf86xkAudioRaiseVolume, nil
} case KeyMediaPlayPause:
if key == KeyMediaPlayPause {
return xf86xkAudioPlay, nil return xf86xkAudioPlay, nil
} case KeyMediaPrevTrack:
if key == KeyMediaPrevTrack {
return xf86xkAudioPrev, nil return xf86xkAudioPrev, nil
} case KeyMediaNextTrack:
if key == KeyMediaNextTrack {
return xf86xkAudioNext, nil return xf86xkAudioNext, nil
} case KeyBrowserBack:
if key == KeyBrowserBack {
return xf86xkBack, nil return xf86xkBack, nil
} case KeyBrowserForward:
if key == KeyBrowserForward {
return xf86xkForward, nil return xf86xkForward, nil
} default:
return 0, errors.New("key not mapped to keysym") return 0, errors.New("key not mapped to keysym")
}
} }