ver 2009.11.29 → 2009.12.14

data/lib/ver/status.rb

@@ -1,6 +1,8 @@
 module VER
   # The status bar
   class Status < VER::Entry
+    autoload :Context, 'ver/status/context'
+
     attr_accessor :keymap, :view
     attr_reader :mode
 
@@ -112,7 +114,6 @@ module VER
         @history_idx = history.size - 1
       end
 
-      p prev: [history, @history_idx]
       answer = history[@history_idx]
       return unless answer
       self.value = answer
@@ -126,7 +127,6 @@ module VER
         @history_idx = 0
       end
 
-      p next: [history, @history_idx]
       answer = history[@history_idx]
       return unless answer
       self.value = answer

data/lib/ver/status/context.rb

@@ -0,0 +1,166 @@
+module VER
+  class Status
+    class Context < Struct.new(:text)
+      def filename(width = 0)
+        "%#{width}s" % text.filename
+      end
+      alias F filename
+
+      def basename(width = 0)
+        "%#{width}s" % text.filename.basename
+      end
+      alias f basename
+
+      def relative(width = 0)
+        "%#{width}s" % text.short_filename
+      end
+      alias r relative
+
+      def dir(width = 0)
+        "%#{width}s" % text.filename.directory
+      end
+      alias d dir
+
+      def line(width = 0)
+        "%#{width}s" % (text.count(1.0, :insert, :lines) + 1)
+      end
+      alias l line
+
+      def lines(width = 0)
+        "%#{width}s" % text.count(1.0, :end, :lines)
+      end
+      alias L lines
+
+      def column(width = 0)
+        "%#{width}s" % text.count('insert linestart', :insert, :displaychars)
+      end
+      alias c column
+
+      def percent
+        here = text.count(1.0, :insert, :lines)
+        total = text.count(1.0, :end, :lines)
+        percent = ((100.0 / total) * here).round
+
+        case percent
+        when 100; 'Bot'
+        when 0  ; 'Top'
+        else    ; '%2d%%' % percent
+        end
+      end
+      alias P percent
+
+      def buffer(width = 0)
+        "%#{width}s" % text.layout.views.index(text.view)
+      end
+      alias b buffer
+
+      def buffers(width = 0)
+        "%#{width}s" % text.layout.views.size
+      end
+      alias B buffers
+
+      def encoding(width = 0)
+        "%#{width}s" % text.encoding
+      end
+      alias e encoding
+
+      def syntax(width = 0)
+        "%#{width}s" % text.syntax.name if text.syntax
+      end
+      alias s syntax
+
+      def mode(width = 0)
+        "%#{width}s" % text.keymap.mode
+      end
+      alias m mode
+
+      # format sequences:
+      #
+      # %c Current capacity (mAh)
+      # %r Current rate
+      # %b short battery status, '+', '-', '!'
+      # %p battery load percentage
+      # %m remaining time in minutes
+      # %h remaining time in hours
+      # %t remaining time in as 'H:M'
+      def battery(format = '[%b] %p% %t')
+        now = Time.now
+
+        if @battery_last
+          if @battery_last < (now - 60)
+            @battery_last = now
+            @battery_value = battery_build(format)
+          else
+            @battery_value
+          end
+        else
+          @battery_last = now
+          @battery_value = battery_build(format)
+        end
+      rescue => ex
+        puts ex, *ex.backtrace
+        ex.message
+      end
+
+      def battery_build(format)
+        total = {}
+
+        Dir.glob('/proc/acpi/battery/*/{state,info}') do |file|
+          parsed = battery_parse(file)
+          next unless parsed[:present] == 'yes'
+          # FIXME: doesn't take care of multiple batteries
+          total.merge!(parsed)
+        end
+
+        # rate might be 0
+        rate = total[:present_rate].to_i
+        capacity = total[:remaining_capacity].to_i
+
+        if rate == 0
+          hours, percent = 2, 100
+          time = hours_left = minutes_left = 'N/A'
+        else
+          hours, minutes = ((capacity * 60.0) / rate).divmod(60)
+          minutes = minutes.round
+          percent = ((100 / total[:last_full_capacity].to_f) * capacity).round
+          hours_left = (hours + (minutes / 60.0)).round
+          minutes_left = (hours / 60.0) + minutes
+          time = "#{hours}:#{minutes}"
+        end
+
+        case total[:charging_state]
+        when 'discharging'
+          b = hours < 1 ? '!' : '-'
+        when 'charging'
+          b = '+'
+        end
+
+        final = {
+          '%c' => capacity,
+          '%r' => rate,
+          '%b' => b,
+          '%p' => percent,
+          '%m' => minutes_left,
+          '%h' => hours_left,
+          '%t' => time,
+        }
+
+        @last = Time.now
+        format.gsub(/%\w/, final)
+      end
+
+      def battery_parse(file)
+        data = {}
+
+        File.open(file) do |io|
+          io.each_line do |line|
+            next unless line =~ /^([^:]+):\s*(.+)$/
+            data[$1.downcase.tr(' ', '_').to_sym] = $2
+          end
+        end
+
+        data
+      end
+    end
+  end
+end

