curses 1.1.3-x64-mingw32 → 1.2.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4cf50588910963afee4f81ebc68d5675fd9760
-  data.tar.gz: 95da1ffb64b5f3887e60635619121c95a1cfd6e9
+  metadata.gz: 04d04686d090e2a3913983232742be67966d9fbd
+  data.tar.gz: 8843bf19009918d55b4e3bc7d7284aa47c4c5785
 SHA512:
-  metadata.gz: 34a335070bfee6c2139c64fd7562132cd057b0e0aa4a4b7d6144c13f5ad7492267fa7d30dfb16846738a9355e1da3789a5da467f5644d7487b3f838ac84792e1
-  data.tar.gz: 2751b223334fa9977e2e26880f624bd7689232e62dac66b32d5774df2daeeafd36bedc88a98337a97d31345a92056f6f03df5f08a36f8ef5167c40d2ea3af005
+  metadata.gz: 56acbf3928bb3c762a57759f8caca3e03cbe4c148ef8878054ee4d4554ccc13b5e24b8541644a9249bf4cf40e898077f4c6536500d3f51f83b740d79d23bde6e
+  data.tar.gz: f34c4f2341d67915db884a7252113120d8fb08204800af5fddf223dfaf92142f03cb9a4b228fae88d62a9633ed6e8adf8b297137e233d9c5558bd4acca8c9165

data/History.md

@@ -1,3 +1,16 @@
+### 1.2.0 / 2017-02-19
+
+New features:
+
+* Add Curses.assume_default_colors.
+
+Bug fixes:
+
+* Curses.unget_char should use String#ord even if unget_wch() is not available.
+* The default value of keyboard_encoding should be ASCII-8BIT if get_wch() is
+  not available.
+* NUM2ULONG() should be used in Window#bkgd etc.
+
 ### 1.1.3 / 2017-02-08
 
 Bug fixes:

data/README.md

@@ -1,5 +1,6 @@
 # curses
 
+[![Gem Version](https://badge.fury.io/rb/curses.svg)](https://badge.fury.io/rb/curses)
 [![Build Status](https://travis-ci.org/ruby/curses.svg?branch=master)](https://travis-ci.org/ruby/curses)
 [![Build status](https://ci.appveyor.com/api/projects/status/kdvksgjo4fyd3c4m/branch/master?svg=true)](https://ci.appveyor.com/project/ruby/curses/branch/master)
 

data/curses.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.1.3"
+  s.version = "1.2.0"
   s.author = ["Shugo Maeda", 'Eric Hodel']
   s.email = ["shugo@ruby-lang.org", 'drbrain@segment7.net']
   s.homepage = "https://github.com/ruby/curses"

data/ext/curses/curses.c

@@ -954,7 +954,7 @@ curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
     curses_stdscr();
-    bkgdset(NUM2CH(ch));
+    bkgdset(NUM2ULONG(ch));
 #endif
     return Qnil;
 }
@@ -975,7 +975,7 @@ curses_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGD
     curses_stdscr();
-    return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+    return (bkgd(NUM2ULONG(ch)) == OK) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -998,6 +998,23 @@ curses_use_default_colors(VALUE obj)
 #define curses_use_default_colors rb_f_notimplement
 #endif
 
+#if defined(HAVE_ASSUME_DEFAULT_COLORS)
+/*
+ * tells which colors to paint for color pair 0.
+ *
+ * see also the system manual for default_colors(3)
+ */
+static VALUE
+curses_assume_default_colors(VALUE obj, VALUE fg, VALUE bg)
+{
+    curses_stdscr();
+    assume_default_colors(NUM2INT(fg), NUM2INT(bg));
+    return Qnil;
+}
+#else
+#define curses_assume_default_colors rb_f_notimplement
+#endif
+
 #if defined(HAVE_TABSIZE)
 /*
  * Document-method: Curses.TABSIZE=
@@ -2385,7 +2402,7 @@ window_bkgdset(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    wbkgdset(winp->window, NUM2CH(ch));
+    wbkgdset(winp->window, NUM2ULONG(ch));
 #endif
     return Qnil;
 }
@@ -2406,7 +2423,7 @@ window_bkgd(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+    return (wbkgd(winp->window, NUM2ULONG(ch)) == OK) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -2425,7 +2442,7 @@ window_getbkgd(VALUE obj)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
+    return (c = getbkgd(winp->window) != ERR) ? ULONG2NUM(c) : Qnil;
 #else
     return Qnil;
 #endif
@@ -2747,9 +2764,8 @@ curses_set_terminal_encoding(VALUE obj, VALUE enc)
 static VALUE
 curses_unget_char(VALUE obj, VALUE ch)
 {
-#ifdef HAVE_UNGET_WCH
     ID id_ord;
-#endif
+    unsigned int c;
 
     curses_stdscr();
     if (FIXNUM_P(ch)) {
@@ -2757,11 +2773,15 @@ curses_unget_char(VALUE obj, VALUE ch)
     }
     else {
 	StringValue(ch);
-#ifdef HAVE_UNGET_WCH
 	CONST_ID(id_ord, "ord");
-	unget_wch(NUM2UINT(rb_funcall(ch, id_ord, 0)));
+	c = NUM2UINT(rb_funcall(ch, id_ord, 0));
+#ifdef HAVE_UNGET_WCH
+	unget_wch(c);
 #else
-	ungetch(NUM2UINT(ch));
+	if (c > 0xff) {
+	    rb_raise(rb_eRangeError, "Out of range: %u", c);
+	}
+	ungetch(c);
 #endif
     }
     return Qnil;
@@ -2929,7 +2949,12 @@ window_get_char(VALUE obj)
 void
 Init_curses(void)
 {
-    keyboard_encoding = terminal_encoding = rb_locale_encoding();
+#ifdef HAVE_GET_WCH
+    keyboard_encoding = rb_locale_encoding();
+#else
+    keyboard_encoding = rb_ascii8bit_encoding();
+#endif
+    terminal_encoding = rb_locale_encoding();
 
     mCurses    = rb_define_module("Curses");
 
@@ -2975,6 +3000,7 @@ Init_curses(void)
     rb_define_module_function(mCurses, "TABSIZE=", curses_tabsize_set, 1);
 
     rb_define_module_function(mCurses, "use_default_colors", curses_use_default_colors, 0);
+    rb_define_module_function(mCurses, "assume_default_colors", curses_assume_default_colors, 2);
     rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
     rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
     rb_define_module_function(mCurses, "closed?", curses_closed, 0);

data/ext/curses/extconf.rb

@@ -61,8 +61,8 @@ if header_library
               wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr
               wresize wscrl wsetscrreg werase redrawwin
               def_prog_mode reset_prog_mode timeout wtimeout nodelay
-              init_color wcolor_set use_default_colors newpad
-              unget_wch get_wch wget_wch)
+              init_color wcolor_set use_default_colors assume_default_colors
+              newpad unget_wch get_wch wget_wch)
     have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
   end
   flag = "-D_XOPEN_SOURCE_EXTENDED"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: x64-mingw32
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A Ruby binding for curses, ncurses, and PDCurses. curses is an extension