fix naming convention
This commit is contained in:
parent
01d6ea5ad0
commit
832968e8fc
@ -219,6 +219,6 @@ func (manager *RemoteManager) GetScreenSize() *types.ScreenSize {
|
||||
return xorg.GetScreenSize()
|
||||
}
|
||||
|
||||
func (manager *RemoteManager) SetKeyboard(layout string) {
|
||||
xorg.SetKeyboard(layout)
|
||||
func (manager *RemoteManager) SetKeyboardLayout(layout string) {
|
||||
xorg.SetKeyboardLayout(layout)
|
||||
}
|
@ -22,5 +22,5 @@ type RemoteManager interface {
|
||||
ReadClipboard() string
|
||||
WriteClipboard(data string)
|
||||
ResetKeys()
|
||||
SetKeyboard(layout string)
|
||||
SetKeyboardLayout(layout string)
|
||||
}
|
||||
|
@ -123,6 +123,6 @@ func (h *MessageHandler) controlKeyboard(id string, session types.Session, paylo
|
||||
return nil
|
||||
}
|
||||
|
||||
h.remote.SetKeyboard(payload.Layout)
|
||||
h.remote.SetKeyboardLayout(payload.Layout)
|
||||
return nil
|
||||
}
|
||||
|
@ -166,7 +166,7 @@ short XGetScreenRate() {
|
||||
return XRRConfigCurrentRate(conf);
|
||||
}
|
||||
|
||||
void SetKeyboard(char *layout) {
|
||||
void SetKeyboardLayout(char *layout) {
|
||||
// TOOD: refactor, use native API.
|
||||
char cmd[13] = "setxkbmap ";
|
||||
strncat(cmd, layout, 2);
|
||||
|
@ -211,7 +211,7 @@ func GetScreenSize() *types.ScreenSize {
|
||||
return nil
|
||||
}
|
||||
|
||||
func SetKeyboard(layout string) {
|
||||
func SetKeyboardLayout(layout string) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
|
||||
@ -222,7 +222,7 @@ func SetKeyboard(layout string) {
|
||||
layoutUnsafe := C.CString(layout)
|
||||
defer C.free(unsafe.Pointer(layoutUnsafe))
|
||||
|
||||
C.SetKeyboard(layoutUnsafe)
|
||||
C.SetKeyboardLayout(layoutUnsafe)
|
||||
}
|
||||
|
||||
//export goCreateScreenSize
|
||||
|
@ -39,6 +39,6 @@
|
||||
void XDisplayClose(void);
|
||||
void XDisplaySet(char *input);
|
||||
|
||||
void SetKeyboard(char *layout);
|
||||
void SetKeyboardLayout(char *layout);
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user