curses 1.3.2 → 1.4.3

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;
@@ -289,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();
@@ -312,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
@@ -328,7 +341,7 @@ curses_init_screen(void)
  *
  */
 static VALUE
-curses_close_screen(void)
+curses_close_screen(VALUE self)
 {
     curses_stdscr();
 #ifdef HAVE_ISENDWIN
@@ -368,7 +381,7 @@ curses_finalize(VALUE dummy)
  * returns +false+ otherwise.
  */
 static VALUE
-curses_closed(void)
+curses_closed(VALUE self)
 {
     curses_stdscr();
     if (isendwin()) {
@@ -418,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();
@@ -607,6 +620,20 @@ curses_nonl(VALUE obj)
     return Qnil;
 }
 
+/*
+ * Document-method: Curses.flushinp
+ *
+ * The flushinp routine throws away any typeahead that has been
+ * typed by the user and has not yet been read by the program.
+ */
+static VALUE
+curses_flushinp(VALUE obj)
+{
+    curses_stdscr();
+    flushinp();
+    return Qnil;
+}
+
 /*
  * Document-method: Curses.beep
  *
@@ -745,7 +772,7 @@ static VALUE
 curses_inch(VALUE obj)
 {
     curses_stdscr();
-    return CH2FIX(inch());
+    return CHTYPE2NUM(inch());
 }
 
 /*
@@ -760,7 +787,7 @@ static VALUE
 curses_addch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
-    addch(NUM2CH(ch));
+    addch(OBJ2CHTYPE(ch));
     return Qnil;
 }
 
@@ -775,7 +802,7 @@ static VALUE
 curses_insch(VALUE obj, VALUE ch)
 {
     curses_stdscr();
-    insch(NUM2CH(ch));
+    insch(OBJ2CHTYPE(ch));
     return Qnil;
 }
 
@@ -947,7 +974,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);
 }
@@ -958,7 +985,7 @@ curses_lines(void)
  * Returns the number of columns on the screen
  */
 static VALUE
-curses_cols(void)
+curses_cols(VALUE self)
 {
     return INT2FIX(COLS);
 }
@@ -1104,7 +1131,7 @@ curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
     curses_stdscr();
-    bkgdset(NUM2CHTYPE(ch));
+    bkgdset(OBJ2CHTYPE(ch));
 #endif
     return Qnil;
 }
@@ -1125,7 +1152,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
@@ -1546,7 +1573,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) \
@@ -1587,7 +1614,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 */
 
@@ -1679,7 +1711,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));
@@ -2176,7 +2208,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.
@@ -2191,16 +2223,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;
@@ -2267,7 +2301,7 @@ window_inch(VALUE obj)
     struct windata *winp;
 
     GetWINDOW(obj, winp);
