rbcurse-core 0.0.0 → 0.0.1

data/lib/rbcurse/core/util/viewer.rb

@@ -98,7 +98,7 @@ module RubyCurses
       rescue => err
           $log.error " VIEWER ERROR #{err} "
           $log.debug(err.backtrace.join("\n"))
-        alert "Viewer:" + err.to_s
+          textdialog ["Error in viewer: #{err} ", *err.backtrace], :title => "Exception"
       ensure
         v_window.destroy if !v_window.nil?
       end

data/lib/rbcurse/core/widgets/rmessagebox.rb

@@ -168,8 +168,8 @@ module RubyCurses
     # A textview object is created and yielded.
     #
     def text message
-      @suggested_w = @width || (FFI::NCurses.COLS * 0.70).floor
-      @suggested_h = @height || (FFI::NCurses.LINES * 0.70).floor
+      @suggested_w = @width || (FFI::NCurses.COLS * 0.80).floor
+      @suggested_h = @height || (FFI::NCurses.LINES * 0.80).floor
 
       message_col = 3
       r = 2
@@ -179,11 +179,21 @@ module RubyCurses
       bgclr = @bgcolor || :black
 
       if message.is_a? Array
+        l = longest_in_list message
+        if l > @suggested_w 
+          if l < FFI::NCurses.COLS
+            #@suggested_w = l
+            @suggested_w = FFI::NCurses.COLS-2 
+          else
+            @suggested_w = FFI::NCurses.COLS-2 
+          end
+          display_length = @suggested_w-6
+        end
         # reduce width and height if you can based on array contents
       else
         message = wrap_text(message, display_length).split("\n")
       end
-      message_height = message.size
+      message_height = message.size + 8
       # reduce if possible if its not required.
       #
       r1 = (FFI::NCurses.LINES-@suggested_h)/2
@@ -217,7 +227,7 @@ module RubyCurses
           rescue => err
             $log.debug( err) if err
             $log.debug(err.backtrace.join("\n")) if err
-            alert "Exception in Messagebox: #{err}. Check log"
+            textdialog ["Error in Messagebox: #{err} ", *err.backtrace], :title => "Exception"
             @window.refresh # otherwise the window keeps showing (new FFI-ncurses issue)
             $error_message.value = ""
           ensure

data/lib/rbcurse/core/widgets/rtabbedwindow.rb

@@ -54,7 +54,7 @@ class TabbedWindow
         rescue => err
           $log.debug( err) if err
           $log.debug(err.backtrace.join("\n")) if err
-          alert "Got an exception in NewTabbedWindow: #{err}. Check log"
+          textdialog ["Error in TabbedWindow: #{err} ", *err.backtrace], :title => "Exception"
           $error_message.value = ""
         ensure
         end

data/lib/rbcurse/core/widgets/rtextarea.rb

@@ -234,7 +234,8 @@ module RubyCurses
     # Added on 2011-10-10 
     # @since 1.4.0
     # @param [String, Array] String is an existing filename, Array is content to be replaced
-    def set_content lines
+    # Added config for compatibility with textview
+    def set_content lines, config={}
       case lines
       when String
         if File.exists? lines
@@ -249,7 +250,20 @@ module RubyCurses
       @list.replace lines
       @repaint_required = true
     end
-    alias :text :set_content
+    #alias :text :set_content
+    # set text
+    # Added for consistency with other widgets
+    def text(*val)
+      if val.empty?
+        return @list
+      end
+      set_content(*val)
+      self
+    end
+    def text=(val)
+      return unless val # added 2010-11-17 20:11, dup will fail on nil
+      set_content(val)
+    end
     def get_window
       @graphic
     end
@@ -271,12 +285,12 @@ module RubyCurses
       # the next was irritating if user wanted to add a row ! 2011-10-10 
       #bind_key(Ncurses::KEY_DOWN){ ret = down ; get_window.ungetch(KEY_TAB) if ret == :NO_NEXT_ROW }
       bind_key(Ncurses::KEY_DOWN){ ret = down ; }
-      bind_key(?\C-a){ cursor_bol }
-      bind_key(?\C-e){ cursor_eol }
-      bind_key(?\C-n) { scroll_forward }
-      bind_key(?\C-p) { scroll_backward }
-      bind_key(?\C-[) { goto_start }
-      bind_key(?\C-]) { goto_end }
+      bind_key(?\C-a, 'start of line'){ cursor_bol }
+      bind_key(?\C-e, 'end of line'){ cursor_eol }
+      bind_key(?\C-d, 'scroll forward') { scroll_forward }
+      bind_key(?\C-b, 'scroll backward') { scroll_backward }
+      bind_key(?\C-[, 'goto start') { goto_start }
+      bind_key(?\C-], 'goto end') { goto_end }
 
       bind_key(KEY_BACKSPACE){ delete_prev_char if @editable }
       bind_key(KEY_BSPACE){ delete_prev_char if @editable}
