curses 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be7e62d906986b92d5aeb5ad8c7dd948833268f8
-  data.tar.gz: 72f1b3eca9ec5a59946542a035a056acf0f06480
+  metadata.gz: 1c4334a25b2d2defa891e6563b7302ab6cd6e1fd
+  data.tar.gz: 85c551081b9df4fe67373b4009b952e03b879101
 SHA512:
-  metadata.gz: '09b7f6fbe55a30bc30c4eb8217525be91ae62dd4621574a6376c7403d98ce599556be616677ad7d811cb2bfa46365a4d542e0ab7ec87c6b9b14a86ed31cda388'
-  data.tar.gz: cdc9f6227b7d35a71a31c3bc389e8e4c4c81d898a7fc9ed99c3e2233c6613d5949124878bdf287ba9d9ecc95e5bf2c245f8a82fa001c6db12b2593d625cf3c6e
+  metadata.gz: f17ebf960373a51a71635296cfafd607b058df2878fb22e217a72b320f3bde6367b8f5c09c7dbe5d93b144bdf874a712325f05ee432441b89051770eaca2cb54
+  data.tar.gz: f57ca3e245404dd7282c41a7745a1044de0e763970cf34c2d27cc3e52b79e61de1b65f63374ad34139fee2b4ea9c31a01536eb004df06f40c3b169c0f315b28d

data/.gitignore

@@ -10,5 +10,6 @@
 /Gemfile.lock
 /vendor/x86-mingw32
 /vendor/x64-mingw32
+/vendor/x64-mswin64*
 /ext/curses/Makefile
 .ruby-version

data/.travis.yml

@@ -6,9 +6,8 @@ notifications:
       - drbrain@segment7.net
       - shugo@ruby-lang.org
 rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 script: rake compile

data/History.md

@@ -1,3 +1,11 @@
+### 1.2.2 / 2017-04-22
+
+New features:
+
+* Add Curses.get_key_modifiers, Curses.return_key_modifiers, and
+  Curses.save_key_modifiers.
+* Support mswin native build.  Pull request #29 by usa.
+
 ### 1.2.1 / 2017-03-27
 
 New features:

data/Rakefile

@@ -9,6 +9,9 @@ rescue LoadError => e
   warn "run: bundle install\n\n"
 end
 
+$mswin = /mswin/ =~ RUBY_PLATFORM
+
+CLOBBER.include("vendor/#{RUBY_PLATFORM}") if $mswin
 CLOBBER.include("vendor/x86-mingw32")
 CLOBBER.include("vendor/x64-mingw32")
 CLOBBER.include("lib/2.*")
@@ -17,11 +20,18 @@ CLOBBER.include("pkg")
 namespace :build do
   desc "Build PDCurses"
   task :pdcurses do
+    mkdir_p "vendor/#{RUBY_PLATFORM}/PDCurses" if $mswin
     mkdir_p "vendor/x86-mingw32/PDCurses"
     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 "make -f mingwin32.mak clean all _linux_w64=1 WIDE=Y DLL=Y"
       cp "pdcurses.dll", "../../x64-mingw32/PDCurses"
     end
@@ -32,6 +42,7 @@ namespace :clean do
   desc "Clean PDCurses"
   task :pdcurses do
     chdir "vendor/PDCurses/win32" do
+      sh "nmake -f vcwin32.mak clean" if $mswin
       sh "make -f mingwin32.mak clean _linux_w64=1"
     end
   end
@@ -39,6 +50,14 @@ end
 
 spec = eval(File.read(File.expand_path("curses.gemspec", __dir__)))
 Rake::ExtensionTask.new(spec.name, spec) do |ext|
+  if $mswin
+    ext.config_options << '--with-curses-include=' + 
+      File.expand_path("vendor/PDCurses", __dir__) +
+      ' --with-curses-version=function --enable-pdcurses-wide' +
+      ' --with-curses-lib=' +
+      File.expand_path("vendor/#{RUBY_PLATFORM}/PDCurses", __dir__)
+  end
+
   ext.cross_compile = true
   ext.cross_platform = ["x86-mingw32", "x64-mingw32"]
   ext.cross_config_options << '--with-curses-include=' + 

data/appveyor.yml

@@ -12,6 +12,5 @@ test: off
 deploy: off
 environment:
   matrix:
-    - ruby_version: "21-x64"
     - ruby_version: "22-x64"
     - ruby_version: "23-x64"

data/curses.gemspec

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

