clipboard: introduce native clipboard, clip-persist, clip-storage functionality

core/internal/server/clipboard/handlers.go

@@ -0,0 +1,215 @@
+package clipboard
+
+import (
+	"encoding/json"
+	"fmt"
+	"net"
+
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/models"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/params"
+)
+
+func HandleRequest(conn net.Conn, req models.Request, m *Manager) {
+	switch req.Method {
+	case "clipboard.getState":
+		handleGetState(conn, req, m)
+	case "clipboard.getHistory":
+		handleGetHistory(conn, req, m)
+	case "clipboard.getEntry":
+		handleGetEntry(conn, req, m)
+	case "clipboard.deleteEntry":
+		handleDeleteEntry(conn, req, m)
+	case "clipboard.clearHistory":
+		handleClearHistory(conn, req, m)
+	case "clipboard.copy":
+		handleCopy(conn, req, m)
+	case "clipboard.paste":
+		handlePaste(conn, req, m)
+	case "clipboard.subscribe":
+		handleSubscribe(conn, req, m)
+	case "clipboard.search":
+		handleSearch(conn, req, m)
+	case "clipboard.getConfig":
+		handleGetConfig(conn, req, m)
+	case "clipboard.setConfig":
+		handleSetConfig(conn, req, m)
+	case "clipboard.store":
+		handleStore(conn, req, m)
+	default:
+		models.RespondError(conn, req.ID, "unknown method: "+req.Method)
+	}
+}
+
+func handleGetState(conn net.Conn, req models.Request, m *Manager) {
+	models.Respond(conn, req.ID, m.GetState())
+}
+
+func handleGetHistory(conn net.Conn, req models.Request, m *Manager) {
+	history := m.GetHistory()
+	for i := range history {
+		history[i].Data = nil
+	}
+	models.Respond(conn, req.ID, history)
+}
+
+func handleGetEntry(conn net.Conn, req models.Request, m *Manager) {
+	id, err := params.Int(req.Params, "id")
+	if err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	entry, err := m.GetEntry(uint64(id))
+	if err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	models.Respond(conn, req.ID, entry)
+}
+
+func handleDeleteEntry(conn net.Conn, req models.Request, m *Manager) {
+	id, err := params.Int(req.Params, "id")
+	if err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	if err := m.DeleteEntry(uint64(id)); err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "entry deleted"})
+}
+
+func handleClearHistory(conn net.Conn, req models.Request, m *Manager) {
+	m.ClearHistory()
+	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "history cleared"})
+}
+
+func handleCopy(conn net.Conn, req models.Request, m *Manager) {
+	text, err := params.String(req.Params, "text")
+	if err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	if err := m.CopyText(text); err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "copied to clipboard"})
+}
+
+func handlePaste(conn net.Conn, req models.Request, m *Manager) {
+	text, err := m.PasteText()
+	if err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	models.Respond(conn, req.ID, map[string]string{"text": text})
+}
+
+func handleSubscribe(conn net.Conn, req models.Request, m *Manager) {
+	clientID := fmt.Sprintf("clipboard-%d", req.ID)
+
+	ch := m.Subscribe(clientID)
+	defer m.Unsubscribe(clientID)
+
+	initialState := m.GetState()
+	if err := json.NewEncoder(conn).Encode(models.Response[State]{
+		ID:     req.ID,
+		Result: &initialState,
+	}); err != nil {
+		return
+	}
+
+	for state := range ch {
+		if err := json.NewEncoder(conn).Encode(models.Response[State]{
+			ID:     req.ID,
+			Result: &state,
+		}); err != nil {
+			return
+		}
+	}
+}
+
+func handleSearch(conn net.Conn, req models.Request, m *Manager) {
+	p := SearchParams{
+		Query:    params.StringOpt(req.Params, "query", ""),
+		MimeType: params.StringOpt(req.Params, "mimeType", ""),
+		Limit:    params.IntOpt(req.Params, "limit", 50),
+		Offset:   params.IntOpt(req.Params, "offset", 0),
+	}
+
+	if img, ok := req.Params["isImage"].(bool); ok {
+		p.IsImage = &img
+	}
+	if b, ok := req.Params["before"].(float64); ok {
+		v := int64(b)
+		p.Before = &v
+	}
+	if a, ok := req.Params["after"].(float64); ok {
+		v := int64(a)
+		p.After = &v
+	}
+
+	models.Respond(conn, req.ID, m.Search(p))
+}
+
+func handleGetConfig(conn net.Conn, req models.Request, m *Manager) {
+	models.Respond(conn, req.ID, m.GetConfig())
+}
+
+func handleSetConfig(conn net.Conn, req models.Request, m *Manager) {
+	cfg := m.GetConfig()
+
+	if _, ok := req.Params["maxHistory"]; ok {
+		cfg.MaxHistory = params.IntOpt(req.Params, "maxHistory", cfg.MaxHistory)
+	}
+	if _, ok := req.Params["maxEntrySize"]; ok {
+		cfg.MaxEntrySize = int64(params.IntOpt(req.Params, "maxEntrySize", int(cfg.MaxEntrySize)))
+	}
+	if _, ok := req.Params["autoClearDays"]; ok {
+		cfg.AutoClearDays = params.IntOpt(req.Params, "autoClearDays", cfg.AutoClearDays)
+	}
+	if v, ok := req.Params["clearAtStartup"].(bool); ok {
+		cfg.ClearAtStartup = v
+	}
+	if v, ok := req.Params["disabled"].(bool); ok {
+		cfg.Disabled = v
+	}
+	if v, ok := req.Params["disableHistory"].(bool); ok {
+		cfg.DisableHistory = v
+	}
+	if v, ok := req.Params["disablePersist"].(bool); ok {
+		cfg.DisablePersist = v
+	}
+
+	if err := m.SetConfig(cfg); err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "config updated"})
+}
+
+func handleStore(conn net.Conn, req models.Request, m *Manager) {
+	data, err := params.String(req.Params, "data")
+	if err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	mimeType := params.StringOpt(req.Params, "mimeType", "text/plain;charset=utf-8")
+
+	if err := m.StoreData([]byte(data), mimeType); err != nil {
+		models.RespondError(conn, req.ID, err.Error())
+		return
+	}
+
+	models.Respond(conn, req.ID, models.SuccessResult{Success: true, Message: "stored"})
+}

