Changeset 29145

Timestamp:

01/28/09 01:55:43 (4 years ago)

Author:

isaisstillalive

Message:

• selection系の動作をEditFieldとRichで合わせた。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/edit_field.rb (modified) (2 diffs)
• lib/ruwin/edit_field/rich.rb (modified) (1 diff)
• test/ruwin/edit_field/test_rich.rb (modified) (1 diff)
• test/ruwin/test_edit_field.rb (modified) (1 diff)
• test/ruwin/testm_edit_field.rb (modified) (3 diffs)

lang/ruby/ruwin/lib/ruwin/edit_field.rb

@@ -37 +37 @@
       
       def get_selection
+        return getsel
+      end
+      
+      
+      def selection_string
+        first, last = getsel
+        string[first...last]
+      end
+      
+      def getsel
         ranges = sendMessage EM_GETSEL, 0, 0
         return LOWORD(ranges), HIWORD(ranges)
       end
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+      private :getsel
       
       
@@ -147 +146 @@
       STYLE = Control::STYLE | ES_MULTILINE | ES_AUTOVSCROLL
       STRING_CONVERTER = Proc.new{|string| string.gsub(/\r\n|\r|\n/u, "\r\n") }
+      
+      def set_selection logical_first, logical_last
+        logical_length = logical_last-logical_first
+        
+        physical_first = physical_add(0,              logical_first)
+        physical_last  = physical_add(physical_first, logical_length)
+        
+        super physical_first, physical_last
+      end
+      
+      def get_selection
+        physical_first, physical_last = super
+        
+        physical_length = physical_last-physical_first
+        
+        logical_length = logical_length(physical_first, physical_length)
+        logical_first  = logical_length(0,              physical_first)
+        
+        return logical_first, logical_first+logical_length
+      end
+      
+      private
+      def return_count physical_first, physical_length
+        string[physical_first, physical_length].split("\r\n").size-1
+      end
+      
+      def physical_add physical_first, logical_length
+        pos = physical_first
+        len = logical_length
+        until len == 0
+          return_count = return_count(pos, len)
+          pos += len
+          len = return_count
+        end
+        pos
+      end
+      
+      def logical_length physical_first, physical_length
+        physical_length - return_count(physical_first, physical_length)
+      end
     end
   end

lang/ruby/ruwin/lib/ruwin/edit_field/rich.rb

@@ -39 +39 @@
         @default = Format::Char.new self, SCF_DEFAULT
         @default.color = @proparty[:color] if @proparty[:color]
+      end
+      
+      
+      def selection_string
+        range = getsel
+        result = "\0"*(range.last-range.first)
+        sendMessage EM_GETSELTEXT, 0, result
+        result.gsub("\r", "\r\n")
       end
       

lang/ruby/ruwin/test/ruwin/edit_field/test_rich.rb

@@ -139 +139 @@
     assert_equal "RICHEDIT20A", @control.classname
   end
+  
+  
+  def test_set_selection_should_counting_return_code_1_char
+    @control.string = "caption\r\ncaption\r\ncaption"
+    @control.set_selection 12, 19
+    
+    sel = @control.sendMessage(EM_GETSEL, 0, 0)
+    assert_equal 12, Ruwin::LOWORD(sel)
+    assert_equal 19, Ruwin::HIWORD(sel)
+  end
+  
+  def test_get_selection_should_counting_return_code_1_char
+    @control.string = "caption\r\ncaption\r\ncaption"
+    @control.sendMessage(EM_SETSEL, 12, 19)
+    assert_equal [12, 19], @control.get_selection
+  end
 end

lang/ruby/ruwin/test/ruwin/test_edit_field.rb

@@ -14 +14 @@
   include Ruwin::Const::EditField
   TARGET_CLASS = Ruwin::EditField::Multiline
+  
+  
+  def test_set_selection_should_counting_return_code_1_char
+    @control.string = "caption\r\ncaption\r\ncaption"
+    @control.set_selection 12, 19
+    
+    sel = @control.sendMessage(EM_GETSEL, 0, 0)
+    assert_equal 13, Ruwin::LOWORD(sel)
+    assert_equal 21, Ruwin::HIWORD(sel)
+  end
+  
+  def test_get_selection_should_counting_return_code_1_char
+    @control.string = "caption\r\ncaption\r\ncaption"
+    @control.sendMessage(EM_SETSEL, 13, 21)
+    assert_equal [12, 19], @control.get_selection
+  end
 end

lang/ruby/ruwin/test/ruwin/testm_edit_field.rb

@@ -42 +42 @@
     @control.string = "caption"
     @control.set_selection 1, 4
-    assert_equal 1|4<<16, @control.sendMessage(EM_GETSEL, 0, 0)
+    sel = @control.sendMessage(EM_GETSEL, 0, 0)
+    assert_equal 1, Ruwin::LOWORD(sel)
+    assert_equal 4, Ruwin::HIWORD(sel)
   end
   
@@ -50 +52 @@
     assert_equal [1, 4], @control.get_selection
   end
+  
+  
+  def test_selection_string_getter
+    @control.string = "caption"
+    @control.set_selection 1, 4
+    assert_equal "apt", @control.selection_string
+  end
+  
+  
   
   
@@ -274 +285 @@
     assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", control.string
   end
+  
+  
+  def test_selection_string_getter_multiline
+    @control.string = "caption\r\ncaption"
+    @control.set_selection 4, 11
+    assert_equal "ion\r\ncap", @control.selection_string
+  end
 end