@@ -284,10 +298,12 @@ module RubyCurses
       bind_key(?\M-f, :forward_word)
 
       #bind_key(127){ delete_prev_char }
-      bind_key(330){ delete_curr_char if @editable }
+      bind_key(330, 'delete current char'){ delete_curr_char if @editable }
       #bind_key(?\C-k){ delete_eol }
       #bind_key(?\C-_){ undo_delete_eol }
       #bind_key(27){ set_buffer @original_value }
+      bind_key([?\C-x, ?e], :edit_external)
+      bind_key([?\C-x, ?\C-s], :saveas)
       @keys_mapped = true
     end
 
@@ -915,6 +931,40 @@ module RubyCurses
       return unless @undo_handler
       @undo_handler.redo
     end
+
+    def edit_external
+      require 'rbcurse/core/include/appmethods'
+      require 'tempfile'
+      f = Tempfile.new("rbcurse")
+      l = self.text
+      l.each { |line| f.puts line }
+      fp = f.path
+      f.flush
+
+      editor = ENV['EDITOR'] || 'vi'
+      vimp = %x[which #{editor}].chomp
+      ret = shell_out "#{vimp} #{fp}"
+      if ret
+        lines = File.open(f,'r').readlines
+        set_content(lines, :content_type => @old_content_type)
+      end
+    end
+    def saveas name=nil, config={}
+      unless name
+        name = rb_gets "File to save as: "
+        return if name.nil? || name == ""
+      end
+      exists = File.exists? name
+      if exists # need to prompt
+        return unless rb_confirm("Overwrite existing file? ")
+      end
+      l = getvalue
+      File.open(name, "w"){ |f|
+        l.each { |line| f.puts line }
+        #l.each { |line| f.write line.gsub(/\r/,"\n") }
+      }
+      rb_puts "#{name} written."
+    end
   end # class textarea
   ##
 end # modul

data/lib/rbcurse/core/widgets/rtextview.rb

@@ -95,12 +95,13 @@ module RubyCurses
       bind_key(?\M-l, :scroll_right)
       bind_key(?\M-h, :scroll_left)
       bind_key([?\C-x, ?\C-s], :saveas)
+      bind_key([?\C-x, ?e], :edit_external)
       bind_keys([?\C-d, 32], 'scroll forward'){ scroll_forward() }
       bind_key(?\C-b, 'scroll backward'){ scroll_backward() }
       # have placedhere so multi-bufer can override BS to prev buffer
       bind_keys([KEY_BACKSPACE,KEY_BSPACE,KEY_DELETE], :cursor_backward)
-      #bind_key(?r) { getstr("Enter a word: ") }
-      bind_key(?m, :disp_menu)
+      bind_key(?r) { getstr("Enter a word: ") } if $log.debug?
+      bind_key(?m, :disp_menu)                  if $log.debug?
     end
     ## 
     # send in a list
@@ -117,6 +118,7 @@ module RubyCurses
         formatted_text list, @content_type
         return
       end
+      # please note that content type is lost once formatted text does it's work
       @wrap_policy = config[:wrap]
       if list.is_a? String
         if @wrap_policy == :WRAP_WORD
@@ -138,7 +140,18 @@ module RubyCurses
       init_vars
     end
     # for consistency with other objects that respect text
-    alias :text :set_content
+    #alias :text :set_content
+    def text(*val)
+      if val.empty?
+        return @list
+      end
+      set_content(*val)
+      self
+    end
+    def text=(val)
+      return unless val # added 2010-11-17 20:11, dup will fail on nil
+      set_content(val)
+    end
     def formatted_text text, fmt
       require 'rbcurse/core/include/chunk'
       @formatted_text = text
@@ -257,6 +270,8 @@ module RubyCurses
       @repaint_footer_required = true if @oldrow != @current_index # 2011-10-15 
       print_foot if @print_footer && !@suppress_borders && @repaint_footer_required
     end
+    # this sucks and should not be used but is everywhere, should
+    # use text()
     def getvalue
       @list
     end
@@ -369,7 +384,7 @@ module RubyCurses
         rescue => err
           $log.error " TEXTVIEW ERROR #{err} "
           $log.debug(err.backtrace.join("\n"))
-          alert err.to_s
+          textdialog [err.to_s, *err.backtrace], :title => "Exception"
         end
         return :UNHANDLED if ret == :UNHANDLED
       end
@@ -510,6 +525,7 @@ module RubyCurses
         #l = []
         #@formatted_text.each { |e| l << cp.convert_to_chunk(e) }
 
+        @old_content_type = @content_type
         text(l)
         @formatted_text = nil
 
@@ -635,13 +651,14 @@ module RubyCurses
     end
     ## this is just a test of prompting user for a string
     #+ as an alternative to the dialog.
-    def getstr prompt, maxlen=10  #:nodoc:
+    def getstr prompt, maxlen=80  #:nodoc:
       tabc = Proc.new {|str| Dir.glob(str +"*") }
       config={}; config[:tab_completion] = tabc
-      config[:default] = "default"
+      config[:default] = "test"
+      config[:display_length] = 11
       $log.debug " inside getstr before call "
       ret, str = rbgetstr(@form.window, @row+@height-1, @col+1, prompt, maxlen, config)
-      $log.debug " rbgetstr returned #{ret} , #{str} "
+      $log.debug " rbgetstr returned #{ret} ,#{str}."
       return "" if ret != 0
       return str
     end
@@ -759,19 +776,40 @@ module RubyCurses
     end
     def saveas name=nil, config={}
       unless name
-        name = ask "File to save as: "
+        name = rb_gets "File to save as: "
         return if name.nil? || name == ""
       end
       exists = File.exists? name
       if exists # need to prompt
-        return unless agree("Overwrite existing file? ", true)
+        return unless rb_confirm("Overwrite existing file? ")
       end
       l = getvalue
       File.open(name, "w"){ |f|
         l.each { |line| f.puts line }
         #l.each { |line| f.write line.gsub(/\r/,"\n") }
       }
-      say_with_wait "#{name} written."
+      rb_puts "#{name} written."
+    end
+
+    # edit content of textview in EDITOR and bring back
+    # NOTE: does not maintain content_type, so if you edit ansi text,
+    # it will come back in as normal text
+    def edit_external
+      require 'rbcurse/core/include/appmethods'
+      require 'tempfile'
+      f = Tempfile.new("rbcurse")
+      l = self.text
+      l.each { |line| f.puts line }
+      fp = f.path
+      f.flush
+
+      editor = ENV['EDITOR'] || 'vi'
+      vimp = %x[which #{editor}].chomp
+      ret = shell_out "#{vimp} #{fp}"
+      if ret
+        lines = File.open(f,'r').readlines
+        set_content(lines, :content_type => @old_content_type)
+      end
     end
 
 

data/lib/rbcurse/core/widgets/rwidget.rb

@@ -439,7 +439,7 @@ module RubyCurses
             $log.debug "KEY: #{name} : #{val} "
           }
         }
