Changeset 38cc669 for perlglue.xs

Timestamp:

Mar 23, 2010, 5:23:43 PM (13 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

master, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0d17295

Parents:

8dfb59c

git-author:

Nelson Elhage <nelhage@mit.edu> (03/13/10 23:54:51)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/23/10 17:23:43)

Message:

Create/destroy editwins rather than reusing a single one.

File:

• perlglue.xs (modified) (8 diffs)

perlglue.xs

@@ -549 +549 @@
         int count;
         const char *string;
-        CODE:
-                RETVAL = owl_editwin_replace(owl_global_get_typwin(&g), count, string);
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        RETVAL = owl_editwin_replace(e, count, string);
+                } else {
+                        RETVAL = 0;
+                }
         OUTPUT:
                 RETVAL
@@ -557 +564 @@
 point_move(delta)
         int delta;
-        CODE:
-                RETVAL = owl_editwin_point_move(owl_global_get_typwin(&g), delta);
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        RETVAL = owl_editwin_point_move(e, delta);
+                } else {
+                        RETVAL = 0;
+                }
         OUTPUT:
                 RETVAL
@@ -565 +579 @@
 replace_region(string)
         const char *string;
-        CODE:
-                RETVAL = owl_editwin_replace_region(owl_global_get_typwin(&g), string);
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        RETVAL = owl_editwin_replace_region(e, string);
+                } else {
+                        RETVAL = 0;
+                }
         OUTPUT:
                 RETVAL
@@ -574 +595 @@
         PREINIT:
                 char *region;
-        CODE:
-                region = owl_editwin_get_region(owl_global_get_typwin(&g));
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        region = owl_editwin_get_region(owl_global_get_typwin(&g));
+                } else {
+                        region = NULL;
+                }
                 RETVAL = region;
         OUTPUT:
@@ -588 +615 @@
         PREINIT:
                 int count;
+                owl_editwin *e;
                 owl_editwin_excursion *x;
         CODE:
         {
+                e = owl_global_get_typwin(&g);
+                if(!e)
+                        croak("The edit window is not currently active!");
+
                 x = owl_editwin_begin_excursion(owl_global_get_typwin(&g));
                 PUSHMARK(SP);
@@ -612 +644 @@
 int
 current_column()
-        CODE:
-                RETVAL = owl_editwin_current_column(owl_global_get_typwin(&g));
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        RETVAL = owl_editwin_current_column(e);
+                } else {
+                        RETVAL = 0;
+                }
         OUTPUT:
                 RETVAL
@@ -619 +658 @@
 int
 point()
-        CODE:
-                RETVAL = owl_editwin_get_point(owl_global_get_typwin(&g));
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        RETVAL = owl_editwin_get_point(e);
+                } else {
+                        RETVAL = 0;
+                }
         OUTPUT:
                 RETVAL
@@ -626 +672 @@
 int
 mark()
-        CODE:
-                RETVAL = owl_editwin_get_mark(owl_global_get_typwin(&g));
-        OUTPUT:
-                RETVAL
+        PREINIT:
+                owl_editwin *e;
+        CODE:
+                e = owl_global_get_typwin(&g);
+                if (e) {
+                        RETVAL = owl_editwin_get_mark(e);
+                } else {
+                        RETVAL = 0;
+                }
+        OUTPUT:
+                RETVAL