KeyboardLayout to KeyboardMap.

internal/types/desktop.go

@@ -26,6 +26,11 @@ type KeyboardModifiers struct {
 	CapsLock *bool
 }
 
+type KeyboardMap struct {
+	Layout  string
+	Variant string
+}
+
 type DesktopManager interface {
 	Start()
 	Shutdown() error
@@ -43,7 +48,8 @@ type DesktopManager interface {
 	ResetKeys()
 	ScreenConfigurations() map[int]ScreenConfiguration
 	GetScreenSize() *ScreenSize
-	SetKeyboardLayout(layout string, variant string) error
+	SetKeyboardMap(KeyboardMap) error
+	GetKeyboardMap() (*KeyboardMap, error)
 	SetKeyboardModifiers(mod KeyboardModifiers)
 	GetKeyboardModifiers() KeyboardModifiers
 	GetCursorImage() *CursorImage

internal/types/event/events.go

@@ -41,7 +41,7 @@ const (
 
 const (
 	KEYBOARD_MODIFIERS = "keyboard/modifiers"
-	KEYBOARD_LAYOUT    = "keyboard/layout"
+	KEYBOARD_MAP       = "keyboard/map"
 )
 
 const (

internal/types/message/messages.go

@@ -132,6 +132,12 @@ type ClipboardData struct {
 // Keyboard
 /////////////////////////////
 
+type KeyboardMap struct {
+	Event   string `json:"event,omitempty"`
+	Layout  string `json:"layout"`
+	Variant string `json:"variant"`
+}
+
 type KeyboardModifiers struct {
 	Event      string `json:"event,omitempty"`
 	CapsLock   *bool  `json:"caps_lock"`
@@ -139,12 +145,6 @@ type KeyboardModifiers struct {
 	ScrollLock *bool  `json:"scroll_lock"`	
 }
 
-type KeyboardLayout struct {
-	Event   string `json:"event,omitempty"`
-	Layout  string `json:"layout"`
-	Variant string `json:"variant"`
-}
-
 /////////////////////////////
 // Cursor
 /////////////////////////////