-        textdialog arr
+        textdialog arr, :title => "Key Bindings"
       end
       def bind_keys keycodes, *args, &blk
         keycodes.each { |k| bind_key k, *args, &blk }
@@ -1902,6 +1902,9 @@ module RubyCurses
     attr_reader :original_value                # value on entering field
     attr_accessor :overwrite_mode              # true or false INSERT OVERWRITE MODE
 
+    attr_reader :field_col                     # column on which field is printed
+                                               # required due to labels. Is updated after printing
+    #                                          # so can be nil if accessed early 2011-12-8 
     # For consistency, now width equates to display_length
     alias :width :display_length
     alias :width= :display_length=
@@ -1928,6 +1931,8 @@ module RubyCurses
     def init_vars
       @pcol = 0                    # needed for horiz scrolling
       @curpos = 0                  # current cursor position in buffer
+                                   # this is the index where characters are put or deleted
+      #                            # when user edits
       @modified = false
       @repaint_required = true
     end
@@ -2039,6 +2044,8 @@ module RubyCurses
       #$log.debug " FIELD DATA #{@datatype}"
       @delete_buffer = @buffer.dup
       @buffer = value.to_s.dup
+      # don't allow setting of value greater than maxlen
+      @buffer = @buffer[0,@maxlen] if @maxlen && @buffer.length > @maxlen
       @curpos = 0
       # hope @delete_buffer is not overwritten
       fire_handler :CHANGE, InputDataEvent.new(@curpos,@curpos, self, :DELETE, 0, @delete_buffer)     # 2010-09-11 13:01 
@@ -2111,7 +2118,7 @@ module RubyCurses
     end
     @bgcolor ||= $def_bg_color
     @color   ||= $def_fg_color
-    $log.debug("repaint FIELD: #{id}, #{name}, #{row} #{col},  #{focusable} st: #{@state} ")
+    $log.debug("repaint FIELD: #{id}, #{name}, #{row} #{col},pcol:#{@pcol},  #{focusable} st: #{@state} ")
     #return if display_length <= 0 # added 2009-02-17 00:17 sometimes editor comp has 0 and that
     # becomes negative below, no because editing still happens
     @display_length = 1 if display_length == 0
@@ -2143,6 +2150,7 @@ module RubyCurses
       @col_offset = c-@col            # required so cursor lands in right place
     end
     @graphic.printstring r, c, sprintf("%-*s", display_length, printval), acolor, @attr
