rbcurse 1.2.0 → 1.3.0

data/examples/sqlc.rb

@@ -1,4 +1,15 @@
 ## rkumar, 2009
+#DEPRECATED. See sqlm.rb
+#AVOID USING TabbedPane till its rewritten 1.3.2 or so.
+#You will have to press a downarrow or any key if the pane goes blank.
+#
+############ WARNING ##############################################################
+#           TabbedPanes seem to have stopped displaying at some points
+#           after moving to FFI-Ncurses. And i've not been able to locate the point.
+#           This is one subtle difference between ncurses and ffi-ncurses.
+#           So i will scrap this and do a fresh clean rewrite of TabbedPane class.
+#
+###################################################################################
 # Sample demo of various widgets and their interaction.
 # This is a simple sql client which allows table / column selection, construction
 # of SQL queries, and multiple resultsets.
@@ -157,7 +168,7 @@ class Sqlc
   end
   def run
     title = "rbcurse"
-    @header = ApplicationHeader.new @form, title, {:text2=>"Demo", :text_center=>"SQL Client"}
+    @header = ApplicationHeader.new @form, title, {:text2=>"Demo", :text_center=>"SQL Client ***DEPRECATED use sqlm.rb ******"}
     status_row = RubyCurses::Label.new @form, {'text' => "", :row => Ncurses.LINES-4, :col => 0, :display_length=>70}
     @status_row = status_row
     # setting ENTER across all objects on a form
@@ -423,8 +434,8 @@ if $0 == __FILE__
   begin
     # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    #$log = Logger.new("view.log")
-    $log = Logger.new(ENV['LOGDIR'] || "" + "view.log")
+    #$log = Logger.new("rbc13.log")
+    $log = Logger.new(ENV['LOGDIR'] || "" + "rbc13.log")
 
     $log.level = Logger::DEBUG
 

data/examples/sqlm.rb

@@ -380,8 +380,8 @@ class Sqlc
       atable.set_column_widths cw
       rescue => exc
         $log.debug(exc.backtrace.join("\n"))
-        raise exc.to_s
         alert exc.to_s
+        raise exc.to_s
         return
       end
       @status_row.text = "#{@content.size} rows retrieved"
@@ -434,8 +434,8 @@ if $0 == __FILE__
   begin
     # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    #$log = Logger.new("view.log")
-    $log = Logger.new(ENV['LOGDIR'] || "" + "view.log")
+    #$log = Logger.new("rbc13.log")
+    $log = Logger.new(ENV['LOGDIR'] || "" + "rbc13.log")
 
     $log.level = Logger::DEBUG
 

data/examples/term.rb

@@ -0,0 +1,48 @@
+require 'rbcurse/app'
+require 'terminal-table/import'
+
+App.new do 
+  header = app_header "rbcurse 1.2.0", :text_center => "**** Demo", :text_right =>"New Improved!", :color => :black, :bgcolor => :white, :attr => :bold 
+  message "Press F1 to escape from here"
+
+  stack :margin_top => 2, :margin => 5, :width => 30 do
+    t = Terminal::Table.table(['a', 'b'], [1, 2], [3, 4])
+    $log.debug "YYY table #{t.class} "
+    list_box :list => t.render2
+    t = Terminal::Table.table ['a', 'b']
+    t << [1, 2]
+    t << [3, 4]
+    t << :separator
+    t << [4, 6]
+    #list_box :list => t.to_s.split("\n")
+    list_box :list => t.render2
+  end # stack
+  t = Terminal::Table.table do |t|
+    t.headings = 'First Name', 'Last Name', 'Email'
+    t << %w( TJ Holowaychuk tj@vision-media.ca )
+    t << %w( Bob Someone bob@vision-media.ca )
+    t << %w( Joe Whatever bob@vision-media.ca )
+  end
+  #t = t.to_s.split(/[|+]\n/)
+  t = t.render2
+  wid = t[0].length + 2
+  stack :margin_top => 2, :margin => 35, :width => wid do
+    list_box :list => t
+    t = Terminal::Table.table do
+      self.headings = 'First Name', 'Last Name', 'Email'
+      add_row ['TJ',  'Holowaychuk', 'tj@vision-media.ca']
+      add_row ['Bob', 'Someone',     'bob@vision-media.ca']
+      add_row ['Joe', 'Whatever',    'joe@vision-media.ca']
+      add_separator
+      add_row ['Total', { :value => '3', :colspan => 2, :alignment => :right }]
+      align_column 1, :center
+    end
+    #lb =  list_box :list => t.render2
+    lb =  textview :set_content => t.render2, :height => 10
+    lb.bind(:PRESS){|tae|
+      alert "Pressed list on #{tae.word_under_cursor(nil, nil, "|")}  "
+    }
+    # make a textview that is vienabled by default.
+end
+
+end # app

