ncursesw 1.4.10 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ec628a1e081fa07f8233e63155ddaed5a8066f68
-  data.tar.gz: 594ab5a6e15cd1718a449fb8f198f0be35add5bd
+SHA256:
+  metadata.gz: 5a846d10840ceea6519165015d366a350d41c791c65fde5e882cffb5bbc2e157
+  data.tar.gz: 6a10a52e885cb8824bf10c734855f4862dcaeec3d020b9afcf6995311febd2a7
 SHA512:
-  metadata.gz: 831bc04ef2f201d798e3f897b6a8dd9f7d3b0f571e87682baa30764e3fd9de98f71f2faf22ae3d800163c040ffbb5d27fdac0b3d51feadcc47cd43e8d5845792
-  data.tar.gz: ad904d96212b3819d39b731de568e6aecd3509f0f80fb17b7fd37355331a8e4d24bd5c1a2668b0df5560a0de2f210d05a560854863e078d786ff73edce1566d6
+  metadata.gz: e8cbd887172807b687a9d59be846d48c8e92fd86c2b7bb73aa34ef171672f9ad7c96a91083ca3a78380ce3f70976213af8c4089b3832edefe0762dd0c9eabf18
+  data.tar.gz: 9f24b8e345dfe91b83311adc913aeef03ddf077888e7517b7dd15ef9f03d38a7f55184be61ef1fdc1ae652069dbe96940a0847a675e0272007717b847c919e5a

data/COPYING

@@ -1,9 +1,8 @@
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
 
   When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -57,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-^L
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -89,8 +87,7 @@ libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
   For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
+encourage the widest possible use of a certain library, so that it becomes
 a de-facto standard.  To achieve this, non-free programs must be
 allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
@@ -114,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-^L
+
                   GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -139,8 +136,7 @@ included without limitation in the term "modification".)
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
+interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
   Activities other than copying, distribution and modification are not
@@ -220,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-^L
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -271,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-^L
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -333,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-^L
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -374,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-^L
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -388,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
@@ -409,11 +404,11 @@ be a consequence of the rest of this License.
 
   12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.
@@ -427,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-^L
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -461,30 +456,27 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-^L
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
 everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
 
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
 
-
-    <one line to give the library's name and a brief idea of what it
-does.>
+    <one line to give the library's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -493,23 +485,18 @@ does.>
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-Also add information on how to contact you by electronic and paper
-mail.
+Also add information on how to contact you by electronic and paper mail.
 
-You should also get your employer (if you work as a programmer) or
-your
+You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the library, if
 necessary.  Here is a sample; alter the names:
 
   Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
   <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

data/Changes

@@ -1,11 +1,34 @@
+ncurses-ruby-1.4.12
+ * Fixed getch non-blocking behaviour with NCURSES_OPAQUE.
+
+ncurses-ruby-1.4.11
+ * Fixed some incorrectly declared method arguments.
+ * Fixed warnings about "undefining the allocator of T_DATA class".
+
+ncurses-ruby-1.4.10
+ * Auto detection of ncurses vs ncursesw installation.
+ * Added --with-ncurses-dir={path} option to specify location for libs and
+  include files.
+
+ncurses-ruby-1.4.9
+ * (Updated readme, mailing list, etc.)
+
+ncurses-ruby-1.4.8
+ * (bug fixes)
+
+ncurses-ruby-1.4.7
+ * (bug fixes)
+
+--- (Change log was not maintained for a while here) ---
+
 ncurses-ruby-1.1
-* Bugfixes by T. Sutherland in _tracef and _tracedump.
+ * Bugfixes by T. Sutherland in _tracef and _tracedump.
 
 ncurses-ruby-1.0
-* Mousemask bugfix from P.Duncan.
-* Solved timing problems that affected visual smoothness of reactions
-  to user input
-* Each SCREEN got back its own "halfdelay" and "cbreak" settings
+ * Mousemask bugfix from P.Duncan.
+ * Solved timing problems that affected visual smoothness of reactions
+   to user input
+ * Each SCREEN got back its own "halfdelay" and "cbreak" settings
 
 ncurses-ruby-0.9.2
  * Preventing getch and wgetch functions from blocking other ruby threads.

data/examples/example.rb

@@ -6,8 +6,8 @@
 # Copyright (C) 2002 Tobias Peters <t-peters@users.berlios.de>
 #
 # The following license applys only to this file. It is less restrictive
