osxhotkey 0.0.2 → 0.0.3

data/Rakefile

@@ -15,7 +15,7 @@ DESCRIPTION = "HotKey integration with Ruby/Cocoa"
 RUBYFORGE_PROJECT = "osxhotkey"
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES = %w(  )
-VERS = "0.0.2"
+VERS = "0.0.3"
 
 
 NAME = "osxhotkey"
@@ -90,7 +90,8 @@ end
 Rake::RDocTask.new do |rdoc|
 	rdoc.rdoc_dir = 'html'
 	rdoc.options += RDOC_OPTS
-	rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+	#rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+	rdoc.template = "#{ENV["HOME"]}/coderepos/lang/ruby/rdoc/generators/template/html/resh/resh.rb" 
 	if ENV['DOC_FILES']
 		rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
 	else

data/lib/osx/hotkey.rb

@@ -8,7 +8,7 @@ include OSX
 
 class OSX::NSApplicationWithHotKey < NSApplication
 
-	ns_override 'sendEvent:'
+	# ns_override 'sendEvent:'
 
 	KEYMAP = {
 		"0" => 0x1D, "1" => 0x12, "2" => 0x13, "3" => 0x14,
@@ -20,6 +20,10 @@ class OSX::NSApplicationWithHotKey < NSApplication
 		"O" => 0x1F, "P" => 0x23, "Q" => 0x0C, "R" => 0x0F,
 		"S" => 0x01, "T" => 0x11, "U" => 0x20, "V" => 0x09,
 		"W" => 0x0D, "X" => 0x07, "Y" => 0x10, "Z" => 0x06,
+		"=" => 0x18, "-" => 0x1B, "]" => 0x1E, "[" => 0x21,
+		"RET" => 0x24, "\"" => 0x27, ";" => 0x29, "\\" => 0x2A,
+		"," => 0x2B, "/" => 0x2C, "." => 0x2F, "TAB" => 0x30,
+		"SPC" => 0x31, "`" => 0x32, "BS" => 0x33, "ESC" => 0x35,
 	}
 
 	def sendEvent(event) # :nodoc:
@@ -41,20 +45,24 @@ class OSX::NSApplicationWithHotKey < NSApplication
 		raise ArgumentError, "Require block." unless block_given?
 		mod = 0
 		key = nil
-		keys.split('+').each do |k|
-			k = k.upcase
-			case k
-			when 'SHIFT', 'CONTROL', 'COMMAND', 'OPTION'
-				mod |= HotKey.const_get(k)
-			else
-				if KEYMAP[k]
-					key = KEYMAP[k]
+		if keys.kind_of? Numeric
+			key = keys
+		else
+			keys.split('+').each do |k|
+				k = k.upcase
+				case k
+				when 'SHIFT', 'CONTROL', 'COMMAND', 'OPTION'
+					mod |= HotKey.const_get(k)
 				else
-					raise ArgumentError, "The Key #{k} is not in Map"
+					if KEYMAP[k]
+						key = KEYMAP[k]
+					else
+						raise ArgumentError, "The Key #{k} is not in Map"
+					end
 				end
 			end
+			raise ArgumentError, "The Key is invalid" unless key
 		end
-		raise ArgumentError, "The Key is invalid" unless key
 		ref = HotKey.new(key, mod)
 		id = ref.register
 		@hotkey_procs ||= {}
@@ -66,7 +74,10 @@ end
 
 if $0 == __FILE__
 	app = NSApplicationWithHotKey.sharedApplication
-	ref = app.register_hotkey("command+shift+j") do
+#	ref = app.register_hotkey("command+shift+j") do
+#		puts 'hello'
+#	end
+	ref = app.register_hotkey("command+`") do
 		puts 'hello'
 	end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: osxhotkey
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-11-19 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-10-26 00:00:00 +09:00
 summary: HotKey integration with Ruby/Cocoa
 require_paths: 
   - lib