Changes in perlglue.xs [8c59178:9186c75]

File:

• perlglue.xs (modified) (13 diffs)

perlglue.xs

@@ -172 +172 @@
         SV *callback
         PREINIT:
+                owl_editwin *e;
         CODE:
         {
@@ -177 +178 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_question(line);
-
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g), newSVsv(callback));
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                e = owl_function_start_question(line);
+
+                owl_editwin_set_cbdata(e,
+                                       newSVsv(callback),
+                                       owl_perlconfig_dec_refcnt);
+                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
         }
 
@@ -188 +191 @@
         SV *callback
         PREINIT:
+                owl_editwin *e;
         CODE:
         {
@@ -193 +197 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_password(line);
-
-                owl_editwin_set_cbdata(owl_global_get_typwin(&g), newSVsv(callback));
-                owl_editwin_set_callback(owl_global_get_typwin(&g), owl_perlconfig_edit_callback);
+                e = owl_function_start_password(line);
+
+                owl_editwin_set_cbdata(e,
+                                       newSVsv(callback),
+                                       owl_perlconfig_dec_refcnt);
+                owl_editwin_set_callback(e, owl_perlconfig_edit_callback);
         }
 
@@ -208 +214 @@
                         croak("Callback must be a subref");
 
-                owl_function_start_edit_win(line, owl_perlconfig_edit_callback, newSVsv(callback));
+                owl_function_start_edit_win(line,
+                                            owl_perlconfig_edit_callback,
+                                            newSVsv(callback),
+                                            owl_perlconfig_dec_refcnt);
         }
 
@@ -542 +551 @@
         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
@@ -550 +566 @@
 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
@@ -558 +581 @@
 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
@@ -567 +597 @@
         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:
@@ -581 +617 @@
         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);
@@ -605 +646 @@
 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
@@ -612 +660 @@
 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
@@ -619 +674 @@
 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