Changeset a88f35a

Timestamp:

Jul 11, 2009, 1:14:36 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:

cf26b72

Parents:

0190c4d

git-author:

Nelson Elhage <nelhage@mit.edu> (06/20/09 23:45:56)

git-committer:

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

Message:

Give perl code more rope with respect to the editwin.

In particular, implement save_excursion and replace_region.

Files:

• editwin.c (modified) (4 diffs)
• owl.h (modified) (1 diff)
• perlglue.xs (modified) (1 diff)

editwin.c

@@ -9 +9 @@
 #define VALID_EXCURSION (0x9a2b4729)
 
-typedef struct oe_excursion_struct { /*noproto*/
+typedef struct _owl_editwin_excursion { /*noproto*/
   int valid;
   int index;
@@ -15 +15 @@
   int goal_column;
   int lock;
-  struct oe_excursion_struct *next;
+  struct _owl_editwin_excursion *next;
 } oe_excursion;
 
@@ -365 +365 @@
     oe_release_excursion(e, x);
   }
+}
+
+/* External interface to oe_save_excursion */
+owl_editwin_excursion *owl_editwin_begin_excursion(owl_editwin *e)
+{
+  owl_editwin_excursion *x = owl_malloc(sizeof *x);
+  oe_save_excursion(e, x);
+  return x;
+}
+
+void owl_editwin_end_excursion(owl_editwin *e, owl_editwin_excursion *x)
+{
+  oe_restore_excursion(e, x);
+  owl_free(x);
 }
 
@@ -565 +579 @@
 }
 
+int owl_editwin_replace_region(owl_editwin *e, char *s)
+{
+  oe_excursion x;
+  oe_save_excursion(e, &x);
+  int ret;
+
+  if(e->index > e->mark) {
+    owl_editwin_exchange_point_and_mark(e);
+  }
+
+  ret = owl_editwin_replace_internal(e, e->mark - e->index, s);
+
+  oe_restore_excursion(e, &x);
+
+  return ret;
+}
+
 /* replace 'replace' characters at the point with s, returning the change in size */
 int owl_editwin_replace(owl_editwin *e, int replace, char *s)

owl.h

@@ -425 +425 @@
 
 typedef struct _owl_editwin owl_editwin;
+typedef struct _owl_editwin_excursion owl_editwin_excursion;
 
 typedef struct _owl_keybinding {

perlglue.xs

@@ -474 +474 @@
         OUTPUT:
                 RETVAL
+
+int
+replace_region(string)
+        char *string;
+        CODE:
+                RETVAL = owl_editwin_replace_region(owl_global_get_typwin(&g), string);
+        OUTPUT:
+                RETVAL
+
+SV *
+save_excursion(sub)
+        SV *sub;
+        PROTOTYPE: &
+        PREINIT:
+                int count;
+                owl_editwin_excursion *x;
+        CODE:
+        {
+                x = owl_editwin_begin_excursion(owl_global_get_typwin(&g));
+                count = call_sv(sub, G_SCALAR|G_EVAL|G_NOARGS);
+                owl_editwin_end_excursion(owl_global_get_typwin(&g), x);
+
+                if(SvTRUE(ERRSV)) {
+                        croak(NULL);
+                }
+
+                SPAGAIN;
+                if(count == 1)
+                        RETVAL = SvREFCNT_inc(POPs);
+                else
+                        XSRETURN_UNDEF;
+
+        }
+        OUTPUT:
+                RETVAL