Changeset a60edf2

Timestamp:

Jul 11, 2009, 1:14:35 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

2da7348

Parents:

7f0c26f

git-author:

Nelson Elhage <nelhage@mit.edu> (07/07/09 22:49:21)

git-committer:

Nelson Elhage <nelhage@mit.edu> (07/11/09 13:14:35)

Message:

Implement kill-region, copy-region-as-kill, and yank.

Files:

• commands.c (modified) (1 diff)
• editwin.c (modified) (8 diffs)
• keys.c (modified) (1 diff)

commands.c

@@ -889 +889 @@
                   OWL_CTX_EDIT,
                   "exchanges the point and the mark",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("edit:copy-region-as-kill", owl_editwin_copy_region_as_kill,
+                  OWL_CTX_EDIT,
+                  "copy the text between the point and the mark",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("edit:kill-region", owl_editwin_kill_region,
+                  OWL_CTX_EDIT,
+                  "kill text between the point and the mark",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("edit:yank", owl_editwin_yank,
+                  OWL_CTX_EDIT,
+                  "insert the current text from the kill buffer",
                   "", ""),
 

editwin.c

@@ -25 +25 @@
   int index;
   int mark;
+  char *killbuf;
   int goal_column;
   int topindex;
@@ -41 +42 @@
 };
 
-
 static void oe_reframe(owl_editwin *e);
 static void oe_save_excursion(owl_editwin *e, oe_excursion *x);
 static void oe_release_excursion(owl_editwin *e, oe_excursion *x);
 static void oe_restore_excursion(owl_editwin *e, oe_excursion *x);
+static void oe_restore_mark_only(owl_editwin *e, oe_excursion *x);
 static int oe_count_glyphs(char *s);
 static int oe_char_width(gunichar c, int column);
@@ -56 +57 @@
 static gunichar owl_editwin_get_char_at_point(owl_editwin *e);
 static int owl_editwin_replace(owl_editwin *e, int count, char *s);
+static char *oe_copy_buf(owl_editwin *e, char *buf, int len);
+static int oe_copy_region(owl_editwin *e);
 
 #define INCR 4096
@@ -113 +116 @@
   oe_set_index(e, 0);
   oe_set_mark(e, -1);
+  if (e->killbuf != NULL)
+    free(e->killbuf);
+  e->killbuf = NULL;
   e->goal_column = -1;
   e->cursorx = -1;
@@ -345 +351 @@
     e->mark = x->mark;
     e->lock = x->lock;
+
+    oe_release_excursion(e, x);
+  }
+}
+
+static void oe_restore_mark_only(owl_editwin *e, oe_excursion *x)
+{
+  if (x->valid == VALID_EXCURSION) {
+    e->mark = x->mark;
 
     oe_release_excursion(e, x);
@@ -544 +559 @@
   if (need > 0) {
     size = e->allocated + need + INCR - (need % INCR);
-    p = realloc(e->buff, size);
+    p = owl_realloc(e->buff, size);
     if (p == NULL) {
       /* XXX signal impending doom somehow and don't do anything */
@@ -915 +930 @@
 {
   oe_excursion x;
-  int distance;
 
   oe_save_excursion(e, &x);
-  distance = owl_editwin_forward_word(e);
-  oe_restore_excursion(e, &x);
-  owl_editwin_replace(e, distance, "");
+  oe_set_mark(e, e->index);
+  owl_editwin_forward_word(e);
+  owl_editwin_kill_region(e);
+  oe_restore_mark_only(e, &x);
 }
 
 void owl_editwin_delete_previousword(owl_editwin *e)
 {
-  /* go backwards to the last non-space character, then delete chars */
-  int distance;
-
-  distance = owl_editwin_backward_word(e);
-  owl_editwin_replace(e, -distance, "");
+  oe_excursion x;
+
+  oe_save_excursion(e, &x);
+  oe_set_mark(e, e->index);
+  owl_editwin_backward_word(e);
+  owl_editwin_kill_region(e);
+  oe_restore_mark_only(e, &x);
 }
 
@@ -943 +960 @@
 
   oe_save_excursion(e, &x);
+  owl_editwin_set_mark(e);
   distance = owl_editwin_move_to_end_of_line(e);
+  if (distance)
+    owl_editwin_kill_region(e);
+  else
+    owl_editwin_replace(e, 1, "");
   oe_restore_excursion(e, &x);
-  owl_editwin_replace(e, distance ? distance : 1, "");
+}
+
+void owl_editwin_yank(owl_editwin *e)
+{
+  if (e->killbuf != NULL)
+    owl_editwin_replace(e, 0, e->killbuf);
+}
+
+static char *oe_copy_buf(owl_editwin *e, char *buf, int len)
+{
+  char *p;
+
+  p = owl_malloc(len + 1);
+
+  if (p != NULL) {
+    owl_free(e->killbuf);
+    e->killbuf = p;
+    memcpy(e->killbuf, buf, len);
+    e->killbuf[len] = 0;
+  }
+
+  return p;
+}
+
+static int oe_copy_region(owl_editwin *e)
+{
+  char *p;
+  int start, end;
+
+  if (e->mark == -1)
+    return 0;
+
+  start = MIN(e->index, e->mark);
+  end = MAX(e->index, e->mark);
+
+  p = oe_copy_buf(e, e->buff + start, end - start);
+  if (p != NULL)
+    return end - start;
+  return 0;
+}
+
+void owl_editwin_copy_region_as_kill(owl_editwin *e)
+{
+  oe_copy_region(e);
+}
+
+void owl_editwin_kill_region(owl_editwin *e)
+{
+  if (e->index > e->mark)
+    owl_editwin_exchange_point_and_mark(e);
+
+  owl_editwin_replace(e, oe_copy_region(e), "");
 }
 

keys.c

@@ -86 +86 @@
   BIND_CMD("C-@",         "edit:set-mark", "");
   BIND_CMD("C-x C-x",     "edit:exchange-point-and-mark", "");
+
+  BIND_CMD("M-w",         "edit:copy-region-as-kill", "");
+  BIND_CMD("C-w",         "edit:kill-region", "");
+  BIND_CMD("C-y",         "edit:yank", "");
 
   BIND_CMD("C-l",         "( edit:recenter ; redisplay )", "");