ncursesw 1.2.4.3 → 1.4.0.0

data/README

@@ -1,4 +1,4 @@
-$Id: README,v 1.16 2009/05/03 14:13:27 t-peters Exp $
+$Id: README,v 1.16 2009-05-03 14:13:27 t-peters Exp $
 ------------------------------------------------------------------------
 This directory contains a ruby module for accessing the FSF's ncurses
 library.

data/THANKS

@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.9 2009/05/03 10:37:54 t-peters Exp $
+$Id: THANKS,v 1.9 2009-05-03 10:37:54 t-peters Exp $
 
 A list of people that helped me with ncurses-ruby
 

data/TODO

@@ -1,4 +1,4 @@
-$Id: TODO,v 1.6 2003/03/22 22:55:27 t-peters Exp $
+$Id: TODO,v 1.6 2003-03-22 22:55:27 t-peters Exp $
 
 This is the complete list of functions present in ncurses that have not yet
 been wrapped by ncurses-ruby:

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.4.0.0

data/compat.h

@@ -2,7 +2,7 @@
 #define _COMPAT_H
 
 #ifndef STR2CSTR
-#define STR2CSTR(x) ({ VALUE *y = (x); StringValuePtr(y); })
+#define STR2CSTR(x) ({ VALUE y = x; StringValuePtr (y); })
 #endif
 
 #endif

data/examples/LICENSES_for_examples

@@ -1,4 +1,4 @@
-$Id: LICENSES_for_examples,v 1.6 2004/05/13 21:55:17 t-peters Exp $
+$Id: LICENSES_for_examples,v 1.6 2004-05-13 21:55:17 t-peters Exp $
 
 Ideally, an example program on how to use a library should be in the public
 domain.

data/examples/example.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: example.rb,v 1.4 2002/03/04 13:24:29 t-peters Exp $
+# $Id: example.rb,v 1.4 2002-03-04 13:24:29 t-peters Exp $
 
 # This file provides an example for the usage of the ncurses-ruby module.
 # Copyright (C) 2002 Tobias Peters <t-peters@users.berlios.de>
@@ -59,7 +59,7 @@
 
 
 
-require "ncurses"
+require "ncursesw"
 
 def moving(scr)
   scr.clear() # clear screen

data/examples/form.rb

@@ -8,7 +8,7 @@
 # Copyright (c) 2001 by Pradeep Padala. This document may be distributed 
 # under the terms set forth in the LDP license at linuxdoc.org/COPYRIGHT.html.
  
-require 'ncurses.rb'
+require 'ncursesw.rb'
 
 begin
   scr = Ncurses.initscr()

data/examples/form2.rb

@@ -11,7 +11,7 @@
 # Copyright (c) 2001 by Pradeep Padala. This document may be distributed 
 # under the terms set forth in the LDP license at linuxdoc.org/COPYRIGHT.html.
 
-require 'ncurses'
+require 'ncursesw'
 
 include Ncurses
 include Ncurses::Form

data/examples/hello_ncurses.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: hello_ncurses.rb,v 1.3 2002/02/28 13:50:03 t-peters Exp $
+# $Id: hello_ncurses.rb,v 1.3 2002-02-28 13:50:03 t-peters Exp $
 
 # this ncurses-ruby program follows an ancient tradition of example
 # computer programs: When invoked, it prints a friendly greeting on the
@@ -14,7 +14,7 @@
 
 # First, we have to tell Ruby to use the Ncurses extension module:
 
-require "ncurses"
+require "ncursesw"
 
 
 

data/examples/rain.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: rain.rb,v 1.6 2005/08/22 21:41:49 t-peters Exp $
+# $Id: rain.rb,v 1.6 2005-08-22 21:41:49 t-peters Exp $
 
 # This program is a translation of the popular rain.c demo program from the
 # ncurses library distribution.
@@ -40,7 +40,7 @@
 
 
 
-require "ncurses"
+require "ncursesw"
 
 
 # A class responsible for raindrop drawing

data/examples/read_line.rb

@@ -7,7 +7,7 @@
 # No warranties
 # Share and enjoy!
 
-require "ncurses"
+require "ncursesw"
 
 # read_line returns an array
 # [string, last_cursor_position_in_string, keycode_of_terminating_enter_key].