+    @field_col = c
     @repaint_required = false
   end
   def set_focusable(tf)
@@ -2191,8 +2199,9 @@ module RubyCurses
   ## 
   # position cursor at start of field
   def cursor_home
-    set_form_col 0
+    @curpos = 0
     @pcol = 0
+    set_form_col 0
   end
   ##
   # goto end of field, "end" is a keyword so could not use it.
@@ -2201,13 +2210,29 @@ module RubyCurses
     if blen < @display_length
       set_form_col blen
     else
+      # there is a problem here FIXME. 
       @pcol = blen-@display_length
-      set_form_col @display_length-1
+      #set_form_col @display_length-1
+      set_form_col blen
     end
-    @curpos = blen # HACK 
+    @curpos = blen # this is position in array where editing or motion is to happen regardless of what you see
+                   # regardless of pcol (panning)
     #  $log.debug " crusor END cp:#{@curpos} pcol:#{@pcol} b.l:#{@buffer.length} d_l:#{@display_length} fc:#{@form.col}"
     #set_form_col @buffer.length
   end
+  # sets the visual cursor on the window at correct place
+  # added here since we need to account for pcol. 2011-12-7 
+  # NOTE be careful of curpos - pcol being less than 0
+  def set_form_col col1=@curpos
+    @curpos = col1 || 0 # NOTE we set the index of cursor here
+    c = @col + @col_offset + @curpos - @pcol
+    min = @col + @col_offset
+    max = min + @display_length
+    c = min if c < min
+    c = max if c > max
+    $log.debug " #{@name} FIELD set_form_col #{c}, curpos #{@curpos}  , #{@col} + #{@col_offset} pcol:#{@pcol} "
+    setrowcol nil, c
+  end
   def delete_eol
     return -1 unless @editable
     pos = @curpos-1
@@ -2254,10 +2279,17 @@ module RubyCurses
     def delete_prev_char
       return -1 if !@editable 
       return if @curpos <= 0
+      # if we've panned, then unpan, and don't move cursor back
+      # Otherwise, adjust cursor (move cursor back as we delete)
+      adjust = true
+      if @pcol > 0
+        @pcol -= 1
+        adjust = false
+      end
       @curpos -= 1 if @curpos > 0
       delete_at
+      addcol -1 if adjust # move visual cursor back
       set_modified 
-      addcol -1
     end
     ## add a column to cursor position. Field
     def addcol num

data/lib/rbcurse/core/widgets/tabular.rb

@@ -60,7 +60,7 @@ module RubyCurses
       @x = '+'
       self.columns = cols if cols
       if !args.empty?
-        puts "ARGS after shift #{args} "
+        #puts "ARGS after shift #{args} "
         if !args.empty?
           self.data = args
         end
@@ -84,8 +84,8 @@ module RubyCurses
     # set data as an array of arrays
     # @param [Array<Array>] data as array of arrays
     def data=(list)
-      puts "got data: #{list.size} " if !$log
-      puts list if !$log
+      #puts "got data: #{list.size} " if !$log
+      #puts list if !$log
       @list = list
     end
 
@@ -213,7 +213,7 @@ module RubyCurses
         end
       }
       @fmstr = fmt.join(@y)
-      puts "format: #{@fmstr} "
+      #puts "format: #{@fmstr} " # 2011-12-09 23:09:57
     end
   end
 end

data/lib/rbcurse/core/widgets/tabularwidget.rb

@@ -516,7 +516,7 @@ module RubyCurses
         rescue => err
           $error_message.value = err.to_s
           #          @form.window.print_error_message # changed 2011 dts  
-          alert err.to_s
+          textdialog ["Error in TabularWidget: #{err} ", *err.backtrace], :title => "Exception"
           $log.error " Tabularwidget ERROR #{err} "
           $log.debug(err.backtrace.join("\n"))
           # XXX caller app has no idea error occurred so can't do anything !

data/lib/rbcurse/core/widgets/textpad.rb

@@ -392,7 +392,7 @@ module RubyCurses
           rescue => err
             $log.error " TEXTPAD ERROR #{err} "
             $log.debug(err.backtrace.join("\n"))
-            alert err.to_s
+            textdialog ["Error in TextPad: #{err} ", *err.backtrace], :title => "Exception"
             # FIXME why does this result in a blank spot on screen till its refreshed again
             # should not happen if its deleting its panel and doing an update panel
           end
@@ -402,7 +402,7 @@ module RubyCurses
       rescue => err
         $log.debug( err) if err
         $log.debug(err.backtrace.join("\n")) if err
-        alert "Got an exception in PadReader: #{err}. Check log"
+        textdialog ["Error in TextPad: #{err} ", *err.backtrace], :title => "Exception"
         $error_message.value = ""
       ensure
       end