-# than the license for the rest of the ncurses-ruby distribution. 
-# I've adapted this file from someone else, see below. 
+# than the license for the rest of the ncurses-ruby distribution.
+# I've adapted this file from someone else, see below.
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this file
@@ -16,10 +16,10 @@
 # publish, distribute, sublicense, and/or sell copies of the Software,
 # and to permit persons to whom the Software is furnished to do so,
 # subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -36,7 +36,7 @@
 # statement:
 
 # Copyright (c) 2000 by Harry Henry Gebel
-# 
+#
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
 # (the "Software"), to deal in the Software without restriction,
@@ -44,10 +44,10 @@
 # publish, distribute, sublicense, and/or sell copies of the Software,
 # and to permit persons to whom the Software is furnished to do so,
 # subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/examples/form.rb

@@ -5,9 +5,9 @@
 # For a more rubyish approach that uses Ruby objects see form2.rb
 #
 # The original example contained the following copyright:
-# Copyright (c) 2001 by Pradeep Padala. This document may be distributed 
+# Copyright (c) 2001 by Pradeep Padala. This document may be distributed
 # under the terms set forth in the LDP license at linuxdoc.org/COPYRIGHT.html.
- 
+
 require 'ncursesw.rb'
 
 begin
@@ -20,7 +20,7 @@ begin
   fields = Array.new
   fields.push(Ncurses::Form.new_field(1,10,4,18,0,0))
   fields.push(Ncurses::Form.new_field(1,10,6,18,0,0))
-  
+
   # set field options
   Ncurses::Form.set_field_back(fields[0], Ncurses::A_UNDERLINE)
   Ncurses::Form.field_opts_off(fields[0], Ncurses::Form::O_AUTOSKIP)
@@ -29,7 +29,7 @@ begin
   Ncurses::Form.field_opts_off(fields[1], Ncurses::Form::O_AUTOSKIP)
 
 
-  # create a form  
+  # create a form
   form = Ncurses::Form.new_form(fields)
 
   # post the form and refresh the screen
@@ -49,24 +49,24 @@ begin
       # Go to the end of the present buffer
       # Leaves nicely at the last character
       Ncurses::Form.form_driver(form, Ncurses::Form::REQ_END_LINE)
-      
+
     when Ncurses::KEY_UP
       #Go to previous field
       Ncurses::Form.form_driver(form, Ncurses::Form::REQ_PREV_FIELD)
       Ncurses::Form.form_driver(form, Ncurses::Form::REQ_END_LINE);
-    else                                                                   
+    else
       # If this is a normal character, it gets Printed
       Ncurses::Form.form_driver(form, ch)
     end
   end
-    
+
   # unpost and free form
   Ncurses::Form.unpost_form(form);
   Ncurses::Form.free_form(form)
   Ncurses::Form.free_field(fields[0]);
   Ncurses::Form.free_field(fields[1]);
 
-  
+
   #using class methods this time
 #  form = Ncurses::Form::FORM.new(fields)
 #  puts "Created form: #{form.inspect}\n"

data/examples/form2.rb

@@ -3,12 +3,12 @@
 # Simple example of a form in action, based on the NCURSES Programming HOWTO:
 # http://www.tldp.org/HOWTO/NCURSES-Programming-HOWTO/
 #
-# All standard field types are created in the form. 
-# Additionnally a custom field is created to illustrate 
+# All standard field types are created in the form.
+# Additionnally a custom field is created to illustrate
 # custom field validation using Ruby Proc objects, as shown in the example.
 #
 # The original example contained the following copyright:
-# Copyright (c) 2001 by Pradeep Padala. This document may be distributed 
+# Copyright (c) 2001 by Pradeep Padala. This document may be distributed
 # under the terms set forth in the LDP license at linuxdoc.org/COPYRIGHT.html.
 
 require 'ncursesw'
@@ -44,20 +44,20 @@ end
 
 fields = Array.new
 
