Linux client support (#16)

* Allow building linux client, go fmt, misc

cmd/mockserver/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/gookit/color"
 	"github.com/vmihailenco/msgpack/v5"
-	"ledctl3/pkg/events"
+	"ledctl3/internal/pkg/events"
 	"ledctl3/pkg/udp"
 )
 
@@ -28,7 +28,7 @@ func main() {
 		}
 
 		fmt.Print("\r")
-		for i:=0; i<len(e.Data); i+= 4 {
+		for i := 0; i < len(e.Data); i += 4 {
 			color.RGB(e.Data[i], e.Data[i+1], e.Data[i+2], true).Print("  ")
 		}
 	}

cmd/server/main.go

@@ -5,13 +5,13 @@ import (
 	"time"
 )
 
-func main()  {
+func main() {
 	ctl, err := server.New()
 	if err != nil {
-        panic(err)
-    }
+		panic(err)
+	}
 
-	err= ctl.Start()
+	err = ctl.Start()
 	if err != nil {
 		panic(err)
 	}

internal/client/api/client.go

@@ -7,8 +7,8 @@ import (
 )
 
 type Client struct {
-	id string
-	mux sync.Mutex
+	id   string
+	mux  sync.Mutex
 	conn *websocket.Conn
 }
 
@@ -30,7 +30,7 @@ func (c *Client) Receive() ([]byte, error) {
 
 func NewClient(conn *websocket.Conn) *Client {
 	return &Client{
-		id:  shortuuid.New(),
+		id:   shortuuid.New(),
 		conn: conn,
 	}
 }

internal/client/api/ws.go

@@ -35,8 +35,8 @@ func (h *Hub) AcceptWebsocketConnection(w http.ResponseWriter, req *http.Request
 
 		// trigger the event
 		h.evts <- Event{
-            ClientId: client.id,
-            Data: b,
-        }
+			ClientId: client.id,
+			Data:     b,
+		}
 	}
 }

internal/client/app.go

@@ -6,13 +6,13 @@ import (
 	"ledctl3/internal/client/controller"
 	"ledctl3/internal/client/controller/ambilight"
 	"ledctl3/internal/client/interfaces"
-	"ledctl3/pkg/events"
+	"ledctl3/internal/pkg/events"
 	"ledctl3/pkg/udp"
 )
 
 type App struct {
-	DefaultMode  controller.Mode
-	BlackPoint int
+	DefaultMode controller.Mode
+	BlackPoint  int
 
 	Host       string
 	Port       int

internal/client/config/config.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"gopkg.in/yaml.v3"
+	"ledctl3/internal/client"
 	"os"
 )
 