core/internal/server/clipboard/types.go

@@ -0,0 +1,191 @@
+package clipboard
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"sync"
+	"time"
+
+	bolt "go.etcd.io/bbolt"
+
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/wlcontext"
+	wlclient "github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
+)
+
+type Config struct {
+	MaxHistory     int   `json:"maxHistory"`
+	MaxEntrySize   int64 `json:"maxEntrySize"`
+	AutoClearDays  int   `json:"autoClearDays"`
+	ClearAtStartup bool  `json:"clearAtStartup"`
+
+	Disabled       bool `json:"disabled"`
+	DisableHistory bool `json:"disableHistory"`
+	DisablePersist bool `json:"disablePersist"`
+}
+
+func DefaultConfig() Config {
+	return Config{
+		MaxHistory:     100,
+		MaxEntrySize:   5 * 1024 * 1024,
+		AutoClearDays:  0,
+		ClearAtStartup: false,
+	}
+}
+
+func getConfigPath() (string, error) {
+	configDir, err := os.UserConfigDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(configDir, "DankMaterialShell", "clsettings.json"), nil
+}
+
+func LoadConfig() Config {
+	cfg := DefaultConfig()
+
+	path, err := getConfigPath()
+	if err != nil {
+		return cfg
+	}
+
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return cfg
+	}
+
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return DefaultConfig()
+	}
+	return cfg
+}
+
+func SaveConfig(cfg Config) error {
+	path, err := getConfigPath()
+	if err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+		return err
+	}
+
+	data, err := json.MarshalIndent(cfg, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(path, data, 0644)
+}
+
+type SearchParams struct {
+	Query    string `json:"query"`
+	MimeType string `json:"mimeType"`
+	IsImage  *bool  `json:"isImage"`
+	Limit    int    `json:"limit"`
+	Offset   int    `json:"offset"`
+	Before   *int64 `json:"before"`
+	After    *int64 `json:"after"`
+}
+
+type SearchResult struct {
+	Entries []Entry `json:"entries"`
+	Total   int     `json:"total"`
+	HasMore bool    `json:"hasMore"`
+}
+
+type Entry struct {
+	ID        uint64    `json:"id"`
+	Data      []byte    `json:"data,omitempty"`
+	MimeType  string    `json:"mimeType"`
+	Preview   string    `json:"preview"`
+	Size      int       `json:"size"`
+	Timestamp time.Time `json:"timestamp"`
+	IsImage   bool      `json:"isImage"`
+}
+
+type State struct {
+	Enabled bool    `json:"enabled"`
+	History []Entry `json:"history"`
+	Current *Entry  `json:"current,omitempty"`
+}
+
+type Manager struct {
+	config      Config
+	configMutex sync.RWMutex
+	configPath  string
+
+	display *wlclient.Display
+	wlCtx   *wlcontext.SharedContext
+
+	registry       *wlclient.Registry
+	dataControlMgr any
+	seat           *wlclient.Seat
+	dataDevice     any
+	currentOffer   any
+	currentSource  any
+	seatName       uint32
+	mimeTypes      []string
+	offerMimeTypes map[any][]string
+	offerMutex     sync.RWMutex
+	offerRegistry  map[uint32]any
+
+	sourceMimeTypes []string
+	sourceMutex     sync.RWMutex
+
+	persistData      map[string][]byte
+	persistMimeTypes []string
+	persistMutex     sync.RWMutex
+
+	isOwner     bool
+	ownerLock   sync.Mutex
+	initialized bool
+
+	alive    bool
+	stopChan chan struct{}
+
+	db     *bolt.DB
+	dbPath string
+
+	state      *State
+	stateMutex sync.RWMutex
+
+	subscribers map[string]chan State
+	subMutex    sync.RWMutex
+	dirty       chan struct{}
+	notifierWg  sync.WaitGroup
+	lastState   *State
+}
+
+func (m *Manager) GetState() State {
+	m.stateMutex.RLock()
+	defer m.stateMutex.RUnlock()
+	if m.state == nil {
+		return State{}
+	}
+	return *m.state
+}
+
+func (m *Manager) Subscribe(id string) chan State {
+	ch := make(chan State, 64)
+	m.subMutex.Lock()
+	m.subscribers[id] = ch
+	m.subMutex.Unlock()
+	return ch
+}
+
+func (m *Manager) Unsubscribe(id string) {
+	m.subMutex.Lock()
+	if ch, ok := m.subscribers[id]; ok {
+		close(ch)
+		delete(m.subscribers, id)
+	}
+	m.subMutex.Unlock()
+}
+
+func (m *Manager) notifySubscribers() {
+	select {
+	case m.dirty <- struct{}{}:
+	default:
+	}
+}

