curses 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab24f57e39b3e38b5b9833d34f9bf5d6c2d55337f59693c628e30aa1f4f7324e
-  data.tar.gz: a91a892d3c975670cccda3d99a5d7b7a9b0ff8e708aedaf87a2d57cc505d6338
+  metadata.gz: 857d0a003f909b9e148855feb1d7b5eca2487aab1d22c544e0fdf560a92293b5
+  data.tar.gz: 49329a8c35c0e157c5cba591eb317bf9acf2672af16c8e826aa22ab0ada59cda
 SHA512:
-  metadata.gz: eff7ca406eeb081d6dcac3fe394e44577fdfdfa41428ecfb2068fd7de5288204df78081ff1e5bc41f5594c43194e8b20797ae6361cf7ffa028faf7301b085dd9
-  data.tar.gz: d06b2e6d23e5eaac2b5c42cc9b433ef6e5ea25961e28dbe760d51b3fee5aadb2d5f68e76e1a7b1b066ecbcdc129b079c00e7e8427d7e31f4fe65950239eae9b5
+  metadata.gz: 7330fdebb60f3871c10d74685ea5c7ed0194ba7630d0def5cd65de72a3e32e48df343b290ed7e718a116eae1eeab52b5f32d58a4e16e64db6210da9fea19d99e
+  data.tar.gz: 77d3c8bcc7183642917311d0cbde1d14f55771b133adb2b7953a052a02672053a5bdc3dd0fc0ab78963383d1e114c9b4534df643be05cb17c2adfdcfca8d7c1a

data/.github/workflows/windows.yml

@@ -7,19 +7,16 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ '2.7.x', '2.6.x', '2.5.x' ]
+        ruby: [ 'mingw', 'mswin', '2.7', '2.6', '2.5' ]
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
+        bundler-cache: true
     - name: Build package
       run: bundle exec rake build
     - name: Install package

data/History.md

@@ -1,3 +1,10 @@
+### 1.4.1 / 2021-05-22
+
+Bug fixes:
+
+* Use chtype instead of char to support attributes
+* Fixes for Ruby 3.1.
+
 ### 1.4.0 / 2020-12-10
 
 New features:

data/README.md

@@ -1,8 +1,9 @@
 # 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)
