curses 1.3.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d2078ada136fc3603a23e253c9342efe47cc62daad3db6459c57d1822b740a
-  data.tar.gz: 27ee0f6320474baacbe459dc52f40500240d55ce7656663cf8c8074774643fdf
+  metadata.gz: 1dbe3f75b839ed01f58ee7743d9d2e147491255aabc4292d04ddcf00a2eaec25
+  data.tar.gz: 057d072c126f7d00f8f23cd6fdb246255f94545af1bdb836648b68903a1f959f
 SHA512:
-  metadata.gz: dd21a812ca31bc59dc6e4377a61fc1b19d57779c95b5da48b358b28eb69f29686273de212527744038e508e0a42aed87ead357fe91f85d075eee30eed2aa1a68
-  data.tar.gz: e378f6977737d7871074d3fd08436b447823ef347fc67cfe4d367fc245bb7238c2d7514799a2a6324c2ec5cebb544c94f5fabaacfe66adc753ecc6c372970648
+  metadata.gz: 4bd61ea426ca6a68141099c8f6b734cd9094ade75fb5cb11525f285c41e6bec346e3b163bc0f37e1a29b96857ac1d2430f751f056e28641da7116c46ba458a19
+  data.tar.gz: bd3f77e5ff14b8c9aeb86d2e498a66f53d66999f55eb81848cf953946a10f242d906b2047eb8e342f0149a436766c810d53c3c06ee942e69d3ae20068e3c8e14

data/.github/workflows/macos.yml

@@ -0,0 +1,19 @@
+name: macos
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Build package
+      run: bundle exec rake build
+    - name: Install package
+      run: |
+        gem install pkg/curses-*.gem
+        ruby -r curses -e 'puts Curses::VERSION'

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,26 @@
+name: ubuntu
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [ head, 2.7, 2.6, 2.5 ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        sudo apt install libncursesw5-dev
+        gem install bundler --no-document
+        bundle install
+    - name: Build package
+      run: bundle exec rake build
+    - name: Install package
+      run: |
+        gem install pkg/curses-*.gem
+        ruby -r curses -e 'puts Curses::VERSION'

data/.github/workflows/windows.yml

@@ -0,0 +1,25 @@
+name: windows
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ 'mingw', 'mswin', '2.7', '2.6', '2.5' ]
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Build package
+      run: bundle exec rake build
+    - name: Install package
+      run: |
+        gem install pkg/curses-*.gem
+        ruby -r curses -e 'puts Curses::VERSION'

data/History.md

@@ -1,3 +1,37 @@
+### 1.4.2 / 2021-06-14
+
+New features:
+
+* Added samples for addch, attron, mouse tracking and colors.
+  Pull request #62 by coezbek.
+
+### 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:
+
+* Remove fat binary support for newer versions of Ruby
+
+### 1.3.2 / 2019-12-20
+
+Bug fixes:
+
+* Drop rb_safe_level check for Ruby 2.7 by Eric Wong.
+* Try libtinfow first.  Issue #52 by Marco Sirabella. 
+
+### 1.3.1 / 2019-04-21
+
+Bug fixes:
+
+* Check whether sizeof(WINDOW) is available to avoid build failures on macOS.
+  Issue #48 reported by chdiza.
+
 ### 1.3.0 / 2019-04-16
 
 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
@@ -18,7 +19,7 @@ with the release of Ruby 2.1.0. (see [ruby/ruby@9c5b2fd][2])
 ## Install
 
     $ gem install curses
-        
+
 Requires ncurses or ncursesw (with wide character support).
 On Debian based distributions, you can install it with apt:
 
@@ -28,6 +29,14 @@ Or
 
     $ apt install libncursesw5-dev
 
