rbcurse-core 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/rbcurse.rb

@@ -4,5 +4,5 @@ require 'rbcurse/core/system/window'
 require 'rbcurse/core/widgets/rwidget'
 require 'rbcurse/core/util/rdialogs'
 class Rbcurse
-  VERSION = '0.0.8'
+  VERSION = '0.0.12'
 end

data/lib/rbcurse/core/include/listbindings.rb

@@ -4,7 +4,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 2011-12-11 - 12:58
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-04 17:52
+#  Last update: 2013-03-25 01:53
 # ----------------------------------------------------------------------------- #
 #
 module RubyCurses
@@ -44,6 +44,7 @@ module RubyCurses
         bind_key(?k, 'previous row'){ previous_row() }
         ## added 2013-03-04 - 17:52 
         bind_key(?w, 'forward_word'){ forward_word }
+        bind_key(?b, 'backward_word'){ backward_word }
         bind_key(?\C-d, 'scroll forward'){ scroll_forward() }
         bind_key(?\C-b, 'scroll backward'){ scroll_backward() }
         bind_key([?g,?g], 'goto start'){ goto_start } # mapping double keys like vim

data/lib/rbcurse/core/include/listscrollable.rb

@@ -490,6 +490,48 @@ module ListScrollable
       set_form_col pos
       @repaint_required = true
     end
+
+    ## 
+    # go to beginning of previous word somewhat similar to vim's 'b' movement.
+    # Introduced on 2013-03-25 - 00:49 and has some errors but mostly quite
+    # helpful - i think i've fixed the error of getting stuck on a line
+    def backward_word
+      $multiplier = 1 if !$multiplier || $multiplier == 0
+      line = @current_index
+      buff = @list[line].to_s
+      return unless buff
+      pos = @curpos || 0 # list does not have curpos
+      $multiplier.times {
+        #found = buff.index(/[[:punct:][:space:]]+/, pos)
+        # 2013-03-04 - 17:35 modified so it skips spaces and puncts
+        # ouch pos becomes -2 and remains in same line !
+
+        spos = pos -2
+        spos = 0 if spos < 0
+        found = buff.rindex(/[[:punct:][:space:]]\w/, spos)
+        if !found || found == 0
+          # if not found, we've lost a counter/multiplier
+          if pos > 0
+            pos = 0
+          elsif line > 0
+            line -= 1
+            buff = @list[line].to_s
+            pos = buff.size - 1
+          else
+            return
+          end
+        else
+          pos = found + 1
+        end
+        $log.debug "BBB backward_word: pos #{pos} line #{line} buff: #{buff}, found #{found}"
+      }
+      @current_index = line
+      @curpos = pos
+      @buffer = @list[@current_index].to_s
+      set_form_row
+      set_form_col pos
+      @repaint_required = true
+    end
     ##
     # goes to  next occurence of <char> (or nth occurence)
     # Actually, we can club this with forward_word so no duplication

data/lib/rbcurse/core/include/listselectable.rb

@@ -203,16 +203,23 @@ module RubyCurses
       return []
     end # mod
     # Applications may call this or just copy and modify
+
+    ## 
+    # bindings related to selection
+    #
     def list_bindings
       # what about users wanting 32 and ENTER to also go to next row automatically
       # should make that optional, TODO
       bind_key($row_selector || 32, 'toggle selection') { toggle_row_selection }
-      bind_key(0, 'range select') { add_to_selection }
-      bind_key(?+, :ask_select) # --> calls select_values
-      bind_key(?-, :ask_unselect) # please implement FIXME TODO
-      bind_key(?a, :select_all)
-      bind_key(?*, :invert_selection)
-      bind_key(?u, :clear_selection)
+      # 2013-03-24 - 14:46 added condition so single select does not get these
+      if @selection_mode == :multiple
+        bind_key(0, 'range select') { add_to_selection }
+        bind_key(?+, :ask_select) # --> calls select_values
+        bind_key(?-, :ask_unselect) # please implement FIXME TODO
+        bind_key(?a, :select_all)
+        bind_key(?*, :invert_selection)
+        bind_key(?u, :clear_selection)
+      end
       @_header_adjustment ||= 0 #  incase caller does not use
       @_events << :LIST_SELECTION_EVENT unless @_events.include? :LIST_SELECTION_EVENT
     end

data/lib/rbcurse/core/include/ractionevent.rb

@@ -57,6 +57,12 @@ module RubyCurses
     def word_under_cursor line=text(), pos=@curpos, delim=" "
       line ||= text()
       pos ||= @curpos
+      # if pressed on a space, try to go to next word to make easier 2013-03-24
+      if line[pos,1] == delim
+        while line[pos,1] == delim
+          pos += 1
+        end
+      end
       finish = line.index(delim, pos)
       start = line.rindex(delim,pos)
       finish = -1 if finish.nil?

data/lib/rbcurse/core/system/window.rb

@@ -4,7 +4,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: Around for a long time
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-08 19:12
+#  Last update: 2013-03-25 12:38
 #
 #  == CHANGED
 #     removed Pad and Subwin to lib/ver/rpad.rb - hopefully I've seen the last of both

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