-    return CH2FIX(winch(winp->window));
+    return CHTYPE2NUM(winch(winp->window));
 }
 
 /*
@@ -2284,7 +2318,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;
 }
@@ -2302,7 +2336,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;
 }
@@ -2730,7 +2764,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;
 }
@@ -2751,7 +2785,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
@@ -2919,7 +2953,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));
@@ -3090,7 +3124,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");
@@ -3303,7 +3337,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");
@@ -3598,6 +3632,121 @@ menu_set_format(VALUE obj, VALUE rows, VALUE cols)
     return obj;
 }
 
+/*
+ * Document-method: Curses::Menu#mark=
+ *
+ * call-seq:
+ *   mark=(str)
+ *
+ * Set the mark string to distinguish the selected items
+ */
+static VALUE
+menu_set_mark(VALUE obj, VALUE mark)
+{
+    struct menudata *menup;
+
+    GetMENU(obj, menup);
+    set_menu_mark(menup->menu, StringValueCStr(mark));
+
+    return obj;
+}
+
+/*
+ * Document-method: Curses::Menu#mark
+ *
+ * call-seq:
+ *   mark
+ *
+ * Get the Menu's mark string
+ */
+static VALUE
+menu_get_mark(VALUE obj)
+{
+    struct menudata *menup;
+    const char *mark;
+
+    GetMENU(obj, menup);
+    mark = menu_mark(menup->menu);
+
+    return rb_external_str_new_with_enc(mark, strlen(mark), terminal_encoding);
+}
+
+/*
+ * Document-method: Curses::Menu#fore=
+ *
+ * call-seq:
+ *   fore=(attr)
+ *
+ * Sets the foreground attribute of menu.
+ * This is the highlight used for selected menu items.
+ */
+static VALUE
+menu_set_fore(VALUE obj, VALUE attr)
+{
+    struct menudata *menup;
+
+    GetMENU(obj, menup);
+    set_menu_fore(menup->menu, NUM2CHTYPE(attr));
+
+    return attr;
+}
+
+/*
+ * Document-method: Curses::Menu#fore
+ *
+ * call-seq:
+ *   fore
+ *
+ * Sets the foreground attribute of menu.
+ * This is the highlight used for selected menu items.
+ */
+static VALUE
+menu_get_fore(VALUE obj, VALUE attr)
+{
+    struct menudata *menup;
+
+    GetMENU(obj, menup);
+
+    return CHTYPE2NUM(menu_fore(menup->menu));
+}
+
+/*
+ * Document-method: Curses::Menu#set_back
+ *
+ * call-seq:
+ *   set_back(attr)
+ *
+ * Get the background attribute of menu.
+ */
+static VALUE
+menu_set_back(VALUE obj, VALUE attr)
+{
+    struct menudata *menup;
+
+    GetMENU(obj, menup);
+    CHTYPE2NUM(set_menu_back(menup->menu, NUM2CHTYPE(attr)));
+
+    return attr;
+}
+
+/*
+ * Document-method: Curses::Menu#back
+ *
+ * call-seq:
+ *   back
+ *
+ * Get the background attribute of menu.
+ */
+static VALUE
+menu_get_back(VALUE obj, VALUE attr)
+{
+    struct menudata *menup;
+
+    GetMENU(obj, menup);
+
+    return CHTYPE2NUM(menu_back(menup->menu));
+}
+
 /*
  * Document-method: Curses::Menu#format
  *
@@ -3759,7 +3908,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");
@@ -4217,7 +4366,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");
@@ -4717,7 +4866,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);
@@ -4733,6 +4882,7 @@ Init_curses(void)
     rb_define_module_function(mCurses, "nocrmode", curses_nocbreak, 0);
     rb_define_module_function(mCurses, "nl", curses_nl, 0);
     rb_define_module_function(mCurses, "nonl", curses_nonl, 0);
+    rb_define_module_function(mCurses, "flushinp", curses_flushinp, 0);
     rb_define_module_function(mCurses, "beep", curses_beep, 0);
     rb_define_module_function(mCurses, "flash", curses_flash, 0);
     rb_define_module_function(mCurses, "ungetch", curses_ungetch, 1);
@@ -4857,7 +5007,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);
@@ -4941,7 +5091,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);
@@ -4952,7 +5102,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);
@@ -4968,6 +5118,12 @@ Init_curses(void)
     rb_define_method(cMenu, "scale", menu_scale, 0);
     rb_define_method(cMenu, "set_format", menu_set_format, 2);
     rb_define_method(cMenu, "format", menu_format_m, 0);
+    rb_define_method(cMenu, "mark=", menu_set_mark, 1);
+    rb_define_method(cMenu, "mark", menu_get_mark, 0);
+    rb_define_method(cMenu, "fore=", menu_set_fore, 1);
+    rb_define_method(cMenu, "fore", menu_get_fore, 0);
+    rb_define_method(cMenu, "back=", menu_set_back, 1);
+    rb_define_method(cMenu, "back", menu_get_back, 0);
     rb_define_method(cMenu, "set_opts", menu_set_opts, 1);
     rb_define_method(cMenu, "opts_on", menu_opts_on_m, 1);
     rb_define_method(cMenu, "opts_off", menu_opts_off_m, 1);
@@ -4975,7 +5131,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);
@@ -5002,7 +5158,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);

data/ext/curses/extconf.rb

@@ -1,5 +1,6 @@
 require 'mkmf'
 require 'shellwords'
+require 'fileutils'
 
 def have_all(*args)
   old_libs = $libs.dup
@@ -22,7 +23,68 @@ def have_all(*args)
   end
 end
 
-dir_config('curses')
+def exec_command(cmd)
+  puts "> #{cmd}"
+  if !system(cmd)
+    STDERR.puts("External command failed")
+    exit 1
+  end
+end
+
+$library_candidates = [
+  ["ncursesw/curses.h", ["ncursesw"]],
+  ["ncurses.h", ["ncursesw", "ncurses"]],
+  ["ncurses/curses.h", ["ncurses"]],
+  ["curses_colr/curses.h", ["cur_colr"]],
+  ["curses.h", ["curses", "pdcurses"]],
+  # ["xcurses.h", ["XCurses"]], # XCurses (PDCurses for X11)
+]
+
+$mingw = /mingw/ =~ RUBY_PLATFORM
+$mswin = /mswin/ =~ RUBY_PLATFORM
+$windows = $mingw || $mswin
+$x64 = /x64/ =~ RUBY_PLATFORM
+$use_system_libs = arg_config('--use-system-libraries',
+                              ENV.key?("CURSES_USE_SYSTEM_LIBRARIES"))
+$idefault = nil
+$ldefault = nil
+$pdcurses_wide_default = nil
+$pdcurses_dll_default = nil
+$curses_version_default = nil
+$use_bundled_pdcurses = !$use_system_libs && /mingw|mswin/ =~ RUBY_PLATFORM
+if $use_bundled_pdcurses
+  $pdcurses_wide_default = true
+  $curses_version_default = "function"
+  pdcurses_dir = File.expand_path("../../vendor/PDCurses", __dir__)
+  $idefault = $ldefault = pdcurses_dir
+  wincon_dir = File.expand_path("wincon", pdcurses_dir)
+  old_dir = Dir.pwd
+  Dir.chdir(wincon_dir)
+  begin
+    if $mswin
+      exec_command "nmake -f Makefile.vc clean all WIDE=Y DLL=Y"
+      FileUtils.cp("pdcurses.dll", pdcurses_dir)
+      FileUtils.cp("pdcurses.lib", pdcurses_dir)
+      $pdcurses_dll_default = true
+    else
+      if $x64
+        exec_command "make -f Makefile.mng clean all _w64=1 WIDE=Y DLL=N"
+      else
+        exec_command "make -f Makefile.mng clean all WIDE=Y DLL=N"
+      end
+      FileUtils.cp("pdcurses.a", File.expand_path("libpdcurses.a", pdcurses_dir))
+    end
+  ensure
+    Dir.chdir(old_dir)
+  end
+  FileUtils.cp(File.expand_path("curses.h", pdcurses_dir),
+               File.expand_path("pdcurses.h", pdcurses_dir))
+  $library_candidates = [
+    ["pdcurses.h", ["pdcurses"]]
+  ]
+end
+
+dir_config('curses', $idefault, $ldefault)
 dir_config('ncurses')
 dir_config('termcap')
 
@@ -32,14 +94,7 @@ have_library("tinfow", "tgetent") ||
   have_library("termcap", "tgetent")
 
 header_library = nil
-[
-  ["ncursesw/curses.h", ["ncursesw"]],
-  ["ncurses.h", ["ncursesw", "ncurses"]],
-  ["ncurses/curses.h", ["ncurses"]],
-  ["curses_colr/curses.h", ["cur_colr"]],
-  ["curses.h", ["curses", "pdcurses"]],
-  # ["xcurses.h", ["XCurses"]], # XCurses (PDCurses for X11)
-].each {|hdr, libs|
+$library_candidates.each {|hdr, libs|
   header_library = have_all(
     lambda { have_header(hdr) && hdr },
     lambda {|h| libs.find {|lib| have_library(lib, "initscr", h) } })
@@ -89,8 +144,8 @@ if header_library
   #   --with-curses-version=function    for SVR4
   #   --with-curses-version=variable    for ncurses and PDcurses
   #   (not given)                       automatically determined
-
-  case with_curses_version = with_config("curses-version")
+  with_curses_version = with_config("curses-version", $curses_version_default)
+  case with_curses_version
   when "function"
     $defs << '-DHAVE_FUNC_CURSES_VERSION'
   when "variable"
@@ -136,27 +191,29 @@ if header_library
     warn "unexpected value for --with-curses-version: #{with_curses_version}"
   end
 
-  if enable_config("pdcurses-wide")
+  if enable_config("pdcurses-wide", $pdcurses_wide_default)
     $defs << '-DPDC_WIDE'
   end
 
-  if enable_config("pdcurses-dll")
+  if enable_config("pdcurses-dll", $pdcurses_dll_default)
     $defs << '-DPDC_DLL_BUILD'
   end
 
-  if (have_header("ncursesw/menu.h") ||
-      have_header("ncurses/menu.h") ||
-      have_header("curses/menu.h") ||
-      have_header("menu.h")) &&
+  if !$use_bundled_pdcurses &&
+      (have_header("ncursesw/menu.h") ||
+       have_header("ncurses/menu.h") ||
+       have_header("curses/menu.h") ||
+       have_header("menu.h")) &&
       (have_library("menuw", "new_menu") ||
        have_library("menu", "new_menu"))
     $defs << '-DHAVE_MENU'
   end
 
-  if (have_header("ncursesw/form.h") ||
-      have_header("ncurses/form.h") ||
-      have_header("curses/form.h") ||
-      have_header("form.h")) &&
+  if !$use_bundled_pdcurses &&
+      (have_header("ncursesw/form.h") ||
+       have_header("ncurses/form.h") ||
+       have_header("curses/form.h") ||
+       have_header("form.h")) &&
       (have_library("formw", "new_form") ||
        have_library("form", "new_form"))
     $defs << '-DHAVE_FORM'
@@ -166,7 +223,9 @@ if header_library
   ["WINDOW", "MEVENT", "ITEM", "MENU", "FIELD", "FORM"].each do |type|
     checking_for("sizeof(#{type}) is available") {
       if try_compile(<<EOF, Shellwords.join($defs))
-#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>

data/lib/curses.rb

@@ -1,24 +1,17 @@
-platform = RUBY_PLATFORM.sub(/i[3-7]86/, "x86")
-pdcurses_path = File.expand_path("../vendor/#{platform}/PDCurses", __dir__)
-pdcurses_bundled = File.directory?(pdcurses_path)
-if pdcurses_bundled
+pdcurses_dll = File.expand_path("../vendor/PDCurses/pdcurses.dll", __dir__)
+if File.exist?(pdcurses_dll)
   path = ENV["PATH"]
   dir = File::ALT_SEPARATOR ?
-    pdcurses_path.tr("/", File::ALT_SEPARATOR) : dir
+    File.dirname(pdcurses_dll).tr("/", File::ALT_SEPARATOR) : dir
   dirs = path.split(File::PATH_SEPARATOR)
   if !dirs.include?(dir)
     ENV["PATH"] = [dir, *dirs].join(File::PATH_SEPARATOR)
   end
 end
 
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/curses.so"
-rescue LoadError
-  require "curses.so"
-end
+require "curses.so"
 
-if pdcurses_bundled
+if /mingw|mswin/ =~ RUBY_PLATFORM
   Curses.keyboard_encoding = Encoding::UTF_8
 end
 

data/sample/addch.rb

@@ -0,0 +1,16 @@
+require_relative "../lib/curses"
+include Curses
+
+init_screen
+begin
+  addstr("The following letter A should be BOLD and UNDERLINED by using addch:\n")
+  addch('A'.ord | A_BOLD | A_UNDERLINE)
+
+  addstr("\nIt should look the same as when using attron and addstr:\n")
+  attron(A_BOLD | A_UNDERLINE)
+  addstr("A")
+  getch
+
+ensure
+  close_screen
+end