@@ -3030,6 +3030,26 @@ window_get_char(VALUE obj)
 #endif
 }
 
+#ifdef HAVE_PDC_GET_KEY_MODIFIERS
+static VALUE
+curses_get_key_modifiers(VALUE obj)
+{
+    return ULONG2NUM(PDC_get_key_modifiers());
+}
+
+static VALUE
+curses_return_key_modifiers(VALUE obj, VALUE flag)
+{
+    return INT2NUM(PDC_return_key_modifiers(RTEST(flag)));
+}
+
+static VALUE
+curses_save_key_modifiers(VALUE obj, VALUE flag)
+{
+    return INT2NUM(PDC_save_key_modifiers(RTEST(flag)));
+}
+#endif
+
 /*------------------------- Initialization -------------------------*/
 
 /*
@@ -3193,6 +3213,11 @@ Init_curses(void)
     rb_define_module_function(mCurses, "terminal_encoding=", curses_set_terminal_encoding, 1);
     rb_define_module_function(mCurses, "unget_char", curses_unget_char, 1);
     rb_define_module_function(mCurses, "get_char", curses_get_char, 0);
+#ifdef HAVE_PDC_GET_KEY_MODIFIERS
+    rb_define_module_function(mCurses, "get_key_modifiers", curses_get_key_modifiers, 0);
+    rb_define_module_function(mCurses, "return_key_modifiers", curses_return_key_modifiers, 1);
+    rb_define_module_function(mCurses, "save_key_modifiers", curses_save_key_modifiers, 1);
+#endif
 
     {
         VALUE version;
@@ -3335,7 +3360,7 @@ Init_curses(void)
     rb_undef_method(cPad, "subwin");
 #endif
 
-#define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
+#define rb_curses_define_const(c) rb_define_const(mCurses,#c,CHTYPE2NUM(c))
 
 #ifdef USE_COLOR
     /* Document-const: A_ATTRIBUTES
@@ -4758,6 +4783,49 @@ Init_curses(void)
 	    rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
 	}
     }
+#ifdef PDC_KEY_MODIFIER_SHIFT
+    /* PDCurses-specific keys */
+    rb_curses_define_const(ALT_0);
+    rb_curses_define_const(ALT_1);
+    rb_curses_define_const(ALT_2);
+    rb_curses_define_const(ALT_3);
+    rb_curses_define_const(ALT_4);
+    rb_curses_define_const(ALT_5);
+    rb_curses_define_const(ALT_6);
+    rb_curses_define_const(ALT_7);
+    rb_curses_define_const(ALT_8);
+    rb_curses_define_const(ALT_9);
+    rb_curses_define_const(ALT_A);
+    rb_curses_define_const(ALT_B);
+    rb_curses_define_const(ALT_C);
+    rb_curses_define_const(ALT_D);
+    rb_curses_define_const(ALT_E);
+    rb_curses_define_const(ALT_F);
+    rb_curses_define_const(ALT_G);
+    rb_curses_define_const(ALT_H);
+    rb_curses_define_const(ALT_I);
+    rb_curses_define_const(ALT_J);
+    rb_curses_define_const(ALT_K);
+    rb_curses_define_const(ALT_L);
+    rb_curses_define_const(ALT_M);
+    rb_curses_define_const(ALT_N);
+    rb_curses_define_const(ALT_O);
+    rb_curses_define_const(ALT_P);
+    rb_curses_define_const(ALT_Q);
+    rb_curses_define_const(ALT_R);
+    rb_curses_define_const(ALT_S);
+    rb_curses_define_const(ALT_T);
+    rb_curses_define_const(ALT_U);
+    rb_curses_define_const(ALT_V);
+    rb_curses_define_const(ALT_W);
+    rb_curses_define_const(ALT_X);
+    rb_curses_define_const(ALT_Y);
+    rb_curses_define_const(ALT_Z);
+    rb_curses_define_const(PDC_KEY_MODIFIER_SHIFT);
+    rb_curses_define_const(PDC_KEY_MODIFIER_CONTROL);
+    rb_curses_define_const(PDC_KEY_MODIFIER_ALT);
+    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

@@ -63,7 +63,7 @@ if header_library
               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
-              newpad unget_wch get_wch wget_wch)
+              newpad unget_wch get_wch wget_wch PDC_get_key_modifiers)
     have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
   end
   convertible_int('chtype', [["#undef MOUSE_MOVED\n"]]+curses) or abort

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler