ncursesw 1.4.11 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2449dc12bd5aa4a1fd83323ad528ede0d71ae0632a9e1c61e18f298985d2ef1b
-  data.tar.gz: a2f3a6e4a289ade617c3a36e6929b31285ded7ed3cefbb91ef18c0b73010d873
+  metadata.gz: 5a846d10840ceea6519165015d366a350d41c791c65fde5e882cffb5bbc2e157
+  data.tar.gz: 6a10a52e885cb8824bf10c734855f4862dcaeec3d020b9afcf6995311febd2a7
 SHA512:
-  metadata.gz: fe5797d9be9b6b1086b785d1a8628cb7527ad4af4b3b92892ff66313f5a78244f2f88ae7d34e8f016cf76332b3d1a6772eb2c7d31badfa50bc1804fafff14231
-  data.tar.gz: b5e269223c5fa27cdbaa3c03a5ebf8491881bed52c8195960e932e9709c8106be1c336fd18ad6bb42424a07d11e4e6e62fd562f0dbcaf0d65352c422d61d2c16
+  metadata.gz: e8cbd887172807b687a9d59be846d48c8e92fd86c2b7bb73aa34ef171672f9ad7c96a91083ca3a78380ce3f70976213af8c4089b3832edefe0762dd0c9eabf18
+  data.tar.gz: 9f24b8e345dfe91b83311adc913aeef03ddf077888e7517b7dd15ef9f03d38a7f55184be61ef1fdc1ae652069dbe96940a0847a675e0272007717b847c919e5a

data/Changes

@@ -1,3 +1,6 @@
+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".

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/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) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncursesw
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
 platform: ruby
 authors:
 - Tobias Herzke
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: 'This wrapper provides access to the functions, macros, global variables