Changeset 77f605d

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:

2fc8397

Parents:

3e36085

git-author:

Karl Ramm <kcr@1ts.org> (06/15/09 11:56:08)

git-committer:

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

Message:

Slightly more rope that you require for completion.

New owl_editwin_text_{before,after}_point, exported to perl.  Also,
export owl_editwin_replace and owl_editwin_point_move.

Files:

• editwin.c (modified) (3 diffs)
• perlglue.xs (modified) (1 diff)

editwin.c

@@ -56 +56 @@
 static int owl_editwin_is_char_in(owl_editwin *e, char *set);
 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);
 static int oe_display_column(owl_editwin *e);
+static char *oe_chunk(owl_editwin *e, int start, int end);
 
 #define INCR 4096
@@ -565 +565 @@
 
 /* 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)
+int owl_editwin_replace(owl_editwin *e, int replace, char *s)
 {
   int start, end, i, free, need, size, change;
@@ -1260 +1260 @@
 }
 
-int owl_editwin_get_echochar(owl_editwin *e) {
+int owl_editwin_get_echochar(owl_editwin *e)
+{
   return e->echochar;
 }
+
+static char *oe_chunk(owl_editwin *e, int start, int end)
+{
+  char *p;
+  
+  p = owl_malloc(end - start + 1);
+  memcpy(p, e->buff + start, end - start);
+  p[end - start] = 0;
+
+  return p;
+}
+
+char *owl_editwin_text_before_point(owl_editwin *e)
+{
+  return oe_chunk(e, e->index < e->lock ? 0 : e->lock, e->index);
+}
+
+char *owl_editwin_text_after_point(owl_editwin *e)
+{
+  return oe_chunk(e, e->index, e->bufflen);
+}
+
 
 

perlglue.xs

@@ -429 +429 @@
                 owl_function_debugmsg("Freeing timer %p", t);
                                 owl_select_remove_timer(t);
+
+char *
+text_before_point()
+        PREINIT:
+                char *p;
+        CODE:
+                p = owl_editwin_text_before_point(owl_global_get_typwin(&g));
+                RETVAL = p;
+        OUTPUT:
+                RETVAL
+        CLEANUP:
+                if (p)
+                        owl_free(p);
+
+char *
+text_after_point()
+        PREINIT:
+                char *p;
+        CODE:
+                p = owl_editwin_text_after_point(owl_global_get_typwin(&g));
+                RETVAL = p;
+        OUTPUT:
+                RETVAL
+        CLEANUP:
+                if (p)
+                        owl_free(p);
+
+int
+replace(count, string)
+        int count;
+        char *string;
+        CODE:
+                RETVAL = owl_editwin_replace(owl_global_get_typwin(&g), count, string);
+        OUTPUT:
+                RETVAL
+
+int
+point_move(delta)
+        int delta;
+        CODE:
+                RETVAL = owl_editwin_point_move(owl_global_get_typwin(&g), delta);
+        OUTPUT:
+                RETVAL