Changeset 0902edfe in mainline

Timestamp:

2009-12-04T20:53:50Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0b772f5

Parents:

0f24c57

Message:

Editor copy and paste. Clipboard API with task-local implementation.

Location:

uspace

Files:

• app/edit/edit.c (modified) (7 diffs)
• lib/libc/Makefile.build (modified) (1 diff)
• lib/libc/generic/clipboard.c (added)
• lib/libc/include/clipboard.h (added)

uspace/app/edit/edit.c

@@ -45 +45 @@
 #include <align.h>
 #include <macros.h>
+#include <clipboard.h>
 #include <bool.h>
 
@@ -119 +120 @@
     spt_t const *epos);
 static char *filename_prompt(char const *prompt, char const *init_value);
+static char *range_get_str(spt_t const *spos, spt_t const *epos);
 
 static void pane_text_display(void);
@@ -133 +135 @@
 
 static bool selection_active(void);
+static void selection_get_points(spt_t *pa, spt_t *pb);
 static void selection_delete(void);
+static void selection_copy(void);
+static void insert_clipboard_data(void);
 
 static void pt_get_sof(spt_t *pt);
@@ -321 +326 @@
         case KC_E:
                 file_save_as();
+                break;
+        case KC_C:
+                selection_copy();
+                break;
+        case KC_V:
+                selection_delete();
+                insert_clipboard_data();
+                pane.rflags |= REDRAW_TEXT;
+                caret_update();
                 break;
         default:
@@ -579 +593 @@
 }
 
+/** Return contents of range as a new string. */
+static char *range_get_str(spt_t const *spos, spt_t const *epos)
+{
+        char *buf;
+        spt_t sp, bep;
+        size_t bytes;
+        size_t buf_size, bpos;
+
+        buf_size = 1;
+
+        buf = malloc(buf_size);
+        if (buf == NULL)
+                return NULL;
+
+        bpos = 0;
+        sp = *spos;
+
+        while (true) {
+                sheet_copy_out(&doc.sh, &sp, epos, &buf[bpos], buf_size - bpos,
+                    &bep);
+                bytes = str_size(&buf[bpos]);
+                bpos += bytes;
+                sp = bep;
+
+                if (spt_equal(&bep, epos))
+                        break;
+
+                buf_size *= 2;
+                buf = realloc(buf, buf_size);
+                if (buf == NULL)
+                        return NULL;
+        }
+
+        return buf;
+}
+
 static void pane_text_display(void)
 {
@@ -913 +963 @@
 }
 
+static void selection_get_points(spt_t *pa, spt_t *pb)
+{
+        spt_t pt;
+
+        tag_get_pt(&pane.sel_start, pa);
+        tag_get_pt(&pane.caret_pos, pb);
+
+        if (spt_cmp(pa, pb) > 0) {
+                pt = *pa;
+                *pa = *pb;
+                *pb = pt;
+        }
+}
+
 /** Delete selected text. */
 static void selection_delete(void)
@@ -940 +1004 @@
 }
 
+static void selection_copy(void)
+{
+        spt_t pa, pb;
+        char *str;
+
+        selection_get_points(&pa, &pb);
+        str = range_get_str(&pa, &pb);
+        if (str == NULL || clipboard_put_str(str) != EOK) {
+                status_display("Copying to clipboard failed!");
+        }
+        free(str);
+}
+
+static void insert_clipboard_data(void)
+{
+        char *str;
+        size_t off;
+        wchar_t c;
+        int rc;
+
+        rc = clipboard_get_str(&str);
+        if (rc != EOK || str == NULL)
+                return;
+
+        off = 0;
+
+        while (true) {
+                c = str_decode(str, &off, STR_NO_LIMIT);
+                if (c == '\0')
+                        break;
+
+                insert_char(c);
+        }
+
+        free(str);
+}
+
 /** Get start-of-file s-point. */
 static void pt_get_sof(spt_t *pt)

uspace/lib/libc/Makefile.build

@@ -50 +50 @@
         generic/as.c \
         generic/cap.c \
+        generic/clipboard.c \
         generic/devmap.c \
         generic/event.c \