hilfer 0.9.5 → 0.10.0

data/ChangeLog

@@ -1,256 +1,310 @@
+2009-08-01 18:28  panic
+
+	* [r4351] bin/hilfer, lib/hilfer/extensions.rb,
+	  lib/hilfer/scite_editor.rb, lib/hilfer/tree_viewer.rb,
+	  lib/hilfer/window.rb:
+	  Pass options to SciteEditor. Fix single-char event name matching.
+	  make sure wmctrl -l is matched with hex digits. Use puts instead
+	  of print.
+
+2009-08-01 17:56  panic
+
+	* [r4350] README.txt, lib/hilfer/extensions.rb,
+	  lib/hilfer/tree_viewer.rb, test, test/test_key_matcher.rb:
+	  Don't use scancodes anymore. Make keystroke checking more modular
+	  for easier testing.
+
+2009-08-01 17:27  panic
+
+	* [r4349] test, test-dir:
+	  move out of the way
+
+2009-08-01 15:54  panic
+
+	* [r4348] History.txt, Manifest.txt, TODO,
+	  lib/hilfer/scite_editor.rb, lib/hilfer/tree_viewer_window.rb,
+	  lib/hilfer/version.rb, lib/hilfer/window.rb,
+	  lib/hilfer/xfce_terminal.rb:
+	  raise window using wmctrl when files opened
+
+2009-02-05 14:37  panic
+
+	* [r4083] History.txt, lib/hilfer/tree_viewer.rb,
+	  lib/hilfer/version.rb:
+	  hack for Desktop Comfort Laser
+
 2008-04-11 13:37  panic
 
-	* [r3487] trunk/Manifest.txt, trunk/Rakefile,
-	  trunk/lib/hilfer/version.rb:
+	* [r3487] Manifest.txt, Rakefile, lib/hilfer/version.rb:
 	  add xfce_terminal to Manifest.txt
 
 2008-04-11 09:36  panic
 
-	* [r3486] trunk/Rakefile:
+	* [r3486] Rakefile:
 	  clean up ChangeLog'
 
 2008-04-11 09:27  panic
 
-	* [r3485] trunk/README.txt:
+	* [r3485] README.txt:
 	  fix home page link
 
 2008-04-11 09:17  panic
 
-	* [r3483] trunk/History.txt, trunk/Rakefile,
-	  trunk/lib/hilfer/tree_viewer.rb, trunk/lib/hilfer/version.rb,
-	  trunk/lib/hilfer/xfce_terminal.rb:
+	* [r3483] History.txt, Rakefile, lib/hilfer/tree_viewer.rb,
+	  lib/hilfer/version.rb, lib/hilfer/xfce_terminal.rb:
 	  0.9.4. ad xfce terminal. add version flag. fix ChangeLog issues
 
 2008-04-11 08:47  panic
 
-	* [r3482] trunk/bin/hilfer:
+	* [r3482] bin/hilfer:
 	  add version flag
 
 2008-04-10 13:20  panic
 
-	* [r3480] trunk/History.txt, trunk/Rakefile,
-	  trunk/lib/hilfer/version.rb:
+	* [r3480] History.txt, Rakefile, lib/hilfer/version.rb:
 	  Remove text-format dependency. Increase version
 
 2008-04-10 12:56  panic
 
-	* [r3479] trunk, trunk/History.txt, trunk/Manifest.txt,
-	  trunk/README.txt, trunk/Rakefile:
+	* [r3479] ., History.txt, Manifest.txt, README.txt, Rakefile:
 	  clean up packaging and docs files
 
 2008-04-10 12:33  panic
 
-	* [r3476] trunk/History.txt:
+	* [r3476] History.txt:
 	  history changes
 
 2008-04-10 12:27  panic
 
