Changeset 28766

Timestamp:

01/21/09 23:18:50 (4 years ago)

Author:

isaisstillalive

Message:

• Window自体がWM_ACTIVATEを処理し、自身のイベントを実行する機能を実装。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/window.rb (modified) (2 diffs)
• test/ruwin/test_window.rb (modified) (2 diffs)

lang/ruby/ruwin/lib/ruwin/window.rb

@@ -30 +30 @@
     end
     
-    def msghandler msg
-      case msg.msg
-      when WM_COMMAND
-        wm_command msg
+    messages = {
+        :WM_COMMAND  => :wm_command,
+        :WM_ACTIVATE => :wm_activate,
+      }.map{|command, event| "when #{command}; #{event} msg;" }.join
+    class_eval <<-"END"
+      def msghandler msg
+        case msg.msg
+        #{messages}
+        end
       end
-    end
+    END
     
     def wm_command msg
-      window_id = LOWORD(msg.wParam)
+      wID = LOWORD(msg.wParam)
       wNotifyCode = HIWORD(msg.wParam)
       hwndControl = msg.lParam
@@ -52 +57 @@
       __send__ named_event
     end
+    
+    def wm_activate msg
+      fActive    = LOWORD(msg.wParam)
+      fMinimized = HIWORD(msg.wParam)
+      hwndPre    = msg.lParam
+      case fActive
+      when WA_INACTIVE
+        inactivated
+      when WA_ACTIVE, WA_CLICKACTIVE
+        if method(:activated).arity == 0
+          activated
+        else
+          activated(fActive == WA_CLICKACTIVE)
+        end
+      end
+    end
+    def inactivated; end
+    def activated; end
   end
 end

lang/ruby/ruwin/test/ruwin/test_window.rb

@@ -63 +63 @@
   
   {
-    WM_COMMAND => :wm_command,
+    WM_COMMAND  => :wm_command,
+    WM_ACTIVATE => :wm_activate,
   }.each do |command, event|
     class_eval <<-"END2"
-      def test_msghandler
+      def test_msghandler_#{command}
         klass = Class.new(Ruwin::Window)
         klass.class_eval <<-'END'
@@ -106 +107 @@
     assert_equal true, instance.button_updated_called
   end
+  
+  {
+    WA_INACTIVE     => :inactivated,
+    WA_ACTIVE       => :activated,
+    WA_CLICKACTIVE  => :activated,
+  }.each do |command, event|
+    class_eval <<-"END2"
+      def test_wm_activate_#{command}
+        klass = Class.new(Ruwin::Window)
+        klass.class_eval <<-'END'
+          attr_reader :wm_active_called
+          def #{event}
+            @wm_active_called = :#{event}
+          end
+        END
+        instance = klass.new
+        
+        msg = DummyMSG.new nil, WM_COMMAND, #{command}
+        instance.wm_activate msg
+        assert_equal :#{event}, instance.wm_active_called
+      end
+    END2
+  end
+  
+  {
+    WA_ACTIVE       => :false,
+    WA_CLICKACTIVE  => :true,
+  }.each do |command, clicked|
+    class_eval <<-"END2"
+      def test_wm_activate_#{command}_with_clicked
+        klass = Class.new(Ruwin::Window)
+        klass.class_eval <<-'END'
+          attr_reader :wm_active_called
+          def activated clicked
+            @wm_active_called = clicked
+          end
+        END
+        instance = klass.new
+        
+        msg = DummyMSG.new nil, WM_COMMAND, #{command}
+        instance.wm_activate msg
+        assert_equal #{clicked}, instance.wm_active_called
+      end
+    END2
+  end
 end