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

@ -43,7 +43,8 @@ func (h *RoomHandler) Route(r chi.Router) {
})
r.Route("/keyboard", func(r chi.Router) {
r.With(auth.HostsOnly).Post("/layout", h.keyboardLayoutSet)
r.Get("/map", h.keyboardMapGet)
r.With(auth.HostsOnly).Post("/map", h.keyboardMapSet)
r.Get("/modifiers", h.keyboardModifiersGet)
r.With(auth.HostsOnly).Post("/modifiers", h.keyboardModifiersSet)

View File

@ -7,7 +7,7 @@ import (
"demodesk/neko/internal/types"
)
type KeyboardLayoutData struct {
type KeyboardMapData struct {
Layout string `json:"layout"`
Variant string `json:"variant"`
}
@ -17,21 +17,39 @@ type KeyboardModifiersData struct {
CapsLock *bool `json:"capslock"`
}
func (h *RoomHandler) keyboardLayoutSet(w http.ResponseWriter, r *http.Request) {
data := &KeyboardLayoutData{}
func (h *RoomHandler) keyboardMapSet(w http.ResponseWriter, r *http.Request) {
data := &KeyboardMapData{}
if !utils.HttpJsonRequest(w, r, data) {
return
}
err := h.desktop.SetKeyboardLayout(data.Layout, data.Variant)
err := h.desktop.SetKeyboardMap(types.KeyboardMap{
Layout: data.Layout,
Variant: data.Variant,
})
if err != nil{
utils.HttpInternalServerError(w, "Unable to change keyboard layout.")
utils.HttpInternalServerError(w, "Unable to change keyboard map.")
return
}
utils.HttpSuccess(w)
}
func (h *RoomHandler) keyboardMapGet(w http.ResponseWriter, r *http.Request) {
data, err := h.desktop.GetKeyboardMap()
if err != nil{
utils.HttpInternalServerError(w, "Unable to get keyboard map.")
return
}
utils.HttpSuccess(w, KeyboardMapData{
Layout: data.Layout,
Variant: data.Variant,
})
}
func (h *RoomHandler) keyboardModifiersSet(w http.ResponseWriter, r *http.Request) {
data := &KeyboardModifiersData{}
if !utils.HttpJsonRequest(w, r, data) {