Changes in perlglue.xs [fe7616e:ffc4df6]

File:

• perlglue.xs (modified) (4 diffs)

perlglue.xs

@@ -318 +318 @@
 
 void
-add_dispatch(fd, cb)
+remove_io_dispatch(fd)
         int fd
-        SV * cb
-        CODE:
-        owl_select_add_perl_dispatch(fd, SvREFCNT_inc(cb));
-
-void
-remove_dispatch(fd)
-        int fd
-        CODE:
-        owl_select_remove_perl_dispatch(fd);
-
+        CODE:
+        owl_select_remove_perl_io_dispatch(fd);
 
 AV*
 all_filters()
         PREINIT:
+                AV *filters;
                 const owl_list *fl;
+                const owl_filter *f;
+                int i;
         CODE:
         {
                 fl = owl_global_get_filterlist(&g);
-                RETVAL = owl_new_av(fl, (SV*(*)(const void*))owl_filter_to_sv);
+                filters = newAV();
+                for(i=0;i<owl_list_get_size(fl);i++) {
+                        f = owl_list_get_element(fl, i);
+                        av_push(filters, owl_new_sv(owl_filter_get_name(f)));
+                }
+                RETVAL = filters;
                 sv_2mortal((SV*)RETVAL);
         }
@@ -347 +347 @@
 all_styles()
         PREINIT:
+                AV *styles;
                 owl_list l;
+                const char *name;
+                int i;
         CODE:
         {
                 owl_list_create(&l);
                 owl_global_get_style_names(&g, &l);
-                RETVAL = owl_new_av(&l, (SV*(*)(const void*))owl_new_sv);
+                styles = newAV();
+                for(i=0;i<owl_list_get_size(&l);i++) {
+                        name = owl_list_get_element(&l, i);
+                        av_push(styles, owl_new_sv(name));
+                }
+                RETVAL = styles;
                 sv_2mortal((SV*)RETVAL);
         }
@@ -364 +372 @@
 all_variables()
         PREINIT:
+                AV *vars;
                 owl_list l;
+                const char *name;
+                int i;
         CODE:
         {
                 owl_list_create(&l);
                 owl_dict_get_keys(owl_global_get_vardict(&g), &l);
-                RETVAL = owl_new_av(&l, (SV*(*)(const void*))owl_new_sv);
-                sv_2mortal((SV*)RETVAL);
-        }
-        OUTPUT:
-                RETVAL
-        CLEANUP:
-                owl_list_free_all(&l, owl_free);
-
-
-AV*
-all_keymaps()
-        PREINIT:
-                owl_list l;
-                const owl_keyhandler *kh;
-        CODE:
-        {
-                owl_list_create(&l);
-                kh = owl_global_get_keyhandler(&g);
-                owl_keyhandler_get_keymap_names(kh, &l);
-                RETVAL = owl_new_av(&l, (SV*(*)(const void*))owl_new_sv);
+                vars = newAV();
+                for(i=0;i<owl_list_get_size(&l);i++) {
+                        name = owl_list_get_element(&l, i);
+                        av_push(vars, owl_new_sv(name));
+                }
+                RETVAL = vars;
                 sv_2mortal((SV*)RETVAL);
         }
@@ -504 +501 @@
                                       ival);
 
+void
+add_io_dispatch(fd, mode, cb)
+        int fd
+        int mode
+        SV * cb
+        CODE:
+        owl_select_add_perl_io_dispatch(fd, mode, SvREFCNT_inc(cb));
+
 IV
 add_timer(after, interval, cb)