rbcurse 1.2.0.pre → 1.2.0

data/examples/viewtodo.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH << "/Users/rahul/work/projects/rbcurse/"
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/rcombo'
@@ -475,50 +475,50 @@ module ViewTodo
     def make_popup table
       require 'rbcurse/rpopupmenu'
       tablemenu = RubyCurses::PopupMenu.new "Table"
-      #tablemenu.add(item = RubyCurses::MenuItem.new("Open",'O'))
-      tablemenu.add(item = RubyCurses::MenuItem.new("&Open"))
+      #tablemenu.add(item = RubyCurses::PMenuItem.new("Open",'O'))
+      tablemenu.add(item = RubyCurses::PMenuItem.new("&Open"))
 
       tablemenu.insert_separator 1
-      #tablemenu.add(RubyCurses::MenuItem.new "New",'N')
+      #tablemenu.add(RubyCurses::PMenuItem.new "New",'N')
       tablemenu.add(@new_act)
-      tablemenu.add(item = RubyCurses::MenuItem.new("&Save"))
+      tablemenu.add(item = RubyCurses::PMenuItem.new("&Save"))
       item.command() { @save_cmd.call }
 
-      item=RubyCurses::MenuItem.new "Select"
+      item=RubyCurses::PMenuItem.new "Select"
       item.accelerator = "Ctrl-X"
       item.command() { table.toggle_row_selection() }
       #item.enabled = false
       tablemenu.add(item)
 
-      item=RubyCurses::MenuItem.new "Clr Selection"
+      item=RubyCurses::PMenuItem.new "Clr Selection"
       item.accelerator = "Alt-e"
       item.command() { table.clear_selection() }
       item.enabled = table.selected_row_count > 0 ? true : false
       tablemenu.add(item)
 
-      item=RubyCurses::MenuItem.new "Delete"
+      item=RubyCurses::PMenuItem.new "Delete"
       item.accelerator = "Alt-D"
       item.command() { @del_cmd.call }
       tablemenu.add(item)
 
-      gotomenu = RubyCurses::Menu.new "&Goto"
+      gotomenu = RubyCurses::PMenu.new "&Goto"
 
-      item = RubyCurses::MenuItem.new "Top"
+      item = RubyCurses::PMenuItem.new "Top"
       item.accelerator = "Alt-0"
       item.command() { table.goto_top }
       gotomenu.add(item)
 
-      item = RubyCurses::MenuItem.new "Bottom"
+      item = RubyCurses::PMenuItem.new "Bottom"
       item.accelerator = "Alt-9"
       item.command() { table.goto_bottom }
       gotomenu.add(item)
 
-      item = RubyCurses::MenuItem.new "Next Page"
+      item = RubyCurses::PMenuItem.new "Next Page"
       item.accelerator = "Ctrl-n"
       item.command() { table.scroll_forward }
       gotomenu.add(item)
 
-      item = RubyCurses::MenuItem.new "Prev Page"
+      item = RubyCurses::PMenuItem.new "Prev Page"
       item.accelerator = "Ctrl-p"
       item.command() { table.scroll_backward }
       gotomenu.add(item)

data/lib/rbcurse/app.rb

@@ -365,7 +365,11 @@ module RubyCurses
         cmdline = str.split
         cmd = cmdline.shift #.to_sym
         if respond_to?(cmd, true)
-          send cmd, *cmdline
+          if cmd == "close"
+            throw :close
+          else
+            send cmd, *cmdline
+          end
         else
           alert "#{self.class} does not respond to #{cmd} "
           ret = false

data/lib/rbcurse/extras/bottomline.rb

@@ -1467,7 +1467,7 @@ module RubyCurses
       require 'rbcurse/rcommandwindow'
       ht = config[:height] || 15
       layout = { :height => ht, :width => Ncurses.COLS-1, :top => Ncurses.LINES-ht+1, :left => 0 }