-	* [r3475] trunk/History.txt, trunk/Manifest.txt, trunk/README.txt,
-	  trunk/Rakefile, trunk/TODO, trunk/bin/hilfer, trunk/bin/ssc,
-	  trunk/lib/hilfer/gnome_terminal.rb,
-	  trunk/lib/hilfer/hilfer_config.rb,
-	  trunk/lib/hilfer/hilfer_item.rb,
-	  trunk/lib/hilfer/hilfer_model.rb,
-	  trunk/lib/hilfer/rails_locator.rb,
-	  trunk/lib/hilfer/svn_colours.rb,
-	  trunk/lib/hilfer/tree_viewer.rb,
-	  trunk/lib/hilfer/tree_viewer_window.rb,
-	  trunk/lib/hilfer/version.rb, trunk/lib/hilfer/xterm.rb:
+	* [r3475] History.txt, Manifest.txt, README.txt, Rakefile, TODO,
+	  bin/hilfer, bin/ssc, lib/hilfer/gnome_terminal.rb,
+	  lib/hilfer/hilfer_config.rb, lib/hilfer/hilfer_item.rb,
+	  lib/hilfer/hilfer_model.rb, lib/hilfer/rails_locator.rb,
+	  lib/hilfer/svn_colours.rb, lib/hilfer/tree_viewer.rb,
+	  lib/hilfer/tree_viewer_window.rb, lib/hilfer/version.rb,
+	  lib/hilfer/xterm.rb:
 	  Implement graceful failure for optional dependencies. Move
 	  classes to separate files.
 
 2008-04-02 08:21  panic
 
-	* [r3457] trunk/lib/hilfer/tree_viewer.rb:
+	* [r3457] lib/hilfer/tree_viewer.rb:
 	  alt-q toggles editor shutdown
 
 2008-04-01 21:28  panic
 
-	* [r3456] trunk/Rakefile, trunk/bin/hilfer,
-	  trunk/lib/hilfer/svn_colours.rb,
-	  trunk/lib/hilfer/tree_viewer.rb:
+	* [r3456] Rakefile, bin/hilfer, lib/hilfer/svn_colours.rb,
+	  lib/hilfer/tree_viewer.rb:
 	  allow loading of svn/client to fail gracefully. output modifier
 	  mask in debug. Don't use -w, because of all the activerecord
 	  verbiage.
 
 2008-04-01 20:21  panic
 
-	* [r3455] trunk/README.txt:
+	* [r3455] README.txt:
 	  link to RubyForge project from docs pages
 
 2008-04-01 18:37  panic
 
-	* [r3454] trunk/History.txt, trunk/Rakefile:
+	* [r3454] History.txt, Rakefile:
 	  dependencies were the wrong way round
 
 2008-04-01 18:18  panic
 
-	* [r3453] trunk/Rakefile:
+	* [r3453] Rakefile:
 	  bump version
-	* [r3452] trunk/Rakefile, trunk/bin/hilfer,
-	  trunk/lib/hilfer/tree_viewer.rb:
+
+2008-04-01 18:18  panic
+
+	* [r3452] Rakefile, bin/hilfer, lib/hilfer/tree_viewer.rb:
 	  ruby-gtk is not a gem. find icon properly. fix enter key.
 
 2008-04-01 15:31  panic
 
-	* [r3451] trunk, trunk/History.txt, trunk/Manifest.txt,
-	  trunk/README.txt, trunk/Rakefile, trunk/TODO,
-	  trunk/bin/hilfer-icon.png, trunk/lib/hilfer/hilfer-icon.png,
-	  trunk/lib/hilfer/scite_editor.rb,
-	  trunk/lib/hilfer/svn_colours.rb:
+	* [r3451] ., History.txt, Manifest.txt, README.txt, Rakefile, TODO,
+	  bin/hilfer-icon.png, lib/hilfer/hilfer-icon.png,
+	  lib/hilfer/scite_editor.rb, lib/hilfer/svn_colours.rb:
 	  documentation
 
 2008-04-01 14:45  panic
 
-	* [r3450] trunk/ext:
+	* [r3450] ext:
 	  remove old bash files