+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
 
 See [https://www.rubydoc.info/gems/curses](https://www.rubydoc.info/gems/curses).
@@ -39,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/Rakefile

@@ -1,89 +1,3 @@
 require "bundler"
 
 Bundler::GemHelper.install_tasks
-
-begin
-  require 'rake/extensiontask'
-rescue LoadError => e
-  warn "\nmissing #{e.path} (for rake-compiler)" if e.respond_to? :path
-  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.*")
-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/wincon" do
-      if $mswin
-        sh "nmake -f Makefile.vc clean all WIDE=Y DLL=Y"
-        cp %w[pdcurses.dll pdcurses.lib], "../../#{RUBY_PLATFORM}/PDCurses"
-      else
-        sh "make -f Makefile.mng clean all WIDE=Y DLL=N"
-        cp "pdcurses.a", "../../x86-mingw32/PDCurses/libpdcurses.a"
-
-        sh "make -f Makefile.mng clean all _w64=1 WIDE=Y DLL=N"
-        cp "pdcurses.a", "../../x64-mingw32/PDCurses/libpdcurses.a"
-      end
-    end
-  end
-end
-
-namespace :clean do
-  desc "Clean PDCurses"
-  task :pdcurses do
-    chdir "vendor/PDCurses/wincon" do
-      if $mswin
-        sh "nmake -f Makefile.vc clean"
-      else
-        sh "make -f Makefile.mng clean _linux_w64=1"
-      end
-    end
-  end
-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' +
-      ' --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
-  ext.cross_platform = ["x86-mingw32", "x64-mingw32"]
-  ext.cross_config_options << '--with-curses-include=' + 
-    File.expand_path("vendor/PDCurses", __dir__) +
-    ' --with-curses-version=function --enable-pdcurses-wide'
-  ext.cross_config_options << {
-    'x86-mingw32' => '--with-curses-lib=' +
-      File.expand_path("vendor/x86-mingw32/PDCurses", __dir__),
-    'x64-mingw32' => '--with-curses-lib=' +
-      File.expand_path("vendor/x64-mingw32/PDCurses", __dir__)
-  }
-  if $mswin
-    ext.cross_compiling do |_spec|
-      bin_file = "vendor/#{_spec.platform}/PDCurses/pdcurses.dll"
-      _spec.files += [bin_file]
-      stage_file = "#{ext.tmp_dir}/#{_spec.platform}/stage/#{bin_file}"
-      stage_dir = File.dirname(stage_file)
-      directory stage_dir
-      file stage_file => [stage_dir, bin_file] do
-        cp bin_file, stage_file
-      end
-    end
-  end
-end

data/curses.gemspec

@@ -1,17 +1,16 @@
 Gem::Specification.new { |s|
   s.name = "curses"
-  s.version = "1.3.0"
+  s.version = "1.4.2"
   s.author = ["Shugo Maeda", 'Eric Hodel']
   s.email = ["shugo@ruby-lang.org", 'drbrain@segment7.net']
   s.homepage = "https://github.com/ruby/curses"
   s.platform = Gem::Platform::RUBY
   s.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])"
-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(vendor)/}) }
+  s.files = `git ls-files --recurse-submodules -z`.split("\x0")
   s.extensions = ["ext/curses/extconf.rb"]
   s.require_path = "lib"
   s.required_ruby_version = Gem::Requirement.new('>= 2.1.0')
   s.licenses = ['Ruby', 'BSD-2-Clause']
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rake-compiler'
 }

data/ext/curses/curses.c

@@ -20,7 +20,9 @@
 #include "ruby/io.h"
 #include "ruby/thread.h"
 
-#if defined(HAVE_NCURSESW_CURSES_H)
+#if defined(HAVE_PDCURSES_H)
+# include <pdcurses.h>
+#elif defined(HAVE_NCURSESW_CURSES_H)
 # include <ncursesw/curses.h>
 #elif defined(HAVE_NCURSES_CURSES_H)
 # include <ncurses/curses.h>
@@ -80,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;
@@ -213,6 +226,7 @@ static VALUE window_attroff(VALUE obj, VALUE attrs);
 static VALUE window_attron(VALUE obj, VALUE attrs);
 static VALUE window_attrset(VALUE obj, VALUE attrs);
 
+NORETURN(static void no_window(void));
 static void
 no_window(void)
 {
@@ -220,8 +234,6 @@ no_window(void)
 }
 
 #define GetWINDOW(obj, winp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
     TypedData_Get_Struct((obj), struct windata, &windata_type, (winp));\
     if ((winp)->window == 0) no_window();\
 } while (0)
@@ -241,7 +253,7 @@ window_memsize(const void *p)
     const struct windata *winp = p;
     size_t size = sizeof(*winp);
     if (!winp) return 0;
-    if (winp->window && winp->window != stdscr) size += sizeof(*winp->window);
+    if (winp->window && winp->window != stdscr) size += CURSES_SIZEOF_WINDOW;
     return size;
 }
 
@@ -290,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();
@@ -313,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
@@ -329,7 +341,7 @@ curses_init_screen(void)
  *
  */
 static VALUE
-curses_close_screen(void)
+curses_close_screen(VALUE self)
 {
     curses_stdscr();
 #ifdef HAVE_ISENDWIN
@@ -369,7 +381,7 @@ curses_finalize(VALUE dummy)
  * returns +false+ otherwise.
  */
 static VALUE
-curses_closed(void)
+curses_closed(VALUE self)
 {
     curses_stdscr();
     if (isendwin()) {
@@ -419,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();
@@ -746,7 +758,7 @@ static VALUE
 curses_inch(VALUE obj)
 {
     curses_stdscr();
-    return CH2FIX(inch());
+    return CHTYPE2NUM(inch());
 }
 
 /*
@@ -761,7 +773,7 @@ static VALUE
 curses_addch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
-    addch(NUM2CH(ch));
+    addch(OBJ2CHTYPE(ch));
     return Qnil;
 }
 
@@ -776,7 +788,7 @@ static VALUE
 curses_insch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
-    insch(NUM2CH(ch));
+    insch(OBJ2CHTYPE(ch));
     return Qnil;
 }
 
@@ -857,7 +869,7 @@ getstr_func(void *arg)
 /*
  * Document-method: Curses.getstr
  *
- * This is equivalent to a series f Curses::Window.getch calls
+ * This is equivalent to a series of Curses::Window.getch calls
  *
  */
 static VALUE
@@ -948,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);
 }
@@ -959,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);
 }
