curses 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 752aede822d94ce057584a85299d487d950d6879
-  data.tar.gz: bd0a91aafa38b4b9c84bcc0e2d39973d46f4d7b2
+SHA256:
+  metadata.gz: 7cde762b5d566d153efcb872a949cdd742ee678351642f99ff4142a302792f54
+  data.tar.gz: 3cacf0b68211f369d99b23592bb3e1035ab8d56f31c64ffb713ae573b30068c9
 SHA512:
-  metadata.gz: ba77b3fb94a501d9eeb8d10ddc83310aa1105aec4265686c4a515b5f7564507b8372c81bab68a8596472b0aba2ca6dcde01a8be278a839febe5f15ad4162fc25
-  data.tar.gz: 771c80d69e9c10b2e3505cd9cec68daee19a46581254062dc739e4a61ba7b05b97a38f276682b284a79a279383fa2104410efbf0ac719e2d4b274a9be515986b
+  metadata.gz: c113a50e510eb659797ce295982c44e8c8d5355eb7ef9506b9d20b7a98ca92053960da5edc333d7b9fb0e9cfa659b4339abb25859d2bda4126227dce8e2ad17b
+  data.tar.gz: 8fde98598b7c32632bfdab0c0f92564d32088e311754c0c39ec905012ad874718e4a8b69f0953c9ff280de4ef399cb7c874908396a307a77118a72efdea5cb4d

data/History.md

@@ -1,3 +1,14 @@
+### 1.2.5 / 2018-10-16
+
+New features:
+
+* Add mvderwin and derwin methods to Window.  Pull request #37 by meschbach.
+* Add documentation link.  Pull request #39 by atshakil.
+
+Bug fixes:
+
+* Favor ncursesw over curses.  Pull request #40 by DivineDominion.
+
 ### 1.2.4 / 2017-09-13
 
 New features:

data/README.md

@@ -28,6 +28,10 @@ Or
 
     $ apt install libncursesw5-dev
 
+## Documentation
+
+See [http://www.rubydoc.info/gems/curses](http://www.rubydoc.info/gems/curses).
+
 ## Developers
 
 After checking out the repo, run `bundle install` to install dependencies.

data/curses.gemspec

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

@@ -20,12 +20,12 @@
 #include "ruby/io.h"
 #include "ruby/thread.h"
 
-#if defined(HAVE_NCURSES_H)
-# include <ncurses.h>
-#elif defined(HAVE_NCURSESW_CURSES_H)
+#if defined(HAVE_NCURSESW_CURSES_H)
 # include <ncursesw/curses.h>
 #elif defined(HAVE_NCURSES_CURSES_H)
 # include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
 #elif defined(HAVE_CURSES_COLR_CURSES_H)
 # ifdef HAVE_STDARG_PROTOTYPES
 #  include <stdarg.h>
@@ -1589,6 +1589,38 @@ window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
     return win;
 }
 
+#ifdef HAVE_DERWIN
+/*
+ * Document-method: Curses::Window.derwin
+ * call-seq: derwin(height, width, relative_top, relative_left)
+ *
+ * Construct a new subwindow with constraints of
+ * +height+ lines, +width+ columns, begin at +top+ line, and begin +left+ most column
+ * relative to the parent window.
+ *
+ */
+static VALUE
+window_derwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
+{
+    struct windata *winp;
+    WINDOW *window;
+    VALUE win;
+    int h, w, t, l;
+
+    h = NUM2INT(height);
+    w = NUM2INT(width);
+    t = NUM2INT(top);
+    l = NUM2INT(left);
+    GetWINDOW(obj, winp);
+    window = derwin(winp->window, h, w, t, l);
+    win = prep_window(rb_obj_class(obj), window);
+
+    return win;
+}
+#else
+#define window_derwin rb_f_notimplement
+#endif
+
 /*
  * Document-method: Curses::Window.close
  *
@@ -1854,6 +1886,28 @@ window_move(VALUE obj, VALUE y, VALUE x)
     return Qnil;
 }
 
+#ifdef HAVE_MVDERWIN
+/*
+ * Document-method: Curses::Window.move_relative
+ * call-seq: move_relative(x,y)
+ *
+ * Moves the derived or subwindow inside its parent window. The screen-relative
+ * parameters of the window are not changed.
+ */
+static VALUE
+window_move_relative(VALUE obj, VALUE y, VALUE x)
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+    mvderwin(winp->window, NUM2INT(y), NUM2INT(x));
+
+    return Qnil;
+}
+#else
+#define window_move_relative rb_f_notimplement
+#endif
+
 /*
  * Document-method: Curses::Window.setpos
  * call-seq: setpos(y, x)
@@ -3311,6 +3365,7 @@ Init_curses(void)
     rb_define_alloc_func(cWindow, window_s_allocate);
     rb_define_method(cWindow, "initialize", window_initialize, 4);
     rb_define_method(cWindow, "subwin", window_subwin, 4);
+    rb_define_method(cWindow, "derwin", window_derwin, 4);
     rb_define_method(cWindow, "close", window_close, 0);
     rb_define_method(cWindow, "clear", window_clear, 0);
     rb_define_method(cWindow, "erase", window_erase, 0);
@@ -3325,6 +3380,7 @@ Init_curses(void)
     rb_define_method(cWindow, "line_touched?", window_line_touched, 1);
     rb_define_method(cWindow, "box", window_box, -1);
     rb_define_method(cWindow, "move", window_move, 2);
+    rb_define_method(cWindow, "move_relative", window_move_relative, 2);
     rb_define_method(cWindow, "setpos", window_setpos, 2);
 #if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
     rb_define_method(cWindow, "color_set", window_color_set, 1);

data/ext/curses/extconf.rb

@@ -59,7 +59,7 @@ if header_library
               getbkgd getnstr init isendwin keyname keypad resizeterm
               scrl set setscrreg ungetch addnwstr
               wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr
-              wresize wscrl wsetscrreg werase redrawwin waddnwstr
+              wresize wscrl wsetscrreg werase redrawwin waddnwstr mvderwin derwin
               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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,11 +103,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby binding for curses, ncurses, and PDCurses. curses is an extension
   library for text UI applications. Formerly part of the Ruby standard library, [curses
   was removed and placed in this gem][1] with the release of Ruby 2.1.0. (see [ruby/ruby@9c5b2fd][2])
 test_files: []
-has_rdoc: