curses 1.2.0-x86-mingw32 → 1.2.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6a99bc0bc081a4d7023f5c2e487aa31b2736b8
-  data.tar.gz: 9a9181fca6c0f623277ec99f20f821abf37a5e38
+  metadata.gz: cb99c35ac3745ca7c0ad7d263a17a5b1e4ba062e
+  data.tar.gz: bfe75799c36d3d7d7cce20fc74c3f71a5c8538c5
 SHA512:
-  metadata.gz: a898b5e027249f722b713d88264fd8d6c954c4bf158e434c387b709b83ae9c897037445658a608e90ea0a6dd7f069522dcaf90f15dc88e793681811034d1f56c
-  data.tar.gz: 80759911360084014eba6f71abb2b4e57964afc5d56a560df65352e79f87a35d28d5da21eb5f7ebb457d54da3a37af880dd0db3b16cb58b354a327144c7ecfbf
+  metadata.gz: 8c7d056f6d65d971112ade3799b6788255da86c9141f3c31a032fe4428e7e7893c397c418ba5612b2a706bf7401f02cc7b3e77a9a8bf796b4d23c45b97cbb855
+  data.tar.gz: c10992c9292f16fca86d66173e0f78367c31c35f785e27b6fb77029c36fe71a9e1422cbc7a5f5f4da82008dab5a1057eb34285d42e7390bdc9e168863b3dbd44

data/.gitignore

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

data/History.md

@@ -1,3 +1,14 @@
+### 1.2.1 / 2017-03-27
+
+New features:
+
+* Add touch, untouch, touched?, touch_line, and line_touched?.
+
+Bug fixes:
+
+* Fix Pad#subpad to use subpad(3). (Issue #23)
+* Fix build issues on macOS.  Pull requests #24, #25, #26, #27 and #28 by nobu.
+
 ### 1.2.0 / 2017-02-19
 
 New features:

data/curses.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
   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(NUM2ULONG(ch));
+    bkgdset(NUM2CHTYPE(ch));
 #endif
     return Qnil;
 }
@@ -975,7 +975,7 @@ curses_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGD
     curses_stdscr();
-    return (bkgd(NUM2ULONG(ch)) == OK) ? Qtrue : Qfalse;
+    return (bkgd(NUM2CHTYPE(ch)) == OK) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -1680,7 +1680,7 @@ window_noutrefresh(VALUE obj)
 /*
  * Document-method: Curses::Window.redraw
  *
- * Dedraws the entire window.
+ * Redraws the entire window.
  */
 static VALUE
 window_redraw(VALUE obj)
@@ -1696,6 +1696,125 @@ window_redraw(VALUE obj)
 #define window_redraw rb_f_notimplement
 #endif
 