@@ -7,7 +7,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 07.11.11 - 13:17
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-21 00:42
+#  Last update: 2013-03-25 13:32
 # ----------------------------------------------------------------------------- #
 # == TODO
 #    - perhaps we can compile the regexp once and reuse
@@ -60,6 +60,9 @@ class DefaultColorParser
               attrib = part[0]
             end
           }
+          # 2013-03-25 - 13:31 if numeric color specified
+          color = color.to_i if color =~ /^[0-9]+$/
+          bgcolor = bgcolor.to_i if bgcolor =~ /^[0-9]+$/
           yield [color,bgcolor,attrib] if block_given?
         end # catch
       else

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

@@ -9,7 +9,7 @@
   * Author: rkumar (arunachalesha)
   * Date: 2008-11-19 12:49 
   * License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-  * Last update: 2013-03-21 00:30
+  * Last update: 2013-03-25 12:56
 
   == CHANGES
   * 2011-10-2 Added PropertyVetoException to rollback changes to property

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

@@ -75,28 +75,31 @@ module RubyCurses
         #ftext = " %-20s | %s" % [Time.now, status] # should we print a default value just in case user doesn't
         ftext = status # should we print a default value just in case user doesn't
       end
+      # 2013-03-25 - 11:52 replaced $datacolor with @color_pair - how could this have been ?
+      # what if user wants to change attrib ?
       if ftext =~ /#\[/
-        @form.window.printstring_formatted @row, @col, ftext, $datacolor, Ncurses::A_REVERSE
+        # hopefully color_pair does not clash with formatting
+        @form.window.printstring_formatted @row, @col, ftext, @color_pair, Ncurses::A_REVERSE
       else
-        @form.window.printstring @row, @col, ftext, $datacolor, Ncurses::A_REVERSE
+        @form.window.printstring @row, @col, ftext, @color_pair, Ncurses::A_REVERSE
       end
-      # move this to formatted FIXME
-      #@form.window.printstring_or_chunks @row, @col, ftext, $datacolor, Ncurses::A_REVERSE
 
       if @right_text
         ftext = @right_text.call(self, @right_args) 
         if ftext =~ /#\[/
-          @form.window.printstring_formatted_right @row, nil, ftext, $datacolor, Ncurses::A_REVERSE
+          # hopefully color_pair does not clash with formatting
+          @form.window.printstring_formatted_right @row, nil, ftext, @color_pair, Ncurses::A_REVERSE
         else
           c = len - ftext.length
-          @form.window.printstring @row, c, ftext, $datacolor, Ncurses::A_REVERSE
+          @form.window.printstring @row, c, ftext, @color_pair, Ncurses::A_REVERSE
         end
       else
         t = Time.now
         tt = t.strftime "%F %H:%M:%S"
         r = Ncurses.LINES
-        # 2013-03-20 - 19:04 next line printing as is in 187 ???? what to do
-        ftext = "#[fg=green,bg=blue] %-20s" % [tt] # print a default
+        # somehow the bg defined here affects the bg in left text, if left does not define
+        # a bg. The bgcolor defined of statusline is ignored in left or overriden by this
+        ftext = "#[fg=green,bg=blue] %-20s#[/end]" % [tt] # print a default
         @form.window.printstring_formatted_right @row, nil, ftext, $datacolor, Ncurses::A_REVERSE
       end
 

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

@@ -8,7 +8,7 @@
 #       Author: rkumar http://github.com/rkumar/mancurses/
 #         Date: 2011-11-09 - 16:59
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-03-22 20:09
+#  Last update: 2013-03-25 01:52
 #
 #  == CHANGES
 #  == TODO 
@@ -397,6 +397,7 @@ module RubyCurses
       bind_key(?M, :middle_of_window)
       bind_key(?H, :top_of_window)
       bind_key(?w, :forward_word)
+      bind_key(?b, :backward_word)
       bind_key(?l, :cursor_forward)
       bind_key(?h, :cursor_backward)
       bind_key(?$, :cursor_eol)
@@ -814,6 +815,35 @@ module RubyCurses
       ensure_visible
       @repaint_required = true
     end
+    def backward_word
+      $multiplier = 1 if !$multiplier || $multiplier == 0
+      line = @current_index
+      buff = @content[line].to_s
+      return unless buff
+      pos = @curpos || 0 # list does not have curpos
+      $multiplier.times {
+        found = buff.rindex(/[[:punct:][:space:]]\w/, pos-2)
+        if !found || found == 0
+          # if not found, we've lost a counter
+          if pos > 0
+            pos = 0
+          elsif line > 0
+            line -= 1
+            pos = @content[line].to_s.size
+          else
+            return
+          end
+        else
+          pos = found + 1
+        end
+        $log.debug " backward_word: pos #{pos} line #{line} buff: #{buff}"
+      }
+      $multiplier = 0
+      @current_index = line
+      @curpos = pos
+      ensure_visible
+      @repaint_required = true
+    end
     #
     # move cursor forward by one char (currently will not pan)
     def cursor_forward

data/rbcurse-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-core"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2013-03-23"
+  s.date = "2013-03-25"
   s.description = "Ruby curses/ncurses widgets for easy application development on text terminals (ruby 1.9)"
   s.email = "sentinel1879@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-core
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses