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 281 matching lines @@
   return text_cursor ? gfx::GetCursor(GDK_XTERM) : NULL;
 #endif
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, ContextMenuController overrides:
 void NativeTextfieldViews::ShowContextMenuForView(View* source,
                                                   const gfx::Point& p,
                                                   bool is_mouse_gesture) {
   UpdateContextMenu();
   if (context_menu_runner_->RunMenuAt(

[xji, 2011/08/26 17:59:26]

which bug does this address?

[msw, 2011/08/26 20:10:43]

The change you see here between patchsets is not part of my CL, it's from
another author/change and is on mainline. You'll see a difference here only
because I synced and merged with the latest version of this file between patch
sets.

[xji, 2011/08/26 20:36:44]

got it. thanks for the explanation!

           GetWidget(), NULL, gfx::Rect(p, gfx::Size()),
           views::MenuItemView::TOPLEFT, MenuRunner::HAS_MNEMONICS) ==
       MenuRunner::MENU_DELETED)
     return;
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, views::DragController overrides:
 void NativeTextfieldViews::WriteDragDataForView(views::View* sender,
                                                 const gfx::Point& press_pt,
@@ skipping 554 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);
+        if ((key_code == ui::VKEY_HOME) ==
+            (GetRenderText()->GetTextDirection() == base::i18n::RIGHT_TO_LEFT))

[xji, 2011/08/26 17:59:26]

thanks!

[msw, 2011/08/26 20:10:43]

:)

+          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 62 matching lines @@
   // Notify selection controller
   if (!touch_selection_controller_.get())
     return;
   gfx::RenderText* render_text = GetRenderText();
   const gfx::SelectionModel& sel = render_text->selection_model();
   gfx::SelectionModel start_sel(sel.selection_start(), sel.selection_start(),
       sel.selection_start(), gfx::SelectionModel::LEADING);
   gfx::Rect start_cursor = render_text->GetCursorBounds(start_sel, false);
   gfx::Rect end_cursor = render_text->GetCursorBounds(sel, false);
   gfx::Point start(start_cursor.x(), start_cursor.bottom() - 1);
   gfx::Point end(end_cursor.x(), end_cursor.bottom() - 1);

[xji, 2011/08/26 17:59:26]

is it the right change for touch ui's selection handle? should the handle starts
from bottom() - 1 (overlap with cursor)?

[msw, 2011/08/26 20:10:43]

See above, what you're seeing isn't part of my change.

   touch_selection_controller_->SelectionChanged(start, end);
 }
 
 void NativeTextfieldViews::OnBeforeUserAction() {
   TextfieldController* controller = textfield_->GetController();
   if (controller)
     controller->OnBeforeUserAction(textfield_);
 }
 
 void NativeTextfieldViews::OnAfterUserAction() {
@@ skipping 20 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