curses 1.2.2-x86-mingw32 → 1.2.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f3d8d7657551aeedc577c13b92d6999c3955d12
-  data.tar.gz: 2494cab8da17cf5d9e9a358b86ab98c6cc7934fd
+  metadata.gz: ae1a403a5cf98c4556460ed4283a22d2db100d79
+  data.tar.gz: 2a444e3eda04735adbcb384af0fd9022dc7f9258
 SHA512:
-  metadata.gz: 441ebd565fec09af89f27c002eb84804e51c8c94f9684c77c24eae946a51c7e89e54e41f641f59401d6be0cdf1cb5bbe8c9cf90ac55b16f42acf5188b54f7171
-  data.tar.gz: 8c4f11f6099263db5c00af27cf66bca483d271476578890ef17e9052b44595173ff17c58fea9cf75aa45348bce960f25a9526ac93b1091ae8e49be9a8b68f42b
+  metadata.gz: 6283e52c1d4cd95428dbe8fa6d889422a0757b3c4a3f2a1da342d7a372bb760174559ec46fc7fb1ad27f92af124525c3753e3628860a5808e08c5c435321022b
+  data.tar.gz: 89510d080693330b0a9a40da47145c6537f6544621f6ccc668f582e28433def918fec5d8a50e38e1bc3636a0b44337f94e91fabaea07ddf7b263aa29fa3e3bfa

data/History.md

@@ -1,3 +1,9 @@
+### 1.2.3 / 2017-07-03
+
+Bug fixes:
+
+* Fixes for mswin.  Pull requests #30, #31, #32 and #33 by unak.
+
 ### 1.2.2 / 2017-04-22
 
 New features:

data/Rakefile

@@ -25,15 +25,15 @@ namespace :build do
     mkdir_p "vendor/x64-mingw32/PDCurses"
     chdir "vendor/PDCurses/win32" do
       if $mswin
-        sh "nmake -f vcwin32.mak clean all WIDE=Y"
-        cp "pdcurses.lib", "../../#{RUBY_PLATFORM}/PDCurses"
-      end
-
-      sh "make -f mingwin32.mak clean all _linux_w32=1 WIDE=Y DLL=Y"
-      cp "pdcurses.dll", "../../x86-mingw32/PDCurses"
+        sh "nmake -f vcwin32.mak clean all WIDE=Y DLL=Y"
+        cp %w[pdcurses.dll pdcurses.lib], "../../#{RUBY_PLATFORM}/PDCurses"
+      else
+        sh "make -f mingwin32.mak clean all _linux_w32=1 WIDE=Y DLL=Y"
+        cp "pdcurses.dll", "../../x86-mingw32/PDCurses"
 
-      sh "make -f mingwin32.mak clean all _linux_w64=1 WIDE=Y DLL=Y"
-      cp "pdcurses.dll", "../../x64-mingw32/PDCurses"
+        sh "make -f mingwin32.mak clean all _linux_w64=1 WIDE=Y DLL=Y"
+        cp "pdcurses.dll", "../../x64-mingw32/PDCurses"
+      end
     end
   end
 end
@@ -54,8 +54,10 @@ Rake::ExtensionTask.new(spec.name, spec) do |ext|
     ext.config_options << '--with-curses-include=' + 
       File.expand_path("vendor/PDCurses", __dir__) +
       ' --with-curses-version=function --enable-pdcurses-wide' +
+      ' --enable-pdcurses-dll' +
       ' --with-curses-lib=' +
       File.expand_path("vendor/#{RUBY_PLATFORM}/PDCurses", __dir__)
+    spec.files += ["vendor/#{RUBY_PLATFORM}/PDCurses/pdcurses.dll"]
   end
 
   ext.cross_compile = true

data/curses.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.2.2"
+  s.version = "1.2.3"
   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

@@ -138,8 +138,21 @@ prep_window(VALUE class, WINDOW *window)
     return obj;
 }
 
+#if (defined(HAVE_ADDNWSTR) || defined(HAVE_WADDNWSTR)) && defined(_WIN32)
+static inline rb_encoding *
+get_wide_encoding(void)
+{
+    static rb_encoding *utf16le = NULL;
+    if (!utf16le) {
+	utf16le = rb_enc_find("utf-16le");
+    }
+    return utf16le;
+}
+#endif
+
 /*-------------------------- module Curses --------------------------*/
 
+static void curses_finalize(VALUE);
 /*
  * Document-method: Curses.init_screen
  *
@@ -155,6 +168,7 @@ curses_init_screen(void)
     if (stdscr == 0) {
 	rb_raise(rb_eRuntimeError, "can't initialize curses");
     }
+    rb_set_end_proc(curses_finalize, 0);
     clear();
     rb_stdscr = prep_window(cWindow, stdscr);
     return rb_stdscr;
@@ -648,11 +662,19 @@ static VALUE
 curses_addstr(VALUE obj, VALUE str)
 {
     StringValue(str);
+#if defined(HAVE_ADDNWSTR) && defined(_WIN32)
+    str = rb_str_export_to_enc(str, get_wide_encoding());
+    curses_stdscr();
+    if (!NIL_P(str)) {
+	addnwstr((wchar_t *)RSTRING_PTR(str), RSTRING_LEN(str) / sizeof(wchar_t));
+    }
+#else
     str = rb_str_export_to_enc(str, terminal_encoding);
     curses_stdscr();
     if (!NIL_P(str)) {
 	addstr(StringValueCStr(str));
     }
+#endif
     return Qnil;
 }
 
@@ -2118,9 +2140,15 @@ window_addstr(VALUE obj, VALUE str)
 	struct windata *winp;
 
 	StringValue(str);
+#if defined(HAVE_WADDNWSTR) && defined(_WIN32)
+	str = rb_str_export_to_enc(str, get_wide_encoding());
+	GetWINDOW(obj, winp);
+	waddnwstr(winp->window, (wchar_t *)RSTRING_PTR(str), RSTRING_LEN(str) / sizeof(wchar_t));
+#else
 	str = rb_str_export_to_enc(str, terminal_encoding);
 	GetWINDOW(obj, winp);
 	waddstr(winp->window, StringValueCStr(str));
+#endif
     }
     return Qnil;
 }
@@ -4827,6 +4855,4 @@ Init_curses(void)
     rb_curses_define_const(PDC_KEY_MODIFIER_NUMLOCK);
 #endif
 #undef rb_curses_define_const
-
-    rb_set_end_proc(curses_finalize, 0);
 }

data/ext/curses/extconf.rb

@@ -57,9 +57,9 @@ if header_library
 
   for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash
               getbkgd getnstr init isendwin keyname keypad resizeterm
-              scrl set setscrreg ungetch
+              scrl set setscrreg ungetch addnwstr
               wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr
-              wresize wscrl wsetscrreg werase redrawwin
+              wresize wscrl wsetscrreg werase redrawwin waddnwstr
               touchwin untouchwin wtouchln is_linetouched is_wintouched
               def_prog_mode reset_prog_mode timeout wtimeout nodelay
               init_color wcolor_set use_default_colors assume_default_colors
@@ -137,6 +137,10 @@ if header_library
     $defs << '-DPDC_WIDE'
   end
 
+  if enable_config("pdcurses-dll")
+    $defs << '-DPDC_DLL_BUILD'
+  end
+
   if RUBY_VERSION >= '2.1'
     create_header
     create_makefile("curses")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: x86-mingw32
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-07-02 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.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A Ruby binding for curses, ncurses, and PDCurses. curses is an extension