r29327 - in /trunk/libcurses-perl: Curses.i Curses.pm Curses.s CursesFun.c HISTORY INSTALL debian/changelog demo demo.menu demo.panel test.syms

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Mon Jan 5 14:37:34 UTC 2009


Author: gregoa
Date: Mon Jan  5 14:37:31 2009
New Revision: 29327

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29327
Log:
New upstream release.

Added:
    trunk/libcurses-perl/Curses.i
      - copied unchanged from r29326, branches/upstream/libcurses-perl/current/Curses.i
    trunk/libcurses-perl/Curses.s
      - copied unchanged from r29326, branches/upstream/libcurses-perl/current/Curses.s
Modified:
    trunk/libcurses-perl/Curses.pm
    trunk/libcurses-perl/CursesFun.c
    trunk/libcurses-perl/HISTORY
    trunk/libcurses-perl/INSTALL
    trunk/libcurses-perl/debian/changelog
    trunk/libcurses-perl/demo
    trunk/libcurses-perl/demo.menu
    trunk/libcurses-perl/demo.panel
    trunk/libcurses-perl/test.syms

Modified: trunk/libcurses-perl/Curses.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/Curses.pm?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/Curses.pm (original)
+++ trunk/libcurses-perl/Curses.pm Mon Jan  5 14:37:31 2009
@@ -51,7 +51,7 @@
 
 package Curses;
 
-$VERSION = '1.24'; # Makefile.PL picks this up
+$VERSION = '1.26'; # Makefile.PL picks this up
 
 use Carp;
 require Exporter;

Modified: trunk/libcurses-perl/CursesFun.c
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/CursesFun.c?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/CursesFun.c (original)
+++ trunk/libcurses-perl/CursesFun.c Mon Jan  5 14:37:31 2009
@@ -1278,42 +1278,26 @@
 #endif
 }
 
-/* newterm() has some complexities because of PerlIo.
-
-   IoIFP() returns a FILE * with some Perl cores, and PerlIo with
-   others.  We need FILE *.  One would think that on the PerlIo system,
-   there would be some way to call something that uses FILE *,
-   such as newterm(), but I haven't found one.
-
-   With some Perl cores, "FILE" is a macro that expands to "PerlIo".
-   That seems ridiculous, because something such as newterm() needs a
-   real FILE *, not just something called that.
-*/
-
-
 XS(XS_Curses_newterm)
 {
     dXSARGS;
 #ifdef C_NEWTERM
-#ifdef PERLIO_IS_STDIO
     c_exactargs("newterm", items, 3);
     {
 	char *	type	= ST(0) != &PL_sv_undef ? (char *)SvPV_nolen(ST(0)) : NULL;
 
-	FILE *	outfd	= IoIFP(sv_2io(ST(1)));
-	FILE *	infd	= IoIFP(sv_2io(ST(2)));
+    /* IoIFP() returns a FILE * with some Perl cores, and PerlIo with
+       others.  We need FILE *.  PerlIO_findFILE() takes either a FILE * or
+       PerlIo as input and returns a FILE *.
+    */
+	FILE *	outfd	= PerlIO_findFILE(IoIFP(sv_2io(ST(1))));
+	FILE *	infd	= PerlIO_findFILE(IoIFP(sv_2io(ST(2))));
 	SCREEN *	ret	= newterm(type, outfd, infd);
 	
 	ST(0) = sv_newmortal();
 	c_screen2sv(ST(0), ret);
     }
     XSRETURN(1);
-#else  /* PERLIO_IS_STDIO */
-    croak("You cannot use newterm() with this Perl interpreter core because "
-          "it uses PerlIo for file I/O, and the Curses library doesn't "
-          "know what to do with that");
-     /* See explanation in comments above */
-#endif
 #else
     c_fun_not_there("newterm");
     XSRETURN(0);
@@ -3484,7 +3468,8 @@
     c_exactargs("putwin", items, 2);
     {
 	WINDOW *win	= c_sv2window(ST(0), 0);
-	FILE *	filep	= IoIFP(sv_2io(ST(1)));
+    /* See explanation of PerlIO_findFILE in newterm() */
+	FILE *	filep	= PerlIO_findFILE(IoIFP(sv_2io(ST(1))));
 	int	ret	= putwin(win, filep);
 	
 	ST(0) = sv_newmortal();
@@ -3503,7 +3488,8 @@
 #ifdef C_GETWIN
     c_exactargs("getwin", items, 1);
     {
-	FILE *	filep	= IoIFP(sv_2io(ST(0)));
+    /* See explanation of PerlIO_findFILE in newterm() */
+	FILE *	filep	= PerlIO_findFILE(IoIFP(sv_2io(ST(0))));
 	WINDOW *	ret	= getwin(filep);
 	
 	ST(0) = sv_newmortal();
@@ -4280,7 +4266,7 @@
 }
 
 
-/* Panel support */
+/* Panel functions */
 
 XS(XS_Curses_new_panel)
 {
@@ -4568,7 +4554,7 @@
 }
 
 
-/* Menu support */
+/* Menu functions */
 
 /* menu_attributes */
 
@@ -5733,7 +5719,7 @@
 }
 
 
-/* Form support */
+/* Form functions */
 
 /* form_cursor */
 

Modified: trunk/libcurses-perl/HISTORY
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/HISTORY?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/HISTORY (original)
+++ trunk/libcurses-perl/HISTORY Mon Jan  5 14:37:31 2009
@@ -11,6 +11,13 @@
 Curses itself is much older than the Perl implementation.  Curses was
 originally only a C programming library.
 
+New in 1.26 (Released January 3, 2009)
+
+  newterm() is available and putwin() and getwin() work in newer Perl (with
+  PerlIO).  We now use PerlIO_findFile().
+
+1.25 doesn't exist (The name got burned in a CPAN upload mistake).
+
 New in 1.24 (Released September 10, 2008)
 
   Export KEY_RESIZE, KEY_EVENT.
@@ -160,7 +167,7 @@
 
 New in 1.07 (September 2004)
 
-  - Call to Perl_isa_sv() changed to isa_sv() because the former doesn't
+  - Call to Perl_sv_isa() changed to sv_isa() because the former doesn't
     work on some systems (causes a build failure).
 
 New in 1.06 (July 2001)
@@ -177,14 +184,14 @@
 
  o changed the "Curses->new()" function to be a bit less clever.
 
- o Support for libmenu!  Many thanks to Yury Pshenichny <yura at zp.ua>
+ o Works with libmenu!  Many thanks to Yury Pshenichny <yura at zp.ua>
    who did most of the actual work.
 
-   Update: Well, sort of support.  For some reason beyond my ken, it
+   Update: Well, sort of works.  For some reason beyond my ken, it
    doesn't work with Solaris (2.6) libmenu. (The items won't attach to
    the menu.)  ncurses menu, both 1.9.9 and 5.2, seem to work fine.
 
