KeyboardLayout to KeyboardMap.

This commit is contained in:
Miroslav Šedivý
2021-01-15 16:53:03 +01:00
parent 8c47cbae68
commit 0e09609c67
8 changed files with 76 additions and 22 deletions

View File

@ -76,12 +76,12 @@ func (h *MessageHandlerCtx) Message(session types.Session, raw []byte) bool {
})
// Keyboard Events
case event.KEYBOARD_MODIFIERS:
payload := &message.KeyboardLayout{}
case event.KEYBOARD_MAP:
payload := &message.KeyboardMap{}
err = utils.Unmarshal(payload, raw, func() error {
return h.keyboardLayout(session, payload)
return h.keyboardMap(session, payload)
})
case event.KEYBOARD_LAYOUT:
case event.KEYBOARD_MODIFIERS:
payload := &message.KeyboardModifiers{}
err = utils.Unmarshal(payload, raw, func() error {
return h.keyboardModifiers(session, payload)

View File

@ -6,13 +6,16 @@ import (
)
func (h *MessageHandlerCtx) keyboardLayout(session types.Session, payload *message.KeyboardLayout) error {
func (h *MessageHandlerCtx) keyboardMap(session types.Session, payload *message.KeyboardMap) error {
if !session.IsHost() {
h.logger.Debug().Str("id", session.ID()).Msg("is not the host")
return nil
}
return h.desktop.SetKeyboardLayout(payload.Layout, payload.Variant)
return h.desktop.SetKeyboardMap(types.KeyboardMap{
Layout: payload.Layout,
Variant: payload.Variant,
})
}
func (h *MessageHandlerCtx) keyboardModifiers(session types.Session, payload *message.KeyboardModifiers) error {