-	* [r3449] trunk/Manifest.txt, trunk/README.txt, trunk/Rakefile,
-	  trunk/bin/ssc, trunk/ext/Rakefile, trunk/ext/bin/ec,
-	  trunk/ext/bin/sd:
+
+2008-04-01 14:45  panic
+
+	* [r3449] Manifest.txt, README.txt, Rakefile, bin/ssc,
+	  ext/Rakefile, ext/bin/ec, ext/bin/sd:
 	  add ssc. Rakefile for ext/bin
 
 2008-04-01 09:38  panic
 
-	* [r3448] trunk/bin/hilfer, trunk/lib/hilfer/scite_editor.rb:
+	* [r3448] bin/hilfer, lib/hilfer/scite_editor.rb:
 	  fix scite quitting
 
 2008-03-31 19:54  panic
 
-	* [r3446] trunk/ext, trunk/ext/bin, trunk/ext/bin/ec,
-	  trunk/ext/bin/sd, trunk/ext/ec, trunk/ext/extconf.rb,
-	  trunk/ext/sd, trunk/ext/setup.rb:
+	* [r3446] ext, ext/bin, ext/bin/ec, ext/bin/sd, ext/ec,
+	  ext/extconf.rb, ext/sd, ext/setup.rb:
 	  first attempt at installing bash scripts
 
 2008-03-31 19:17  panic
 
-	* [r3445] trunk/Rakefile, trunk/TODO, trunk/bin/ec, trunk/bin/sd,
-	  trunk/ext, trunk/ext/ec, trunk/ext/extconf.rb, trunk/ext/sd,
-	  trunk/extconf.rb:
+	* [r3445] Rakefile, TODO, bin/ec, bin/sd, ext, ext/ec,
+	  ext/extconf.rb, ext/sd, extconf.rb:
 	  create ext dir for bash scripts
 
 2008-03-31 15:17  panic
 
-	* [r3444] trunk/Rakefile:
+	* [r3444] Rakefile:
 	  bump version
 
 2008-03-31 15:16  panic
 
-	* [r3443] trunk/Rakefile, trunk/TODO, trunk/bin/hilfer,
-	  trunk/dev/listen.rb, trunk/lib/hilfer/scite_editor.rb,
-	  trunk/lib/hilfer/tree_viewer.rb:
+	* [r3443] Rakefile, TODO, bin/hilfer, dev/listen.rb,
+	  lib/hilfer/scite_editor.rb, lib/hilfer/tree_viewer.rb:
 	  copy files to editor. Improve cleanup. Option to quit editor on
 	  close. Relative paths for paste.
 
 2008-03-31 12:22  panic
 
-	* [r3442] trunk/Manifest.txt:
+	* [r3442] Manifest.txt:
 	  add svn_colours
-	* [r3441] trunk/bin/ed:
+
+2008-03-31 12:22  panic
+
+	* [r3441] bin/ed:
 	  remove
 
 2008-03-31 12:21  panic
 
-	* [r3440] trunk/bin/hilfer:
+	* [r3440] bin/hilfer:
 	  remove tabs
 	  make sure app operates without the icon
 
 2008-03-31 12:20  panic
 
-	* [r3439] trunk/lib/hilfer/tree_viewer.rb:
+	* [r3439] lib/hilfer/tree_viewer.rb:
 	  make sure Ctrl-Enter on a top-level file doesn't cause crash
 
 2008-03-31 12:19  panic
 
-	* [r3438] trunk/Rakefile:
+	* [r3438] Rakefile:
 	  remove commented lines
 	  add a run and an irb task
 
 2008-03-10 21:14  panic
 
-	* [r3389] trunk/TODO:
+	* [r3389] TODO:
 	  done
 
 2008-03-10 21:05  panic
 