-states = {"MI" => "Michigan", 
-          "VA" => "Virginia", 
+states = {"MI" => "Michigan",
+          "VA" => "Virginia",
           "VE" => "Vermont"}
-fieldcheck = proc { |afield| 
+fieldcheck = proc { |afield|
   val = afield.field_buffer(0)
   val.strip!
-  if (states[val] != nil) 
+  if (states[val] != nil)
     afield.set_field_buffer(0,states[val])
     return true
   else
     return false
   end
 }
-charcheck = proc { |ch| 
+charcheck = proc { |ch|
   if (('A'..'Z').include?(ch))
     return true
   else
@@ -73,7 +73,7 @@ begin
   Ncurses.noecho();
   Ncurses.keypad(stdscr, true);
 
-  # Initialize few color pairs 
+  # Initialize few color pairs
   Ncurses.init_pair(1, COLOR_RED, COLOR_BLACK);
   Ncurses.init_pair(2, COLOR_BLACK, COLOR_WHITE);
   Ncurses.init_pair(3, COLOR_BLACK, COLOR_BLUE);
@@ -108,7 +108,7 @@ begin
   cols = Array.new()
   my_form.scale_form(rows, cols);
 
-  # Create the window to be associated with the form 
+  # Create the window to be associated with the form
   my_form_win = WINDOW.new(rows[0] + 3, cols[0] + 14, 1, 1);
   my_form_win.bkgd(Ncurses.COLOR_PAIR(3));
   my_form_win.keypad(TRUE);
@@ -133,7 +133,7 @@ begin
   my_form_win.mvaddstr(16, 2, "Regexp")
   my_form_win.mvaddstr(18, 2, "IP")
   my_form_win.mvaddstr(20, 2, "Custom")
-  
+
   my_form_win.wrefresh();
 
   stdscr.mvprintw(Ncurses.LINES - 2, 28, "Use UP, DOWN arrow keys to switch between fields");
@@ -150,7 +150,7 @@ begin
       # Go to the end of the present buffer
       # Leaves nicely at the last character
       my_form.form_driver(REQ_END_LINE);
-      
+
     when KEY_UP
       # Go to previous field
       my_form.form_driver(REQ_VALIDATION);
@@ -168,7 +168,7 @@ begin
     when KEY_BACKSPACE
       my_form.form_driver(REQ_DEL_PREV);
     else
-      # If this is a normal character, it gets Printed    
+      # If this is a normal character, it gets Printed
       my_form.form_driver(ch);
     end
   end

data/extconf.rb

@@ -174,14 +174,6 @@ if have_func("rb_thread_fd_select")
   $CFLAGS  += " -DHAVE_RB_THREAD_FD_SELECT"
 end
 
-# Avoid dereferencing WINDOW pointers on FreeBSD
-if RUBY_PLATFORM =~ /freebsd/
-  $CFLAGS += " -DNCURSES_OPAQUE=1"
-else
-  # add NCURSES_OPAQUE for mac
-  $CFLAGS += " -DNCURSES_OPAQUE=0"
-end
-
 if have_func("clock_gettime")
   $CFLAGS += " -DHAVE_CLOCK_GETTIME"
 end

data/form_wrap.c

@@ -1367,6 +1367,7 @@ void init_form(void)
   /* Forms */
   rb_iv_set(mForm, "@forms_hash", rb_hash_new());
   cFORM  = rb_define_class_under(mForm, "FORM", rb_cObject);
+  rb_undef_alloc_func(cFORM);
   rb_define_singleton_method(cFORM, "new",
 									  (&rbncurs_m_new_form),
 									  1);
@@ -1413,22 +1414,23 @@ void init_form(void)
   /* Fields */
   rb_iv_set(mForm, "@fields_hash", rb_hash_new());
   cFIELD = rb_define_class_under(mForm, "FIELD", rb_cObject);
+  rb_undef_alloc_func(cFIELD);
   rb_define_singleton_method(cFIELD, "new",
 									  (&rbncurs_m_new_field),
 									  6);
   RB_CLASS_METH(cFIELD, "dup", dup_field,2);
   RB_CLASS_METH(cFIELD, "dynamic_info", dynamic_field_info,3);
   RB_CLASS_METH(cFIELD, "arg", field_arg,0);
-  RB_CLASS_METH(cFIELD, "back", field_back,1);
+  RB_CLASS_METH(cFIELD, "back", field_back,0);
   RB_CLASS_METH(cFIELD, "buffer", field_buffer,1);
-  RB_CLASS_METH(cFIELD, "fore", field_fore,1);
+  RB_CLASS_METH(cFIELD, "fore", field_fore,0);
   RB_CLASS_METH(cFIELD, "index", field_index,0);
   RB_CLASS_METH(cFIELD, "info", field_info,6);
   RB_CLASS_METH(cFIELD, "just", field_just,0);
   RB_CLASS_METH(cFIELD, "opts", field_opts,0);
   RB_CLASS_METH(cFIELD, "opts_off", field_opts_off,1);
   RB_CLASS_METH(cFIELD, "opts_on", field_opts_on,1);
-  RB_CLASS_METH(cFIELD, "pad", field_pad,1);
+  RB_CLASS_METH(cFIELD, "pad", field_pad,0);
   RB_CLASS_METH(cFIELD, "status", field_status,0);
   RB_CLASS_METH(cFIELD, "type", field_type,0);
   /*   RB_CLASS_METH(cFIELD, "userptr", field_userptr,0); */
@@ -1454,6 +1456,7 @@ void init_form(void)
   /* Field types */
   rb_iv_set(mForm, "@fieldtypes_hash", rb_hash_new());
   cFIELDTYPE = rb_define_class_under(mForm, "FIELDTYPE", rb_cObject);
+  rb_undef_alloc_func(cFIELDTYPE);
   rb_define_singleton_method(cFIELDTYPE, "new",
 									  (&rbncurs_m_new_fieldtype),
 									  2);

data/menu_wrap.c

@@ -1074,6 +1074,7 @@ void init_menu(void)
   /* Menus */
   rb_iv_set(mMenu, "@menus_hash", rb_hash_new());
   cMENU  = rb_define_class_under(mMenu, "MENU", rb_cObject);
+  rb_undef_alloc_func(cMENU);
   rb_define_singleton_method(cMENU, "new", (&rbncurs_m_new_menu), 1);
 
   RB_CLASS_METH(cMENU, NULL, current_item, 0);
@@ -1127,6 +1128,7 @@ void init_menu(void)
   /* Items */
   rb_iv_set(mMenu, "@items_hash", rb_hash_new());
   cITEM = rb_define_class_under(mMenu, "ITEM", rb_cObject);
+  rb_undef_alloc_func(cITEM);
   rb_define_singleton_method(cITEM, "new", (&rbncurs_m_new_item), 2);
 
   RB_CLASS_METH(cITEM, "free", free_item, 0);

data/menu_wrap.h

@@ -1,10 +1,10 @@
 /*
  * This is a curses menu wrapper as part of ncurses-ruby.
- * It borrows heavily from form_wrap.h. 
+ * It borrows heavily from form_wrap.h.
  * Contributed by Earle Clubb <eclubb@valcom.com>
  * Valcom Inc. <http://www.valcom.com>
  * Copyright 2007
- * 
+ *
  *  This module is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either

data/ncurses_wrap.c

@@ -233,6 +233,7 @@ VALUE   wrap_window(WINDOW* window)
         if (rb_window == Qnil) {
             rb_window = Data_Wrap_Struct(cWINDOW, 0, 0, window);
             rb_iv_set(rb_window, "@destroyed", Qfalse);
+            rb_iv_set(rb_window, "@timeout", INT2FIX(-1));
             rb_hash_aset(windows_hash, window_adress, rb_window);
         }
         return rb_window;
@@ -838,16 +839,11 @@ static VALUE rbncurs_getbkgd(VALUE dummy, VALUE arg1) {
 typedef int (*wgetch_func) (WINDOW *);
 
 /* functor for getting a char nonblocking, pass getchar function */
-static int rbncurshelper_do_wgetch_functor (WINDOW *c_win, wgetch_func _wgetch_func) {
+static int rbncurshelper_do_wgetch_functor (WINDOW *c_win, wgetch_func _wgetch_func, int windelay) {
     /* nonblocking wgetch only implemented for Ncurses */
     int halfdelay = NUM2INT(rb_iv_get(mNcurses, "@halfdelay"));
     int infd = NUM2INT(rb_iv_get(mNcurses, "@infd"));
     double screen_delay = halfdelay * 0.1;
-#if defined(NCURSES_VERSION) && defined(NCURSES_OPAQUE) && !NCURSES_OPAQUE
-    int windelay = c_win->_delay;
-#else
-    int windelay = 0;
-#endif
     double window_delay = (windelay >= 0) ? 0.001 * windelay : (1e200*1e200);
     /* FIXME:                                                  ^ Infinity ^*/
     double delay = (screen_delay > 0) ? screen_delay : window_delay;
@@ -867,9 +863,7 @@ static int rbncurshelper_do_wgetch_functor (WINDOW *c_win, wgetch_func _wgetch_f
     starttime = tv.tv_sec + tv.tv_usec * 1e-6;
 #endif
     finishtime = starttime + delay;
-#if defined(NCURSES_VERSION) && defined(NCURSES_OPAQUE) && !NCURSES_OPAQUE
-    c_win->_delay = 0;
-#endif
+    wtimeout(c_win, 0);
     while (doupdate() /* detects resize */, (result = _wgetch_func(c_win)) == ERR) {
 #ifdef HAVE_RB_THREAD_FD_SELECT
       rb_fdset_t fdsets[3];
@@ -922,15 +916,13 @@ static int rbncurshelper_do_wgetch_functor (WINDOW *c_win, wgetch_func _wgetch_f
 #endif
 #endif
     }
-#if defined(NCURSES_VERSION) && defined(NCURSES_OPAQUE) && !NCURSES_OPAQUE
-    c_win->_delay = windelay;
-#endif
+    wtimeout(c_win, windelay);
     return result;
 }
 
 /* non-wide char getch */
-static int rbncurshelper_nonblocking_wgetch(WINDOW *c_win) {
-  return rbncurshelper_do_wgetch_functor (c_win, &wgetch);
+static int rbncurshelper_nonblocking_wgetch(WINDOW *c_win, int windelay) {
+  return rbncurshelper_do_wgetch_functor (c_win, &wgetch, windelay);
 }
 
 #ifdef HAVE_GET_WCH
@@ -942,20 +934,22 @@ static int my_wget_wch (WINDOW *c_win) {
 
 /* return array with first element being return key code status,
  * and second element the key code */
-static VALUE rbncurshelper_nonblocking_wget_wch(WINDOW *c_win) {
-  int retcode = rbncurshelper_do_wgetch_functor (c_win, &my_wget_wch);
+static VALUE rbncurshelper_nonblocking_wget_wch(WINDOW *c_win, int windelay) {
+  int retcode = rbncurshelper_do_wgetch_functor (c_win, &my_wget_wch, windelay);
   VALUE r = rb_assoc_new (INT2NUM(retcode), LONG2NUM(wget_wch_back));
   return r;
 }
 #endif
 
 static VALUE rbncurs_getch(VALUE dummy) {
-    return INT2NUM(rbncurshelper_nonblocking_wgetch(stdscr));
+    int windelay = NUM2INT(rb_iv_get(get_stdscr(), "@timeout"));
+    return INT2NUM(rbncurshelper_nonblocking_wgetch(stdscr, windelay));
 }
 
 #ifdef HAVE_GET_WCH
 static VALUE rbncurs_get_wch(VALUE dummy) {
-    return rbncurshelper_nonblocking_wget_wch(stdscr);
+    int windelay = NUM2INT(rb_iv_get(get_stdscr(), "@timeout"));
+    return rbncurshelper_nonblocking_wget_wch(stdscr, windelay);
 }
 #endif
 
@@ -1191,9 +1185,10 @@ static VALUE rbncurs_mvderwin(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3) {
     return INT2NUM(mvderwin(get_window(arg1),  NUM2INT(arg2),  NUM2INT(arg3)));
 }
 static VALUE rbncurs_mvgetch(VALUE dummy, VALUE arg1, VALUE arg2) {
+    int windelay = NUM2INT(rb_iv_get(get_stdscr(), "@timeout"));
     if (wmove(stdscr, NUM2INT(arg1),  NUM2INT(arg2)) == ERR)
         return INT2NUM(ERR);
-    return INT2NUM(rbncurshelper_nonblocking_wgetch(stdscr));
+    return INT2NUM(rbncurshelper_nonblocking_wgetch(stdscr, windelay));
 }
 #ifdef HAVE_MVHLINE
 static VALUE rbncurs_mvhline(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4) {
@@ -1253,9 +1248,10 @@ static VALUE rbncurs_mvwdelch(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3) {
 }
 static VALUE rbncurs_mvwgetch(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3) {
     WINDOW * c_win = get_window(arg1);
+    int windelay = NUM2INT(rb_iv_get(arg1, "@timeout"));
     if (wmove(c_win, NUM2INT(arg1),  NUM2INT(arg2)) == ERR)
         return INT2NUM(ERR);
-    return INT2NUM(rbncurshelper_nonblocking_wgetch(c_win));
+    return INT2NUM(rbncurshelper_nonblocking_wgetch(c_win, windelay));
 }
 #ifdef HAVE_MVWHLINE
 static VALUE rbncurs_mvwhline(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4, VALUE arg5) {
@@ -1298,7 +1294,12 @@ static VALUE rbncurs_nocbreak(VALUE dummy) {
     return INT2NUM(rbncurshelper_halfdelay_cbreak(0, 0));
 }
 static VALUE rbncurs_nodelay(VALUE dummy, VALUE arg1, VALUE arg2) {
-    return INT2NUM(nodelay(get_window(arg1),  RTEST(arg2)));
+    bool flag = RTEST(arg2);
+    int return_value = nodelay(get_window(arg1), flag);
+    if (return_value != ERR) {
+        rb_iv_set(arg1, "@timeout", INT2FIX(flag ? 0 : -1));
+    }
+    return INT2NUM(return_value);
 }
 static VALUE rbncurs_noecho(VALUE dummy) {
     return INT2NUM(noecho());
@@ -1498,6 +1499,7 @@ static VALUE rbncurs_tigetstr(VALUE dummy, VALUE arg1) {
 }
 #endif
 static VALUE rbncurs_timeout(VALUE dummy, VALUE arg1) {
+    rb_iv_set(get_stdscr(), "@timeout", arg1);
     return ((timeout(NUM2INT(arg1))),Qnil);
 }
 static VALUE rbncurs_typeahead(VALUE dummy, VALUE arg1) {
@@ -1603,12 +1605,14 @@ static VALUE rbncurs_werase(VALUE dummy, VALUE arg1) {
     return INT2NUM(werase(get_window(arg1)));
 }
 static VALUE rbncurs_wgetch(VALUE dummy, VALUE arg1) {
-    return INT2NUM(rbncurshelper_nonblocking_wgetch(get_window(arg1)));
+    int windelay = NUM2INT(rb_iv_get(arg1, "@timeout"));
+    return INT2NUM(rbncurshelper_nonblocking_wgetch(get_window(arg1), windelay));
 }
 
 #ifdef HAVE_GET_WCH
 static VALUE rbncurs_wget_wch(VALUE dummy, VALUE arg1) {
-    return rbncurshelper_nonblocking_wget_wch(get_window(arg1));
+    int windelay = NUM2INT(rb_iv_get(arg1, "@timeout"));
+    return rbncurshelper_nonblocking_wget_wch(get_window(arg1), windelay);
 }
 #endif
 
@@ -1664,6 +1668,7 @@ static VALUE rbncurs_wsyncup(VALUE dummy, VALUE arg1) {
     return ((wsyncup(get_window(arg1))),Qnil);
 }
 static VALUE rbncurs_wtimeout(VALUE dummy, VALUE arg1, VALUE arg2) {
+    rb_iv_set(arg1, "@timeout", arg2);
     return ((wtimeout(get_window(arg1),  NUM2INT(arg2))),Qnil);
 }
 static VALUE rbncurs_wtouchln(VALUE dummy, VALUE arg1, VALUE arg2, VALUE arg3, VALUE arg4) {
@@ -2592,7 +2597,7 @@ static void init_functions_3(void)
 #ifdef HAVE_WENCLOSE
     rb_define_module_function(mNcurses, "wenclose?",
                               (&rbncurs_wenclose),
-                              1);
+                              3);
 #endif
 #ifdef HAVE_MOUSEINTERVAL
     NCFUNC(mouseinterval, 1);
@@ -2606,7 +2611,7 @@ static void init_functions_3(void)
 #ifdef HAVE_HAS_KEY
     rb_define_module_function(mNcurses, "has_key?",
                               (&rbncurs_has_key),
-                              2);
+                              1);
 #endif
     NCFUNC(getyx, 3);
     NCFUNC(getbegyx, 3);
@@ -2865,7 +2870,9 @@ void Init_ncursesw_bin(void)
     rb_iv_set(mNcurses, "@infd", Qnil);
 
     cWINDOW  = rb_define_class_under(mNcurses, "WINDOW", rb_cObject);
+    rb_undef_alloc_func(cWINDOW);
     cSCREEN  = rb_define_class_under(mNcurses, "SCREEN", rb_cObject);
+    rb_undef_alloc_func(cSCREEN);
     init_constants_1();
     init_constants_2();
     init_constants_3();

data/panel_wrap.c

@@ -2,7 +2,7 @@
  * ncurses-ruby is a ruby module for accessing the FSF's ncurses library
  * (C) 2002 Tobias Peters <t-peters@berlios.de>
  * (C) 2011 Tobias Herzke
- * 
+ *
  *  This module is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ -100,11 +100,11 @@ static VALUE rbncurs_m_new_panel(VALUE dummy, VALUE rb_window)
 { return rbncurs_c_new_panel(rb_window); }
 static VALUE rbncurs_c_panel_above(VALUE rb_panel)
 { return wrap_panel(panel_above(get_panel(rb_panel))); }
-static VALUE rbncurs_m_panel_above(VALUE rb_panel)
+static VALUE rbncurs_m_panel_above(VALUE dummy, VALUE rb_panel)
 { return rbncurs_c_panel_above(rb_panel); }
 static VALUE rbncurs_c_panel_below(VALUE rb_panel)
 { return wrap_panel(panel_below(get_panel(rb_panel))); }
-static VALUE rbncurs_m_panel_below(VALUE rb_panel)
+static VALUE rbncurs_m_panel_below(VALUE dummy, VALUE rb_panel)
 { return rbncurs_c_panel_below(rb_panel); }
 static VALUE rbncurs_c_set_panel_userptr(VALUE rb_panel, VALUE userptr)
 { return INT2NUM(set_panel_userptr(get_panel(rb_panel),
@@ -135,6 +135,7 @@ void init_panel(void)
     mPanel = rb_define_module_under(mNcurses, "Panel");
     rb_iv_set(mPanel, "@panels_hash", rb_hash_new());
     cPANEL  = rb_define_class_under(mPanel, "PANEL", rb_cObject);
+    rb_undef_alloc_func(cPANEL);
     rb_define_singleton_method(mPanel, "del_panel",
                                (&rbncurs_m_del_panel),
                                1);
@@ -163,7 +164,7 @@ void init_panel(void)
                                1);
     rb_define_method(cPANEL, "hide_panel",
                      (&rbncurs_c_hide_panel), 0);
-    
+
     rb_define_method(cPANEL, "hide",
                      (&rbncurs_c_hide_panel), 0);
     rb_define_singleton_method(mPanel, "show_panel",
@@ -171,14 +172,14 @@ void init_panel(void)
                                1);
     rb_define_method(cPANEL, "show_panel",
                      (&rbncurs_c_show_panel), 0);
-    
+
     rb_define_method(cPANEL, "show",
                      (&rbncurs_c_show_panel), 0);
     rb_define_singleton_method(mPanel, "top_panel",
                                (&rbncurs_m_top_panel), 1);
     rb_define_method(cPANEL, "top_panel",
                      (&rbncurs_c_top_panel), 0);
-    
+
     rb_define_method(cPANEL, "top",
                      (&rbncurs_c_top_panel), 0);
     rb_define_singleton_method(mPanel, "bottom_panel",
@@ -186,7 +187,7 @@ void init_panel(void)
                                1);
     rb_define_method(cPANEL, "bottom_panel",
                      (&rbncurs_c_bottom_panel), 0);
-    
+
     rb_define_method(cPANEL, "bottom",
                      (&rbncurs_c_bottom_panel), 0);
     rb_define_singleton_method(mPanel, "new_panel",
@@ -229,7 +230,7 @@ void init_panel(void)
     rb_define_method(cPANEL, "panel_userptr",
                      (&rbncurs_c_panel_userptr),
                      0);
-    rb_define_method(cPANEL, "userptr",                
+    rb_define_method(cPANEL, "userptr",
                      (&rbncurs_c_panel_userptr),
                      0);
     rb_define_singleton_method(mPanel, "move_panel",

data/panel_wrap.h

@@ -2,7 +2,7 @@
  * ncurses-ruby is a ruby module for accessing the FSF's ncurses library
  * (C) 2002 Tobias Peters <t-peters@berlios.de>
  * (C) 2011 Tobias Herzke
- * 
+ *
  *  This module is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ncursesw
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.4.12
 platform: ruby
 authors:
 - Tobias Herzke
 - Sup developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies: []
 description: Tweaked version of ncursesw from http://ncurses-ruby.berlios.de/.
 email:
@@ -50,7 +50,7 @@ homepage: http://github.com/sup-heliotrope/ncursesw-ruby
 licenses:
 - LGPL-2.1
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,12 +65,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: 'This wrapper provides access to the functions, macros, global variables
   and constants of the ncurses library.  These are mapped to a Ruby Module named "Ncurses":  Functions
   and external variables are implemented as singleton functions of the Module Ncurses.'
 test_files: []
-has_rdoc: false