Changeset 7f0c26f

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:

a60edf2

Parents:

16cfd12a

git-author:

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

git-committer:

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

Message:

Implement a setable mark.

Files:

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

commands.c

@@ -879 +879 @@
                   OWL_CTX_EDIT,
                   "replaces the text with the previous history",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("edit:set-mark", owl_editwin_set_mark,
+                  OWL_CTX_EDIT,
+                  "sets the mark",
+                  "", ""),
+
+  OWLCMD_VOID_CTX("edit:exchange-point-and-mark", owl_editwin_exchange_point_and_mark,
+                  OWL_CTX_EDIT,
+                  "exchanges the point and the mark",
                   "", ""),
 

editwin.c

@@ -90 +90 @@
 }
 
+static inline void oe_set_mark(owl_editwin *e, int mark)
+{
+  e->mark = mark;
+}
+
+void owl_editwin_set_mark(owl_editwin *e)
+{
+  oe_set_mark(e, e->index);
+  /* owl_function_makemsg("Mark set."); */
+}
+
 /* initialize the editwin e.
  * 'win' is an already initialzed curses window that will be used by editwin
@@ -101 +112 @@
   e->allocated=INCR;
   oe_set_index(e, 0);
-  e->mark = 0;
+  oe_set_mark(e, -1);
   e->goal_column = -1;
   e->cursorx = -1;
@@ -299 +310 @@
 {
   x->index = e->index;
+  x->mark = e->mark;
   x->goal_column = e->goal_column;
   x->lock = e->lock;
@@ -331 +343 @@
     oe_set_index(e, x->index);
     e->goal_column = x->goal_column;
+    e->mark = x->mark;
     e->lock = x->lock;
 
@@ -497 +510 @@
 }
 
+static inline void oe_fixup(int *target, int start, int end, int change) {
+  if (*target > start) {
+    if (*target < end)
+      *target = end;
+    else
+      *target += change;
+  }
+}
+
 /* replace count characters at the point with s, returning the change in size */
 static int owl_editwin_replace(owl_editwin *e, int replace, char *s)
@@ -537 +559 @@
   e->index += strlen(s);
 
+  /* fix up the mark */
+  if (e->mark != -1)
+    oe_fixup(&e->mark, start, end, change);
   /* fix up any saved points after the replaced area */
-  for (x = e->excursions; x != NULL; x = x->next)
-    if (x->index > start) {
-      if (x->index < end)
-        x->index = end;
-      else
-        x->index += change;
-    }
+  for (x = e->excursions; x != NULL; x = x->next) {
+    oe_fixup(&x->index, start, end, change);
+    if (x->mark != -1)
+      oe_fixup(&x->mark, start, end, change);
+  }
 
   return change;
@@ -644 +667 @@
 {
   return g_utf8_get_char(e->buff + e->index);
+}
+
+void owl_editwin_exchange_point_and_mark(owl_editwin *e) {
+  int tmp;
+
+  if (e->mark != -1) {
+    tmp = e->mark;
+    owl_editwin_set_mark(e);
+    oe_set_index(e, tmp);
+  }
 }
 

keys.c

@@ -83 +83 @@
 
   BIND_CMD("M-q",         "edit:fill-paragraph", "");
+
+  BIND_CMD("C-@",         "edit:set-mark", "");
+  BIND_CMD("C-x C-x",     "edit:exchange-point-and-mark", "");
 
   BIND_CMD("C-l",         "( edit:recenter ; redisplay )", "");