Implement OSC52 support

abbec · abbec · commit 245ef8cf5849 · 2026-02-23T10:41:19.000+01:00
When copying text, it will be available in the OS clipboard as well.
diff --git a/src/dged/command.c b/src/dged/command.c
@@ -48,14 +48,15 @@ struct command *lookup_command_by_hash(struct commands *commands,
 
 int32_t execute_command(struct command *command, struct commands *commands,
                         struct window *active_window, struct buffers *buffers,
-                        int argc, const char *argv[]) {
+                        struct display *display, int argc, const char *argv[]) {
 
   return command->fn(
       (struct command_ctx){
           .buffers = buffers,
           .active_window = active_window,
           .userdata = command->userdata,
           .commands = commands,
+          .display = display,
           .self = command,
           .saved_argv = {0},
           .saved_argc = 0,
diff --git a/src/dged/command.h b/src/dged/command.h
@@ -12,6 +12,7 @@
 struct buffer;
 struct buffers;
 struct window;
+struct display;
 
 /**
  * Execution context for a command
@@ -30,6 +31,11 @@ struct command_ctx {
    */
   struct window *active_window;
 
+  /**
+   * The display in use.
+   */
+  struct display *display;
+
   /**
    * A registry of available commands.
    *
@@ -145,6 +151,7 @@ void register_commands(struct commands *command_list, struct command *commands,
  * well.
  * @param[in] buffers The current list of buffers for context. Can be used for
  * example to create a buffer list.
+ * @param [in] display The current display.
  * @param[in] argc Number of arguments to the command.
  * @param[in] argv The arguments to the command.
  *
@@ -153,7 +160,7 @@ void register_commands(struct commands *command_list, struct command *commands,
  */
 int32_t execute_command(struct command *command, struct commands *commands,
                         struct window *active_window, struct buffers *buffers,
-                        int argc, const char *argv[]);
+                        struct display *display, int argc, const char *argv[]);
 
 /**
  * Hash the name of a command.
diff --git a/src/dged/display.c b/src/dged/display.c
@@ -645,3 +645,21 @@ void display_end_render(struct display *display) {
   end_update(display);
   flush_outbuf(display);
 }
+
+void display_to_clipboard(struct display *display, struct s8 content) {
+  putch(display, ESC);
+  putch(display, ']');
+  putch(display, '5');
+  putch(display, '2');
+  putch(display, ';');
+  putch(display, 'c');
+  putch(display, ';');
+
+  struct s8 b64 = s8base64enc(content);
+  putchars(display, b64.s, b64.l);
+  s8delete(b64);
+
+  putch(display, ESC);
+  putch(display, '\\');
+  flush_outbuf(display);
+}
diff --git a/src/dged/display.h b/src/dged/display.h
@@ -2,6 +2,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "s8.h"
+
 struct display;
 
 struct render_command;
@@ -103,6 +105,11 @@ void display_render(struct display *display, struct command_list *command_list);
  */
 void display_end_render(struct display *display);
 
+/**
+ * Put a string on the clipboard.
+ */
+void display_to_clipboard(struct display *display, struct s8 content);
+
 /**
  * Create a new command list.
  *
diff --git a/src/dged/minibuffer.c b/src/dged/minibuffer.c
@@ -119,8 +119,9 @@ int32_t minibuffer_execute(void) {
     argc += line.nbytes > 0 ? 1 : 0;
 
     minibuffer_abort_prompt_internal(false);
-    int32_t res = execute_command(c->self, c->commands, c->active_window,
-                                  c->buffers, argc, (const char **)argv);
+    int32_t res =
+        execute_command(c->self, c->commands, c->active_window, c->buffers,
+                        c->display, argc, (const char **)argv);
 
     free(l);
 
diff --git a/src/dged/s8.c b/src/dged/s8.c
@@ -222,3 +222,35 @@ ssize_t s8find(struct s8 s, uint8_t c) {
 
   return -1;
 }
+
+static const char base64_enc_tbl[] =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+struct s8 s8base64enc(struct s8 s) {
+  struct s8 output = {.l = 0, .s = 0};
+  size_t output_length = 4 * ((s.l + 2) / 3);
+  output.s = calloc(1, output_length + 1);
+  if (output.s == NULL) {
+    return output;
+  }
+
+  output.l = output_length;
+
+  for (size_t i = 0, j = 0; i < s.l;) {
+    uint32_t octet_a = i < s.l ? s.s[i] : 0;
+    ++i;
+    uint32_t octet_b = i < s.l ? s.s[i] : 0;
+    ++i;
+    uint32_t octet_c = i < s.l ? s.s[i] : 0;
+    ++i;
+
+    uint32_t triple = (octet_a << 16) + (octet_b << 8) + octet_c;
+
+    output.s[j++] = base64_enc_tbl[(triple >> 18) & 0x3F];
+    output.s[j++] = base64_enc_tbl[(triple >> 12) & 0x3F];
+    output.s[j++] = (i > s.l + 1) ? '=' : base64_enc_tbl[(triple >> 6) & 0x3F];
+    output.s[j++] = (i > s.l) ? '=' : base64_enc_tbl[triple & 0x3F];
+  }
+
+  return output;
+}
diff --git a/src/dged/s8.h b/src/dged/s8.h
@@ -33,4 +33,6 @@ struct s8 s8dup(struct s8 s);
 bool s8empty(struct s8 s);
 bool s8onlyws(struct s8 s);
 
+struct s8 s8base64enc(struct s8 s);
+
 #endif
diff --git a/src/main/cmds.c b/src/main/cmds.c
@@ -14,10 +14,12 @@
 #include "dged/buffers.h"
 #include "dged/command.h"
 #include "dged/display.h"
+#include "dged/location.h"
 #include "dged/minibuffer.h"
 #include "dged/path.h"
 #include "dged/s8.h"
 #include "dged/settings.h"
+#include "dged/text.h"
 #include "dged/vec.h"
 #include "dired.h"
 #if defined(SYNTAX_ENABLE)
@@ -109,7 +111,7 @@ int32_t run_interactive(struct command_ctx ctx, int argc, const char *argv[]) {
   struct command *cmd = lookup_command(ctx.commands, argv[0]);
   if (cmd != NULL) {
     return execute_command(cmd, ctx.commands, ctx.active_window, ctx.buffers,
-                           argc - 1, argv + 1);
+                           ctx.display, argc - 1, argv + 1);
   } else {
     minibuffer_echo_timeout(4, "command %s not found", argv[0]);
     return 11;
@@ -168,7 +170,8 @@ int32_t switch_buffer(struct command_ctx ctx, int argc, const char *argv[]) {
   disable_completion(minibuffer_buffer());
 
   return execute_command(&do_switch_buffer_command, ctx.commands,
-                         ctx.active_window, ctx.buffers, argc, argv);
+                         ctx.active_window, ctx.buffers, ctx.display, argc,
+                         argv);
 }
 
 int32_t do_kill_buffer(struct command_ctx ctx, int argc, const char *argv[]) {
@@ -212,7 +215,8 @@ int32_t kill_buffer(struct command_ctx ctx, int argc, const char *argv[]) {
   disable_completion(minibuffer_buffer());
 
   return execute_command(&do_switch_buffer_command, ctx.commands,
-                         ctx.active_window, ctx.buffers, argc, argv);
+                         ctx.active_window, ctx.buffers, ctx.display, argc,
+                         argv);
 }
 
 static struct location draw_timer_value(struct buffer *buffer, double value,
@@ -389,7 +393,8 @@ int32_t buflist_visit_cmd(struct command_ctx ctx, int argc, const char **argv) {
 int32_t buflist_close_cmd(struct command_ctx ctx, int argc,
                           const char *argv[]) {
   return execute_command(&do_switch_buffer_command, ctx.commands,
-                         ctx.active_window, ctx.buffers, argc, argv);
+                         ctx.active_window, ctx.buffers, ctx.display, argc,
+                         argv);
 }
 
 void buflist_refresh(struct buffer *buffer, void *userdata) {
@@ -439,7 +444,7 @@ int32_t buflist_kill_cmd(struct command_ctx ctx, int argc, const char *argv[]) {
     buffers_remove(ctx.buffers, bufname);
     free(bufname);
     execute_command(&buflist_refresh_command, ctx.commands, ctx.active_window,
-                    ctx.buffers, 0, NULL);
+                    ctx.buffers, ctx.display, 0, NULL);
   }
 
   return 0;
@@ -468,7 +473,7 @@ int32_t buflist_save_cmd(struct command_ctx ctx, int argc, const char *argv[]) {
     }
     free(bufname);
     execute_command(&buflist_refresh_command, ctx.commands, ctx.active_window,
-                    ctx.buffers, 0, NULL);
+                    ctx.buffers, ctx.display, 0, NULL);
   }
 
   return 0;
@@ -572,7 +577,7 @@ static int32_t open_file(struct command_ctx ctx, const char *pth) {
     if (cmd != NULL) {
       const char *argv[] = {pth};
       return execute_command(cmd, ctx.commands, ctx.active_window, ctx.buffers,
-                             1, argv);
+                             ctx.display, 1, argv);
     }
 
     minibuffer_echo_timeout(4, "dired is not supported");
@@ -777,14 +782,36 @@ BUFFER_VIEW_WRAPCMD(indent_alt)
 BUFFER_VIEW_WRAPCMD(unindent_line)
 BUFFER_VIEW_WRAPCMD(set_mark)
 BUFFER_VIEW_WRAPCMD(clear_mark)
-BUFFER_VIEW_WRAPCMD(copy)
 BUFFER_VIEW_WRAPCMD(cut)
 BUFFER_VIEW_WRAPCMD(paste)
 BUFFER_VIEW_WRAPCMD(paste_older)
 BUFFER_VIEW_WRAPCMD(goto_beginning)
 BUFFER_VIEW_WRAPCMD(goto_end)
 BUFFER_VIEW_WRAPCMD(sort_lines)
 
+static int32_t copy_cmd(struct command_ctx ctx, int argc, const char *argv[]) {
+  (void)argc;
+  (void)argv;
+  struct buffer_view *bv = window_buffer_view(ctx.active_window);
+  struct region reg = region_new(bv->dot, bv->mark);
+  if (bv->mark_set && region_has_size(reg)) {
+    /* send the copied text to the display. Display
+     * in this case can mean X11/Wayland or terminal.
+     * In the case of the terminal it uses OSC52.
+     */
+    struct text_chunk txt = buffer_region(bv->buffer, reg);
+
+    display_to_clipboard(ctx.display,
+                         (struct s8){.s = txt.text, .l = txt.nbytes});
+    if (txt.allocated) {
+      free(txt.text);
+    }
+  }
+
+  buffer_view_copy(bv);
+  return 0;
+}
+
 static int32_t undo_cmd(struct command_ctx ctx, int argc, const char *argv[]) {
   (void)argc;
   (void)argv;
diff --git a/src/main/completion.c b/src/main/completion.c
@@ -125,7 +125,7 @@ static int32_t scroll_up_completions(struct command_ctx ctx, int argc,
   struct command *command = lookup_command(ctx.commands, "scroll-up");
   if (command != NULL) {
     return execute_command(command, ctx.commands, popup_window(), ctx.buffers,
-                           argc, argv);
+                           ctx.display, argc, argv);
   }
 
   return 0;
@@ -140,7 +140,7 @@ static int32_t scroll_down_completions(struct command_ctx ctx, int argc,
   struct command *command = lookup_command(ctx.commands, "scroll-down");
   if (command != NULL) {
     return execute_command(command, ctx.commands, popup_window(), ctx.buffers,
-                           argc, argv);
+                           ctx.display, argc, argv);
   }
 
   return 0;
@@ -155,7 +155,7 @@ static int32_t goto_first_completion(struct command_ctx ctx, int argc,
   struct command *command = lookup_command(ctx.commands, "goto-beginning");
   if (command != NULL) {
     return execute_command(command, ctx.commands, popup_window(), ctx.buffers,
-                           argc, argv);
+                           ctx.display, argc, argv);
   }
 
   return 0;
@@ -170,7 +170,7 @@ static int32_t goto_last_completion(struct command_ctx ctx, int argc,
   struct command *command = lookup_command(ctx.commands, "goto-end");
   if (command != NULL) {
     return execute_command(command, ctx.commands, popup_window(), ctx.buffers,
-                           argc, argv);
+                           ctx.display, argc, argv);
   }
 
   return 0;
diff --git a/src/main/dired.c b/src/main/dired.c
@@ -388,7 +388,7 @@ static int32_t dired_visit_cmd(struct command_ctx ctx, int argc,
       struct s8 path = canonicalize(new_path);
       const char *args[] = {s8ascstr(path)};
       int32_t res = execute_command(cmd, ctx.commands, ctx.active_window,
-                                    ctx.buffers, 1, args);
+                                    ctx.buffers, ctx.display, 1, args);
 
       s8delete(new_path);
       s8delete(path);
diff --git a/src/main/lsp/goto.c b/src/main/lsp/goto.c
@@ -261,7 +261,7 @@ static int32_t handle_lsp_goto_key(struct command_ctx ctx, int argc,
   }
 
   return execute_command(cmd, ctx.commands, windows_get_active(), ctx.buffers,
-                         0, NULL);
+                         ctx.display, 0, NULL);
 }
 
 COMMAND_FN("lsp-goto-definition", goto_d_pressed, handle_lsp_goto_key,
diff --git a/src/main/main.c b/src/main/main.c
@@ -419,7 +419,8 @@ int main(int argc, char *argv[]) {
     struct command *cmd = lookup_command(&commands, "find-file");
     if (cmd != NULL) {
       const char *av[] = {filename};
-      execute_command(cmd, &commands, windows_get_active(), &buflist, 1, av);
+      execute_command(cmd, &commands, windows_get_active(), &buflist, display,
+                      1, av);
     }
     free((void *)filename);
   }
@@ -508,8 +509,9 @@ int main(int argc, char *argv[]) {
             minibuffer_echo_timeout(
                 4, "binding found for key %s but not command", k);
           } else {
-            int32_t ec = execute_command(res.data.command, &commands,
-                                         active_window, &buflist, 0, NULL);
+            int32_t ec =
+                execute_command(res.data.command, &commands, active_window,
+                                &buflist, display, 0, NULL);
             if (ec != 0 && !minibuffer_displaying()) {
               minibuffer_echo_timeout(4, "command %s failed with exit code %d",
                                       res.data.command->name, ec);
diff --git a/test/command.c b/test/command.c
@@ -93,7 +93,7 @@ void test_execute_command(void) {
   struct commands cmds = single_fake_command("fake");
   struct command *cmd = lookup_command(&cmds, "fake");
 
-  int32_t res = execute_command(cmd, &cmds, NULL, NULL, 0, NULL);
+  int32_t res = execute_command(cmd, &cmds, NULL, NULL, NULL, 0, NULL);
   ASSERT(res == 0, "Expected to be able to execute command successfully");
 
   register_command(&cmds, (struct command){
@@ -102,7 +102,7 @@ void test_execute_command(void) {
                               .userdata = NULL,
                           });
   struct command *fail_cmd = lookup_command(&cmds, "fejl");
-  int32_t res2 = execute_command(fail_cmd, &cmds, NULL, NULL, 0, NULL);
+  int32_t res2 = execute_command(fail_cmd, &cmds, NULL, NULL, NULL, 0, NULL);
   ASSERT(res2 != 0, "Expected failing command to fail");
 
   command_registry_destroy(&cmds);
