Implement Uniscribe RenderText for Windows.

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 89 matching lines @@
     } else {
       aggregated_clicks_ = 0;
     }
     last_click_time_ = event.time_stamp();
     last_click_location_ = event.location();
 
     initiating_drag_ = false;
     bool can_drag = true;
 #if defined(TOUCH_UI)
     can_drag = false;
 #endif

[xji, 2011/08/25 05:58:38]

are the changes here related to bidi/complex script?

[msw, 2011/08/26 16:26:25]

I fixed the ui::VKEY_HOME/END code below, which now checks
GetRenderText()->GetTextDirection().

[msw, 2011/08/26 16:26:25]

The TOUCH_UI check? That's from crrev.com/97424, not part of this change.

I fixed the ui::VKEY_HOME/END code below, which now checks
GetRenderText()->GetTextDirection().

     switch(aggregated_clicks_) {
       case 0:
         if (can_drag && GetRenderText()->IsPointInSelection(event.location()))
           initiating_drag_ = true;
         else
           MoveCursorTo(event.location(), event.IsShiftDown());
         break;
       case 1:
         model_->SelectWord();
         OnCaretBoundsChanged();
@@ skipping 745 matching lines @@
         model_->MoveCursorRight(
             control ? gfx::WORD_BREAK : gfx::CHARACTER_BREAK, selection);
         cursor_changed = true;
         break;
       case ui::VKEY_LEFT:
         model_->MoveCursorLeft(
             control ? gfx::WORD_BREAK : gfx::CHARACTER_BREAK, selection);
         cursor_changed = true;
         break;
       case ui::VKEY_END:
-        model_->MoveCursorRight(gfx::LINE_BREAK, selection);
-        cursor_changed = true;
-        break;
       case ui::VKEY_HOME:
-        model_->MoveCursorLeft(gfx::LINE_BREAK, selection);
+        // TODO(msw): Implement RenderText::GetTextDirection for platforms.
+        // Windows string directionality is determined by UI directionality.
+        // Linux/ChromeOS uses the first strong directionality character.
+#if defined(OS_WIN)
+        if (base::i18n::IsRTL() == (key_code == ui::VKEY_HOME))
+#else
+        if (key_code == ui::VKEY_END)
+#endif
+          model_->MoveCursorRight(gfx::LINE_BREAK, selection);
+        else
+          model_->MoveCursorLeft(gfx::LINE_BREAK, selection);
         cursor_changed = true;
         break;
       case ui::VKEY_BACK:
         if (!editable)
           break;
         if (!model_->HasSelection()) {
           if (selection && control) {
             // If both shift and control are pressed, then erase upto the
             // beginning of the buffer in ChromeOS. In windows, do nothing.
 #if defined(OS_WIN)
@@ skipping 22 matching lines @@
             model_->MoveCursorRight(gfx::LINE_BREAK, true);
 #endif
           } else if (control) {
             // If only control is pressed, then erase the next word.
             model_->MoveCursorRight(gfx::WORD_BREAK, true);
           }
         }
         cursor_changed = text_changed = model_->Delete();
         break;
       case ui::VKEY_INSERT:
-        GetRenderText()->toggle_insert_mode();
+        GetRenderText()->ToggleInsertMode();
         cursor_changed = true;
         break;
       default:
         break;
     }
 
     // We must have input method in order to support text input.
     DCHECK(textfield_->GetInputMethod());
 
     UpdateAfterChange(text_changed, cursor_changed);
@@ skipping 103 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views