-      rc = CommandWindow.new nil, :layout => layout, :box => true
+      rc = CommandWindow.new nil, :layout => layout, :box => true, :title => config[:title]
       w = rc.window
       #rc.text "There was a quick  brown fox who ran over the lazy dog and then went over the moon over and over again and again"
       rc.display_interactive(text) { |l|

data/lib/rbcurse/rbasiclistbox.rb

@@ -281,7 +281,7 @@ module RubyCurses
         @repaint_required = true
       when 27, ?\C-c.getbyte(0)
         #editing_canceled @current_index if @cell_editing_allowed
-        cancel_block # block
+        #cancel_block # block
         $multiplier = 0
       when @KEY_ASK_FIND_FORWARD
       # ask_search_forward

data/lib/rbcurse/rmulticontainer.rb

@@ -164,8 +164,8 @@ module RubyCurses
     # @param [Widget] component
     # @param [String] title
     def add component, title
-      component.row = @row+@row_offset+1
-      component.col = @col+@col_offset+1
+      component.row = @row+@row_offset+0 # changed 1 to 0 2011-09-14 
+      component.col = @col+@col_offset+0 # changed 1 to 0 2011-09-14 
       component.width = @width-2
       component.height = @height-2
       component.form = @form

data/lib/rbcurse/rpopupmenu.rb

@@ -13,6 +13,10 @@ NOTE : this program works but is one of the first programs and is untouched. It
       since its quite crappy.
       Also, we should move to Action classes as against just blokcs of code. And action class would have
 a user friendly string to identifiy the action, as well as a disabled option.
+
+     I am prefixing class names since they are same as those in rmenu and there's 
+    some crashing happening when i first execcute rmenu in one app then rpopupmenu
+    in another.
   
   --------
   * Date: 2008-11-14 23:43 
@@ -21,18 +25,18 @@ a user friendly string to identifiy the action, as well as a disabled option.
 
 =end
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses'
 require 'logger'
 require 'rbcurse'
 require 'rbcurse/action'
 
-include Ncurses
+#include Ncurses # FFI 2011-09-8 
 include RubyCurses
 module RubyCurses
   extend self
 
 
-  class MenuSeparator
+  class PMenuSeparator
     attr_accessor :enabled
     attr_accessor :parent
     attr_accessor :row
@@ -55,7 +59,7 @@ module RubyCurses
     end
   end
   ##
-  class MenuItem
+  class PMenuItem
     attr_accessor :parent
 #    attr_accessor :window
     attr_accessor :row
@@ -90,16 +94,16 @@ module RubyCurses
       @args = args
     end
     def on_enter
-      $log.debug ">>>on enter menuitem : #{@text} #{@row} #{@width} "
+      $log.debug ">>>on enter Pmenuitem : #{@text} #{@row} #{@width} "
       highlight
     end
     def on_leave
-      $log.debug ">>>on leave menuitem : #{@text} "
+      $log.debug ">>>on leave Pmenuitem : #{@text} "
       highlight false
     end
     ## XXX it could be a menu again
     def fire
-      $log.debug ">>>fire menuitem : #{@text} #{@command} "
+      $log.debug ">>>fire Pmenuitem : #{@text} #{@command} "
       @command.call self, *@args if !@command.nil?
       @parent.clear_menus
       return :CLOSE # added 2009-01-02 00:09 to close only actions, not submenus
@@ -143,7 +147,7 @@ module RubyCurses
      $log.debug "DESTRY menuitem #{@text}"
     end
   end
-  class Menu < MenuItem  
+  class PMenu < PMenuItem  
     attr_accessor :parent
     attr_accessor :row
     attr_accessor :col
@@ -178,7 +182,7 @@ module RubyCurses
     # create a Menuitem given an Action
     # if menuitem.kind_of? RubyCurses::Action
     def create_action_component action
-        m = MenuItem.new(action.name, action.mnemonic)
+        m = PMenuItem.new(action.name, action.mnemonic)
         m.command { action.call }
         m.accelerator = action.accelerator
         return m
@@ -199,10 +203,10 @@ module RubyCurses
       return self
     end
     def insert_separator ix
-      @items.insert ix, MenuSeparator.new
+      @items.insert ix, PMenuSeparator.new
     end
     def add_separator 
-      @items << MenuSeparator.new
+      @items << PMenuSeparator.new
     end
     def get_item i
       @items[i]
@@ -220,7 +224,7 @@ module RubyCurses
       if @window.nil?
         #repaint
         create_window
-        if !@parent.is_a? RubyCurses::MenuBar 
+        if !@parent.is_a? RubyCurses::PMenuBar 
           $log.debug " ADDING self to current menu: #{self}"
           # xxx highlight true
           @parent.current_menu << self
@@ -240,7 +244,7 @@ module RubyCurses
     def repaint # menu.repaint
       return if @items.nil? or @items.empty?
       $log.debug "menu repaint: #{@text} row #{@row} col #{@col}  " 
-      if !@parent.is_a? RubyCurses::MenuBar 
+      if !@parent.is_a? RubyCurses::PMenuBar 
         @parent.window.printstring( @row, 0, "|%-*s>|" % [@width-1, @text], $reversecolor)
         # added 2009-01-23 00:49 
         if !@mnemonic.nil?
@@ -307,7 +311,7 @@ module RubyCurses
     def on_enter # menu.on_enter
       $log.debug "menu onenter: #{@text} #{@row} #{@col}  " 
       # call parent method. XXX
-        if @parent.is_a? RubyCurses::MenuBar 
+        if @parent.is_a? RubyCurses::PMenuBar 
           @parent.window.printstring( @row, @col, " %s " % @text, $datacolor)
         else
           highlight
@@ -316,7 +320,7 @@ module RubyCurses
           $log.debug "menu onenter: #{@text} calling window,show"
           @window.show
           select_item 0
-        elsif @parent.is_a? RubyCurses::MenuBar and  @parent.selected
+        elsif @parent.is_a? RubyCurses::PMenuBar and  @parent.selected
           # only on the top level do we open a window if a previous one was opened
           $log.debug "menu onenter: #{@text} calling repaint CLASS: #{@parent.class}"
         #  repaint
@@ -326,7 +330,7 @@ module RubyCurses
     def on_leave # menu.on_leave
       $log.debug "menu onleave: #{@text} #{@row} #{@col}  " 
       # call parent method. XXX
-        if @parent.is_a? RubyCurses::MenuBar 
+        if @parent.is_a? RubyCurses::PMenuBar 
           @parent.window.printstring( @row, @col, " %s " % @text, $reversecolor)
           @window.hide if !@window.nil?
         else
@@ -391,7 +395,7 @@ module RubyCurses
       @visible = false
       panel = @window.panel
       Ncurses::Panel.del_panel(panel) if !panel.nil?   
-      @window.delwin if !@window.nil?
+      @window.delwin if !@window.nil? # FFI
       @items.each do |item|
         #next if item == :SEPARATOR
         item.destroy
@@ -399,7 +403,7 @@ module RubyCurses
       @window = nil
     end
     # menu LEFT, RIGHT, DOWN, UP, ENTER
-    # item could be menuitem or another menu
+    # item could be Pmenuitem or another menu
     #
     def handle_key ch
       #if !@current_menu.empty?
@@ -421,11 +425,11 @@ module RubyCurses
       when KEY_ENTER, 10, 13, 32 # added 32 2008-11-28 23:50 
         return cmenu.fire
       when KEY_LEFT
-        if cmenu.parent.is_a? RubyCurses::Menu 
+        if cmenu.parent.is_a? RubyCurses::PMenu 
           $log.debug "LEFT IN MENU : #{cmenu.parent.class} len: #{cmenu.parent.current_menu.length}"
           $log.debug "left IN MENU : #{cmenu.parent.class} len: #{cmenu.current_menu.length}"
         end
-        if cmenu.parent.is_a? RubyCurses::Menu and !cmenu.parent.current_menu.empty?
+        if cmenu.parent.is_a? RubyCurses::PMenu and !cmenu.parent.current_menu.empty?
           $log.debug " ABOU TO DESTROY DUE TO LEFT"
           cmenu.parent.current_menu.pop
           @@menus.pop
@@ -436,11 +440,11 @@ module RubyCurses
         end
       when KEY_RIGHT
        $log.debug "RIGHTIN MENU : "
-        if cmenu.parent.is_a? RubyCurses::Menu 
+        if cmenu.parent.is_a? RubyCurses::PMenu 
        $log.debug "right IN MENU : #{cmenu.parent.class} len: #{cmenu.parent.current_menu.length}"
        $log.debug "right IN MENU : #{cmenu.parent.class} len: #{cmenu.current_menu.length}"
         end
-        if cmenu.parent.is_a? RubyCurses::Menu and !cmenu.parent.current_menu.empty?
+        if cmenu.parent.is_a? RubyCurses::PMenu and !cmenu.parent.current_menu.empty?
           $log.debug " ABOU TO DESTROY DUE TO RIGHT"
           cmenu.parent.current_menu.pop
           @@menus.pop
@@ -464,7 +468,7 @@ module RubyCurses
         if key == item.mnemonic.downcase
           cmenu.select_item ix # 2009-01-23 13:32  so focus moves to menu
           ret = item.fire
-          return ret # 0 # 2009-01-23 00:43 menuitem returns CLOSE, menu 0
+          return ret # 0 # 2009-01-23 00:43 Pmenuitem returns CLOSE, menu 0
         end
       end
       return :UNHANDLED
@@ -479,7 +483,7 @@ module RubyCurses
         select_item 0
     end
   end
-  class PopupMenu < Menu
+  class PopupMenu < PMenu
     def initialize text, &block
       @row_margin = 0
       @@row = 0
@@ -524,7 +528,7 @@ module RubyCurses
       @visible = false
       panel = @window.panel
       Ncurses::Panel.del_panel(panel) if !panel.nil?   
-      @window.delwin if !@window.nil?
+      @window.delwin if !@window.nil? # FFI
       @items.each do |item|
         item.destroy
       end
@@ -535,7 +539,7 @@ module RubyCurses
   # An application related menubar.
   # Currently, I am adding this to a form. But should this not be application specific ?
   # It should popup no matter which window you are on ?? XXX
-  class MenuBar
+  class PMenuBar
     attr_reader :items
     attr_reader :window
     attr_reader :panel
@@ -704,7 +708,7 @@ module RubyCurses
     end
   end # menubar
 
-  class CheckBoxMenuItem < MenuItem
+  class PCheckBoxMenuItem < PMenuItem
     attr_reader :checkbox
     def initialize text, mnemonic=nil, &block
       @checkbox = CheckBox.new nil

data/lib/rbcurse/rtable.rb

@@ -86,7 +86,8 @@ module RubyCurses
       @col_offset = @row_offset = 1
 
       super
-      @_events.push(*[:TABLE_TRAVERSAL_EVENT,:TABLE_EDITING_EVENT])
+      # added LIST event since bombing when selecting a row in table 2011-09-8 FFI
+      @_events.push(*[:TABLE_TRAVERSAL_EVENT,:TABLE_EDITING_EVENT, :LIST_SELECTION_EVENT])
       init_vars
       install_list_keys
       install_keys_bindings

data/lib/rbcurse/rtextview.rb

@@ -497,6 +497,7 @@ module RubyCurses
     def sanitize content  #:nodoc:
       if content.is_a? String
         content.chomp!
+        content = content.encode("ASCII-8BIT", :invalid => :replace, :undef => :replace, :replace => "?")
         content.gsub!(/\t/, '  ') # don't display tab
         content.gsub!(/[^[:print:]]/, '')  # don't display non print characters
       else

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rbcurse
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 2
-  - 0
-  - pre
-  version: 1.2.0.pre
+  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors: 
 - Rahul Kumar
@@ -15,11 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 +05:30
-default_executable: 
+date: 2011-09-14 00:00:00 Z
 dependencies: []
 
-description: Ruby curses widgets for easy application development on text terminals (ruby 1.9, 1.8)
+description: Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9, 1.8)
 email: sentinel1879@gmail.com
 executables: []
 
