detached 89a38fc

feat(clipboard): add adapter for Wayland/X11 clipboard support

commit
89a38fc96dcda355d09a1bed07f78a1adfcf35d6
author
brice · · 2025-12-17 20:09 UTC
committer
brice · · 2025-12-17 20:01 UTC
parent
e6ce1fe
signature
unsigned
3 files · +136 -0
Unified
UnifiedSplit
M cmd/dumber/main.go +3 -0
@@ -10,6 +10,7 @@ import (
1010 "github.com/bnema/dumber/assets"
1111 "github.com/bnema/dumber/internal/application/usecase"
1212 "github.com/bnema/dumber/internal/cli/cmd"
13+ "github.com/bnema/dumber/internal/infrastructure/clipboard"
1314 "github.com/bnema/dumber/internal/infrastructure/config"
1415 "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite"
1516 "github.com/bnema/dumber/internal/infrastructure/webkit"
@@ -174,6 +175,8 @@ func runGUI() {
174175 FavoritesUC: favoritesUC,
175176 ZoomUC: zoomUC,
176177 NavigateUC: navigateUC,
178+ // Infrastructure Adapters
179+ Clipboard: clipboard.New(),
177180 }
178181
179182 // Run the application
@@ -10,6 +10,7 @@ import (
10 "github.com/bnema/dumber/assets"10 "github.com/bnema/dumber/assets"
11 "github.com/bnema/dumber/internal/application/usecase"11 "github.com/bnema/dumber/internal/application/usecase"
12 "github.com/bnema/dumber/internal/cli/cmd"12 "github.com/bnema/dumber/internal/cli/cmd"
13+ "github.com/bnema/dumber/internal/infrastructure/clipboard"
13 "github.com/bnema/dumber/internal/infrastructure/config"14 "github.com/bnema/dumber/internal/infrastructure/config"
14 "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite"15 "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite"
15 "github.com/bnema/dumber/internal/infrastructure/webkit"16 "github.com/bnema/dumber/internal/infrastructure/webkit"
@@ -174,6 +175,8 @@ func runGUI() {
174 FavoritesUC: favoritesUC,175 FavoritesUC: favoritesUC,
175 ZoomUC: zoomUC,176 ZoomUC: zoomUC,
176 NavigateUC: navigateUC,177 NavigateUC: navigateUC,
178+ // Infrastructure Adapters
179+ Clipboard: clipboard.New(),
177 }180 }
178 181
179 // Run the application182 // Run the application
A internal/infrastructure/clipboard/clipboard.go +130 -0
@@ -0,0 +1,130 @@
1+// Package clipboard provides a clipboard adapter using wl-clipboard (Wayland) with X11 fallback.
2+package clipboard
3+
4+import (
5+ "context"
6+ "fmt"
7+ "os"
8+ "os/exec"
9+ "strings"
10+
11+ "github.com/bnema/dumber/internal/application/port"
12+ "github.com/bnema/dumber/internal/logging"
13+)
14+
15+// Adapter implements port.Clipboard using system clipboard tools.
16+// Uses wl-clipboard for Wayland, falls back to xclip for X11.
17+type Adapter struct {
18+ copyCmd string
19+ pasteCmd string
20+}
21+
22+// New creates a new clipboard adapter.
23+// Detects Wayland vs X11 and selects appropriate clipboard tool.
24+func New() port.Clipboard {
25+ a := &Adapter{}
26+
27+ // Check for Wayland first
28+ if os.Getenv("WAYLAND_DISPLAY") != "" {
29+ if path, err := exec.LookPath("wl-copy"); err == nil {
30+ a.copyCmd = path
31+ if pastePath, err := exec.LookPath("wl-paste"); err == nil {
32+ a.pasteCmd = pastePath
33+ }
34+ }
35+ }
36+
37+ // Fall back to X11 if Wayland tools not available
38+ if a.copyCmd == "" && os.Getenv("DISPLAY") != "" {
39+ if path, err := exec.LookPath("xclip"); err == nil {
40+ a.copyCmd = path
41+ a.pasteCmd = path
42+ } else if path, err := exec.LookPath("xsel"); err == nil {
43+ a.copyCmd = path
44+ a.pasteCmd = path
45+ }
46+ }
47+
48+ return a
49+}
50+
51+// WriteText copies text to the clipboard.
52+func (a *Adapter) WriteText(ctx context.Context, text string) error {
53+ log := logging.FromContext(ctx)
54+
55+ if a.copyCmd == "" {
56+ err := fmt.Errorf("no clipboard tool available (install wl-clipboard or xclip)")
57+ log.Error().Err(err).Msg("clipboard write failed")
58+ return err
59+ }
60+
61+ var cmd *exec.Cmd
62+ if strings.Contains(a.copyCmd, "wl-copy") {
63+ cmd = exec.CommandContext(ctx, a.copyCmd)
64+ } else if strings.Contains(a.copyCmd, "xclip") {
65+ cmd = exec.CommandContext(ctx, a.copyCmd, "-selection", "clipboard")
66+ } else if strings.Contains(a.copyCmd, "xsel") {
67+ cmd = exec.CommandContext(ctx, a.copyCmd, "--clipboard", "--input")
68+ } else {
69+ err := fmt.Errorf("unknown clipboard tool: %s", a.copyCmd)
70+ log.Error().Err(err).Msg("clipboard write failed")
71+ return err
72+ }
73+
74+ cmd.Stdin = strings.NewReader(text)
75+ if err := cmd.Run(); err != nil {
76+ log.Error().Err(err).Str("tool", a.copyCmd).Msg("clipboard write failed")
77+ return err
78+ }
79+
80+ log.Debug().Str("tool", a.copyCmd).Int("len", len(text)).Msg("clipboard write success")
81+ return nil
82+}
83+
84+// ReadText reads text from the clipboard.
85+func (a *Adapter) ReadText(ctx context.Context) (string, error) {
86+ log := logging.FromContext(ctx)
87+
88+ if a.pasteCmd == "" {
89+ err := fmt.Errorf("no clipboard tool available (install wl-clipboard or xclip)")
90+ log.Error().Err(err).Msg("clipboard read failed")
91+ return "", err
92+ }
93+
94+ var cmd *exec.Cmd
95+ if strings.Contains(a.pasteCmd, "wl-paste") {
96+ cmd = exec.CommandContext(ctx, a.pasteCmd, "--no-newline")
97+ } else if strings.Contains(a.pasteCmd, "xclip") {
98+ cmd = exec.CommandContext(ctx, a.pasteCmd, "-selection", "clipboard", "-o")
99+ } else if strings.Contains(a.pasteCmd, "xsel") {
100+ cmd = exec.CommandContext(ctx, a.pasteCmd, "--clipboard", "--output")
101+ } else {
102+ err := fmt.Errorf("unknown clipboard tool: %s", a.pasteCmd)
103+ log.Error().Err(err).Msg("clipboard read failed")
104+ return "", err
105+ }
106+
107+ out, err := cmd.Output()
108+ if err != nil {
109+ log.Debug().Err(err).Str("tool", a.pasteCmd).Msg("clipboard read failed (may be empty)")
110+ return "", err
111+ }
112+
113+ log.Debug().Str("tool", a.pasteCmd).Int("len", len(out)).Msg("clipboard read success")
114+ return string(out), nil
115+}
116+
117+// Clear clears the clipboard contents.
118+func (a *Adapter) Clear(ctx context.Context) error {
119+ return a.WriteText(ctx, "")
120+}
121+
122+// HasText returns true if the clipboard contains text data.
123+func (a *Adapter) HasText(ctx context.Context) (bool, error) {
124+ text, err := a.ReadText(ctx)
125+ if err != nil {
126+ // Empty clipboard often returns error, treat as no text
127+ return false, nil
128+ }
129+ return text != "", nil
130+}
@@ -0,0 +1,130 @@
1+// Package clipboard provides a clipboard adapter using wl-clipboard (Wayland) with X11 fallback.
2+package clipboard
3+
4+import (
5+ "context"
6+ "fmt"
7+ "os"
8+ "os/exec"
9+ "strings"
10+
11+ "github.com/bnema/dumber/internal/application/port"
12+ "github.com/bnema/dumber/internal/logging"
13+)
14+
15+// Adapter implements port.Clipboard using system clipboard tools.
16+// Uses wl-clipboard for Wayland, falls back to xclip for X11.
17+type Adapter struct {
18+ copyCmd string
19+ pasteCmd string
20+}
21+
22+// New creates a new clipboard adapter.
23+// Detects Wayland vs X11 and selects appropriate clipboard tool.
24+func New() port.Clipboard {
25+ a := &Adapter{}
26+
27+ // Check for Wayland first
28+ if os.Getenv("WAYLAND_DISPLAY") != "" {
29+ if path, err := exec.LookPath("wl-copy"); err == nil {
30+ a.copyCmd = path
31+ if pastePath, err := exec.LookPath("wl-paste"); err == nil {
32+ a.pasteCmd = pastePath
33+ }
34+ }
35+ }
36+
37+ // Fall back to X11 if Wayland tools not available
38+ if a.copyCmd == "" && os.Getenv("DISPLAY") != "" {
39+ if path, err := exec.LookPath("xclip"); err == nil {
40+ a.copyCmd = path
41+ a.pasteCmd = path
42+ } else if path, err := exec.LookPath("xsel"); err == nil {
43+ a.copyCmd = path
44+ a.pasteCmd = path
45+ }
46+ }
47+
48+ return a
49+}
50+
51+// WriteText copies text to the clipboard.
52+func (a *Adapter) WriteText(ctx context.Context, text string) error {
53+ log := logging.FromContext(ctx)
54+
55+ if a.copyCmd == "" {
56+ err := fmt.Errorf("no clipboard tool available (install wl-clipboard or xclip)")
57+ log.Error().Err(err).Msg("clipboard write failed")
58+ return err
59+ }
60+
61+ var cmd *exec.Cmd
62+ if strings.Contains(a.copyCmd, "wl-copy") {
63+ cmd = exec.CommandContext(ctx, a.copyCmd)
64+ } else if strings.Contains(a.copyCmd, "xclip") {
65+ cmd = exec.CommandContext(ctx, a.copyCmd, "-selection", "clipboard")
66+ } else if strings.Contains(a.copyCmd, "xsel") {
67+ cmd = exec.CommandContext(ctx, a.copyCmd, "--clipboard", "--input")
68+ } else {
69+ err := fmt.Errorf("unknown clipboard tool: %s", a.copyCmd)
70+ log.Error().Err(err).Msg("clipboard write failed")
71+ return err
72+ }
73+
74+ cmd.Stdin = strings.NewReader(text)
75+ if err := cmd.Run(); err != nil {
76+ log.Error().Err(err).Str("tool", a.copyCmd).Msg("clipboard write failed")
77+ return err
78+ }
79+
80+ log.Debug().Str("tool", a.copyCmd).Int("len", len(text)).Msg("clipboard write success")
81+ return nil
82+}
83+
84+// ReadText reads text from the clipboard.
85+func (a *Adapter) ReadText(ctx context.Context) (string, error) {
86+ log := logging.FromContext(ctx)
87+
88+ if a.pasteCmd == "" {
89+ err := fmt.Errorf("no clipboard tool available (install wl-clipboard or xclip)")
90+ log.Error().Err(err).Msg("clipboard read failed")
91+ return "", err
92+ }
93+
94+ var cmd *exec.Cmd
95+ if strings.Contains(a.pasteCmd, "wl-paste") {
96+ cmd = exec.CommandContext(ctx, a.pasteCmd, "--no-newline")
97+ } else if strings.Contains(a.pasteCmd, "xclip") {
98+ cmd = exec.CommandContext(ctx, a.pasteCmd, "-selection", "clipboard", "-o")
99+ } else if strings.Contains(a.pasteCmd, "xsel") {
100+ cmd = exec.CommandContext(ctx, a.pasteCmd, "--clipboard", "--output")
101+ } else {
102+ err := fmt.Errorf("unknown clipboard tool: %s", a.pasteCmd)
103+ log.Error().Err(err).Msg("clipboard read failed")
104+ return "", err
105+ }
106+
107+ out, err := cmd.Output()
108+ if err != nil {
109+ log.Debug().Err(err).Str("tool", a.pasteCmd).Msg("clipboard read failed (may be empty)")
110+ return "", err
111+ }
112+
113+ log.Debug().Str("tool", a.pasteCmd).Int("len", len(out)).Msg("clipboard read success")
114+ return string(out), nil
115+}
116+
117+// Clear clears the clipboard contents.
118+func (a *Adapter) Clear(ctx context.Context) error {
119+ return a.WriteText(ctx, "")
120+}
121+
122+// HasText returns true if the clipboard contains text data.
123+func (a *Adapter) HasText(ctx context.Context) (bool, error) {
124+ text, err := a.ReadText(ctx)
125+ if err != nil {
126+ // Empty clipboard often returns error, treat as no text
127+ return false, nil
128+ }
129+ return text != "", nil
130+}
M internal/ui/deps.go +3 -0
@@ -44,6 +44,9 @@ type Dependencies struct {
4444 ZoomUC *usecase.ManageZoomUseCase
4545 FavoritesUC *usecase.ManageFavoritesUseCase
4646 HistoryUC *usecase.SearchHistoryUseCase
47+
48+ // Infrastructure Adapters
49+ Clipboard port.Clipboard
4750 }
4851
4952 // Validate checks that all required dependencies are set.
@@ -44,6 +44,9 @@ type Dependencies struct {
44 ZoomUC *usecase.ManageZoomUseCase44 ZoomUC *usecase.ManageZoomUseCase
45 FavoritesUC *usecase.ManageFavoritesUseCase45 FavoritesUC *usecase.ManageFavoritesUseCase
46 HistoryUC *usecase.SearchHistoryUseCase46 HistoryUC *usecase.SearchHistoryUseCase
47+
48+ // Infrastructure Adapters
49+ Clipboard port.Clipboard
47 }50 }
48 51
49 // Validate checks that all required dependencies are set.52 // Validate checks that all required dependencies are set.

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 8

Tags 42

↑↓ moveenter openesc close