-	* [r3388] trunk/History.txt, trunk/Manifest.txt, trunk/README.txt,
-	  trunk/Rakefile, trunk/bin/hilfer, trunk/bin/hilfer-icon.png,
-	  trunk/lib/hilfer/hilfer-icon.png, trunk/lib/hilfer/hilfer.rb:
+	* [r3388] History.txt, Manifest.txt, README.txt, Rakefile,
+	  bin/hilfer, bin/hilfer-icon.png, lib/hilfer/hilfer-icon.png,
+	  lib/hilfer/hilfer.rb:
 	  get gem creation working with Hoe
 
 2008-03-09 21:15  panic
 
-	* [r3387] trunk, trunk/Rakefile, trunk/bin, trunk/bin/ec,
-	  trunk/bin/ed, trunk/bin/hilfer, trunk/bin/sd,
-	  trunk/dev/hilfer.png, trunk/ec, trunk/ed, trunk/hilfer,
-	  trunk/hilfer-icon.png, trunk/hilfer.png,
-	  trunk/lib/hilfer/hilfer-icon.png, trunk/lib/hilfer/hilfer.rb,
-	  trunk/lib/hilfer/tree_viewer.rb, trunk/sd:
+	* [r3387] ., Rakefile, bin, bin/ec, bin/ed, bin/hilfer, bin/sd,
+	  dev/hilfer.png, ec, ed, hilfer, hilfer-icon.png, hilfer.png,
+	  lib/hilfer/hilfer-icon.png, lib/hilfer/hilfer.rb,
+	  lib/hilfer/tree_viewer.rb, sd:
 	  do gem-compatible directory structure
 
 2008-03-09 20:13  panic
 
-	* [r3386] trunk/Rakefile, trunk/dev, trunk/dev/listen.rb,
-	  trunk/hilfer.rb, trunk/lib/hilfer/extconf.rb,
-	  trunk/lib/hilfer/rails_locator.rb, trunk/listen.rb,
-	  trunk/model.rb, trunk/model/model.rb, trunk/rails_locator.rb,
-	  trunk/scite_editor.rb, trunk/svn_colours.rb,
-	  trunk/tree_viewer.rb:
+	* [r3386] Rakefile, dev, dev/listen.rb, hilfer.rb,
+	  lib/hilfer/extconf.rb, lib/hilfer/rails_locator.rb, listen.rb,
+	  model.rb, model/model.rb, rails_locator.rb, scite_editor.rb,
+	  svn_colours.rb, tree_viewer.rb:
 	  remove old unused files
 
 2007-06-14 10:55  panic
 
-	* [r3283] trunk/Rakefile, trunk/extconf.rb, trunk/lib,
-	  trunk/lib/hilfer, trunk/lib/hilfer/extconf.rb,
-	  trunk/lib/hilfer/hilfer.rb, trunk/lib/hilfer/rails_locator.rb,
-	  trunk/lib/hilfer/scite_editor.rb,
-	  trunk/lib/hilfer/svn_colours.rb,
-	  trunk/lib/hilfer/tree_viewer.rb, trunk/tree_viewer.rb:
+	* [r3283] Rakefile, extconf.rb, lib, lib/hilfer,
+	  lib/hilfer/extconf.rb, lib/hilfer/hilfer.rb,
+	  lib/hilfer/rails_locator.rb, lib/hilfer/scite_editor.rb,
+	  lib/hilfer/svn_colours.rb, lib/hilfer/tree_viewer.rb,
+	  tree_viewer.rb:
 	  add missing files
 
 2007-06-04 13:25  panic
 
-	* [r3270] trunk, trunk/TODO, trunk/ec, trunk/hilfer.rb,
-	  trunk/hilfer_options.rb, trunk/rails_locator.rb,
-	  trunk/scite_editor.rb, trunk/sd, trunk/svn_colours.rb:
+	* [r3270] ., TODO, ec, hilfer.rb, hilfer_options.rb,
+	  rails_locator.rb, scite_editor.rb, sd, svn_colours.rb:
 	  merged from no-model
 
 2006-08-12 11:36  panic
 