@@ -41,9 +35,11 @@ files:
 - examples/README.txt
 - examples/abasiclist.rb
 - examples/alpmenu.rb
+- examples/app.rb
 - examples/appdirtree.rb
 - examples/appemail.rb
 - examples/appemaillb.rb
+- examples/appgcompose.rb
 - examples/appgmail.rb
 - examples/atree.rb
 - examples/data.txt
@@ -65,6 +61,8 @@ files:
 - examples/term2.rb
 - examples/test1.rb
 - examples/test2.rb
+- examples/testapp.rb
+- examples/testapp2.rb
 - examples/testchars.rb
 - examples/testcombo.rb
 - examples/testkeypress.rb
@@ -172,25 +170,12 @@ files:
 - lib/ver/ncurses.rb
 - lib/ver/window.rb
 - test/test_rbcurse.rb
-- examples/app.rb
-- examples/appcombo.rb
-- examples/appgcompose.rb
-- examples/cdir/testmultispl.rb
-- examples/focusmanager.rb
-- examples/imap.rb
-- examples/s.rb
-- examples/scrollbar.rb
-- examples/term.rb
-- examples/testapp.rb
-- examples/testapp2.rb
-- examples/testgmail.rb
-has_rdoc: true
 homepage: http://rbcurse.rubyforge.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -198,91 +183,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: rbcurse
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
-summary: Ruby ncurses Toolkit
-test_files: 
-- test/test_rbcurse.rb
-- examples/abasiclist.rb
-- examples/alpmenu.rb
-- examples/app.rb
-- examples/appcombo.rb
-- examples/appdirtree.rb
-- examples/appemail.rb
-- examples/appemaillb.rb
-- examples/appgcompose.rb
-- examples/appgmail.rb
-- examples/atree.rb
-- examples/cdir/testmultispl.rb
-- examples/dirtree.rb
-- examples/focusmanager.rb
-- examples/imap.rb
-- examples/keytest.rb
-- examples/menu1.rb
-- examples/mpad2.rb
-- examples/multispl.rb
-- examples/newtesttabp.rb
-- examples/qdfilechooser.rb
-- examples/rfe.rb
-- examples/rfe_renderer.rb
-- examples/rmail.rb
-- examples/s.rb
-- examples/scrollbar.rb
-- examples/splitp.rb
-- examples/sqlc.rb
-- examples/sqlm.rb
-- examples/table1.rb
-- examples/term.rb
-- examples/term2.rb
-- examples/test1.rb
-- examples/test2.rb
-- examples/testapp.rb
-- examples/testapp2.rb
-- examples/testchars.rb
-- examples/testcombo.rb
-- examples/testgmail.rb
-- examples/testkeypress.rb
-- examples/testlistbox.rb
-- examples/testmenu.rb
-- examples/testmulticomp.rb
-- examples/testmultispl.rb
-- examples/testree.rb
-- examples/testscroller.rb
-- examples/testscrolllb.rb
-- examples/testscrollp.rb
-- examples/testscrollta.rb
-- examples/testscrolltable.rb
-- examples/testsplit.rb
-- examples/testsplit2.rb
-- examples/testsplit3.rb
-- examples/testsplit3_1.rb
-- examples/testsplit3a.rb
-- examples/testsplit3b.rb
-- examples/testsplitta.rb
-- examples/testsplittv.rb
-- examples/testsplittvv.rb
-- examples/testtable.rb
-- examples/testtabp.rb
-- examples/testtodo.rb
-- examples/testtpane.rb
-- examples/testtpane2.rb
-- examples/testtpanetable.rb
-- examples/testvimsplit.rb
-- examples/viewtodo.rb
+summary: Ruby ncurses Toolkit using ffi since v1.2.3
+test_files: []
+