data/examples/term2.rb

@@ -3,12 +3,11 @@ require 'rbcurse/extras/tabular'
 require 'rbcurse/extras/scrollbar'
 
 App.new do 
-  header = app_header "rbcurse 1.2.0", :text_center => "**** Demo", :text_right =>"New Improved!", :color => :black, :bgcolor => :white, :attr => :bold 
-  message "Press F1 to escape from here"
+  header = app_header "rbcurse 1.2.0", :text_center => "Tabular Demo", :text_right =>"New Improved!", :color => :black, :bgcolor => :white, :attr => :bold 
+  message "Press F10 to escape from here"
 
   stack :margin_top => 2, :margin => 5, :width => 30 do
     t = Tabular.new(['a', 'b'], [1, 2], [3, 4])
-    $log.debug "YYY table #{t.class} "
     list_box :list => t.render
     t = Tabular.new ['a', 'b']
     t << [1, 2]
@@ -17,33 +16,61 @@ App.new do
     #list_box :list => t.to_s.split("\n")
     list_box :list => t.render
   end # stack
+  r = `df -gh`
+  # on my system there are extra spaces so i need to remove them, or else
+  # there'll be a mismatch between headers and columns
+  r.gsub!("Mounted on", "Mounted_on")
+  r.gsub!("map ", "map_")
+  res = r.split("\n")
+  heads = res.shift.split
   t = Tabular.new do |t|
-    t.headings = 'First Name', 'Last Name', 'Email'
-    t << %w( TJ Holowaychuk tj@vision-media.ca )
-    t << %w( Bob Someone bob@vision-media.ca )
-    t << %w( Joe Whatever bob@vision-media.ca )
+    t.headings = heads
+    #t.headings = 'First Name', 'Last Name', 'Email'
+    #t << %w( TJ Holowaychuk tj@vision-media.ca )
+    #t << %w( TJ Holowaychuk tj@vision-media.ca 1 2 3  )
+    #t << %w( Bob Someone bob@vision-media.ca )
+    #t << %w( Joe Whatever bob@vision-media.ca )
+
+    #res.each { |e| t <<   e.split.flatten   }
+    res.each { |e| t.add_row e.split   }
   end
 
   t = t.render
   wid = t[0].length + 2
   stack :margin_top => 2, :margin => 35, :width => wid do
-    list_box :list => t
+    list_box :list => t, :title => '[df -gh]'
+
+    r = `ls -l`
+    res = r.split("\n")
+
     t = Tabular.new do