core/internal/server/router.go

@@ -8,6 +8,7 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
@@ -147,6 +148,15 @@ func RouteRequest(conn net.Conn, req models.Request) {
 		return
 	}
 
+	if strings.HasPrefix(req.Method, "clipboard.") {
+		if clipboardManager == nil {
+			models.RespondError(conn, req.ID, "clipboard manager not initialized")
+			return
+		}
+		clipboard.HandleRequest(conn, req, clipboardManager)
+		return
+	}
+
 	switch req.Method {
 	case "ping":
 		models.Respond(conn, req.ID, "pong")

core/internal/server/server.go

@@ -18,6 +18,7 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/apppicker"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/bluez"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/brightness"
+	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/clipboard"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/cups"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/dwl"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/server/evdev"
@@ -32,7 +33,7 @@ import (
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/syncmap"
 )
 
-const APIVersion = 22
+const APIVersion = 23
 
 var CLIVersion = "dev"
 
@@ -63,6 +64,7 @@ var extWorkspaceManager *extworkspace.Manager
 var brightnessManager *brightness.Manager
 var wlrOutputManager *wlroutput.Manager
 var evdevManager *evdev.Manager
+var clipboardManager *clipboard.Manager
 var wlContext *wlcontext.SharedContext
 
 var capabilitySubscribers syncmap.Map[string, chan ServerInfo]
@@ -336,6 +338,31 @@ func InitializeEvdevManager() error {
 	return nil
 }
 
+func InitializeClipboardManager() error {
+	log.Info("Attempting to initialize clipboard manager...")
+
+	if wlContext == nil {
+		ctx, err := wlcontext.New()
+		if err != nil {
+			log.Errorf("Failed to create shared Wayland context: %v", err)
+			return err
+		}
+		wlContext = ctx
+	}
+
+	config := clipboard.LoadConfig()
+	manager, err := clipboard.NewManager(wlContext, config)
+	if err != nil {
+		log.Errorf("Failed to initialize clipboard manager: %v", err)
+		return err
+	}
+
+	clipboardManager = manager
+
+	log.Info("Clipboard manager initialized successfully")
+	return nil
+}
+
 func handleConnection(conn net.Conn) {
 	defer conn.Close()
 
@@ -409,6 +436,10 @@ func getCapabilities() Capabilities {
 		caps = append(caps, "evdev")
 	}
 
+	if clipboardManager != nil {
+		caps = append(caps, "clipboard")
+	}
+
 	return Capabilities{Capabilities: caps}
 }
 
@@ -463,6 +494,10 @@ func getServerInfo() ServerInfo {
 		caps = append(caps, "evdev")
 	}
 
+	if clipboardManager != nil {
+		caps = append(caps, "clipboard")
+	}
+
 	return ServerInfo{
 		APIVersion:   APIVersion,
 		CLIVersion:   CLIVersion,
@@ -1034,6 +1069,38 @@ func handleSubscribe(conn net.Conn, req models.Request) {
 		}()
 	}
 
+	if shouldSubscribe("clipboard") && clipboardManager != nil {
+		wg.Add(1)
+		clipboardChan := clipboardManager.Subscribe(clientID + "-clipboard")
+		go func() {
+			defer wg.Done()
+			defer clipboardManager.Unsubscribe(clientID + "-clipboard")
+
+			initialState := clipboardManager.GetState()
+			select {
+			case eventChan <- ServiceEvent{Service: "clipboard", Data: initialState}:
+			case <-stopChan:
+				return
+			}
+
+			for {
+				select {
+				case state, ok := <-clipboardChan:
+					if !ok {
+						return
+					}
+					select {
+					case eventChan <- ServiceEvent{Service: "clipboard", Data: state}:
+					case <-stopChan:
+						return
+					}
+				case <-stopChan:
+					return
+				}
+			}
+		}()
+	}
+
 	go func() {
 		wg.Wait()
 		close(eventChan)
@@ -1096,6 +1163,9 @@ func cleanupManagers() {
 	if evdevManager != nil {
 		evdevManager.Close()
 	}
+	if clipboardManager != nil {
+		clipboardManager.Close()
+	}
 	if wlContext != nil {
 		wlContext.Close()
 	}
@@ -1259,6 +1329,18 @@ func Start(printDocs bool) error {
 		log.Info("Evdev:")
 		log.Info(" evdev.getState                        - Get current evdev state (caps lock)")
 		log.Info(" evdev.subscribe                       - Subscribe to evdev state changes (streaming)")
+		log.Info("Clipboard:")
+		log.Info(" clipboard.getState                    - Get clipboard state (enabled, history, current)")
+		log.Info(" clipboard.getHistory                  - Get clipboard history with previews")
+		log.Info(" clipboard.getEntry                    - Get full entry by ID (params: id)")
+		log.Info(" clipboard.deleteEntry                 - Delete entry by ID (params: id)")
+		log.Info(" clipboard.clearHistory                - Clear all clipboard history")
+		log.Info(" clipboard.copy                        - Copy text to clipboard (params: text)")
+		log.Info(" clipboard.paste                       - Get current clipboard text")
+		log.Info(" clipboard.search                      - Search history (params: query?, mimeType?, isImage?, limit?, offset?, before?, after?)")
+		log.Info(" clipboard.getConfig                   - Get clipboard configuration")
+		log.Info(" clipboard.setConfig                   - Set configuration (params: maxHistory?, maxEntrySize?, autoClearDays?, clearAtStartup?)")
+		log.Info(" clipboard.subscribe                   - Subscribe to clipboard state changes (streaming)")
 		log.Info("")
 	}
 	log.Info("Initializing managers...")
@@ -1366,10 +1448,15 @@ func Start(printDocs bool) error {
 		}
 	}()
 
-	if wlContext != nil {
-		wlContext.Start()
-		log.Info("Wayland event dispatcher started")
-	}
+	go func() {
+		if err := InitializeClipboardManager(); err != nil {
+			log.Warnf("Clipboard manager unavailable: %v", err)
+		}
+		if wlContext != nil {
+			wlContext.Start()
+			log.Info("Wayland event dispatcher started")
+		}
+	}()
 
 	log.Info("")
 	log.Infof("Ready! Capabilities: %v", getCapabilities().Capabilities)

core/internal/server/wlcontext/context.go

@@ -1,8 +1,11 @@
 package wlcontext
 
 import (
+	"errors"
 	"fmt"
+	"os"
 	"sync"
+	"time"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/errdefs"
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/log"
@@ -13,6 +16,7 @@ type SharedContext struct {
 	display    *wlclient.Display
 	stopChan   chan struct{}
 	fatalError chan error
+	cmdQueue   chan func()
 	wg         sync.WaitGroup
 	mu         sync.Mutex
 	started    bool
@@ -28,6 +32,7 @@ func New() (*SharedContext, error) {
 		display:    display,
 		stopChan:   make(chan struct{}),
 		fatalError: make(chan error, 1),
+		cmdQueue:   make(chan func(), 256),
 		started:    false,
 	}
 
@@ -51,6 +56,13 @@ func (sc *SharedContext) Display() *wlclient.Display {
 	return sc.display
 }
 
+func (sc *SharedContext) Post(fn func()) {
+	select {
+	case sc.cmdQueue <- fn:
+	default:
+	}
+}
+
 func (sc *SharedContext) FatalError() <-chan error {
 	return sc.fatalError
 }
@@ -74,10 +86,35 @@ func (sc *SharedContext) eventDispatcher() {
 		case <-sc.stopChan:
 			return
 		default:
-			if err := ctx.Dispatch(); err != nil {
-				log.Errorf("Wayland connection error: %v", err)
-				return
-			}
+		}
+
+		sc.drainCmdQueue()
+
+		if err := ctx.SetReadDeadline(time.Now().Add(50 * time.Millisecond)); err != nil {
+			log.Errorf("Failed to set read deadline: %v", err)
+		}
+		err := ctx.Dispatch()
+		if err := ctx.SetReadDeadline(time.Time{}); err != nil {
+			log.Errorf("Failed to clear read deadline: %v", err)
+		}
+
+		switch {
+		case err == nil:
+		case errors.Is(err, os.ErrDeadlineExceeded):
+		default:
+			log.Errorf("Wayland connection error: %v", err)
+			return
+		}
+	}
+}
+
+func (sc *SharedContext) drainCmdQueue() {
+	for {
+		select {
+		case fn := <-sc.cmdQueue:
+			fn()
+		default:
+			return
 		}
 	}
 }