ver 2009.10.14 → 2009.11.28

data/lib/ver/view.rb

@@ -1,7 +1,8 @@
 module VER
-  class View < TkFrame
-    autoload :Entry, 'ver/view/entry'
-    autoload :List,  'ver/view/list'
+  class View < Tk::Frame
+    autoload :Entry,   'ver/view/entry'
+    autoload :List,    'ver/view/list'
+    autoload :Console, 'ver/view/console'
 
     attr_reader :layout, :text, :status
 
@@ -9,6 +10,7 @@ module VER
       super
       @layout = layout
       @text = @status = @ybar = @xbar = nil
+      configure takefocus: false
       setup
     end
 
@@ -33,19 +35,20 @@ module VER
     end
 
     def setup_text
-      font = VER.options[:font]
-      tab_width = font.measure('0') * 2
+      font, tabstop = VER.options.font, VER.options.tabstop
+      tabs = font.measure('0') * tabstop
 
       @text = VER::Text.new(
         self,
         autoseparators:   true, # insert separators into the undo flow
         borderwidth:      0,
         exportselection:  true, # copy into X11 buffer automatically
-        insertbackground: '#0f0', # initial value (hardcoded for control mode)
         font:             font,
-        insertofftime:    0, # blinking cursor be gone!
+        insertofftime:    VER.options.insertofftime,
+        insertontime:     VER.options.insertontime,
         setgrid:          true, # tell the wm that this is a griddy window
-        tabs:             tab_width,
+        takefocus:        true,
+        tabs:             tabs,
         tabstyle:         :wordprocessor,
         undo:             true, # enable undo capabilities
         wrap:             :word
@@ -54,45 +57,44 @@ module VER
 
     def setup_scrollbars
       # vertical scrollbar
-      @ybar = Ttk::Scrollbar.new(self)
+      @ybar = Tk::Tile::YScrollbar.new(self)
       @text.yscrollbar(@ybar)
 
       # horizontal scrollbar
-      @xbar = Ttk::Scrollbar.new(self)
+      @xbar = Tk::Tile::XScrollbar.new(self)
       @text.xscrollbar(@xbar)
     end
 
     def setup_status
-      @status = Status.new(self, font: VER.options[:font], takefocus: 0)
+      @status = Status.new(self, font: VER.options[:font], takefocus: false)
     end
 
     def setup_grid
-      TkGrid.grid @text,   row: 0, column: 0, sticky: :nsew              if @text
-      TkGrid.grid @ybar,   row: 0, column: 1, sticky: :ns                if @ybar
-      TkGrid.grid @xbar,   row: 1, column: 0, sticky: :ew                if @xbar
-      TkGrid.grid @status, row: 2, column: 0, sticky: :ew, columnspan: 2 if @status
+      @text.grid_configure   row: 0, column: 0, sticky: :nsew              if @text
+      @ybar.grid_configure   row: 0, column: 1, sticky: :ns                if @ybar
+      @xbar.grid_configure   row: 1, column: 0, sticky: :ew                if @xbar
+      @status.grid_configure row: 2, column: 0, sticky: :ew, columnspan: 2 if @status
 
-      TkGrid.columnconfigure self, 0, weight: 1
-      TkGrid.columnconfigure self, 1, weight: 0
-      TkGrid.rowconfigure    self, 0, weight: 1
-      TkGrid.rowconfigure    self, 1, weight: 0
+      grid_columnconfigure 0, weight: 1
+      grid_columnconfigure 1, weight: 0
+      grid_rowconfigure    0, weight: 1
+      grid_rowconfigure    1, weight: 0
     end
 
     def setup_misc
       @text.status = @status
       @text.view = self
-      @text.start_control_mode
       @status.mode = :status_query
     end
 
     def setup_events
-      %w[Movement Modified Focus].each do |name|
-        @text.bind("<#{name}>"){|event| __send__("on_#{name.downcase}", event) }
+      %w[Modified Focus Movement].each do |name|
+        @text.bind("<<#{name}>>"){|event| __send__("on_#{name.downcase}", event) }
       end
     end
 
-    def open_path(path)
-      @text.open_path(path)
+    def open_path(path, line = 1)
+      @text.open_path(path, line)
     end
 
     def open_empty
@@ -109,35 +111,43 @@ module VER
 
     def on_modified(event)
       @text.see :insert
-      @text.refresh_highlight
+      # @text.refresh_highlight
       @text.status_projection(@status)
     end
 
     def on_focus(event)
       @text.set_window_title
+      @text.see(:insert)
     end
 
-    # @text.bind '<Modified>',       proc{|e| refresh; p :modified }
-    # @text.bind '<Undo>',           proc{|e| refresh; p :undo }
-    # @text.bind '<Redo>',           proc{|e| refresh; p :redo }
-    # @text.bind '<Copy>',           proc{|e| p :copy }
-    # @text.bind '<Cut>',            proc{|e| refresh; p :cut }
-    # @text.bind '<Paste>',          proc{|e| refresh; p :paste }
-    # @text.bind '<PasteSelection>', proc{|e| refresh; p :paste_selection }
-    # @text.bind '<Movement>',       proc{|e| p :movement }
-
     def focus
       text.focus
     end
 
-    def create
+    def create(path = nil, line = nil)
       layout.create_view do |view|
-        view.open_empty
+        path ? view.open_path(path, line) : view.open_empty
+        yield(view) if block_given?
+      end
+    end
+
+    def find_or_create(path, line = nil, &block)
+      needle = Pathname(path.to_s).expand_path
+
+      if found = layout.views.find{|view| view.filename == needle }
+        found.push_top
+        found.focus
+        found.text.go_line(line) if line
+        yield(found) if block_given?
+      else
+        create(needle, line, &block)
       end
     end
 
     def close
-      layout.close_view(self)
+      text.may_close do
+        layout.close_view(self)
+      end
     end
 
     def focus_next
@@ -148,10 +158,24 @@ module VER
       layout.focus_prev(self)
     end
 
+    def push_up
+      layout.push_up(self)
+    end
+
+    def push_down
+      layout.push_down(self)
+    end
+
+    def push_top
+      layout.push_top(self)
+    end
+
+    def push_bottom
+      layout.push_bottom(self)
+    end
+
     def destroy
-      [@text, @ybar, @xbar, @status].each do |widget|
-        widget.destroy if widget
-      end
+      [@text, @ybar, @xbar, @status].compact.each(&:destroy)
 
       super
     end
@@ -160,4 +184,4 @@ module VER
       text.filename
     end
   end
-end
+end

data/lib/ver/view/console.rb

@@ -0,0 +1,171 @@
+require 'eventmachine'
+
+module VER
+  class View
+    class Console
+      class Process < EventMachine::Connection
+        attr_accessor :callback
+
+        def receive_data(data)
+          callback.on_stdout(data)
+        end
+
+        def unbind
+          callback.closed
+        end
+      end
+
+      class Stderr < EventMachine::Connection
+        attr_accessor :callback
+
+        def initialize(stderr)
+          @stderr = stderr
+        end
+
+        def receive_data(data)
+          callback.on_stderr(data)
+        end
+      end
+
+      def initialize(parent, *cmd)
+        @parent = parent
+        setup_widgets
+        setup_events
+        setup_terminal(*cmd)
+      end
+
+      def setup_widgets
+        font = VER.options[:font]
+        tab_width = font.measure('0') * 2
+
+        @text = Tk::Text.new(
+          @parent,
+          borderwidth: 0,
+          exportselection: true,
+          font: font,
+          insertofftime: 0,
+          setgrid: true,
+          tabs: tab_width,
+          tabstyle: :wordprocessor,
+          background: 'black',
+          foreground: 'white',
+          wrap: :word
+        )
+        @text.tag_configure :stdin,  foreground: 'green', background: 'black'
+        @text.tag_configure :stdout, foreground: 'white', background: 'black'
+        @text.tag_configure :stderr, foreground: 'red',   background: 'black'
+
+        @entry = Tk::Tile::Entry.new(@parent)
+        @entry.pack fill: :x, side: :bottom
+        @text.pack fill: :both, side: :bottom, after: @entry, expand: true
+      end
+
+      def setup_events
+        @entry.bind('<Control-q>'){ Tk.exit }
+        # @entry.bind('Escape'){ closed }
+        @entry.bind('<Return>'){
+          send_data @entry.value
+          @entry.clear
+        }
+      end
+
+      def closed
+        @entry.bind('<Return>'){}
+        @entry.bind('<Key>'){ Tk.callback_break }
+        @entry.bind('<Escape>'){ destroy }
+        @entry.value = 'Session ended. Press Escape to close console'
+      rescue => ex
+        VER.error(ex)
+      end
+
+      def destroy
+        @text.destroy
+        @entry.destroy
+        @parent.focus
+      end
+
+      def shell_config
+        buffer = []
+
+        shell = ENV['SHELL'] || 'sh'
+        opts = [shell]
+
+        case shell
+        when /zsh/
+          opts << '-s'
+          buffer << 'echo $ZSH $ZSH_VERSION'
+        when /bash/
+          opts << '-s'
+          buffer << 'echo $BASH $BASH_VERSION'
+        end
+
+        return buffer, opts
+      end
+
+      def setup_terminal(*cmd)
+        if cmd.empty?
+          @buffer, opts = shell_config
+        else
+          @buffer = []
+          opts = cmd
+        end
+
+        # FIXME: this should have proper shell escapes
+        popen3(opts.join(' '), self) do |stdin|
+          begin
+            @entry.focus
+            @stdin = stdin
+
+            while line = @buffer.shift
+              send_data(line)
+            end
+          rescue => ex
+            VER.error(ex)
+          end
+        end
+      end
+
+      # the callback should have #on_stdout and #on_stderr
+      # The method yields the stdin and you can use #send_data on it.
+      # This seems to have the side-effect of messing with the original $stderr,
+      # maybe there are other solutions.
+      def popen3(cmd, callback)
+        old_stderr = $stderr.dup
+        rd, wr = IO::pipe
+        $stderr.reopen(wr)
+
+        popen_stdin = EM.popen(cmd, Process)
+        popen_stdin.callback = callback
+
+        popen_stderr = EM.attach(rd, Stderr, rd)
+        popen_stderr.callback = callback
+
+        yield(popen_stdin) if block_given?
+
+        $stderr.reopen old_stderr
+      end
+
+      def send_data(string)
+        @stdin.send_data("#{string}\n")
+        on_stdin(string)
+      end
+
+      def on_stdin(string)
+        output "i> #{string}\n", :stdin
+      end
+
+      def on_stdout(string)
+        output "#{string}", :stdout
+      end
+
+      def on_stderr(string)
+        output "e> #{string}", :stderr
+      end
+
+      def output(string, tag)
+        @text.insert(:end, string, tag)
+        @text.see(:end)
+      end
+    end
+  end
+end

data/lib/ver/view/entry.rb

@@ -16,13 +16,17 @@ module VER
         list_view.cancel
       end
 
-      def go_line_up
-        list_view.go_line_up
+      def line_up
+        list_view.line_up
       end
 
-      def go_line_down
-        list_view.go_line_down
+      def line_down
+        list_view.line_down
+      end
+
+      def completion
+        list_view.completion
       end
     end
   end
-end
+end

data/lib/ver/view/list.rb

@@ -1,10 +1,13 @@
 module VER
   class View::List < Struct.new(:parent, :frame, :list, :entry, :tag, :callback)
     autoload :Buffer,          'ver/view/list/buffer'
+    autoload :Grep,            'ver/view/list/grep'
+    autoload :Methods,         'ver/view/list/methods'
     autoload :Window,          'ver/view/list/buffer'
     autoload :FuzzyFileFinder, 'ver/view/list/fuzzy_file_finder'
     autoload :Syntax,          'ver/view/list/syntax'
     autoload :Theme,           'ver/view/list/theme'
+    autoload :Ex,              'ver/view/list/ex'
 
     def initialize(parent, &block)
       self.parent, self.callback = parent, block
@@ -16,31 +19,30 @@ module VER
     end
 
     def setup_widgets
-      self.frame = TkFrame.new{
-        pack fill: :both, expand: true
-      }
-
-      self.list = Tk::Listbox.new(frame){
-        setgrid 'yes'
-        width 0
-        background '#000'
-        foreground '#fff'
-        selectforeground '#000'
-        selectbackground '#fff'
-        font VER.options[:font]
-        pack fill: :both, expand: true
-      }
-
-      self.entry = View::Entry.new(frame){
-        pack fill: :x, expand: false
-        font VER.options[:font]
-        focus
-      }
+      self.frame = Tk::Frame.new.pack fill: :both, expand: true
+
+      self.list = list = Tk::Listbox.new(frame)
+      list.configure(
+        setgrid: true,
+        width: 0,
+        background: '#000',
+        foreground: '#fff',
+        selectforeground: '#000',
+        selectbackground: '#fff',
+        exportselection: false,
+        font: VER.options[:font]
+      )
+      list.pack fill: :both, expand: true
+
+      self.entry = entry = View::Entry.new(frame)
+      entry.configure font: VER.options[:font]
+      entry.pack fill: :x, expand: false
+      entry.focus
       entry.list_view = self
     end
 
     def setup_keymap
-      keymap_name = VER.options.fetch(:keymap)
+      keymap_name = VER.options.keymap
 
       @list_keymap = Keymap.get(
         name: keymap_name, receiver: self, widget: list, mode: :list_view_list)
@@ -52,7 +54,7 @@ module VER
     # Setup this event, because Keymap gets very confused when you bind 'Key' and
     # we don't want to break the event-chain anyway
     def setup_events
-      entry.bind('<Modified>'){ on_update }
+      entry.bind('<<Inserted>>'){ on_update }
     end
 
     def on_update
@@ -62,10 +64,10 @@ module VER
     end
 
     def quit
-      Tk.exit
+      VER.exit
     end
 
-    def go_line_up
+    def line_up
       index = list.curselection.first - 1
 
       if index >= 0
@@ -74,7 +76,7 @@ module VER
       end
     end
 
-    def go_line_down
+    def line_down
       index = list.curselection.first + 1
       max = list.size
 
@@ -123,15 +125,28 @@ module VER
     end
 
     def pick_selection
-      pick TkSelection.get
+      pick list.get(list.curselection.first)
     end
 
-    def pick_action(item)
-      callback.call(item) if callback
+    def pick_action(*args)
+      callback.call(*args) if callback
+    end
+
+    def completion
+      values = list.get(0, :end)
+
+      if values.size == 1
+        entry.value = values.first
+      elsif values.size > 1
+        require 'abbrev'
+        if found = values.abbrev[entry.value]
+          entry.value = found
+        end
+      end
     end
 
     def message(string)
       parent.status.message(string)
     end
   end
-end
+end