data/examples/tclock.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: tclock.rb,v 1.6 2002/02/28 13:50:10 t-peters Exp $
+# $Id: tclock.rb,v 1.6 2002-02-28 13:50:10 t-peters Exp $
 
 # tclock - analog/digital clock for curses, translated to ruby
 # Copyright (C) 2002 Tobias Peters <t-peters@users.berlios.de>
@@ -30,7 +30,7 @@
 # clearly marked as such.                                                 #
 ###########################################################################
 
-require "ncurses"
+require "ncursesw"
 PI = Math::PI
 
 def sign(_x)

data/examples/test_scanw.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# $Id: test_scanw.rb,v 1.1 2003/03/22 22:55:00 t-peters Exp $
+# $Id: test_scanw.rb,v 1.1 2003-03-22 22:55:00 t-peters Exp $
 #
 # Test of the scanw function. Should really not be used in any serious curses
 # program. To use it, install scanf for ruby.
@@ -9,7 +9,7 @@
 #
 # No warranties. Share and enjoy.
 
-require "ncurses"
+require "ncursesw"
 begin
   Ncurses.initscr
   Ncurses.mvaddstr(4, 19, "Give me a number: ")

data/extconf.rb

@@ -2,7 +2,8 @@
 
 # ncurses-ruby is a ruby module for accessing the FSF's ncurses library
 # (C) 2002, 2004 Tobias Peters <t-peters@users.berlios.de>
-# (C) 2005, 2009 Tobias Herzke
+# (C) 2005, 2009, 2011 Tobias Herzke
+# (C) 2013 Gaute Hope <eg@gaute.vetsj.com>
 #
 # This module is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,12 +19,11 @@
 # License along with this module; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-# $Id: extconf.rb,v 1.14 2009/05/03 14:13:27 t-peters Exp $
+# $Id: extconf_ncursesw.rb,v 1.1 2011-05-30 23:05:50 t-peters Exp $
 
 require "mkmf"
 
-$CFLAGS  += " -g"
-$CXXFLAGS  = $CFLAGS
+$CFLAGS  += " -g -Wformat -Werror=format-security"
 
 have_header("unistd.h")
 have_header("locale.h")
@@ -106,6 +106,11 @@ have_func("wchgat")
 have_func("wcolor_set")
 have_func("getattrs")
 
+puts "checking for ncursesw (wide char) functions..."
+if not have_func("wget_wch")
+  raise "no wget_wch found."
+end
+
 puts "checking which debugging functions to wrap..."
 have_func("_tracef")
 have_func("_tracedump")
@@ -124,14 +129,48 @@ have_func("attr_get")
 puts "checking for the panel library..."
 if have_header("panel.h")
   have_library("panelw", "panel_hidden")
+else
+  raise "panel library not found"
 end
+
 puts "checking for the form library..."
 if have_header("form.h")
-  have_library("formw", "new_form")
+  if not have_library("formw", "new_form")
+    raise "formw library not found"
+  end
+else
+  raise "form library not found."
+end
+
+if have_library("formw", "form_driver_w")
+  $CFLAGS += " -DHAVE_FORM_DRIVER_W"
 end
+
 puts "checking for the menu library..."
 if have_header("menu.h")
   have_library("menu", "new_menu")
+else
+  raise "menu library not found."
 end
 
+puts "checking for various ruby and standard functions.."
+if have_func("rb_thread_fd_select")
+  $CFLAGS  += " -DHAVE_RB_THREAD_FD_SELECT"
+end
+
+# Avoid dereferencing WINDOW pointers on FreeBSD
+if RUBY_PLATFORM =~ /freebsd/
+  $CFLAGS += " -DNCURSES_OPAQUE=1"
+else
+  # add NCURSES_OPAQUE for mac
+  $CFLAGS += " -DNCURSES_OPAQUE=0"
+end
+
+if have_func("clock_gettime")
+  $CFLAGS += " -DHAVE_CLOCK_GETTIME"
+end
+
+$CXXFLAGS  = $CFLAGS
+
 create_makefile('ncursesw_bin')
+

data/form_wrap.c