- o libform support added, too.  Ho hum.  ;)  This one does appear to
+ o Works with libform too.  Ho hum.  ;)  This one does appear to
    work with Solaris libform.
 
  o Added the following ncurses extension functions:
@@ -205,8 +212,8 @@
    attr_on()
    attr_set()
 
- o Between the functions supported and the functions listed in the
-   pod as not supported, those are all the ones I know about.
+ o Between the functions exposed and the functions listed in the
+   pod as not exposeded, those are all the ones I know about.
    Got any more?  Let me know.
 
  o Fixed 64 bit issue with getch() and possibly others, truncating

Modified: trunk/libcurses-perl/INSTALL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/INSTALL?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/INSTALL (original)
+++ trunk/libcurses-perl/INSTALL Mon Jan  5 14:37:31 2009
@@ -160,9 +160,9 @@
    perl demo
    perl gdc
    perl demo2       [stuff that has a 50/50 chance of showing up right]
-   perl demo.panel  [if you enabled panel support]
-   perl demo.menu   [if you enabled menu support]
-   perl demo.form   [if you enabled form support]
+   perl demo.panel  [if you enabled panel function]
+   perl demo.menu   [if you enabled menu function]
+   perl demo.form   [if you enabled form function]
 
    "gdc" is a digital clock ported from the "ncurses" distribution.
 

Modified: trunk/libcurses-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/debian/changelog?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/debian/changelog (original)
+++ trunk/libcurses-perl/debian/changelog Mon Jan  5 14:37:31 2009
@@ -1,5 +1,6 @@
-libcurses-perl (1.24-2) UNRELEASED; urgency=low
-
+libcurses-perl (1.26-1) UNRELEASED; urgency=low
+
+  * New upstream release.
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.

Modified: trunk/libcurses-perl/demo
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/demo?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/demo (original)
+++ trunk/libcurses-perl/demo Mon Jan  5 14:37:31 2009
@@ -24,7 +24,7 @@
 eval { attron(A_REVERSE) };
 addstr("bold+reverse");
 eval { attrset(A_NORMAL) };
-addstr("  normal  (if your curses supports these modes)");
+addstr("  normal  (if your curses has these modes)");
 
 addstr(6, 1, "do12345678901234567890n't worry be happy");
 eval { box($b, '|', '-') };

Modified: trunk/libcurses-perl/demo.menu
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/demo.menu?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/demo.menu (original)
+++ trunk/libcurses-perl/demo.menu Mon Jan  5 14:37:31 2009
@@ -9,7 +9,7 @@
 
 eval { new_menu() };
 if ($@ =~ /not defined by your vendor/) {
-    print STDERR "Curses was not compiled with menu support.\n";
+    print STDERR "Curses was not compiled with menu function.\n";
     exit 1;
 }
 

Modified: trunk/libcurses-perl/demo.panel
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/demo.panel?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/demo.panel (original)
+++ trunk/libcurses-perl/demo.panel Mon Jan  5 14:37:31 2009
@@ -7,7 +7,7 @@
 
 eval { new_panel() };
 if ($@ =~ /not defined by your vendor/) {
-    print STDERR "Curses was not compiled with panel support.\n";
+    print STDERR "Curses was not compiled with panel function.\n";
     exit 1;
 }
 

Modified: trunk/libcurses-perl/test.syms
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcurses-perl/test.syms?rev=29327&op=diff
==============================================================================
--- trunk/libcurses-perl/test.syms (original)
+++ trunk/libcurses-perl/test.syms Mon Jan  5 14:37:31 2009
@@ -189,17 +189,17 @@
 
 print OUTH 
     $panels ? "#define " : "#undef  ",
-    "C_PANELSUPPORT          /* Add in panel library support?             */",
+    "C_PANELSUPPORT          /* Add in panel library function?             */",
     "\n\n";
 
 print OUTH 
     $menus ? "#define " : "#undef  ",
-    "C_MENUSUPPORT           /* Add in menu library support?              */",
+    "C_MENUSUPPORT           /* Add in menu library function?              */",
     "\n\n";
 
 print OUTH 
     $forms ? "#define " : "#undef  ",
-    "C_FORMSUPPORT           /* Add in form library support?              */",
+    "C_FORMSUPPORT           /* Add in form library function?              */",
     "\n\n";
 
 # Some functions return either int or void, depending on what compiler




More information about the Pkg-perl-cvs-commits mailing list