-	* [r2384] trunk/model, trunk/model/custom-list.c,
-	  trunk/model/custom-list.h, trunk/model/hilfer_tree_model.c,
-	  trunk/model/hilfer_tree_model.h,
-	  trunk/model/sec-custom-model-code.html:
+	* [r2384] model, model/custom-list.c, model/custom-list.h,
+	  model/hilfer_tree_model.c, model/hilfer_tree_model.h,
+	  model/sec-custom-model-code.html:
 	  add model code
 
 2006-08-12 11:34  root
 
-	* [r2383] test, trunk/test:
+	* [r2383] test:
 	  fix trunk oops
-	* [r2382] scite_editor.rb, trunk/scite_editor.rb:
+
+2006-08-12 11:34  root
+
+	* [r2382] scite_editor.rb:
 	  fix trunk oops
-	* [r2381] model.rb, trunk/model.rb:
+
+2006-08-12 11:34  root
+
+	* [r2381] model.rb:
 	  fix trunk oops
-	* [r2380] listen.rb, trunk/listen.rb:
+
+2006-08-12 11:34  root
+
+	* [r2380] listen.rb:
 	  fix trunk oops
-	* [r2379] hilfer_options.rb, trunk/hilfer_options.rb:
+
+2006-08-12 11:34  root
+
+	* [r2379] hilfer_options.rb:
 	  fix trunk oops
-	* [r2378] hilfer.rb, trunk/hilfer.rb:
+
+2006-08-12 11:34  root
+
+	* [r2378] hilfer.rb:
 	  fix trunk oops
-	* [r2377] hilfer.png, trunk/hilfer.png:
+
+2006-08-12 11:34  root
+
+	* [r2377] hilfer.png:
 	  fix trunk oops
-	* [r2376] hilfer-icon.png, trunk/hilfer-icon.png:
+
+2006-08-12 11:34  root
+
+	* [r2376] hilfer-icon.png:
 	  fix trunk oops
-	* [r2375] hilfer, trunk/hilfer:
+
+2006-08-12 11:34  root
+
+	* [r2375] hilfer:
 	  fix trunk oops
-	* [r2374] ed, trunk/ed:
+
+2006-08-12 11:34  root
+
+	* [r2374] ed:
 	  fix trunk oops
-	* [r2373] ec, trunk/ec:
+
+2006-08-12 11:34  root
+
+	* [r2373] ec:
 	  fix trunk oops
-	* [r2372] TODO, trunk/TODO:
+
+2006-08-12 11:34  root
+
+	* [r2372] TODO:
 	  fix trunk oops
 
 2006-08-12 11:22  panic
 
-	* [r2368] trunk:
+	* [r2368] .:
 	  make trunk
 

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.10.0 / 2009-08-01
+
+* Use wmctrl to raise SciTE window.
+* Don't use hardware scan codes
+
 === 0.9.5 / 2008-04-11
 
 * include xfce_terminal.rb in Manifest.txt. Doh.
@@ -6,7 +11,7 @@
 
 * add --version flag
 * fix ChangeLog problem with gem
-* add XFCE Terminal
+* add Xfce Terminal
 
 === 0.9.3 / 2008-04-10
 

data/Manifest.txt

@@ -6,6 +6,7 @@ Rakefile
 TODO
 bin/hilfer
 bin/ssc
+lib/hilfer/extensions.rb
 lib/hilfer/gnome_terminal.rb
 lib/hilfer/hilfer-icon.png
 lib/hilfer/hilfer_config.rb
@@ -17,5 +18,6 @@ lib/hilfer/svn_colours.rb
 lib/hilfer/tree_viewer.rb
 lib/hilfer/tree_viewer_window.rb
 lib/hilfer/version.rb
+lib/hilfer/window.rb
 lib/hilfer/xterm.rb
 lib/hilfer/xfce_terminal.rb

data/README.txt

@@ -19,8 +19,10 @@ I wrote hilfer.
 - Incremental keyboard search - just start typing in the window
 - Editable & hideable location bar showing current directory
 - multiple selections usually do The Right Thing.
