curses 1.2.6 → 1.4.0

data/ext/curses/extconf.rb

@@ -1,4 +1,6 @@
 require 'mkmf'
+require 'shellwords'
+require 'fileutils'
 
 def have_all(*args)
   old_libs = $libs.dup
@@ -21,22 +23,78 @@ def have_all(*args)
   end
 end
 
-dir_config('curses')
-dir_config('ncurses')
-dir_config('termcap')
-
-have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
-have_library("tinfo", "tgetent") or have_library("termcap", "tgetent")
+def exec_command(cmd)
+  puts "> #{cmd}"
+  if !system(cmd)
+    STDERR.puts("External command failed")
+    exit 1
+  end
+end
 
-header_library = nil
-[
+$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)
-].each {|hdr, libs|
+]
+
+$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')
+
+have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
+have_library("tinfow", "tgetent") ||
+  have_library("tinfo", "tgetent") ||
+  have_library("termcap", "tgetent")
+
+header_library = nil
+$library_candidates.each {|hdr, libs|
   header_library = have_all(
     lambda { have_header(hdr) && hdr },
     lambda {|h| libs.find {|lib| have_library(lib, "initscr", h) } })
@@ -86,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"
@@ -133,23 +191,88 @@ 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 !$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'
+    have_func("form_driver_w")
+  end
+
+  ["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_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>
+#elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
+#elif defined(HAVE_CURSES_COLR_CURSES_H)
+# ifdef HAVE_STDARG_PROTOTYPES
+#  include <stdarg.h>
+# else
+#  include <varargs.h>
+# endif
+# include <curses_colr/curses.h>
+#else
+# include <curses.h>
+#endif
+
+#if defined(HAVE_NCURSESW_MENU_H)
+# include <ncursesw/menu.h>
+#elif defined(HAVE_NCURSES_MENU_H)
+# include <ncurses/menu.h>
+#elif defined(HAVE_CURSES_MENU_H)
+# include <curses/menu.h>
+#elif defined(HAVE_MENU_H)
+# include <menu.h>
+#endif
+
+#if defined(HAVE_NCURSESW_FORM_H)
+# include <ncursesw/form.h>
+#elif defined(HAVE_NCURSES_FORM_H)
+# include <ncurses/form.h>
+#elif defined(HAVE_CURSES_FORM_H)
+# include <curses/form.h>
+#elif defined(HAVE_FORM_H)
+# include <form.h>
+#endif
+
+const int sizeof_#{type} = (int) sizeof(#{type});
+EOF
+        $defs << "-DCURSES_SIZEOF_#{type}=sizeof(#{type})"
+        true
+      else
+        $defs << "-DCURSES_SIZEOF_#{type}=0"
+        false
+      end
+    }
+  end
+
   if RUBY_VERSION >= '2.1'
     create_header
     create_makefile("curses")

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/form.rb

@@ -0,0 +1,52 @@
+require "curses"
+
+Curses.init_screen
+Curses.cbreak
+Curses.noecho
+Curses.stdscr.keypad = true
+at_exit do
+  Curses.close_screen
+end
+
+fields = [
+  Curses::Field.new(1, 10, 4, 18, 0, 0),
+  Curses::Field.new(1, 10, 6, 18, 0, 0)
+]
+fields.each do |field|
+  field.set_back(Curses::A_UNDERLINE)
+  field.opts_off(Curses::O_AUTOSKIP)
+end
+
+form = Curses::Form.new(fields)
+form.post
+
+Curses.setpos(4, 10)
+Curses.addstr("Value 1:")
+Curses.setpos(6, 10)
+Curses.addstr("Value 2:")
+
+while ch = Curses.get_char
+  begin
+    case ch
+    when Curses::KEY_F1
+      break
+    when Curses::KEY_DOWN
+      form.driver(Curses::REQ_NEXT_FIELD)
+      form.driver(Curses::REQ_END_LINE)
+    when Curses::KEY_UP
+      form.driver(Curses::REQ_PREV_FIELD)
+      form.driver(Curses::REQ_END_LINE)
+    when Curses::KEY_RIGHT
+      form.driver(Curses::REQ_NEXT_CHAR)
+    when Curses::KEY_LEFT
+      form.driver(Curses::REQ_PREV_CHAR)
+    when Curses::KEY_BACKSPACE
+      form.driver(Curses::REQ_DEL_PREV)
+    else
+      form.driver(ch)
+    end
+  rescue Curses::RequestDeniedError
+  end
+end
+
+form.unpost

data/sample/menu.rb

@@ -5,7 +5,7 @@ Curses.cbreak
 Curses.noecho
 Curses.stdscr.keypad = true
 at_exit do
-  Curses.cloes_screen
+  Curses.close_screen
 end
 
 menu = Curses::Menu.new([

data/vendor/PDCurses/.gitignore

@@ -0,0 +1,47 @@
+*.[oa]
+*.exe
+firework
+manext
+libXCurses.so
+ozdemo
+newtest
+ptest
+rain
+sdltest
+testcurs
+tuidemo
+worm
+xmas
+*.sho
+Makefile
+config.h
+config.log
+config.status
+PDCurses.md
+xcurses-config
+*.dll
+wingui.gif
+wingui.htm
+*.bat
+clock.c
+clock1.c
+fullscrn.c
+hello
+hello.c
+wingui/wcr*
+wingui/wct*
+wingui/wc_*
+wingui/wcw*
+wingui/z*
+wingui/scr2html.c
+wingui/newtest*
+wingui/*.sav
+wingui/*.def
+wincon/*.def
+*.obj
+*.bak
+*.map
+*.lib
+m
+.vscode
+build

data/vendor/PDCurses/.travis.yml

@@ -0,0 +1,49 @@
+language: c
+
+os: 
+  - linux
+  - osx
+
+compiler:
+  - gcc
+  - clang
+
+env:
+  - BUILD_TYPE=Debug CMAKE_ARGS="-DPDC_WIDE=OFF -DPDC_UTF8=OFF -DPDCDEBUG=ON"
+  - BUILD_TYPE=Debug CMAKE_ARGS="-DPDC_WIDE=OFF -DPDC_UTF8=ON -DPDCDEBUG=ON"
+  - BUILD_TYPE=Debug CMAKE_ARGS="-DPDC_WIDE=ON -DPDC_UTF8=OFF -DPDCDEBUG=ON"
+  
+  - BUILD_TYPE=Release CMAKE_ARGS="-DPDC_WIDE=OFF -DPDC_UTF8=OFF"
+  - BUILD_TYPE=Release CMAKE_ARGS="-DPDC_WIDE=OFF -DPDC_UTF8=ON"
+  - BUILD_TYPE=Release CMAKE_ARGS="-DPDC_WIDE=ON -DPDC_UTF8=OFF"
+
+  - BUILD_TYPE=MinSizeRel CMAKE_ARGS="-DPDC_WIDE=OFF -DPDC_UTF8=OFF"
+  - BUILD_TYPE=MinSizeRel CMAKE_ARGS="-DPDC_WIDE=OFF -DPDC_UTF8=ON"
+  - BUILD_TYPE=MinSizeRel CMAKE_ARGS="-DPDC_WIDE=ON -DPDC_UTF8=OFF"
+
+addons:
+  apt:
+    packages:
+      - libncurses5-dev
+      - libncursesw5-dev
+      - libxaw7-dev
+
+install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir ${DEPS_DIR} && cd ${DEPS_DIR} && pwd; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_retry wget --no-check-certificate https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.tar.gz; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "96d67e21f0983ebf0fffc5b106ec338c *cmake-3.11.0-Linux-x86_64.tar.gz" > cmake_md5.txt; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then md5sum -c cmake_md5.txt; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then tar -xvf cmake-3.11.0-Linux-x86_64.tar.gz > /dev/null; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mv cmake-3.11.0-Linux-x86_64 cmake-install; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ncurses; fi
+
+before_script:
+  - cd ${TRAVIS_BUILD_DIR}
+  - mkdir build && cd build
+  - cmake -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+          -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/build/dist ${CMAKE_ARGS}
+          ..
+script:
+  - cmake --build . --config ${BUILD_TYPE} --target install

data/vendor/PDCurses/CMakeLists.txt

@@ -0,0 +1,68 @@
+cmake_minimum_required(VERSION 3.11)
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "MinSizeRel" CACHE STRING "Choose the type of build, options are: Debug, Release, or MinSizeRel." FORCE)
+    message(STATUS "CMAKE_BUILD_TYPE not set, defaulting to MinSizeRel.")
+endif()
+
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake")
+
+include (get_version)
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX d)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")  # enable parallel builds
+endif()
+
+message(STATUS "Generator .............. ${CMAKE_GENERATOR}")
+message(STATUS "Build Type ............. ${CMAKE_BUILD_TYPE}")
+
+include(build_options)
+include(build_dependencies)
+
+project(pdcurses VERSION "${CURSES_VERSION}" LANGUAGES C)
+message(STATUS "PDC Version ............ ${PROJECT_VERSION}")
+
+include(gen_config_header)
+
+file(GLOB pdcurses_src_files pdcurses/*.c)
+
+if(CYGWIN)
+    message(STATUS "Windows Kit UM lib path = ${WINDOWS_KIT_LIBRARY_DIR}")
+    link_directories(${WINDOWS_KIT_LIBRARY_DIR})
+endif()
+
+if(PDC_DOS_BUILD) # currently requires a unique toolchain file
+
+    add_subdirectory(dos)
+
+elseif(PDC_OS2_BUILD) # currently requires a unique toolchain file
+
+    add_subdirectory(os2)
+    
+else()
+
+    add_subdirectory(ncurses)
+    
+    if(PDC_SDL2_BUILD)
+    
+        add_subdirectory(sdl2)
+        
+    endif()
+
+    if(UNIX)
+        add_subdirectory(vt)
+    endif()
+
+    if(WIN32)
+    
+        add_subdirectory(wincon)
+        add_subdirectory(wingui)
+        
+    endif()
+   
+endif()
+
+add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/cmake/make_uninstall.cmake")
+
+set(CPACK_COMPONENTS_ALL applications)