@@ -27,10 +28,10 @@ type Server struct {
 }
 
 type Display struct {
-	Width      int    `yaml:"width" json:"width"`
-	Height     int    `yaml:"height" json:"height"`
-	Leds       int    `yaml:"leds" json:"leds"`
-	Bounds     Bounds `yaml:"bounds" json:"bounds"`
+	Width  int    `yaml:"width" json:"width"`
+	Height int    `yaml:"height" json:"height"`
+	Leds   int    `yaml:"leds" json:"leds"`
+	Bounds Bounds `yaml:"bounds" json:"bounds"`
 }
 
 type Bounds struct {
@@ -118,19 +119,21 @@ func Load() (*Config, error) {
 func createDefault() (*Config, error) {
 	c := Config{
 		DefaultMode:  "ambilight",
-		CapturerType: "dxgi",
+		CapturerType: "bitblt",
 		Server: Server{
 			Host:       "0.0.0.0",
 			Port:       4197,
 			Leds:       100,
-			StripType:  "GRB",
+			StripType:  string(client.GRB),
 			GpioPin:    18,
 			Brightness: 255,
 			BlackPoint: 0,
 		},
 		Displays: []Display{
 			{
 				Leds: 100,
+				Width: 1920,
+				Height: 1080,
 				Bounds: Bounds{
 					From: Vector2{X: 0, Y: 0},
 					To:   Vector2{X: 0, Y: 0},

internal/client/controller/ambilight/ambilight.go

@@ -100,9 +100,9 @@ func (v *Visualizer) process(d interfaces.Display, pix []byte) {
 	pix = adjustWhitePoint(pix, 16, 256)
 
 	v.events <- interfaces.UpdateEvent{
-        Display: d,
-        Data:    pix,
-    }
+		Display: d,
+		Data:    pix,
+	}
 }
 
 // adjustWhitePoint adjusts the white point for each color individually.

internal/client/controller/ambilight/capturer/bitblt/capturer.go

@@ -8,7 +8,7 @@ import (
 
 var scaleFactor = 8
 
-type bitbltCapturer struct{
+type bitbltCapturer struct {
 	displays []interfaces.Display
 }
 

internal/client/controller/ambilight/capturer/bitblt/display.go

@@ -8,12 +8,12 @@ import (
 )
 
 type display struct {
-	id       int
-	width    int
-	height   int
-	x        int
-	y        int
-	scaler    draw.Scaler
+	id     int
+	width  int
+	height int
+	x      int
+	y      int
+	scaler draw.Scaler
 }
 
 func (d *display) SyncCapture(ctx context.Context, frames chan []byte) {

internal/client/controller/ambilight/capturer/dxgi/capturer.go

@@ -18,10 +18,10 @@ func (c *dxgiCapturer) All() ([]interfaces.Display, error) {
 
 	count := screenshot.NumActiveDisplays()
 	for i := 0; i < count; i++ {
-		bounds := screenshot.GetDisplayBounds(1-i) // TODO: fix weird displays order
+		bounds := screenshot.GetDisplayBounds(1 - i) // TODO: fix weird displays order
 
 		d := &display{
-			id:    i,
+			id:     i,
 			width:  bounds.Dx(),
 			height: bounds.Dy(),
 			x:      bounds.Min.X,

internal/client/controller/ambilight/capturer/dxgi/display_linux.go

@@ -0,0 +1,62 @@
+package dxgi
+
+import (
+	"context"
+	"fmt"
+	"golang.org/x/image/draw"
+	"image"
+)
+
+type display struct {
+	index  int
+	id     int
+	width  int
+	height int
+	x      int
+	y      int
+	scaler draw.Scaler
+	buf    *image.RGBA
+}
+
+func (d *display) Id() int {
+	return 0
+}
+
+func (d *display) Width() int {
+	return d.width
+}
+
+func (d *display) Height() int {
+	return d.height
+}
+
+func (d *display) X() int {
+	return d.x
+}
+
+func (d *display) Y() int {
+	return d.y
+}
+
+func (d *display) Scaler() draw.Scaler {
+	return d.scaler
+}
+
+func (d *display) Resolution() string {
+	return fmt.Sprintf("%dx%d", d.width, d.height)
+}
+
+
+func (d *display) String() string {
+	return fmt.Sprintf("{id: %d, width: %d, height: %d, left: %d, top: %d}", d.id, d.width, d.height, d.x, d.y)
+}
+
+func (d *display) Capture(ctx context.Context) chan []byte {
+	return nil
+}
+
+func (d *display) reset() error {
+	return nil
+}
+
+func (d *display) SyncCapture(ctx context.Context, frames chan []byte) {}

internal/client/controller/ambilight/capturer/dxgi/display.go → internal/client/controller/ambilight/capturer/dxgi/display_windows.go

@@ -14,17 +14,17 @@ var framerate = 1000
 var ErrNoFrame = fmt.Errorf("no frame")
 
 type display struct {
-	index    int
-	id       int
-	width    int
-	height   int
-	x        int
-	y        int
-	scaler   draw.Scaler
-	buf      *image.RGBA
-	dev      *d3d.ID3D11Device
-	devCtx   *d3d.ID3D11DeviceContext
-	ddup     *d3d.OutputDuplicator
+	index  int
+	id     int
+	width  int
+	height int
+	x      int
+	y      int
+	scaler draw.Scaler
+	buf    *image.RGBA
+	dev    *d3d.ID3D11Device
+	devCtx *d3d.ID3D11DeviceContext
+	ddup   *d3d.OutputDuplicator
 }
 
 func (d *display) Id() int {

internal/client/controller/ambilight/capturer/scrap/capturer.go

@@ -20,7 +20,7 @@ func (c *dxgiCapturer) All() ([]interfaces.Display, error) {
 		bounds := screenshot.GetDisplayBounds(i)
 
 		d := &display{
-			index: i,
+			index:  i,
 			width:  bounds.Dx(),
 			height: bounds.Dy(),
 			x:      bounds.Min.X,

internal/client/controller/ambilight/capturer/scrap/display_linux.go

@@ -0,0 +1,62 @@
+package scrap
+
+import (
+	"context"
+	"fmt"
+	"golang.org/x/image/draw"
+	"image"
+)
+
+type display struct {
+	index  int
+	id     int
+	width  int
+	height int
+	x      int
+	y      int
+	scaler draw.Scaler
+	buf    *image.RGBA
+}
+
+func (d *display) Id() int {
+	return 0
+}
+
+func (d *display) Width() int {
+	return d.width
+}
+
+func (d *display) Height() int {
+	return d.height
+}
+
+func (d *display) X() int {
+	return d.x
+}
+
+func (d *display) Y() int {
+	return d.y
+}
+
+func (d *display) Scaler() draw.Scaler {
+	return d.scaler
+}
+
+func (d *display) Resolution() string {
+	return fmt.Sprintf("%dx%d", d.width, d.height)
+}
+
+
+func (d *display) String() string {
+	return fmt.Sprintf("{id: %d, width: %d, height: %d, left: %d, top: %d}", d.id, d.width, d.height, d.x, d.y)
+}
+
+func (d *display) Capture(ctx context.Context) chan []byte {
+	return nil
+}
+
+func (d *display) reset() error {
+	return nil
+}
+
+func (d *display) SyncCapture(ctx context.Context, frames chan []byte) {}

internal/client/controller/ambilight/options.go

@@ -26,4 +26,3 @@ func WithDisplayConfig(cfg []DisplayConfig) Option {
 		return nil
 	}
 }
-

internal/client/controller/controller.go

@@ -3,7 +3,7 @@ package controller
 import (
 	"github.com/vmihailenco/msgpack/v5"
 	"ledctl3/internal/client/interfaces"
-	"ledctl3/pkg/events"
+	"ledctl3/internal/pkg/events"
 )
 
 type Controller struct {

internal/client/interfaces/interfaces.go

@@ -36,7 +36,7 @@ type Visualizer interface {
 
 type UpdateEvent struct {
 	Display Display
-	Data []byte
+	Data    []byte
 }
 
 type Updater interface {

internal/server/app.go

@@ -3,7 +3,7 @@ package server
 import (
 	"fmt"
 	"github.com/vmihailenco/msgpack/v5"
-	"ledctl3/pkg/events"
+	"ledctl3/internal/pkg/events"
 	"ledctl3/pkg/udp"
 	"ledctl3/pkg/ws281x"
 )