Changeset d41294a

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:

c6ecf5c

Parents:

cf26b72

git-author:

Nelson Elhage <nelhage@mit.edu> (06/21/09 01:08:14)

git-committer:

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

Message:

Export some more functions to perl.

get_region, combined with save_excursion, is a very convenient way for
perl to access a specified piece of the buffer.

In addition, provide methods to get information about the current
point and mark.

Files:

• editwin.c (modified) (5 diffs)
• perl/lib/BarnOwl/Editwin.pm (modified) (1 diff)
• perlglue.xs (modified) (2 diffs)

editwin.c

@@ -59 +59 @@
 static char *oe_copy_buf(owl_editwin *e, char *buf, int len);
 static int oe_copy_region(owl_editwin *e);
-static int oe_display_column(owl_editwin *e);
 static char *oe_chunk(owl_editwin *e, int start, int end);
 
@@ -1113 +1112 @@
 }
 
-static int oe_display_column(owl_editwin *e)
+int owl_editwin_current_column(owl_editwin *e)
 {
   oe_excursion x;
@@ -1184 +1183 @@
   while(e->index < e->mark) {
     /* if we've travelled too far, linewrap */
-    if (oe_display_column(e) >= e->fillcol)
+    if (owl_editwin_current_column(e) >= e->fillcol)
       _owl_editwin_linewrap_word(e);
     owl_editwin_point_move(e, 1);
@@ -1323 +1322 @@
 }
 
+char *owl_editwin_get_region(owl_editwin *e)
+{
+  int start, end;
+  start = e->index;
+  end   = e->mark;
+  if(start > end) {
+    int tmp = end;
+    end = start;
+    start = tmp;
+  }
+
+  return oe_chunk(e, start, end);
+}
+
 int owl_editwin_get_echochar(owl_editwin *e)
 {
@@ -1347 +1360 @@
 {
   return oe_chunk(e, e->index, e->bufflen);
+}
+
+/*
+ * The only guarantee made about these values is that comparisons
+ * between them, as well as comparison between multiple calls to these
+ * functions without modifying the editwin in-between, are meaningful.
+ */
+
+int owl_editwin_get_point(owl_editwin *e)
+{
+  return e->index;
+}
+
+int owl_editwin_get_mark(owl_editwin *e)
+{
+  return e->mark;
 }
 

perl/lib/BarnOwl/Editwin.pm

@@ -18 +18 @@
 
 our @EXPORT_OK = qw(text_before_point text_after_point replace
-                    point_move replace_region save_excursion);
+                    point_move replace_region get_region
+                    save_excursion current_column point mark);
 
 1;

perlglue.xs

@@ -483 +483 @@
                 RETVAL
 
+char *
+get_region()
+        PREINIT:
+                char *region;
+        CODE:
+                region = owl_editwin_get_region(owl_global_get_typwin(&g));
+                RETVAL = region;
+        OUTPUT:
+                RETVAL
+        CLEANUP:
+                owl_free(region);
+
 SV *
 save_excursion(sub)
@@ -509 +521 @@
         OUTPUT:
                 RETVAL
+
+int
+current_column()
+        CODE:
+                RETVAL = owl_editwin_current_column(owl_global_get_typwin(&g));
+        OUTPUT:
+                RETVAL
+
+int
+point()
+        CODE:
+                RETVAL = owl_editwin_get_point(owl_global_get_typwin(&g));
+        OUTPUT:
+                RETVAL
+
+int
+mark()
+        CODE:
+                RETVAL = owl_editwin_get_mark(owl_global_get_typwin(&g));
+        OUTPUT:
+                RETVAL