xorg refactor.

server/internal/desktop/xorg.go

@@ -1,7 +1,10 @@
 package desktop
 
 import (
+	"image"
 	"os/exec"
+	"regexp"
+	"time"
 
 	"m1k1o/neko/internal/desktop/xorg"
 	"m1k1o/neko/internal/types"
@@ -11,26 +14,54 @@ func (manager *DesktopManagerCtx) Move(x, y int) {
 	xorg.Move(x, y)
 }
 
+func (manager *DesktopManagerCtx) GetCursorPosition() (int, int) {
+	return xorg.GetCursorPosition()
+}
+
 func (manager *DesktopManagerCtx) Scroll(x, y int) {
 	xorg.Scroll(x, y)
 }
 
-func (manager *DesktopManagerCtx) ButtonDown(code int) error {
+func (manager *DesktopManagerCtx) ButtonDown(code uint32) error {
 	return xorg.ButtonDown(code)
 }
 
-func (manager *DesktopManagerCtx) KeyDown(code uint64) error {
+func (manager *DesktopManagerCtx) KeyDown(code uint32) error {
 	return xorg.KeyDown(code)
 }
 
-func (manager *DesktopManagerCtx) ButtonUp(code int) error {
+func (manager *DesktopManagerCtx) ButtonUp(code uint32) error {
 	return xorg.ButtonUp(code)
 }
 
-func (manager *DesktopManagerCtx) KeyUp(code uint64) error {
+func (manager *DesktopManagerCtx) KeyUp(code uint32) error {
 	return xorg.KeyUp(code)
 }
 
+func (manager *DesktopManagerCtx) ButtonPress(code uint32) error {
+	xorg.ResetKeys()
+	defer xorg.ResetKeys()
+
+	return xorg.ButtonDown(code)
+}
+
+func (manager *DesktopManagerCtx) KeyPress(codes ...uint32) error {
+	xorg.ResetKeys()
+	defer xorg.ResetKeys()
+
+	for _, code := range codes {
+		if err := xorg.KeyDown(code); err != nil {
+			return err
+		}
+	}
+
+	if len(codes) > 1 {
+		time.Sleep(10 * time.Millisecond)
+	}
+
+	return nil
+}
+
 func (manager *DesktopManagerCtx) ResetKeys() {
 	xorg.ResetKeys()
 }
@@ -39,14 +70,72 @@ func (manager *DesktopManagerCtx) ScreenConfigurations() map[int]types.ScreenCon
 	return xorg.ScreenConfigurations
 }
 
+func (manager *DesktopManagerCtx) SetScreenSize(size types.ScreenSize) error {
+	return xorg.ChangeScreenSize(size.Width, size.Height, size.Rate)
+}
+
 func (manager *DesktopManagerCtx) GetScreenSize() *types.ScreenSize {
 	return xorg.GetScreenSize()
 }
 
-func (manager *DesktopManagerCtx) SetKeyboardLayout(layout string) {
-	_ = exec.Command("setxkbmap", layout).Run()
+func (manager *DesktopManagerCtx) SetKeyboardMap(kbd types.KeyboardMap) error {
+	// TOOD: Use native API.
+	cmd := exec.Command("setxkbmap", "-layout", kbd.Layout, "-variant", kbd.Variant)
+	_, err := cmd.Output()
+	return err
 }
 
-func (manager *DesktopManagerCtx) SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int) {
-	xorg.SetKeyboardModifiers(NumLock, CapsLock, ScrollLock)
+func (manager *DesktopManagerCtx) GetKeyboardMap() (*types.KeyboardMap, error) {
+	// TOOD: Use native API.
+	cmd := exec.Command("setxkbmap", "-query")
+	res, err := cmd.Output()
+	if err != nil {
+		return nil, err
+	}
+
+	kbd := types.KeyboardMap{}
+
+	re := regexp.MustCompile(`layout:\s+(.*)\n`)
+	arr := re.FindStringSubmatch(string(res))
+	if len(arr) > 1 {
+		kbd.Layout = arr[1]
+	}
+
+	re = regexp.MustCompile(`variant:\s+(.*)\n`)
+	arr = re.FindStringSubmatch(string(res))
+	if len(arr) > 1 {
+		kbd.Variant = arr[1]
+	}
+
+	return &kbd, nil
+}
+
+func (manager *DesktopManagerCtx) SetKeyboardModifiers(mod types.KeyboardModifiers) {
+	if mod.NumLock != nil {
+		xorg.SetKeyboardModifier(xorg.KbdModNumLock, *mod.NumLock)
+	}
+
+	if mod.CapsLock != nil {
+		xorg.SetKeyboardModifier(xorg.KbdModCapsLock, *mod.CapsLock)
+	}
+}
+
+func (manager *DesktopManagerCtx) GetKeyboardModifiers() types.KeyboardModifiers {
+	modifiers := xorg.GetKeyboardModifiers()
+
+	NumLock := (modifiers & xorg.KbdModNumLock) != 0
+	CapsLock := (modifiers & xorg.KbdModCapsLock) != 0
+
+	return types.KeyboardModifiers{
+		NumLock:  &NumLock,
+		CapsLock: &CapsLock,
+	}
+}
+
+func (manager *DesktopManagerCtx) GetCursorImage() *types.CursorImage {
+	return xorg.GetCursorImage()
+}
+
+func (manager *DesktopManagerCtx) GetScreenshotImage() *image.RGBA {
+	return xorg.GetScreenshotImage()
 }