split remote to desktop and capture.

server/internal/types/capture.go

@@ -0,0 +1,14 @@
+package types
+
+type CaptureManager interface {
+	VideoCodec() string
+	AudioCodec() string
+	Start()
+	Shutdown() error
+	OnVideoFrame(listener func(sample Sample))
+	OnAudioFrame(listener func(sample Sample))
+	StartStream()
+	StopStream()
+	Streaming() bool
+	ChangeResolution(width int, height int, rate int) error
+}

server/internal/types/config/capture.go

@@ -1,14 +1,11 @@
 package config
 
 import (
-	"regexp"
-	"strconv"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
-type Remote struct {
+type Capture struct {
 	Display      string
 	Device       string
 	AudioCodec   string
@@ -18,13 +15,10 @@ type Remote struct {
 	VideoCodec   string
 	VideoParams  string
 	VideoBitrate uint
-	ScreenWidth  int
-	ScreenHeight int
-	ScreenRate   int
 	MaxFPS       int
 }
 
-func (Remote) Init(cmd *cobra.Command) error {
+func (Capture) Init(cmd *cobra.Command) error {
 	cmd.PersistentFlags().String("display", ":99.0", "XDisplay to capture")
 	if err := viper.BindPFlag("display", cmd.PersistentFlags().Lookup("display")); err != nil {
 		return err
@@ -55,11 +49,6 @@ func (Remote) Init(cmd *cobra.Command) error {
 		return err
 	}
 
-	cmd.PersistentFlags().String("screen", "1280x720@30", "default screen resolution and framerate")
-	if err := viper.BindPFlag("screen", cmd.PersistentFlags().Lookup("screen")); err != nil {
-		return err
-	}
-
 	cmd.PersistentFlags().Int("max_fps", 25, "maximum fps delivered via WebRTC, 0 is for no maximum")
 	if err := viper.BindPFlag("max_fps", cmd.PersistentFlags().Lookup("max_fps")); err != nil {
 		return err
@@ -111,7 +100,7 @@ func (Remote) Init(cmd *cobra.Command) error {
 	return nil
 }
 
-func (s *Remote) Set() {
+func (s *Capture) Set() {
 	audioCodec := "Opus"
 	if viper.GetBool("opus") {
 		audioCodec = "Opus"
@@ -146,24 +135,5 @@ func (s *Remote) Set() {
 	s.VideoParams = viper.GetString("video")
 	s.VideoBitrate = viper.GetUint("video_bitrate")
 
-	s.ScreenWidth = 1280
-	s.ScreenHeight = 720
-	s.ScreenRate = 30
-
-	r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`)
-	res := r.FindStringSubmatch(viper.GetString("screen"))
-
-	if len(res) > 0 {
-		width, err1 := strconv.ParseInt(res[1], 10, 64)
-		height, err2 := strconv.ParseInt(res[2], 10, 64)
-		rate, err3 := strconv.ParseInt(res[3], 10, 64)
-
-		if err1 == nil && err2 == nil && err3 == nil {
-			s.ScreenWidth = int(width)
-			s.ScreenHeight = int(height)
-			s.ScreenRate = int(rate)
-		}
-	}
-
 	s.MaxFPS = viper.GetInt("max_fps")
 }

server/internal/types/config/desktop.go

@@ -0,0 +1,51 @@
+package config
+
+import (
+	"os"
+	"regexp"
+	"strconv"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+type Desktop struct {
+	Display string
+
+	ScreenWidth  int
+	ScreenHeight int
+	ScreenRate   int
+}
+
+func (Desktop) Init(cmd *cobra.Command) error {
+	cmd.PersistentFlags().String("screen", "1280x720@30", "default screen resolution and framerate")
+	if err := viper.BindPFlag("screen", cmd.PersistentFlags().Lookup("screen")); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *Desktop) Set() {
+	// Display is provided by env variable
+	s.Display = os.Getenv("DISPLAY")
+
+	s.ScreenWidth = 1280
+	s.ScreenHeight = 720
+	s.ScreenRate = 30
+
+	r := regexp.MustCompile(`([0-9]{1,4})x([0-9]{1,4})@([0-9]{1,3})`)
+	res := r.FindStringSubmatch(viper.GetString("screen"))
+
+	if len(res) > 0 {
+		width, err1 := strconv.ParseInt(res[1], 10, 64)
+		height, err2 := strconv.ParseInt(res[2], 10, 64)
+		rate, err3 := strconv.ParseInt(res[3], 10, 64)
+
+		if err1 == nil && err2 == nil && err3 == nil {
+			s.ScreenWidth = int(width)
+			s.ScreenHeight = int(height)
+			s.ScreenRate = int(rate)
+		}
+	}
+}

server/internal/types/desktop.go

@@ -1,27 +1,21 @@
 package types
 
-type RemoteManager interface {
-	VideoCodec() string
-	AudioCodec() string
+type DesktopManager interface {
 	Start()
 	Shutdown() error
-	OnVideoFrame(listener func(sample Sample))
-	OnAudioFrame(listener func(sample Sample))
-	StartStream()
-	StopStream()
-	Streaming() bool
-	ChangeResolution(width int, height int, rate int) error
-	GetScreenSize() *ScreenSize
-	ScreenConfigurations() map[int]ScreenConfiguration
+	// clipboard
+	ReadClipboard() string
+	WriteClipboard(data string)
+	// xorg
 	Move(x, y int)
 	Scroll(x, y int)
 	ButtonDown(code int) error
 	KeyDown(code uint64) error
 	ButtonUp(code int) error
 	KeyUp(code uint64) error
-	ReadClipboard() string
-	WriteClipboard(data string)
 	ResetKeys()
+	ScreenConfigurations() map[int]ScreenConfiguration
+	GetScreenSize() *ScreenSize
 	SetKeyboardLayout(layout string)
 	SetKeyboardModifiers(NumLock int, CapsLock int, ScrollLock int)
 }