+[![ubuntu](https://github.com/ruby/curses/workflows/ubuntu/badge.svg)](https://github.com/ruby/curses/actions?query=workflow%3Aubuntu)
+[![windows](https://github.com/ruby/curses/workflows/windows/badge.svg)](https://github.com/ruby/curses/actions?query=workflow%3Awindows)
+[![macos](https://github.com/ruby/curses/workflows/macos/badge.svg)](https://github.com/ruby/curses/actions?query=workflow%3Amacos)
 
 * https://github.com/ruby/curses
 * https://github.com/ruby/curses/issues
@@ -28,8 +29,13 @@ Or
 
     $ apt install libncursesw5-dev
 
-On mingw, `gem install curses` will install pre-built PDCurses, so you
+On Windows, `gem install curses` will build bundled PDCurses, so you
 don't need to install extra libraries.
+However, if you prefer ncurses to PDCurses, specify the following option:
+
+    > gem install curses -- --use-system-libraries
+
+On mingw, you need DevKit to compile the extension library.
 
 ## Documentation
 
@@ -42,57 +48,16 @@ After checking out the repo, run `bundle install` to install dependencies.
 To compile the extension library, run `bundle exec rake compile`.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `curses.gemspec`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-### Cross compilation for Windows on Debian GNU/Linux based platforms
-
-1. Install development environment fo 32- and 64-bit Windows.
-
-   ```
-   $ sudo apt-get install mingw-w64
-   ```
-
-2. Install rake-compiler.
-
-   ```
-   $ gem install rake-compiler
-   ```
-
-3. Compile multiple versions of Ruby.
-
-   ```
-   $ rake-compiler cross-ruby HOST=i686-w64-mingw32 VERSION=2.2.6
-   $ rake-compiler cross-ruby HOST=i686-w64-mingw32 VERSION=2.3.3
-   $ rake-compiler cross-ruby HOST=i686-w64-mingw32 VERSION=2.4.0
-   $ rake-compiler cross-ruby HOST=x86_64-w64-mingw32 VERSION=2.2.6
-   $ rake-compiler cross-ruby HOST=x86_64-w64-mingw32 VERSION=2.3.3
-   $ rake-compiler cross-ruby HOST=x86_64-w64-mingw32 VERSION=2.4.0
-   ```
-
-3. Compile PDCurses.
-
-   ```
-   $ rake build:pdcurses
-   ```
-
-5. Compile curses.gem.
-
-   ```
-   $ rake RUBY_CC_VERSION=2.3.3:2.4.0 cross clean compile native gem
-   ```
-
-Binary gems are generated in pkg/.
-
 ## License
 
 curses is released under the Ruby and 2-clause BSD licenses.  See COPYING for
 details.
 
-Binary gems for mingw32 include a forked version of PDCurses, which is in
-the public domain:
+It includes a forked version of PDCurses, which is in the public domain:
 
   https://github.com/Bill-Gray/PDCurses
 
-The version for Win32 console mode in the win32 subdirectory is used.
+The version for Win32 console mode in the wincon subdirectory is used.
 
 [1]: https://bugs.ruby-lang.org/issues/8584
 [2]: https://github.com/ruby/ruby/commit/9c5b2fd8aa0fd343ad094d47a638cfd3f6ae0a81

data/curses.gemspec

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

@@ -82,8 +82,19 @@
 # define USE_MOUSE 1
 #endif
 
-#define NUM2CH NUM2CHR
-#define CH2FIX CHR2FIX
+#define OBJ2CHTYPE rb_obj2chtype_inline
+
+static inline chtype
+rb_obj2chtype_inline(VALUE x)
+{
+    if (RB_TYPE_P(x, RUBY_T_STRING)) {
+	ID id_ord;
+
+	CONST_ID(id_ord, "ord");
+	x = rb_funcall(x, id_ord, 0);
+    }
+    return NUM2CHTYPE(x);
+}
 
 static VALUE mCurses;
 static VALUE mKey;
@@ -291,7 +302,7 @@ static void curses_finalize(VALUE);
  * see also Curses.stdscr
  */
 static VALUE
-curses_init_screen(void)
+curses_init_screen(VALUE self)
 {
     if (rb_stdscr) return rb_stdscr;
     initscr();
@@ -314,7 +325,7 @@ curses_init_screen(void)
  *
  * Many curses functions use this window.
  */
-#define curses_stdscr curses_init_screen
+#define curses_stdscr() curses_init_screen(Qnil)
 
 /*
  * Document-method: Curses.close_screen
@@ -330,7 +341,7 @@ curses_init_screen(void)
  *
  */
 static VALUE
-curses_close_screen(void)
+curses_close_screen(VALUE self)
 {
     curses_stdscr();
 #ifdef HAVE_ISENDWIN
@@ -370,7 +381,7 @@ curses_finalize(VALUE dummy)
  * returns +false+ otherwise.
  */
 static VALUE
-curses_closed(void)
+curses_closed(VALUE self)
 {
     curses_stdscr();
     if (isendwin()) {
@@ -420,7 +431,7 @@ curses_erase(VALUE obj)
  * Clears to the end of line, that the cursor is currently on.
  */
 static VALUE
-curses_clrtoeol(void)
+curses_clrtoeol(VALUE self)
 {
     curses_stdscr();
     clrtoeol();
@@ -747,7 +758,7 @@ static VALUE
 curses_inch(VALUE obj)
 {
     curses_stdscr();
-    return CH2FIX(inch());
+    return CHTYPE2NUM(inch());
 }
 
 /*
@@ -762,7 +773,7 @@ static VALUE
 curses_addch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
-    addch(NUM2CH(ch));
+    addch(OBJ2CHTYPE(ch));
     return Qnil;
 }
 
@@ -777,7 +788,7 @@ static VALUE
 curses_insch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
-    insch(NUM2CH(ch));
+    insch(OBJ2CHTYPE(ch));
     return Qnil;
 }
 
@@ -949,7 +960,7 @@ curses_keyname(VALUE obj, VALUE c)
  * Returns the number of lines on the screen
  */
 static VALUE
-curses_lines(void)
+curses_lines(VALUE self)
 {
     return INT2FIX(LINES);
 }
@@ -960,7 +971,7 @@ curses_lines(void)
  * Returns the number of columns on the screen
  */
 static VALUE
-curses_cols(void)
+curses_cols(VALUE self)
 {
     return INT2FIX(COLS);
 }
@@ -1106,7 +1117,7 @@ curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
     curses_stdscr();
-    bkgdset(NUM2CHTYPE(ch));
+    bkgdset(OBJ2CHTYPE(ch));
 #endif
     return Qnil;
 }
@@ -1127,7 +1138,7 @@ curses_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGD
     curses_stdscr();
-    return (bkgd(NUM2CHTYPE(ch)) == OK) ? Qtrue : Qfalse;
+    return (bkgd(OBJ2CHTYPE(ch)) == OK) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -1548,7 +1559,7 @@ static VALUE
 curses_mousemask(VALUE obj, VALUE mask)
 {
     curses_stdscr();
-    return INT2NUM(mousemask(NUM2UINT(mask),NULL));
+    return ULONG2NUM(mousemask(NUM2UINT(mask),NULL));
 }
 
 #define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
@@ -1589,7 +1600,12 @@ DEFINE_MOUSE_GET_MEMBER(curs_mouse_z, z)
  * Returns the current mouse's button state.  Use this with the button state
  * constants to determine which buttons were pressed.
  */
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
+static VALUE curs_mouse_bstate(VALUE mouse)
+{
+    struct mousedata *mdata;
+    GetMOUSE(mouse, mdata);
+    return ULONG2NUM(mdata->mevent->bstate);
+}
 #undef define_curs_mouse_member
 #endif /* USE_MOUSE */
 
@@ -1681,7 +1697,7 @@ window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
     struct windata *winp;
     WINDOW *window;
 
-    curses_init_screen();
+    curses_init_screen(Qnil);
     TypedData_Get_Struct(obj, struct windata, &windata_type, winp);
     if (winp->window) delwin(winp->window);
     window = newwin(NUM2INT(h), NUM2INT(w), NUM2INT(top), NUM2INT(left));
@@ -2178,7 +2194,7 @@ window_begx(VALUE obj)
 
 /*
  * Document-method: Curses::Window.box
- * call-seq: box(vert, hor)
+ * call-seq: box(vert = nil, hor = nil, corn = nil)
  *
  * set the characters to frame the window in.
  * The vertical +vert+ and horizontal +hor+ character.
@@ -2193,16 +2209,18 @@ window_box(int argc, VALUE *argv, VALUE self)
     struct windata *winp;
     VALUE vert, hor, corn;
 
-    rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
+    rb_scan_args(argc, argv, "03", &vert, &hor, &corn);
 
     GetWINDOW(self, winp);
-    box(winp->window, NUM2CH(vert), NUM2CH(hor));
+    box(winp->window,
+	NIL_P(vert) ? 0 : OBJ2CHTYPE(vert),
+	NIL_P(hor) ? 0 : OBJ2CHTYPE(hor));
 
     if (!NIL_P(corn)) {
 	int cur_x, cur_y, x, y;
 	chtype c;
 
-	c = NUM2CH(corn);
+	c = OBJ2CHTYPE(corn);
 	getyx(winp->window, cur_y, cur_x);
 	x = NUM2INT(window_maxx(self)) - 1;
 	y = NUM2INT(window_maxy(self)) - 1;
@@ -2269,7 +2287,7 @@ window_inch(VALUE obj)
     struct windata *winp;
 
     GetWINDOW(obj, winp);
-    return CH2FIX(winch(winp->window));
+    return CHTYPE2NUM(winch(winp->window));
 }
 
 /*
@@ -2286,7 +2304,7 @@ window_addch(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj, winp);
-    waddch(winp->window, NUM2CH(ch));
+    waddch(winp->window, OBJ2CHTYPE(ch));
 
     return Qnil;
 }
@@ -2304,7 +2322,7 @@ window_insch(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj, winp);
-    winsch(winp->window, NUM2CH(ch));
+    winsch(winp->window, OBJ2CHTYPE(ch));
 
     return Qnil;
 }
@@ -2732,7 +2750,7 @@ window_bkgdset(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    wbkgdset(winp->window, NUM2CHTYPE(ch));
+    wbkgdset(winp->window, OBJ2CHTYPE(ch));
 #endif
     return Qnil;
 }
@@ -2753,7 +2771,7 @@ window_bkgd(VALUE obj, VALUE ch)
     struct windata *winp;
 
     GetWINDOW(obj,winp);
-    return (wbkgd(winp->window, NUM2CHTYPE(ch)) == OK) ? Qtrue : Qfalse;
+    return (wbkgd(winp->window, OBJ2CHTYPE(ch)) == OK) ? Qtrue : Qfalse;
 #else
     return Qfalse;
 #endif
@@ -2921,7 +2939,7 @@ pad_initialize(VALUE obj, VALUE h, VALUE w)
     struct windata *padp;
     WINDOW *window;
 
-    curses_init_screen();
+    curses_init_screen(Qnil);
     TypedData_Get_Struct(obj, struct windata, &windata_type, padp);
     if (padp->window) delwin(padp->window);
     window = newpad(NUM2INT(h), NUM2INT(w));
@@ -3092,7 +3110,7 @@ item_initialize(VALUE obj, VALUE name, VALUE description)
 {
     struct itemdata *itemp;
 
-    curses_init_screen();
+    curses_init_screen(Qnil);
     TypedData_Get_Struct(obj, struct itemdata, &itemdata_type, itemp);
     if (itemp->item) {
 	rb_raise(rb_eRuntimeError, "already initialized item");
@@ -3305,7 +3323,7 @@ menu_initialize(VALUE obj, VALUE items)
     ID id_new;
 
     Check_Type(items, T_ARRAY);
-    curses_init_screen();
+    curses_init_screen(Qnil);
     TypedData_Get_Struct(obj, struct menudata, &menudata_type, menup);
     if (menup->menu) {
 	rb_raise(rb_eRuntimeError, "already initialized menu");
@@ -3761,7 +3779,7 @@ field_initialize(VALUE obj, VALUE height, VALUE width,
 {
     struct fielddata *fieldp;
 
-    curses_init_screen();
+    curses_init_screen(Qnil);
     TypedData_Get_Struct(obj, struct fielddata, &fielddata_type, fieldp);
     if (fieldp->field) {
 	rb_raise(rb_eRuntimeError, "already initialized field");
@@ -4219,7 +4237,7 @@ form_initialize(VALUE obj, VALUE fields)
     int i;
 
     Check_Type(fields, T_ARRAY);
-    curses_init_screen();
+    curses_init_screen(Qnil);
     TypedData_Get_Struct(obj, struct formdata, &formdata_type, formp);
     if (formp->form) {
 	rb_raise(rb_eRuntimeError, "already initialized form");
@@ -4719,7 +4737,7 @@ Init_curses(void)
     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);
-    rb_define_module_function(mCurses, "stdscr", curses_stdscr, 0);
+    rb_define_module_function(mCurses, "stdscr", curses_init_screen, 0);
     rb_define_module_function(mCurses, "refresh", curses_refresh, 0);
     rb_define_module_function(mCurses, "doupdate", curses_doupdate, 0);
     rb_define_module_function(mCurses, "clear", curses_clear, 0);
@@ -4859,7 +4877,7 @@ Init_curses(void)
      *   win.close
      *
      */
-    cWindow = rb_define_class_under(mCurses, "Window", rb_cData);
+    cWindow = rb_define_class_under(mCurses, "Window", rb_cObject);
     rb_define_alloc_func(cWindow, window_s_allocate);
     rb_define_method(cWindow, "initialize", window_initialize, 4);
     rb_define_method(cWindow, "subwin", window_subwin, 4);
@@ -4943,7 +4961,7 @@ Init_curses(void)
 #endif
 
 #ifdef HAVE_MENU
-    cItem = rb_define_class_under(mCurses, "Item", rb_cData);
+    cItem = rb_define_class_under(mCurses, "Item", rb_cObject);
     rb_define_alloc_func(cItem, item_s_allocate);
     rb_define_method(cItem, "initialize", item_initialize, 2);
     rb_define_method(cItem, "==", item_eq, 1);
@@ -4954,7 +4972,7 @@ Init_curses(void)
     rb_define_method(cItem, "opts_off", item_opts_off_m, 1);
     rb_define_method(cItem, "opts", item_opts_m, 0);
 
-    cMenu = rb_define_class_under(mCurses, "Menu", rb_cData);
+    cMenu = rb_define_class_under(mCurses, "Menu", rb_cObject);
     rb_define_alloc_func(cMenu, menu_s_allocate);
     rb_define_method(cMenu, "initialize", menu_initialize, 1);
     rb_define_method(cMenu, "post", menu_post, 0);
@@ -4977,7 +4995,7 @@ Init_curses(void)
 #endif
 
 #ifdef HAVE_FORM
-    cField = rb_define_class_under(mCurses, "Field", rb_cData);
+    cField = rb_define_class_under(mCurses, "Field", rb_cObject);
     rb_define_alloc_func(cField, field_s_allocate);
     rb_define_method(cField, "initialize", field_initialize, 6);
     rb_define_method(cField, "set_buffer", field_set_buffer, 2);
@@ -5004,7 +5022,7 @@ Init_curses(void)
     rb_define_method(cField, "max=", field_set_max, 1);
     rb_define_method(cField, "set_type", field_set_type, -1);
 
-    cForm = rb_define_class_under(mCurses, "Form", rb_cData);
+    cForm = rb_define_class_under(mCurses, "Form", rb_cObject);
     rb_define_alloc_func(cForm, form_s_allocate);
     rb_define_method(cForm, "initialize", form_initialize, 1);
     rb_define_method(cForm, "post", form_post, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curses
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Shugo Maeda
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,14 +53,12 @@ files:
 - ".github/workflows/windows.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
 - BSDL
 - COPYING
 - Gemfile
 - History.md
 - README.md
 - Rakefile
-- appveyor.yml
 - curses.gemspec
 - ext/curses/curses.c
 - ext/curses/depend
@@ -337,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A Ruby binding for curses, ncurses, and PDCurses. curses is an extension

data/.travis.yml

@@ -1,16 +0,0 @@
----
-language: ruby
-notifications:
-  email:
-    recipients:
-      - drbrain@segment7.net
-      - shugo@ruby-lang.org
-rvm:
-  - 2.2.10
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-  - ruby-head
-before_install: gem install bundler -v '<2'
-script: rake compile

data/appveyor.yml

@@ -1,16 +0,0 @@
----
-clone_depth: 10
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - appveyor DownloadFile http://dl.bintray.com/oneclick/OpenKnapsack/x64/pdcurses-3.4-x64-windows.tar.lzma
-  - 7z e pdcurses-3.4-x64-windows.tar.lzma
-  - 7z x -y -oC:\Ruby%ruby_version% pdcurses-3.4-x64-windows.tar
-  - bundle install
-build_script:
-  - rake -rdevkit compile -- --with-curses-dir=C:\Ruby%ruby_version%
-test: off
-deploy: off
-environment:
-  matrix:
-    - ruby_version: "22-x64"
-    - ruby_version: "23-x64"