+#ifdef HAVE_TOUCHWIN
+/*
+ * Document-method: Curses::Window.touch
+ *
+ * Treat the window as if it has been modified since the last call of refresh.
+ */
+static VALUE
+window_touch(VALUE obj)
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+    touchwin(winp->window);
+
+    return Qnil;
+}
+#else
+#define window_touch rb_f_notimplement
+#endif
+
+#ifdef HAVE_UNTOUCHWIN
+/*
+ * Document-method: Curses::Window.untouch
+ *
+ * Treat the window as if it has not been modified since the last call of
+ * refresh.
+ */
+static VALUE
+window_untouch(VALUE obj)
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+    untouchwin(winp->window);
+
+    return Qnil;
+}
+#else
+#define window_touch rb_f_notimplement
+#endif
+
+#ifdef HAVE_IS_WINTOUCHED
+/*
+ * Document-method: Curses::Window.touched?
+ *
+ * Return true if the window has been modified since the last call of refresh.
+ */
+static VALUE
+window_touched(VALUE obj)
+{
+    struct windata *winp;
+
+    GetWINDOW(obj, winp);
+    return is_wintouched(winp->window) ? Qtrue : Qfalse;
+}
+#else
+#define window_touched rb_f_notimplement
+#endif
+
+#ifdef HAVE_WTOUCHLN
+/*
+ * Document-method: Curses::Window.touch_line
+ * call-seq: touch_line(y, n, changed = true)
+ *
+ * Make n lines from line y look as if they have (changed = true) or have not
+ * (changed = false) been modified since the last call of refresh.
+ */
+static VALUE
+window_touch_line(int argc, VALUE *argv, VALUE obj)
+{
+    struct windata *winp;
+    VALUE y, n, changed;
+    int result;
+
+    rb_scan_args(argc, argv, "12", &y, &n, &changed);
+    if (argc < 2) {
+	n = INT2NUM(1);
+    }
+    if (argc < 3) {
+	changed = Qtrue;
+    }
+    GetWINDOW(obj, winp);
+    result = wtouchln(winp->window, NUM2INT(y), NUM2INT(n), RTEST(changed));
+    if (result == ERR) {
+	rb_raise(rb_eRangeError, "Out of window");
+    }
+
+    return Qnil;
+}
+#else
+#define window_touch_line rb_f_notimplement
+#endif
+
+#ifdef HAVE_IS_LINETOUCHED
+/*
+ * Document-method: Curses::Window.line_touched?
+ * call-seq: line_touched?(line)
+ *
+ * Return true if the specified line has been modified since the last call of
+ * refresh.
+ */
+static VALUE
+window_line_touched(VALUE obj, VALUE line)
+{
+    struct windata *winp;
+    int result, n;
+
+    GetWINDOW(obj, winp);
+    n = NUM2INT(line);
+    result = is_linetouched(winp->window, n);
+    if (result == ERR) {
+	rb_raise(rb_eArgError, "Invalid line %d", n);
+    }
+    return result ? Qtrue : Qfalse;
+}
+#else
+#define window_line_touched rb_f_notimplement
+#endif
+
 /*
  * Document-method: Curses::Window.move
  * call-seq: move(y,x)
@@ -1779,7 +1898,7 @@ window_maxy(VALUE obj)
     return INT2FIX(getmaxy(winp->window));
 #elif defined(getmaxyx)
     {
-	int x, y;
+	int RB_UNUSED_VAR(x), y;
 	getmaxyx(winp->window, y, x);
 	return INT2FIX(y);
     }
@@ -1803,7 +1922,7 @@ window_maxx(VALUE obj)
     return INT2FIX(getmaxx(winp->window));
 #elif defined(getmaxyx)
     {
-	int x, y;
+	int x, RB_UNUSED_VAR(y);
 	getmaxyx(winp->window, y, x);
 	return INT2FIX(x);
     }
@@ -2402,7 +2521,7 @@ window_bkgdset(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    wbkgdset(winp->window, NUM2ULONG(ch));
+    wbkgdset(winp->window, NUM2CHTYPE(ch));
 #endif
     return Qnil;
 }
@@ -2423,7 +2542,7 @@ window_bkgd(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    return (wbkgd(winp->window, NUM2ULONG(ch)) == OK) ? Qtrue : Qfalse;
+    return (wbkgd(winp->window, NUM2CHTYPE(ch)) == OK) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -2601,9 +2720,6 @@ pad_initialize(VALUE obj, VALUE h, VALUE w)
     return obj;
 }
 
-#if 1
-#define pad_subpad window_subwin
-#else
 /*
  * Document-method: Curses::Pad.subpad
  * call-seq:
@@ -2617,7 +2733,7 @@ static VALUE
 pad_subpad(VALUE obj, VALUE height, VALUE width, VALUE begin_x, VALUE begin_y)
 {
     struct windata *padp;
-    WINDOW *subpad;
+    WINDOW *sub_pad;
     VALUE pad;
     int h, w, x, y;
 
@@ -2626,12 +2742,11 @@ pad_subpad(VALUE obj, VALUE height, VALUE width, VALUE begin_x, VALUE begin_y)
     x = NUM2INT(begin_x);
     y = NUM2INT(begin_y);
     GetWINDOW(obj, padp);
-    subpad = subwin(padp->window, h, w, x, y);
-    pad = prep_window(rb_obj_class(obj), subpad);
+    sub_pad = subpad(padp->window, h, w, x, y);
+    pad = prep_window(rb_obj_class(obj), sub_pad);
 
     return pad;
 }
-#endif
 
 /*
  * Document-method: Curses::Pad.refresh
@@ -3150,6 +3265,11 @@ Init_curses(void)
     rb_define_method(cWindow, "refresh", window_refresh, 0);
     rb_define_method(cWindow, "noutrefresh", window_noutrefresh, 0);
     rb_define_method(cWindow, "redraw", window_redraw, 0);
+    rb_define_method(cWindow, "touch", window_touch, 0);
+    rb_define_method(cWindow, "untouch", window_untouch, 0);
+    rb_define_method(cWindow, "touched?", window_touched, 0);
+    rb_define_method(cWindow, "touch_line", window_touch_line, -1);
+    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, "setpos", window_setpos, 2);

data/ext/curses/extconf.rb

@@ -60,15 +60,17 @@ if header_library
               scrl set setscrreg ungetch
               wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr
               wresize wscrl wsetscrreg werase redrawwin
+              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)
     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
   flag = "-D_XOPEN_SOURCE_EXTENDED"
-  if try_static_assert("sizeof(char*)>sizeof(int)",
-                       %w[stdio.h stdlib.h]+curses,
-                       flag)
+  if checking_for("_XOPEN_SOURCE_EXTENDED") {
+       try_compile(cpp_include(%w[stdio.h stdlib.h]+curses), flag, :werror => true)
+     }
     $defs << flag
   end
   have_var("ESCDELAY", curses)
@@ -134,8 +136,9 @@ if header_library
   if enable_config("pdcurses-wide")
     $defs << '-DPDC_WIDE'
   end
-  
+
   if RUBY_VERSION >= '2.1'
+    create_header
     create_makefile("curses")
   else
     # curses is part of ruby-core pre-2.1.0, so this gem is not required. But

metadata

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