iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'guacamole-kbd' of github.com:m1k1o/neko into kbd-modifier-state-sync

Browse Source
This commit is contained in:
m1k1o
2020-06-21 03:09:53 +02:00
parent 6f4bbeb452 832968e8fc
commit 38e1b8f3e5
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/internal/xorg/xorg.c
View File

@ -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);

4
server/internal/xorg/xorg.go
View File

@ -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)
}
func SetKeyboardModifiers(num_lock int, caps_lock int, scroll_lock int) {

2
server/internal/xorg/xorg.h
View File

@ -40,7 +40,7 @@
void XDisplayClose(void);
void XDisplaySet(char *input);
void SetKeyboard(char *layout);
void SetKeyboardLayout(char *layout);
void SetKeyboardModifiers(int num_lock, int caps_lock, int scroll_lock);
#endif