-- launch Gnome Terminal in a directory
-- close scite on shutdown (command-line option only)
+- Can track which file is currently in front in the editor.
+- Can open new windows for other directories, but the same editor.
+- launch Gnome Terminal or Xfce Terminal or xterm in a directory
+- close scite on shutdown
 
 === Keyboard Shortcuts
 
@@ -39,6 +41,7 @@ I wrote hilfer.
 - ctrl-r refreshes from filesystem
 - ctrl-t opens a terminal window on the given directorties.
 - alt-l toggles the location bar
+- alt-q toggles whether shutdown is automatic or not
 - ctrl-* on keypad means expand the entire tree
 - * on keypad expands subtrees
 - shift-/ on keypad means collapse the entire tree
@@ -87,6 +90,9 @@ hilfer.
 
 == PROBLEMS
 
+These may or may not be problems, as you like. No drag-and-drop. No
+icon themes. Can't create new files. Only opens files in SciTE.
+
 See TODO file
 
 == SYNOPSIS
@@ -106,8 +112,9 @@ See TODO file
 
 * text-format for ssc to display extended scite director commands
 * subversion-ruby to display colour highlighted subversion status
-* gnome-terminal executable
+* gnome-terminal or Xfce Terminal executable
 * ActiveSupport to enable rails-specific shortcuts
+* wmctrl to raise SciTE editor window when files are opened
 
 == INSTALL:
 
@@ -117,7 +124,7 @@ sudo gem install
 
 (The MIT License)
 
-Copyright (c) John Anderson 2008
+Copyright (c) John Anderson 2006 - 2009
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/TODO

@@ -1,6 +1,6 @@
-switch focus to editor when opening files
+menu
 working sets, like eclipse
-option to connect to existing scite
+option to connect to existing scite, by pid?
 Sort by directories, then files. Needs Options.
 fix multiple selection editing, ie when several files are selected?
 shift-* to select all descendants
@@ -97,3 +97,7 @@ svn status highlighting
 11-mar-2008
 -----------
 package using Hoe
+
+01-aug-2009
+-----------
+switch focus to editor when opening files. wmctrl. EMWH and ICCCM to control windows

data/bin/hilfer

@@ -57,7 +57,7 @@ CONFIG_FILE = File.expand_path( '~/.hilfer' )
 
 tvw = TreeViewerWindow.new(
   File.expand_path( args[0] || '.' ),
-  SciteEditor.new
+  SciteEditor.new( $options )
 )
 
 # and off we go...

data/lib/hilfer/extensions.rb

@@ -0,0 +1,64 @@
+module Gdk
+  module Keyval
+    def self.symbol( keyval )
+      if @lookup.nil?
+        @lookup = {}
+        constants.each do |c|
+          val = eval( c )
+          @lookup[val] = c
+        end
+      end
+      @lookup[keyval]
+    end
+  end
+  
+  # mainly for testing Gdk::EventKey, cos they're hard to
+  # instantiate
+  module KeyMatcher
+    def key_name
+      self.gdk_symbol[4..-1]
+    end
+    
+    def gdk_symbol
+      Gdk::Keyval.symbol( keyval )
+    end
+    
+    def match( *args )
+      bools = args.map do |arg|
+        case arg
+          when String
+            key_name == arg
+          when Regexp
+            !arg.match( key_name ).nil?
+          when Symbol
+            arg.to_s.downcase == key_name.downcase
+        end
+      end
+      return bools.include?( true )
+    end
+    
+    def =~( arg )
+      match( arg )
+    end
+    
+    def method_missing( meth, *args, &block )
+      if meth.to_s[-1] == "?"[0]
+        possible_key = meth.to_s[0..-2] 
+        if possible_key.size == 1
+          key_name == possible_key || key_name == possible_key.upcase
+        else
+          key_name == possible_key.capitalize
+        end
+      else
+        super
+      end
+    end
+  end
+
+  class EventKey
+    include KeyMatcher
+    def inspect
+      "#<Gdk::EventKey #{key_name}(#{keyval}) state=#{state.inspect}"
+    end
+  end
+end