Changeset 664

Timestamp:

10/24/07 09:46:12 (6 years ago)

Author:

cho45

Message:

lang/ruby/Chemr/CHMDocument.rb,
lang/ruby/Chemr/English.lproj/CHMDocument.nib/info.nib,
lang/ruby/Chemr/English.lproj/CHMDocument.nib/keyedobjects.nib,
lang/ruby/Chemr/English.lproj/CHMDocument.nib/classes.nib:

Psychs さんの助言によりキーバインドが実装できた。
ありがとうございます。
http://subtech.g.hatena.ne.jp/cho45/20071024#c1193174365

Location:

lang/ruby/Chemr

Files:

• CHMDocument.rb (modified) (4 diffs)
• English.lproj/CHMDocument.nib/classes.nib (modified) (1 diff)
• English.lproj/CHMDocument.nib/info.nib (modified) (2 diffs)
• English.lproj/CHMDocument.nib/keyedobjects.nib (modified) (previous)

lang/ruby/Chemr/CHMDocument.rb

@@ -46 +46 @@
 end
 
-#class MySearchField < NSSearchField
-#
-#       attr_accessor :list
-#
-#       ib_action :keyDown do |e|
-#               log "keyDown #{e.keyCode} #{e.characters}"
-#       end
-#
-#       ib_action :moveDown do |sender|
-#               log "moveDown"
-#       end
-#
-#       ib_action :mouseDown do |sender|
-#               log "mouseDown"
-#       end
-#
-#       ib_action :moveUp do |sender|
-#               log "moveUp"
-#       end
-#
-#       def performKeyEquivalent(e)
-#               log "performKeyEquivalent"
-#               false
-#       end
-#end
+class MySearchWindow < NSWindow
+
+        def sendEvent(e)
+                if e.oc_type == NSKeyDown
+                        return if delegate.process_keybinds(e)
+                end
+                super_sendEvent(e)
+        end
+
+end
 
 
@@ -134 +119 @@
         def controlTextDidEndEditing(anot)
                 log "end #{@now.first.inspect}"
+                #jumpToCurrent
+        end
+
+        def jumpToCurrent(sender)
                 browse @now.first[1].first
         end
@@ -162 +151 @@
         end
 
+        def completion(sender)
+                # not implemented yet
+        end
+
         # from menu
         def searchActivate(sender)
@@ -181 +174 @@
                 end
         end
+
+        # from MySearchWindow
+
+        def process_keybinds(e)
+                key = key_string(e)
+                log "keyDown (#{e.characters}:#{e.charactersIgnoringModifiers}) -> #{key}"
+                keybinds = {
+                        "C-j" => self.method(:nextCandidate),
+                        "C-k" => self.method(:prevCandidate),
+                        "\r"  => self.method(:jumpToCurrent),
+                        "\t"  => self.method(:completion),
+                }
+                if keybinds.key?(key)
+                        keybinds[key].call(self)
+                        true
+                else
+                        false
+                end
+        end
+
+        def key_string(e)
+                key = ""
+                m = e.modifierFlags
+                key << "S-" if m & NSShiftKeyMask > 0
+                key << "C-" if m & NSControlKeyMask > 0
+                key << "M-" if m & NSAlternateKeyMask > 0
+                key << "%-" if m & NSCommandKeyMask > 0 # TODO
+                key << e.charactersIgnoringModifiers
+                key
+        end
 end

lang/ruby/Chemr/English.lproj/CHMDocument.nib/classes.nib

@@ -7 +7 @@
             SUPERCLASS = NSWindowController; 
         }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = MySearchWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }
     ); 
     IBVersion = 1; 

lang/ruby/Chemr/English.lproj/CHMDocument.nib/info.nib

@@ -8 +8 @@
         <dict>
                 <key>39</key>
-                <string>532 305 422 473 0 0 1280 778 </string>
+                <string>429 291 422 473 0 0 1280 778 </string>
         </dict>
         <key>IBFramework Version</key>
@@ -18 +18 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>39</integer>
                 <integer>5</integer>
-                <integer>39</integer>
         </array>
         <key>IBSystem Version</key>