VimMate 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,5 +1,23 @@
 = Changelog
 
+=== Version 0.6.4
+- VimMate now has shortcut keys to control it's various parts. Here is the
+  list of the shortcut keys that where added:
+  - CTRL+SHIFT+T: Set focus to current terminal
+  - CTRL+SHIFT+N: Create a new terminal
+  - CTRL+SHIFT+W: Close current terminal
+  - CTRL+PAGEDOWN: Next terminal
+  - CTRL+PAGEDOWN: Previous terminal
+  - CTRL+SHIFT+L: Set focus to file filter
+  - CTRL+SHIFT+F: Set focus to file list
+  - CTRL+SHIFT+S: Set focus to search file list
+  - CTRL+SHIFT+V: Set focus to Vim
+  Setting the focus to Vim doesn't work perfectly. If it doesn't seem to work,
+  you can try to press TAB or the Up or Down keys on your keyboard after using
+  the CTRL+SHIFT+V shortcut and it works most of the time. Thanks to Florian
+  Frank who sent me a patch for the first 5 shortcuts. The other shortcuts
+  where also added thanks to this patch by Florian Frank.
+
 === Version 0.6.3
 - # 13212: VimMate could not be resized properly.
 - # 7399, partially. A new warning has been added when too many files are

data/README

@@ -24,6 +24,7 @@ VimMate has the following features:
 - Basic Subversion[http://subversion.tigris.org/] integration: <i>(Optional)</i>
   - The file status is displayed in the file tree.
   - You can add, rename, delete and revert a file from the file tree.
+- Navigate the various part of the interface with the keyboard
 
 = Installation
 VimMate has only been tested under Linux (in fact,
@@ -108,13 +109,15 @@ You can redirect the output of this command to overwrite your .vimmaterc file
 and then run VimMate: it should work this time.
 
 An other nice trick is to add a special alias that exists only within
-VimMate's terminals:
+VimMate's terminals (Thanks to Jonathan Hankins for this updated tip,
+see {#13432}[http://rubyforge.org/tracker/index.php?func=detail&aid=13432&group_id=2612&atid=10058]
+for details):
 
  # Other configurations before...
  # (Because of a small quirk in rdoc, I put a space between the
  #  colon (:) and terminals_autoexec but there must be no space.)
  : terminals_autoexec: |
-   alias vm='gvim --servername `gvim --serverlist | grep VIMMATE_` --remote-tab'
+   alias vm='gvim --servername $(gvim --serverlist | grep "VIMMATE_$PPID") --remote-tab'
    export TERM="gnome"
    clear
    
@@ -136,7 +139,7 @@ edit your commit messages within VimMate:
  # (Because of a small quirk in rdoc, I put a space between the
  #  colon (:) and terminals_autoexec but there must be no space.)
  : terminals_autoexec: |
-   alias vm='gvim --servername `gvim --serverlist | grep VIMMATE_` --remote-tab'
+   alias vm='gvim --servername $(gvim --serverlist | grep "VIMMATE_$PPID") --remote-tab'
    export SVN_EDITOR='gvim --servername `gvim --serverlist | grep VIMMATE_` --remote-wait'
    export TERM="gnome"
    clear
@@ -182,6 +185,22 @@ make Vim more powerful:
 There are a lot of other nice script out there so check
 {Vim's web site}[http://www.vim.org/] for more scripts.
 
+= Keyboard shortcuts
+Here is a list of the various shortcut keys:
+- CTRL+SHIFT+T: Set focus to current terminal
+- CTRL+SHIFT+N: Create a new terminal
+- CTRL+SHIFT+W: Close current terminal
+- CTRL+PAGEDOWN: Next terminal
+- CTRL+PAGEDOWN: Previous terminal
+- CTRL+SHIFT+L: Set focus to file filter
+- CTRL+SHIFT+F: Set focus to file list
+- CTRL+SHIFT+S: Set focus to search file list
+- CTRL+SHIFT+V: Set focus to Vim
+Thanks to Florian Frank who sent me a patch for the first 5 shortcuts. The
+other shortcuts where also added thanks to this patch by Florian Frank. (Note
+that if there are bugs in the processing of those shortcut keys, it's probably
+my fault and not is.)
+
 = Limitations
 - VimMate cannot handle well a directory tree with thousands of files,
   although it has no problems with hundreds of files although it can take
@@ -191,6 +210,9 @@ There are a lot of other nice script out there so check
   things. You should wait for Vim before you start playing with VimMate.
   Weird things can also happen if you close VimMate without saving in
   Vim before.
+- Setting the focus to Vim with the shortcut key doesn't work perfectly. If it
+  doesn't seem to work, you can try to press TAB or the Up or Down keys on
+  your keyboard after using the shortcut key and it works most of the time.
 
 = Author and Copyright
 

data/Rakefile

@@ -70,3 +70,7 @@ task :package => [:rdoc]
 desc 'Remove rdoc and package'
 task :clobber => [:clobber_rdoc, :clobber_package]
 
+desc 'Upload rdoc to Rubyforge'
+task :upload_rdoc => [:rdoc] do
+  sh "scp -r html bennygui@rubyforge.org:/var/www/gforge-projects/vimmate"
+end

data/bin/vimmate

@@ -91,6 +91,10 @@ fork do
     VimMate::TerminalsWindow.new
   end
 
+  main.files_window = files if files
+  main.vim_window = vim if files
+  main.terminals_window = terminals if terminals
+
   # Set the signals for the file list
   files.add_open_signal do |path, kind|
     vim.open(path, kind)

data/lib/vimmatelib/files_window.rb

@@ -182,15 +182,15 @@ module VimMate
       # Create a box to filter the list
       gtk_filter_box = Gtk::HBox.new
       gtk_filter_box.pack_start(gtk_filter_button = Gtk::ToggleButton.new("Filter"), false, false)
-      gtk_filter_box.pack_start(gtk_entry = Gtk::Entry.new, true, true)
+      gtk_filter_box.pack_start(@gtk_file_filter_entry = Gtk::Entry.new, true, true)
       changed_lambda = lambda do
         if gtk_filter_button.active?
-          self.filter = gtk_entry.text
+          self.filter = @gtk_file_filter_entry.text
         else
           self.clear_filter
         end
       end
-      gtk_entry.signal_connect("changed", &changed_lambda)
+      @gtk_file_filter_entry.signal_connect("changed", &changed_lambda)
       gtk_filter_button.signal_connect("toggled", &changed_lambda)
       gtk_filter_button.active = Config[:files_filter_active]
       gtk_filter_box.spacing = 10
@@ -208,16 +208,16 @@ module VimMate
       if Config[:files_use_search]
         @gtk_paned_box = Gtk::VPaned.new
         @gtk_paned_box.add(gtk_top_box)
-        @gtk_paned_box.add((search_window = SearchWindow.new(@file_tree)).gtk_window)
+        @gtk_paned_box.add((@search_window = SearchWindow.new(@file_tree)).gtk_window)
         @gtk_paned_box.position = Config[:files_search_separator_position]
 
         # Set the signals for the search window
-        search_window.add_open_signal do |path, kind|
+        @search_window.add_open_signal do |path, kind|
           @open_signal.each do |signal|
             signal.call(path, kind)
           end
         end
-        search_window.add_menu_signal do |path|
+        @search_window.add_menu_signal do |path|
           @menu_signal.each do |signal|
             signal.call(path)
           end
@@ -280,6 +280,21 @@ module VimMate
       filter
     end
 
+    # Set the focus to the file filter
+    def focus_file_filter
+      @gtk_file_filter_entry.has_focus = true if @gtk_file_filter_entry
+    end
+
+    # Set the focus to the file list
+    def focus_file_list
+      @gtk_tree_view.has_focus = true if @gtk_tree_view
+    end
+
+    # Set the focus to the search file list
+    def focus_file_search
+      @search_window.focus_file_search if @search_window
+    end
+
     # Expand the first row of the file tree
     def expand_first_row
       @gtk_tree_view.collapse_all

data/lib/vimmatelib/main_window.rb

@@ -30,6 +30,8 @@ module VimMate
   # Represents the main window of the application
   class MainWindow
 
+    attr_accessor :vim_window, :files_window, :terminals_window
+
     # Create the MainWindow
     def initialize
       @gtk_main_window = Gtk::Window.new(Gtk::Window::TOPLEVEL)
@@ -40,6 +42,59 @@ module VimMate
       gtk_window.set_default_size(Config[:window_width],
                                   Config[:window_height])
       gtk_window.set_icon_list(Icons.window_icons)
+      # Add an event handler for keys events
+      gtk_window.signal_connect("key-press-event") do |window, event|
+        if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0
+          if event.state & Gdk::Window::ModifierType::SHIFT_MASK != 0
+            case event.keyval
+            # CTRL+SHIFT+T: Set focus to terminal
+            when Gdk::Keyval::GDK_T
+              terminals_window.focus_terminal if terminals_window
+              next true
+            # CTRL+SHIFT+N: New terminal
+            when Gdk::Keyval::GDK_N
+              terminals_window.add_new_terminal if terminals_window
+              next true
+            # CTRL+SHIFT+W: Close terminal
+            when Gdk::Keyval::GDK_W
+              terminals_window.delete_current_terminal if terminals_window
+              next true
+            # CTRL+SHIFT+L: Set focus to file filter
+            when Gdk::Keyval::GDK_L
+              files_window.focus_file_filter if files_window
+              next true
+            # CTRL+SHIFT+F: Set focus to file list
+            when Gdk::Keyval::GDK_F
+              files_window.focus_file_list if files_window
+              next true
+            # CTRL+SHIFT+S: Set focus to search file list
+            when Gdk::Keyval::GDK_S
+              files_window.focus_file_search if files_window
+              next true
+            # CTRL+SHIFT+V: Set focus to Vim
+            when Gdk::Keyval::GDK_V
+              vim_window.focus_vim if vim_window
+              next true
+            else
+              next nil
+            end
+          else
+            case event.keyval
+            # CTRL+PAGEDOWN: Next terminal
+            when Gdk::Keyval::GDK_Page_Down
+              terminals_window.next_terminal if terminals_window
+              next true
+            # CTRL+PAGEDOWN: Previous terminal
+            when Gdk::Keyval::GDK_Page_Up
+              terminals_window.prev_terminal if terminals_window
+              next true
+            else
+              next nil
+            end
+          end
+        end
+        nil
+      end
     end
 
     # The "window" for this object
@@ -54,6 +109,7 @@ module VimMate
       start_window.start
       Gtk.main
     end
+
   end
 end
 

data/lib/vimmatelib/search_window.rb

@@ -202,6 +202,11 @@ module VimMate
       @gtk_container_box
     end
 
+    # Set the focus to the entry field in the file search list
+    def focus_file_search
+      @gtk_entry.has_focus = true if @gtk_entry
+    end
+
     # Add a block that will be called when the user choose to open a file
     # The block take two argument: the path to the file to open, and a
     # symbol to indicate the kind: :open, :split_open, :tab_open

data/lib/vimmatelib/terminals_window.rb

@@ -33,6 +33,10 @@ module VimMate
     not Config[:terminals_enabled]
   end
 
+  class ::Vte::Terminal
+    attr_accessor :pid
+  end
+
   # The window that contains the terminals
   class TerminalsWindow
 
@@ -50,10 +54,7 @@ module VimMate
                                 Gtk::Image.new(Gtk::Stock::NEW, Gtk::IconSize::MENU))
       # When we try to go to the last page, we create a new terminal instead
       @gtk_notebook.signal_connect_after("switch-page") do |notebook, page, page_num|
-        if page_num == (@gtk_notebook.n_pages - 1)
-          @gtk_notebook.insert_page(page_num, new_terminal)
-          @gtk_notebook.page = page_num
-        end
+        add_new_terminal if page_num == (@gtk_notebook.n_pages - 1)
       end
       @gtk_notebook.set_size_request(0, Config[:terminals_height])
     end
@@ -69,6 +70,46 @@ module VimMate
     def add_expander_signal(&block)
       @expander_signal << block
     end
+
+    # Set the focus to the current terminal
+    def focus_terminal
+      page = @gtk_notebook.get_nth_page(@gtk_notebook.page)
+      page.has_focus = true if page
+    end
+
+    # Add a new terminal at the left of the tab bar.
+    def add_new_terminal
+      page_num = @gtk_notebook.n_pages - 1
+      @gtk_notebook.insert_page(page_num, new_terminal)
+      @gtk_notebook.page = page_num
+    end
+
+    # Deletes terminal with number *page_num*, defaults to current page number.
+    def delete_current_terminal
+      page = @gtk_notebook.get_nth_page(@gtk_notebook.page)
+      prev_terminal
+      Process.kill 'HUP', page.pid
+    end
+
+    # Switch the next (right) terminal, if there exists one. Otherwise start
+    # again with the first terminal on the left.
+    def next_terminal
+      if @gtk_notebook.page < @gtk_notebook.n_pages - 2
+        @gtk_notebook.next_page
+      else
+        @gtk_notebook.page = 0
+      end
+    end
+
+    # Switch the previous (left) terminal, if there exists one. Otherwise start
+    # with again with the last terminal on the right.
+    def prev_terminal
+      if @gtk_notebook.page > 0
+        @gtk_notebook.prev_page
+      else
+        @gtk_notebook.page = @gtk_notebook.n_pages - 2
+      end
+    end
     
     private
 
@@ -104,7 +145,7 @@ module VimMate
       gtk_terminal.signal_connect("window-title-changed") do |terminal|
         @gtk_notebook.set_tab_label_text(terminal, terminal.window_title)
       end
-      gtk_terminal.fork_command
+      gtk_terminal.pid = gtk_terminal.fork_command
       gtk_terminal.feed_child(Config[:terminals_autoexec])
       gtk_terminal.show
       gtk_terminal

data/lib/vimmatelib/version.rb

@@ -24,6 +24,6 @@ SOFTWARE.
 module VimMate
 
   # VimMate's version
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end
 

data/lib/vimmatelib/vim_window.rb

@@ -42,6 +42,8 @@ module VimMate
       @gtk_socket.signal_connect("destroy") do
         Gtk.main_quit
       end
+      @gtk_socket.can_focus = true
+      @gtk_socket.has_focus = true
       @vim_started = false
     end
 
@@ -79,6 +81,12 @@ module VimMate
       end
       self
     end
+
+    # Set the focus to Vim
+    def focus_vim
+      @gtk_socket.can_focus = true
+      @gtk_socket.has_focus = true
+    end
   end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: VimMate
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2007-08-20 00:00:00 -04:00
+  version: 0.6.4
+date: 2007-09-05 00:00:00 -04:00
 summary: VimMate is a graphical add-on to Vim with IDE-like features.
 require_paths: 
 - lib