data/lib/ver/text.rb

@@ -42,7 +42,7 @@ module VER
     MATCH_WORD_LEFT =  /(^|\b)\S+(\b|$)/
 
     attr_accessor :keymap, :view, :status
-    attr_reader :filename, :encoding, :pristine, :syntax
+    attr_reader :filename, :encoding, :pristine, :syntax, :undoer
 
     # attributes for diverse functionality
     attr_accessor :selection_mode, :selection_start
@@ -50,17 +50,19 @@ module VER
     def initialize(view, options = {})
       super
       self.view = view
+      @options = Options.new(:text, VER.options)
 
-      keymap_name = VER.options.keymap
+      keymap_name = @options.keymap
       self.keymap = Keymap.get(name: keymap_name, receiver: self)
 
       apply_mode_style(keymap.mode) # for startup
       setup_tags
 
+      @undoer = VER::Undo::Tree.new(self)
+
       self.selection_start = nil
       @pristine = true
       @syntax = nil
-      @options = Options.new(:text, VER.options)
       @encoding = Encoding.default_internal
       @dirty_indices = []
 
@@ -91,34 +93,20 @@ module VER
       view.layout
     end
 
-    # lines start from 1
-    # end is maximum lines + 1
     def status_projection(into)
-      format = "%s  %s  %s [%s]"
-
-      top, bot = yview
-
-      if top < 0.5
-        percent = '[top]'
-      elsif bot > 99.5
-        percent = '[bot]'
-      else
-        percent = "#{bot.to_i}%"
-      end
+      format = options.statusline.dup
 
-      additional = [keymap.mode]
-      syntax_name = syntax.name if syntax
-      additional << syntax_name if syntax_name
-      additional << @encoding
+      format.gsub!(/%([[:alpha:]]+)/, '#{\1()}')
+      format.gsub!(/%_([[:alpha:]]+)/, '#{(_ = \1()) ? " #{_}" : ""}')
+      format.gsub!(/%([+-]?\d+)([[:alpha:]]+)/, '#{\2(\1)}')
+      format = "%{#{format}}"
 
-      values = [
-        short_filename,
-        index(:insert).idx,
-        percent,
-        additional.join(' | '),
-      ]
+      context = Status::Context.new(self)
+      line = context.instance_eval(format)
 
-      into.value = format % values
+      into.value = line
+    rescue => ex
+      puts ex, ex.backtrace
     end
 
     TAG_ALL_MATCHING_OPTIONS = { from: '1.0', to: 'end - 1 chars' }
@@ -183,49 +171,12 @@ module VER
       Tk::Event.generate(self, '<<Movement>>')
     end
 
-    def refresh_selection
-      return unless start = selection_start
-
-      now = index(:insert)
-      left, right = [start, now].sort
-      tag_remove :sel, '1.0', 'end'
-
-      case selection_mode
-      when :select_char
-        tag_add :sel, left, "#{right} + 1 chars"
-      when :select_line
-        tag_add :sel, "#{left} linestart", "#{right} lineend"
-      when :select_block
-        ly, lx = left.split
-        ry, rx = right.split
-
-        from_y, to_y = [ly, ry].sort
-        from_x, to_x = [lx, rx].sort
+    def insert(index, string)
+      index = index(index) unless index.respond_to?(:to_index)
 