@@ -3,10 +3,11 @@
  * Contributed by Simon Kaczor <skaczor@cox.net>
  * Prognosoft Inc. <http://www.prognosoft.biz>
  * Copyright 2004
- * 
+ *
  * Changes:
  * (C) 2004 Tobias Peters
  * (C) 2005 2009 Tobias Herzke
+ * (C) 2013 Gaute Hope <eg@gaute.vetsj.com>
  *
  *  This module is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -22,10 +23,14 @@
  *  License along with this module; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
  *
+ * Changes
+ * (C) 2011 Tobias Herzke
  */
 
 
-#ifdef HAVE_FORM_H
+#if defined(HAVE_FORM_H) || defined(HAVE_NCURSESW_FORM_H)
+
+# include <wchar.h>
 
 #include "form_wrap.h"
 #include "ncurses_wrap.h"
@@ -36,7 +41,7 @@ VALUE cFIELD;
 VALUE cFIELDTYPE;
 VALUE cFORM;
 
-void init_err_codes() 
+void init_err_codes()
 {
   /* The routine succeeded. */
   FORM_DEF_CONST(E_OK);
@@ -360,14 +365,14 @@ static VALUE get_proc_hash(int hook) {
 }
 
 /*
- * Returns an existing Ruby Proc for a given owning "object" and hook type. 
+ * Returns an existing Ruby Proc for a given owning "object" and hook type.
  * Qnil will be returned if no Proc was associated with the owner
  */
 static VALUE get_proc(void* owner, int hook) {
   if (owner == 0) return Qnil;
   {
 	 VALUE owner_adress  = INT2NUM((long)(owner));
-	 VALUE proc_hash     = get_proc_hash(hook);		 
+	 VALUE proc_hash     = get_proc_hash(hook);
 	 VALUE proc          = rb_hash_aref(proc_hash, owner_adress);
 	 return proc;
   }
@@ -398,12 +403,12 @@ static VALUE rbncurs_m_new_form(VALUE dummy, VALUE rb_field_array)
   long n = rbncurs_array_length(rb_field_array);
   /* Will ncurses free this array? If not, must do it after calling free_form(). */
   FIELD** fields = ALLOC_N(FIELD*, (n+1));
-  long i;  
+  long i;
   for (i=0; i<n; i++){
-	 fields[i] = get_field(rb_ary_entry(rb_field_array, i)); 
+	 fields[i] = get_field(rb_ary_entry(rb_field_array, i));
   }
   fields[n] = NULL;
-  return wrap_form(new_form(fields)); 
+  return wrap_form(new_form(fields));
 }
 
 static VALUE rbncurs_c_free_form(VALUE rb_form) {
@@ -444,12 +449,22 @@ static VALUE rbncurs_c_form_driver(VALUE rb_form, VALUE c) {
 static VALUE rbncurs_m_form_driver(VALUE dummy, VALUE rb_form, VALUE c)
 { return rbncurs_c_form_driver(rb_form, c); }
 
+# ifdef HAVE_FORM_DRIVER_W
+/* Form driver W */
+static VALUE rbncurs_c_form_driver_w(VALUE rb_form, VALUE type, VALUE c) {
+  FORM* form = get_form(rb_form);
+  return INT2NUM(form_driver_w(form, NUM2INT(type), NUM2INT(c)));
+}
+static VALUE rbncurs_m_form_driver_w(VALUE dummy, VALUE rb_form, VALUE type, VALUE c)
+{ return rbncurs_c_form_driver_w(rb_form, type, c); }
+# endif
+
 /*
  * form_page(3x)
  */
 static VALUE rbncurs_c_set_current_field(VALUE rb_form, VALUE rb_field) {
   FORM* form = get_form(rb_form);
-  FIELD* field = get_field(rb_field);	 
+  FIELD* field = get_field(rb_field);
   return INT2NUM(set_current_field(form, field));
 }
 static VALUE rbncurs_m_set_current_field(VALUE dummy, VALUE rb_form, VALUE rb_field)
@@ -538,12 +553,12 @@ static VALUE rbncurs_c_free_field(VALUE rb_field) {
 }
 static VALUE rbncurs_m_free_field(VALUE dummy, VALUE rb_field)
 { return rbncurs_c_free_field(rb_field); }
- 
+
 
 /*
  * form_field_info(3x)
  */
-static VALUE rbncurs_c_field_info(VALUE rb_field, VALUE rows, VALUE cols, 
+static VALUE rbncurs_c_field_info(VALUE rb_field, VALUE rows, VALUE cols,
 											 VALUE frow, VALUE fcol, VALUE nrow, VALUE nbuf) {
   if (rb_obj_is_instance_of(rows, rb_cArray) != Qtrue
 		|| rb_obj_is_instance_of(cols, rb_cArray) != Qtrue
@@ -558,7 +573,7 @@ static VALUE rbncurs_c_field_info(VALUE rb_field, VALUE rows, VALUE cols,
   else {
 	 FIELD* field = get_field(rb_field);
 	 int vals[6] = {0,0,0,0,0,0};
-	
+
 	 int result = field_info(field, &vals[0],&vals[1],&vals[2],&vals[3],&vals[4],&vals[5]);
 	 rb_ary_push(rows, INT2NUM(vals[0]));
 	 rb_ary_push(cols, INT2NUM(vals[1]));
@@ -569,15 +584,15 @@ static VALUE rbncurs_c_field_info(VALUE rb_field, VALUE rows, VALUE cols,
 	 return INT2NUM(result);
   }
 }
-static VALUE rbncurs_m_field_info(VALUE dummy, VALUE rb_field, VALUE rows, VALUE cols, 
+static VALUE rbncurs_m_field_info(VALUE dummy, VALUE rb_field, VALUE rows, VALUE cols,
 											 VALUE frow, VALUE fcol, VALUE nrow, VALUE nbuf)
 { return rbncurs_c_field_info(rb_field, rows, cols, frow, fcol, nrow, nbuf); }
 
-static VALUE rbncurs_c_dynamic_field_info(VALUE rb_field, VALUE rows, VALUE cols, 
+static VALUE rbncurs_c_dynamic_field_info(VALUE rb_field, VALUE rows, VALUE cols,
 														VALUE max) {
   if (rb_obj_is_instance_of(rows, rb_cArray) != Qtrue
 		|| rb_obj_is_instance_of(cols, rb_cArray) != Qtrue
-		|| rb_obj_is_instance_of(max, rb_cArray) != Qtrue) {		
+		|| rb_obj_is_instance_of(max, rb_cArray) != Qtrue) {
 	 rb_raise(rb_eArgError,
 				 "rows, cols and max arguments must be empty Arrays");
 	 return Qnil;
@@ -585,7 +600,7 @@ static VALUE rbncurs_c_dynamic_field_info(VALUE rb_field, VALUE rows, VALUE cols
   else {
   	FIELD* field = get_field(rb_field);
   	int vals[3] = {0,0,0};
-	
+
   	int result = dynamic_field_info(field, &vals[0],&vals[1],&vals[2]);
 	rb_ary_push(rows, INT2NUM(vals[0]));
 	rb_ary_push(cols, INT2NUM(vals[1]));
@@ -593,7 +608,7 @@ static VALUE rbncurs_c_dynamic_field_info(VALUE rb_field, VALUE rows, VALUE cols
 	return INT2NUM(result);
   }
 }
-static VALUE rbncurs_m_dynamic_field_info(VALUE dummy, VALUE rb_field, VALUE rows, VALUE cols, 
+static VALUE rbncurs_m_dynamic_field_info(VALUE dummy, VALUE rb_field, VALUE rows, VALUE cols,
 														VALUE max)
 { return rbncurs_c_dynamic_field_info(rb_field, rows, cols, max); }
 /*
@@ -606,12 +621,12 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
 
   rb_scan_args(argc, argv, "13", &rb_fieldtype, &arg3, &arg4, &arg5);
   ftype = get_fieldtype(rb_fieldtype);
-	
+
   if (ftype == TYPE_ALNUM ||
 		ftype == TYPE_ALPHA) {
 	 if (argc != 2)
 		rb_raise(rb_eArgError, "TYPE_ALNUM and TYPE_ALPHA require one additional argument");
-	 return INT2NUM(set_field_type(field, ftype, 
+	 return INT2NUM(set_field_type(field, ftype,
 											 NUM2INT(arg3)));
   }
   if (ftype == TYPE_ENUM) {
@@ -619,7 +634,7 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
 		rb_raise(rb_eArgError, "TYPE_ENUM requires three additional arguments");
 	 }
     else {
-		int n = rbncurs_array_length(arg3);
+		int n = (int) rbncurs_array_length(arg3);
 		/*  Will ncurses free this array of strings in free_field()? */
 		char** list = ALLOC_N(char*, n+1);
 		int i;
@@ -627,7 +642,7 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
 		  list[i] = STR2CSTR(rb_ary_entry(arg3, (long)i));
 		}
 		list[n] = NULL;
-		return INT2NUM(set_field_type(field, ftype, 
+		return INT2NUM(set_field_type(field, ftype,
 												list,
 												RTEST(arg4),
 												RTEST(arg5)));
@@ -636,7 +651,7 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
   else if (ftype == TYPE_INTEGER) {
 	 if (argc != 4)
 		rb_raise(rb_eArgError, "TYPE_INTEGER requires three additional arguments");
-	 return INT2NUM(set_field_type(field, ftype, 
+	 return INT2NUM(set_field_type(field, ftype,
 											 NUM2INT(arg3),
 											 NUM2LONG(arg4),
 											 NUM2LONG(arg5)));
@@ -644,7 +659,7 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
   else if (ftype == TYPE_NUMERIC) {
 	 if (argc != 4)
 		rb_raise(rb_eArgError, "TYPE_NUMERIC requires three additional arguments");
-	 return INT2NUM(set_field_type(field, ftype, 
+	 return INT2NUM(set_field_type(field, ftype,
 											 NUM2INT(arg3),
 											 NUM2DBL(arg4),
 											 NUM2DBL(arg5)));
@@ -652,15 +667,15 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
   else if (ftype == TYPE_REGEXP){
 	 if (argc != 2)
 		rb_raise(rb_eArgError, "TYPE_REGEXP requires one additional argument");
-	 return INT2NUM(set_field_type(field, ftype, 
+	 return INT2NUM(set_field_type(field, ftype,
 											 STR2CSTR(arg3)));
   }
-  else if (ftype == TYPE_IPV4){	
+  else if (ftype == TYPE_IPV4){
 	 if (argc != 1)
 		rb_raise(rb_eArgError, "TYPE_IPV4 has no additional arguments");
 	 return INT2NUM(set_field_type(field, ftype));
   }
-  else {	
+  else {
 	 /*  It is a user-defined field type. */
 	 /*  Will store the arguments associated with this field */
 	 /*  for use in the callback function. */
@@ -671,7 +686,7 @@ static VALUE rbncurs_c_set_field_type(int argc, VALUE* argv, VALUE rb_field) {
 	 /*  the block-argument used in finding the appropriate Ruby Proc */
 	 return INT2NUM(set_field_type(field, ftype, field));
   }
-	
+
 }
 static VALUE rbncurs_m_set_field_type(int argc, VALUE* argv, VALUE dummy)
 { return rbncurs_c_set_field_type(argc-1, argv+1, argv[0]); }
@@ -696,7 +711,7 @@ static VALUE rbncurs_m_field_arg(VALUE dummy, VALUE rb_field)
  */
 static VALUE rbncurs_c_set_field_fore(VALUE rb_field, VALUE attr) {
   FIELD* field = get_field(rb_field);
-  return INT2NUM(set_field_fore(field, NUM2ULONG(attr)));
+  return INT2NUM(set_field_fore(field, (int) NUM2ULONG(attr)));
 }
 static VALUE rbncurs_m_set_field_fore(VALUE dummy, VALUE rb_field, VALUE attr)
 { return rbncurs_c_set_field_fore(rb_field, attr); }
@@ -710,7 +725,7 @@ static VALUE rbncurs_m_field_fore(VALUE dummy, VALUE rb_field)
 
 static VALUE rbncurs_c_set_field_back(VALUE rb_field, VALUE attr) {
   FIELD* field = get_field(rb_field);
-  return INT2NUM(set_field_back(field, NUM2ULONG(attr)));
+  return INT2NUM(set_field_back(field, (int) NUM2ULONG(attr)));
 }
 static VALUE rbncurs_m_set_field_back(VALUE dummy, VALUE rb_field, VALUE attr)
 { return rbncurs_c_set_field_back(rb_field, attr); }
@@ -785,7 +800,7 @@ static VALUE rbncurs_c_set_form_fields(VALUE rb_form, VALUE rb_field_array) {
   long i;
   FORM* form = NULL;
   for (i=0; i<n; i++){
-	 fields[i] = get_field(rb_ary_entry(rb_field_array, i)); 
+	 fields[i] = get_field(rb_ary_entry(rb_field_array, i));
   }
   fields[n] = NULL;
   form = get_form(rb_form);
@@ -799,7 +814,7 @@ static VALUE rbncurs_c_form_fields(VALUE rb_form) {
   FIELD** fields = form_fields(form);
   VALUE arr = Qundef;
   int i;
-  if (fields == NULL) 
+  if (fields == NULL)
 	 rb_raise(rb_eRuntimeError, "Error retrieving form fields");
   arr = rb_ary_new();
   i=0;
@@ -841,12 +856,12 @@ static void field_init_hook(FORM* form) {
 static VALUE rbncurs_c_set_field_init(VALUE rb_form, VALUE proc) {
   FORM* form = NULL;
   if (!rb_obj_is_kind_of(rb_form, cFORM))
-	 rb_raise(rb_eArgError, "arg1 must be a FORM object");		 
+	 rb_raise(rb_eArgError, "arg1 must be a FORM object");
   if (!rb_obj_is_kind_of(proc, rb_cProc))
-	 rb_raise(rb_eArgError, "arg2 must be a Proc object");		 
+	 rb_raise(rb_eArgError, "arg2 must be a Proc object");
   form = get_form(rb_form);
   reg_proc(form, FIELD_INIT_HOOK, proc);
-  if (proc != Qnil)	{	
+  if (proc != Qnil)	{
 	 return INT2NUM(set_field_init(form, field_init_hook));
   }
   else {
@@ -874,12 +889,12 @@ static void field_term_hook(FORM* form) {
 static VALUE rbncurs_c_set_field_term(VALUE rb_form, VALUE proc) {
   FORM * form = NULL;
   if (!rb_obj_is_kind_of(rb_form, cFORM))
-	 rb_raise(rb_eArgError, "arg1 must be a FORM object");		 
+	 rb_raise(rb_eArgError, "arg1 must be a FORM object");
   if (!rb_obj_is_kind_of(proc, rb_cProc))
-	 rb_raise(rb_eArgError, "arg2 must be a Proc object");		 
+	 rb_raise(rb_eArgError, "arg2 must be a Proc object");
   form = get_form(rb_form);
   reg_proc(form, FIELD_TERM_HOOK, proc);
-  if (proc != Qnil)	{	
+  if (proc != Qnil)	{
 	 return INT2NUM(set_field_term(form, field_term_hook));
   }
   else {
@@ -907,12 +922,12 @@ static void form_init_hook(FORM* form) {
 static VALUE rbncurs_c_set_form_init(VALUE rb_form, VALUE proc) {
   FORM * form = NULL;
   if (!rb_obj_is_kind_of(rb_form, cFORM))
-	 rb_raise(rb_eArgError, "arg1 must be a FORM object");		 
+	 rb_raise(rb_eArgError, "arg1 must be a FORM object");
   if (!rb_obj_is_kind_of(proc, rb_cProc))
-	 rb_raise(rb_eArgError, "arg2 must be a Proc object");		 
+	 rb_raise(rb_eArgError, "arg2 must be a Proc object");
   form = get_form(rb_form);
   reg_proc(form, FORM_INIT_HOOK, proc);
-  if (proc != Qnil)	{	
+  if (proc != Qnil)	{
 	 return INT2NUM(set_form_init(form, form_init_hook));
   }
   else {
@@ -940,12 +955,12 @@ static void form_term_hook(FORM* form) {
 static VALUE rbncurs_c_set_form_term(VALUE rb_form, VALUE proc) {
   FORM * form = NULL;
   if (!rb_obj_is_kind_of(rb_form, cFORM))
-	 rb_raise(rb_eArgError, "arg1 must be a FORM object");		 
+	 rb_raise(rb_eArgError, "arg1 must be a FORM object");
   if (!rb_obj_is_kind_of(proc, rb_cProc))
-	 rb_raise(rb_eArgError, "arg2 must be a Proc object");		 
+	 rb_raise(rb_eArgError, "arg2 must be a Proc object");
   form = get_form(rb_form);
   reg_proc(form, FORM_TERM_HOOK, proc);
-  if (proc != Qnil)	{	
+  if (proc != Qnil)	{
 	 return INT2NUM(set_form_term(form, form_term_hook));
   }
   else {
@@ -1098,7 +1113,7 @@ static VALUE rbncurs_c_scale_form(VALUE rb_form, VALUE rows, VALUE columns) {
 	 return Qnil;
   }
   else {
-	 int vals[2] = {0,0};	
+	 int vals[2] = {0,0};
 	 int result = scale_form(form, &vals[0],&vals[1]);
 	 rb_ary_push(rows, INT2NUM(vals[0]));
 	 rb_ary_push(columns, INT2NUM(vals[1]));
@@ -1111,28 +1126,28 @@ static VALUE rbncurs_m_scale_form(VALUE dummy, VALUE rb_form, VALUE rows, VALUE
 /*
  * form_fieldtype
  */
-static void* make_arg(va_list* ap) {	
+static void* make_arg(va_list* ap) {
   /*  This method creates a list of arguments to be passed */
   /*  to the validation functions (char_check and field_check). */
-  FIELD* field =  va_arg(*ap, FIELD*);	
+  FIELD* field =  va_arg(*ap, FIELD*);
   FIELDTYPE* fieldtype = field_type(field);
   VALUE proc = get_proc(fieldtype, FIELDTYPE_FIELD_CHECK_HOOK);
   if (proc == Qnil) {
 	 proc = get_proc(fieldtype, FIELDTYPE_CHAR_CHECK_HOOK);
   }
-	
+
   /*  Compare number of arguments in Ruby Proc with that of set_field_type */
-  if (proc != Qnil) {	
+  if (proc != Qnil) {
 	 VALUE argc = rb_funcall(proc, rb_intern("arity"),0);
 	 VALUE args = get_proc(field, FIELDTYPE_ARGS);
-	 if (args != Qnil) {		
-		if (NUM2INT(argc)-1 != rbncurs_array_length(args)) {	
+	 if (args != Qnil) {
+		if (NUM2INT(argc)-1 != rbncurs_array_length(args)) {
 		  char msg[500];
-		  snprintf(msg, 500, "The validation functions for this field type need %d additional arguments.",NUM2INT(argc)-1);
+		  snprintf(msg, 500, "The validation functions for this field type need %d additional arguments.",(int)(NUM2INT(argc)-1));
 		  msg[499]=0;
-		  rb_raise(rb_eArgError, msg);	
+		  rb_raise(rb_eArgError, "%s", msg);
 		}
-	 } 
+	 }
   }
   /*  field will be the only argument in field_check/char_check callback */
   /*  and will be used to locate the appropriate Ruby Proc */
@@ -1141,10 +1156,10 @@ static void* make_arg(va_list* ap) {
 static bool field_check(FIELD* field, const void* argblock) {
   FIELDTYPE* fieldtype = field_type(field);
   VALUE proc = get_proc(fieldtype, FIELDTYPE_FIELD_CHECK_HOOK);
-  if (proc != Qnil) 
+  if (proc != Qnil)
 	 {
 		VALUE args = rb_ary_dup(get_proc(field, FIELDTYPE_ARGS));
-		rb_ary_unshift(args, wrap_field(field));		
+		rb_ary_unshift(args, wrap_field(field));
 		return RTEST(rb_apply(proc, rb_intern("call"), args));
 	 }
   return 1;
@@ -1163,18 +1178,18 @@ static bool char_check(int c, const void* argblock) {
   }
   return 1;
 }
-static VALUE rbncurs_m_new_fieldtype(VALUE dummy, VALUE field_check_proc, VALUE char_check_proc) 
+static VALUE rbncurs_m_new_fieldtype(VALUE dummy, VALUE field_check_proc, VALUE char_check_proc)
 {
   FIELDTYPE* fieldtype = new_fieldtype(field_check_proc == Qnil ? NULL : field_check,
-													char_check_proc == Qnil ? NULL : char_check);	
+													char_check_proc == Qnil ? NULL : char_check);
   set_fieldtype_arg(fieldtype, make_arg, NULL, NULL);
   if (field_check_proc != Qnil) {
 	 reg_proc(fieldtype, FIELDTYPE_FIELD_CHECK_HOOK, field_check_proc);
-  }  
+  }
   if (char_check_proc != Qnil) {
 	 reg_proc(fieldtype, FIELDTYPE_CHAR_CHECK_HOOK, char_check_proc);
   }
-  
+
   return wrap_fieldtype(fieldtype);
 }
 
@@ -1206,13 +1221,13 @@ static bool prev_choice(FIELD* field, const void* argblock) {
 
 static VALUE rbncurs_c_set_fieldtype_choice(VALUE rb_fieldtype, VALUE next_choice_proc, VALUE prev_choice_proc) {
   FIELDTYPE* fieldtype = get_fieldtype(rb_fieldtype);
-  int result = set_fieldtype_choice(fieldtype, 
-												next_choice_proc == Qnil ? NULL : next_choice, 
+  int result = set_fieldtype_choice(fieldtype,
+												next_choice_proc == Qnil ? NULL : next_choice,
 												prev_choice_proc == Qnil ? NULL : prev_choice);
   if (next_choice_proc != Qnil)
 	 reg_proc(fieldtype, FIELDTYPE_NEXT_CHOICE_HOOK, next_choice_proc);
   if (prev_choice_proc != Qnil)
-	 reg_proc(fieldtype, FIELDTYPE_PREV_CHOICE_HOOK, prev_choice_proc);	
+	 reg_proc(fieldtype, FIELDTYPE_PREV_CHOICE_HOOK, prev_choice_proc);
   return INT2NUM(result);
 }
 static VALUE rbncurs_m_set_fieldtype_choice(VALUE dummy, VALUE rb_fieldtype, VALUE next_choice_proc, VALUE prev_choice_proc)
@@ -1252,9 +1267,9 @@ static VALUE rbncurs_m_pos_form_cursor(VALUE dummy, VALUE rb_form)
 
 void init_form(void)
 {
-	
+
   mForm = rb_define_module_under(mNcurses, "Form");
-	
+
   FORM_SNG_FUNC(current_field,1);
   FORM_SNG_FUNC(data_ahead,1);
   FORM_SNG_FUNC(data_behind,1);
@@ -1278,6 +1293,11 @@ void init_form(void)
   FORM_SNG_FUNC(field_type,1);
   /*   FORM_SNG_FUNC(field_userptr,1); */
   FORM_SNG_FUNC(form_driver,2);
+
+  # ifdef HAVE_FORM_DRIVER_W
+  FORM_SNG_FUNC(form_driver_w,3);
+  #endif
+
   FORM_SNG_FUNC(form_fields,1);
   FORM_SNG_FUNC(form_init,1);
   FORM_SNG_FUNC(form_opts,1);
@@ -1333,7 +1353,7 @@ void init_form(void)
   init_opts_constants();
   init_just_constants();
   init_form_opts_constants();
-	
+
   /*  Hashes to store registered blocks (Proc) */
   {
 	 VALUE hashes = rb_iv_set(mForm, "@proc_hashes", rb_ary_new());
@@ -1358,6 +1378,11 @@ void init_form(void)
   RB_CLASS_METH(cFORM, NULL, field_init,0);
   RB_CLASS_METH(cFORM, NULL, field_term,0);
   RB_CLASS_METH(cFORM, "driver", form_driver,1);
+
+  # ifdef HAVE_FORM_DRIVER_W
+  RB_CLASS_METH(cFORM, "driver_w", form_driver_w,2);
+  #endif
+
   RB_CLASS_METH(cFORM, "fields", form_fields,0);
   RB_CLASS_METH(cFORM, "init", form_init,0);
   RB_CLASS_METH(cFORM, "opts", form_opts,0);