-      self.headings = 'First Name', 'Last Name', 'Email'
-      add_row ['Roald',  'Amundsen', 'ra@explorers.org']
-      add_row ['Francis', 'Drake',    'joe@ducks.com']
-      add_row ['Hsuan', 'Tsang',    'tsang@asia.org']
-      add_separator
-      add_row ['Ernest', 'Shackleton',    'jack@radio-schakc.org']
-      add_row ['Fa', 'Hsien',    'fa@sheen.net']
-      add_row ['Vasco', 'Da Gama',     'bob@vasco.org']
-      add_row ['David', 'Livingstone',    'jack@trolls.com']
-      #add_row ['Total', { :value => '3', :colspan => 2, :alignment => :right }]
-      align_column 1, :center
-      self.numbering = true
+#      self.headings = 'Perm', 'Gr', 'User', 'U',  'Size', 'Mon', 'Date', 'Time', 'File' # changed 2011 dts  
+      self.headings = 'User',  'Size', 'Mon', 'Date', 'Time', 'File'
+      res.each { |e| 
+        cols = e.split
+        next if cols.count < 6
+        cols = cols[3..-1]
+        cols = cols[0..5] if cols.count > 6
+        #cols[1] = cols[1].to_i
+        add_row cols
+      }
+      column_width 1, 6
+      align_column 1, :right
+      #self.headings = 'First Name', 'Last Name', 'Email'
+      #add_row ['Roald',  'Amundsen', 'ra@explorers.org']
+      #add_row ['Francis', 'Drake',    'joe@ducks.com']
+      #add_row ['Hsuan', 'Tsang',    'tsang@asia.org']
+      #add_separator
+      #add_row ['Ernest', 'Shackleton',    'jack@radio-schakc.org']
+      #add_row ['Fa', 'Hsien',    'fa@sheen.net']
+      #add_row ['Vasco', 'Da Gama',     'bob@vasco.org']
+      #add_row ['David', 'Livingstone',    'jack@trolls.com']
+      ##add_row ['Total', { :value => '3', :colspan => 2, :alignment => :right }]
+      #align_column 1, :center
+      #self.numbering = true
     end
     #lb =  list_box :list => t.render2
-    lb =  textview :set_content => t.render, :height => 10
+    lb =  textview :set_content => t.render, :height => 15, :title => '[ls -l]'
     lb.bind(:PRESS){|tae|
       alert "Pressed list on line #{tae.current_index}  #{tae.word_under_cursor(nil, nil, "|")}  "
     }

data/examples/test1.rb

@@ -7,7 +7,7 @@
 #
 #$LOAD_PATH << "/Users/rahul/work/projects/rbcurse/"
 require 'rubygems'
-require 'ncurses'
+#require 'ncurses' # FFI
 require 'logger'
 #require 'lib/rbcurse/mapper'
 #require 'lib/rbcurse/keylabelprinter'