-        from_y.upto to_y do |y|
-          tag_add :sel, "#{y}.#{from_x}", "#{y}.#{to_x + 1}"
-        end
-      end
-    end
-
-    # fix the ruby definition of delete, Tk allows more than 2 indices
-    def delete(*args)
-      if args.size > 2
-        deleted = args.each_slice(2).map{|left, right| get(left, right) }
-      else
-        deleted = get(*args)
+      undo_record do |record|
+        record.insert(index, string)
       end
-
-      copy(deleted)
-
-      execute('delete', *args)
-
-      touch!(*args)
-    end
-
-    def insert(*args)
-      super
-      touch!(args.first)
     end
 
     # Replaces the range of characters between index1 and index2 with the given
@@ -241,9 +192,14 @@ module VER
     # are active in the text widget.
     #
     # replace index1 index2 chars ?tagList chars tagList ...?
-    def replace(index1, index2, *rest)
-      super
-      touch!(*index(index1).upto(index(index2)).to_a)
+    def replace(index1, index2, string)
+      index1 = index(index1) unless index1.respond_to?(:to_index)
+      index2 = index(index2) unless index2.respond_to?(:to_index)
+      return if index1 == index2
+
+      undo_record do |record|
+        record.replace(index1, index2, string)
+      end
     end
 
     def focus
@@ -282,6 +238,7 @@ module VER
 
       if @syntax = Syntax.from_filename(filename)
         defer{ syntax.highlight(self, value) }
+        status_projection(status) if status
       end
     end
 
@@ -296,6 +253,13 @@ module VER
       schedule_highlight!
     end
 
+    # TODO: maybe we can make this one faster when many lines are going to be
+    #       highlighted at once by bundling them.
+    def touch!(*args)
+      args.each{|arg| schedule_line_highlight(arg) } if @syntax
+      Tk::Event.generate(self, '<<Modified>>')
+    end
+
     private
 
     def schedule_highlight!(*args)
@@ -315,22 +279,16 @@ module VER
       end
     end
 
-    # TODO: maybe we can make this one faster when many lines are going to be
-    #       highlighted at once by bundling them.
-    def touch!(*args)
-      args.each{|arg| schedule_line_highlight(arg) } if @syntax
-      Tk::Event.generate(self, '<<Modified>>')
-    end
-
     def mode=(name)
       keymap.mode = mode = name.to_sym
-      edit_separator
+      undo_separator
       apply_mode_style(mode)
       status_projection(status) if status
     end
 
     def apply_mode_style(mode)
       cursor = MODE_CURSOR[mode]
+      return unless cursor
       configure cursor
 
       return unless status && color = cursor[:insertbackground]
@@ -426,8 +384,12 @@ module VER
       end
     end
 
-    def font(options)
-      VER.options[:font].configure options
+    def font(given_options = nil)
+      if given_options
+        options.font.configure(given_options)
+      else
+        options.font
+      end
     end
   end
 end

data/lib/ver/text/index.rb

@@ -19,6 +19,11 @@ module VER
         return  0 if widget.compare(self_idx, '==', other_idx)
       end
 
+      def ==(other)
+        self_idx, other_idx = idx, other.to_index.idx
+        widget.compare(self_idx, '==', other_idx)
+      end
+
       def delta(other)
         y_diff = other.y - y
 
@@ -38,27 +43,39 @@ module VER
       end
 
       def linestart
-        "#{idx} linestart"
+        widget.index "#{idx} linestart"
       end
 
       def lineend
-        "#{idx} lineend"
+        widget.index "#{idx} lineend"
       end
 
       def wordstart
-        "#{idx} wordstart"
+        widget.index "#{idx} wordstart"
       end
 
       def wordend
-        "#{idx} wordend"
+        widget.index "#{idx} wordend"
       end
 
       def next
-        self.class.new(widget, "#{y + 1}.#{x}")
+        widget.index "#{y + 1}.#{x}"
       end
 
       def prev
-        self.class.new(widget, "#{y - 1}.#{x}")
+        widget.index "#{y - 1}.#{x}"
+      end
+
+      def +(chars)
+        widget.index "#{idx} + #{chars} chars"
+      end
+
+      def -(other)
+        if other.is_a?(self.class)
+          widget.count(other, self, :displaychars)
+        else
+          widget.index "#{idx} - #{other.to_int} chars"
+        end
       end
 
       def split
@@ -66,7 +83,7 @@ module VER
       end
 
       def inspect
-        "#<Text::Index #{self}>"
+        to_s # "#<Text::Index #{self}>"
       end
 
       def to_str