@@ -1105,7 +1117,7 @@ curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
     curses_stdscr();
-    bkgdset(NUM2CHTYPE(ch));
+    bkgdset(OBJ2CHTYPE(ch));
 #endif
     return Qnil;
 }
@@ -1126,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
@@ -1439,6 +1451,7 @@ struct mousedata {
     MEVENT *mevent;
 };
 
+NORETURN(static void no_mevent(void));
 static void
 no_mevent(void)
 {
@@ -1446,8 +1459,6 @@ no_mevent(void)
 }
 
 #define GetMOUSE(obj, data) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
     TypedData_Get_Struct((obj), struct mousedata, &mousedata_type, (data));\
     if ((data)->mevent == 0) no_mevent();\
 } while (0)
@@ -1466,7 +1477,7 @@ curses_mousedata_memsize(const void *p)
     const struct mousedata *mdata = p;
     size_t size = sizeof(*mdata);
     if (!mdata) return 0;
-    if (mdata->mevent) size += sizeof(*mdata->mevent);
+    if (mdata->mevent) size += CURSES_SIZEOF_MEVENT;
     return size;
 }
 
@@ -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;
 }
@@ -2414,7 +2432,7 @@ wgetstr_func(void *_arg)
 /*
  * Document-method: Curses::Window.getstr
  *
- * This is equivalent to a series f Curses::Window.getch calls
+ * This is equivalent to a series of Curses::Window.getch calls
  *
  */
 static VALUE
@@ -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));
@@ -3042,8 +3060,6 @@ no_item(void)
 }
 
 #define GetITEM(obj, itemp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted item");\
     TypedData_Get_Struct((obj), struct itemdata, &itemdata_type, (itemp));\
     if ((itemp)->item == 0) no_item();\
 } while (0)
@@ -3063,7 +3079,7 @@ item_memsize(const void *p)
     const struct itemdata *itemp = p;
     size_t size = sizeof(*itemp);
     if (!itemp) return 0;
-    if (itemp->item) size += sizeof(*itemp->item);
+    if (itemp->item) size += CURSES_SIZEOF_ITEM;
     return size;
 }
 
@@ -3094,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");
@@ -3242,8 +3258,6 @@ no_menu(void)
 }
 
 #define GetMENU(obj, menup) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted menu");\
     TypedData_Get_Struct((obj), struct menudata, &menudata_type, (menup));\
     if ((menup)->menu == 0) no_menu();\
 } while (0)
@@ -3274,7 +3288,7 @@ menu_memsize(const void *p)
     const struct menudata *menup = p;
     size_t size = sizeof(*menup);
     if (!menup) return 0;
-    if (menup->menu) size += sizeof(*menup->menu);
+    if (menup->menu) size += CURSES_SIZEOF_MENU;
     return size;
 }
 
@@ -3309,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");
@@ -3706,6 +3720,7 @@ struct fielddata {
     FIELD *field;
 };
 
+NORETURN(static void no_field(void));
 static void
 no_field(void)
 {
@@ -3713,8 +3728,6 @@ no_field(void)
 }
 
 #define GetFIELD(obj, fieldp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted field");\
     TypedData_Get_Struct((obj), struct fielddata, &fielddata_type, (fieldp));\
     if ((fieldp)->field == 0) no_field();\
 } while (0)
@@ -3734,7 +3747,7 @@ field_memsize(const void *p)
     const struct fielddata *fieldp = p;
     size_t size = sizeof(*fieldp);
     if (!fieldp) return 0;
-    if (fieldp->field) size += sizeof(*fieldp->field);
+    if (fieldp->field) size += CURSES_SIZEOF_FIELD;
     return size;
 }
 
@@ -3766,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");
@@ -4152,6 +4165,7 @@ struct formdata {
     VALUE fields;
 };
 
+NORETURN(static void no_form(void));
 static void
 no_form(void)
 {
@@ -4159,8 +4173,6 @@ no_form(void)
 }
 
 #define GetFORM(obj, formp) do {\
-    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted form");\
     TypedData_Get_Struct((obj), struct formdata, &formdata_type, (formp));\
     if ((formp)->form == 0) no_form();\
 } while (0)
@@ -4191,7 +4203,7 @@ form_memsize(const void *p)
     const struct formdata *formp = p;
     size_t size = sizeof(*formp);
     if (!formp) return 0;
-    if (formp->form) size += sizeof(*formp->form);
+    if (formp->form) size += CURSES_SIZEOF_FORM;
     return size;
 }
 
@@ -4225,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");
@@ -4725,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);
@@ -4865,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);
@@ -4949,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);
@@ -4960,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);
@@ -4983,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);
@@ -5010,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);