@@ -19,7 +19,7 @@ if $0 == __FILE__
   begin
     # XXX update with new color and kb
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    $log = Logger.new((File.join(ENV['LOGDIR'] || "./" ,"view.log")))
+    $log = Logger.new((File.join(ENV['LOGDIR'] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
 #    @window = VER::Window.root_window

data/examples/test2.rb

@@ -16,14 +16,57 @@ require 'rbcurse/celleditor'
 require './qdfilechooser'
 require 'rbcurse/rlistbox'
 require 'rbcurse/rmessagebox'
+require 'rbcurse/rtree'
+require './appmethods.rb'
+def shell_output
+  cmd = get_string("Enter shell command:", 50)
+  if cmd && !cmd.empty?
+    run_command cmd
+  end
+end
+def run_command cmd
+  # http://whynotwiki.com/Ruby_/_Process_management#What_happens_to_standard_error_.28stderr.29.3F
+  require 'rbcurse/extras/viewer'
+  begin
+    res = `#{cmd} 2>&1`
+  rescue => ex
+    res = ex.to_s
+    res << ex.backtrace.join("\n") 
+  end
+  res.gsub!("\t","   ")
+  RubyCurses::Viewer.view(res.split("\n"), :close_key => KEY_RETURN, :title => "<Enter> to close, M-l M-h to scroll")
+end
+def help_text
+      <<-eos
+               TEST2  HELP 
+
+      This is some help text for test2.
+
+      Alt-C/F1 -   Exit application (F1 will become help in 1.3.1)
+      Alt-!    -   Drop to shell
+      C-x c    -   Drop to shell
+      C-x l    -   list of files
+      C-x p    -   process list
+      C-x d    -   disk usage list
+      C-x s  -   Git status
+      C-x d  -   Git diff
+      C-x w  -   Git whatchanged
+      Alt-x    -   Command mode (<tab> to see commands and select)
+
+      Some commands for using bottom of screen as vim and emacs do.
+        To add
+
+      -----------------------------------------------------------------------
+      eos
+end
 if $0 == __FILE__
   include RubyCurses
 
   begin
   # Initialize curses
     VER::start_ncurses  # this is initializing colors via ColorMap.setup
-    #$log = Logger.new(ENV['LOGDIR'] || "" + "view.log")
-    $log = Logger.new((File.join(ENV['LOGDIR'] || "./" ,"view.log")))
+    #$log = Logger.new(ENV['LOGDIR'] || "" + "rbc13.log")
+    $log = Logger.new((File.join(ENV['LOGDIR'] || "./" ,"rbc13.log")))
     $log.level = Logger::DEBUG
 
     @window = VER::Window.root_window
@@ -35,7 +78,7 @@ if $0 == __FILE__
       colors = Ncurses.COLORS
       $log.debug "START #{colors} colors test2.rb --------- #{@window} "
       @form = Form.new @window
-      @form.window.printstring 0, 30, "Demo of Ruby Curses Widgets - rbcurse", $normalcolor, 'reverse'
+      @form.window.printstring 0, 30, "Demo of some Ruby Curses Widgets - rbcurse", $normalcolor, 'reverse'
       r = 1; fc = 12;
       mnemonics = %w[ n l r p]
       %w[ name line regex password].each_with_index do |w,i|
@@ -58,7 +101,7 @@ if $0 == __FILE__
       $results.value = "A variable"
       var = RubyCurses::Label.new @form, {'text_variable' => $results, "row" => r, "col" => fc}
         r += 1
-        mylist = []
+        mylist = ["Release gem","Bump version","Fix bugs","Make enhancements", "Brag on rubyforum"]
         0.upto(100) { |v| mylist << "#{v} scrollable data" }
         $listdata = Variable.new mylist
         listb = Listbox.new @form do
@@ -73,18 +116,19 @@ if $0 == __FILE__
           show_selector true
           row_selected_symbol "[X] "
           row_unselected_symbol "[ ] "
-          title "A long list"
+          title "C-Space to select"
           title_attrib 'reverse'
           cell_editing_allowed true
         end
         #listb.insert 55, "hello ruby", "so long python", "farewell java", "RIP .Net"
         #$listdata.value.insert 55, "hello ruby", "so long python", "farewell java", "RIP .Net"
         listb.list_data_model.insert 55, "hello ruby", "so long python", "farewell java", "RIP .Net", "hi lisp", "hi clojure"
+        col2 = 42
         texta = TextArea.new @form do
           name   "mytext" 
           row  1 
-          col  52 
-          width 40
+          col  col2
+          width 50
           height 14
           title "Editable box"
           title_attrib (Ncurses::A_REVERSE | Ncurses::A_BOLD)
@@ -97,49 +141,36 @@ if $0 == __FILE__
         texta << " F1 to exit. or click cancel button"
         texta << " Or alt-c"
 
-        alist = [true, false, true, false, true, false, true, false, true]
-        cblist = Variable.new alist
-        listcb = Listbox.new @form do
-          name   "cblist" 
-          row  1 
-          col  96 
-          width 8
-          height 10
-#         list mylist
-          list_variable cblist
-          #selection_mode :SINGLE
-          title "CList"
-          title_attrib 'reverse'
-          cell_renderer RubyCurses::CheckBoxCellRenderer.new nil, {"parent" => self, "display_length"=> @width-2}
-          cell_editing_allowed true
-          cell_editor RubyCurses::CellEditor.new(RubyCurses::CheckBox.new nil, {"focusable"=>false, "visible"=>false})
-        end
-        colist = ["Todo", "WIP", "Fin", "Cancel", "Postp"]
-        colistdata = ["Todo", "Todo", "WIP","WIP", "Postp", "Cancel","Cancel", "Postp"]
-        colistv = Variable.new colistdata
-        listcb = Listbox.new @form do
-          name   "colist" 
-          row  16
-          col  96 
-          width 12
-          height 10
-#         list mylist
-          list_variable colistv
-          #selection_mode :SINGLE
-          title "Status"
-          title_attrib 'bold'
-          cell_editing_allowed true
-          cell_renderer RubyCurses::ComboBoxCellRenderer.new nil, {"parent" => self, "display_length"=> width()-2}
-          cell_editor RubyCurses::CellEditor.new(RubyCurses::ComboBox.new nil, {"focusable"=>false, "visible"=>false, "list"=>colist, "display_length"=>width()-2})
+        col3 = 92
+        treemodel = nil
+      atree = Tree.new @form, :title => "Tree", :row =>1, :col=>col3, :height => 14, :width => 15 do
+        treemodel = root "ruby" do
+          branch "mri" do
+            leaf "1.9.1"
+            leaf "1.9.2"
+            leaf "1.9.3"
+          end
+          branch "jruby" do
+            leaf "1.5"
+          end
+          branch "ree" do
+            leaf "1.8"
+            leaf "1.9"
+            leaf "2.0"
+          end
         end
+      end
+      root = treemodel.root
+      atree.set_expanded_state root, true
         #listcb.cell_editor.component.form = @form
 
+      w1 = Ncurses.COLS-col2-1
         @textview = TextView.new @form do
           name   "myView" 
-          row  16 
-          col  52 
-          width 40
-          height 10
+          row  15 
+          col  col2 
+          width w1
+          height 11
           title "README.mark"
           title_attrib 'bold'
           print_footer true
@@ -150,7 +181,23 @@ if $0 == __FILE__
         #@textview.top_row 21
 
         # just for demo, lets scroll the text view as we scroll this.
-        listb.bind(:ENTER_ROW, @textview) { |alist, tview| tview.top_row alist.current_index }
+        listb.bind(:ENTER_ROW, @textview) { |alist, tview| tview.top_row alist.current_index
+         pb =  @form.by_name["pbar"]
+         pb.visible true
+         len = alist.current_index
+         pb.fraction(len/100.0)
+         i = ((len/100.0)*100).to_i
+         i = 100 if i > 100
+         pb.text = "completed:#{i}"
+        }
+        listb.bind(:LEAVE) { 
+          pb =  @form.by_name["pbar"]
+          pb.visible false
+          r = pb.row
+          c = pb.col
+          @window.wmove(r,c); @window.wclrtoeol
+          #@window.wrefresh
+        }
         
         # just for demo, lets scroll the text view to the line you enter
         @form.by_name["line"].bind(:LEAVE, @textview) { |fld, tv| raise(FieldValidationException, "#{fld.getvalue.to_i} Outside range 1,200") if fld.getvalue.to_i >200; tv.top_row(fld.getvalue.to_i) }
@@ -272,12 +319,13 @@ if $0 == __FILE__
       # changing nil to normal since PROP CHAN handler will not fire if nil being set.
       @cb_rev.update_command(colorlabel,checkbutton1) {|tv, label, cb| attrs =  cb.value ? 'reverse' : 'normal'; label.attr(attrs); message_label.attr(attrs)}
       row += 1
+      dlen = 10
       radio1 = RadioButton.new @form do
         variable $radio
         text "red"
         value "red"
         color "red"
-        display_length 18  # helps when right aligning
+        display_length dlen  # helps when right aligning
         row row
         col col
       end
@@ -286,7 +334,7 @@ if $0 == __FILE__
         text "c&yan"
         value "cyan"
         color "cyan"
-        display_length 18  # helps when right aligning
+        display_length dlen  # helps when right aligning
         row row
         col col+24
       end
@@ -296,7 +344,7 @@ if $0 == __FILE__
         text  "&green"
         value  "green"
         color "green"
-        display_length 18  # helps when right aligning
+        display_length dlen  # helps when right aligning
         row row
         col col
       end
@@ -305,7 +353,7 @@ if $0 == __FILE__
         text "magenta"
         value "magenta"
         color "magenta"
-        display_length 18  # helps when right aligning
+        display_length dlen  # helps when right aligning
         row row
         col col+24
       end
@@ -339,6 +387,8 @@ if $0 == __FILE__
             content.each do |line|
               texta << line
             end
+          else
+            alert "File name #{filesel} nil. Pls check code. "
           end
         end
       }
@@ -362,13 +412,13 @@ if $0 == __FILE__
         str << " bugs as they crop up."
         testa.goto_start
         #testa.cursor_bol
-        testa.handle_key ?\C-a  # bol XXX should it be getbytes(0) now
+        testa.handle_key ?\C-a.getbyte(0)  # bol XXX should it be getbytes(0) now
         str.each_char {|c| testa.putch(c)}
         testa.repaint
         testa.handle_key KEY_DOWN # down
         testa.handle_key KEY_DOWN # down
         testa.handle_key KEY_DOWN # down
-        testa.handle_key ?\C-a  # bol XXX should it be getbytes(0) now
+        testa.handle_key ?\C-a.getbyte(0)  # bol XXX should it be getbytes(0) now
         #testa.cursor_bol
         str.each_char {|c| testa.putch(c)}
         $message.value = "Wrapping textarea"
@@ -378,7 +428,7 @@ if $0 == __FILE__
       filemenu.add(item = RubyCurses::MenuItem.new("Wrap",'W'))
       item.command(@form, texta) do |it, form, testa|  
         #testa.goto_start
-        testa.handle_key ?\C-a  # bol XXX should it be getbytes(0) now
+        testa.handle_key ?\C-a.getbyte(0)  # bol XXX should it be getbytes(0) now
         testa.wrap_para
         testa.repaint
         throw(:menubarclose)
@@ -395,19 +445,21 @@ if $0 == __FILE__
      #item.text="Labelcb"
       # in next line, an explicit repaint is required since label is on another form.
       item.command(colorlabel){|it, label| att = it.getvalue ? 'reverse' : 'normal'; label.attr(att); label.repaint}
-    
       row += 2
+      ftext = "                        | F2 Menu | F3 View | F4 Shell | F5 Sh | F9 Help "
+      @form.window.printstring row, 0, "%-*s" % [Ncurses.COLS, ftext], $datacolor, Ncurses::A_REVERSE
       ok_button = Button.new @form do
         text "OK"
         name "OK"
         row row
         col col
+        attr 'reverse'
+        highlight_background "white"
+        highlight_foreground "blue"
         mnemonic 'O'
       end
       ok_button.command() { |eve| 
-        alert("About to dump data into log file!")
-        @form.dump_data 
-        $message.value = "Dumped data to log file"
+        alert("Hope you enjoyed this demo", {'title' => "Hello", :bgcolor => :blue, :color => :white})
         listb.list.insert 0, "hello ruby", "so long python", "farewell java", "RIP .Net"
       }
 
@@ -417,6 +469,9 @@ if $0 == __FILE__
         text "&Cancel"
         row row
         col col + 10
+        attr 'reverse'
+        highlight_background "white"
+        highlight_foreground "blue"
         #surround_chars ['{ ',' }']  ## change the surround chars
       end
       cancel_button.command { |aeve| 
@@ -426,6 +481,17 @@ if $0 == __FILE__
           $message.value = "Quit aborted"
         end
       }
+      #col += 22
+      #Label.new @form, {'text' => "| F2 - Menu", "row" => row, "col" => col}
+      #col += 12
+      #Label.new @form, {'text' => "| F3 - View", "row" => row, "col" => col}
+      col += 15
+      require 'rbcurse/rprogress'
+      pbar = Progress.new @form, {:width => 20, :row => 27, :col => Ncurses.COLS-20 , :bgcolor => 'white',
+        :color => 'red', :name => "pbar"}
+      #len = 1
+      #pbar.fraction(len/100.0)
+      pbar.visible false
 
 
       filemenu.add(item)
@@ -443,7 +509,7 @@ if $0 == __FILE__
       @mb.add(editmenu)
       @mb.add(menu=RubyCurses::Menu.new("Others"))
       #item=RubyCurses::MenuItem.new "Save","S"
-      item = RubyCurses::MenuItem.new "Options"
+      item = RubyCurses::MenuItem.new "Options ..."
       item.command() do |it|  
         require './testtabp'
         tp = TestTabbedPane.new
@@ -452,38 +518,63 @@ if $0 == __FILE__
         $log.debug " returning with #{$config_hash}: #{$config_hash.inspect}"
       end
       menu.add(item)
-      item = RubyCurses::MenuItem.new "Config"
-      menu.add(item)
-      item = RubyCurses::MenuItem.new "Tables"
+      item = RubyCurses::MenuItem.new "Shell Command..."
+      item.command { shell_output }
       menu.add(item)
-      savemenu = RubyCurses::Menu.new "EditM"
-      item = RubyCurses::MenuItem.new "CutM"
+      savemenu = RubyCurses::Menu.new "Shell"
+      item = RubyCurses::MenuItem.new "Processes"
+      item.command { run_command "ps -l" }
       savemenu.add(item)
-      item = RubyCurses::MenuItem.new "DeleteM"
+      item = RubyCurses::MenuItem.new "Files"
+      item.command { run_command "ls -l" }
       savemenu.add(item)
-      item = RubyCurses::MenuItem.new "PasteM"
+      item = RubyCurses::MenuItem.new "Disk"
+      item.command { run_command "df -h" }
       savemenu.add(item)
       menu.add(savemenu)
 
-      savemenu2 = RubyCurses::Menu.new "EditM2"
-      item = RubyCurses::MenuItem.new "CutM2"
+      savemenu2 = RubyCurses::Menu.new "Git"
+      item = RubyCurses::MenuItem.new "Status"
+      item.command { run_command "git status" }
       savemenu2.add(item)
-      item = RubyCurses::MenuItem.new "DeleteM2"
+      item = RubyCurses::MenuItem.new "Diff"
+      item.command { run_command "git diff" }
       savemenu2.add(item)
-      item = RubyCurses::MenuItem.new "PasteM2"
+      item = RubyCurses::MenuItem.new "Name"
+      item.command { run_command "git diff --name-status" }
       savemenu2.add(item)
       savemenu.add(savemenu2)
       # 2008-12-20 13:06 no longer hardcoding toggle key of menu_bar.
-      @mb.toggle_key = KEY_F2
+      @mb.toggle_key = FFI::NCurses::KEY_F2
       @form.set_menu_bar  @mb
       #@cell = CellRenderer.new "Hello", {"col" => 1, "row"=>29, "justify"=>:right, "display_length" => 30}
       # END
+      @form.bind_key(FFI::NCurses::KEY_F3) { 
+        require 'rbcurse/extras/viewer'
+        RubyCurses::Viewer.view("rbc13.log", :close_key => KEY_RETURN, :title => "<Enter> to close")
+      }
+      @form.bind_key(FFI::NCurses::KEY_F4) {  shell_output }
+      @form.bind_key(FFI::NCurses::KEY_F5) {  suspend }
+      @form.bind_key([?\C-x,?c]) {  suspend }
+      @form.bind_key(?\M-!) {  suspend }
+      @form.bind_key([?\C-x,?l]) {  run_command "ls -al" }
+      @form.bind_key([?\C-x,?p]) {  run_command "ps -l" }
+      @form.bind_key([?\C-x,?d]) {  run_command "df -h" }
+      @form.bind_key([?\C-x,?d]) {  run_command "git diff --name-status" }
+      @form.bind_key([?\C-x, ?s]) {  run_command "git status" }
+      @form.bind_key([?\C-x,?w]) {  run_command "git whatchanged" }
+      @form.bind_key(FFI::NCurses::KEY_F9) {  display_app_help help_text() }
       @form.repaint
       @window.wrefresh
       Ncurses::Panel.update_panels
       while((ch = @window.getchar()) != KEY_F1 )
         @form.handle_key(ch)
-        #@form.repaint
+        # print_error_message was taking away cursor, not clearing properly
+        if $error_message.get_value != ""
+          alert($error_message, {:bgcolor => :red, :color => :yellow}) if $error_message.get_value != ""
+          $error_message.value = ""
+          @form.repaint
+        end
         @window.wrefresh
       end
     end