MacViews: Implement text input.

ui/views/cocoa/bridged_content_view.mm

 // Copyright 2014 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.
 
 #import "ui/views/cocoa/bridged_content_view.h"
 
 #include "base/logging.h"
+#include "base/strings/sys_string_conversions.h"
+#include "grit/ui_strings.h"
+#include "ui/base/ime/text_input_client.h"
 #include "ui/gfx/canvas_paint_mac.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 @interface BridgedContentView ()
 
 // Passes the event to NativeWidgetMac for handling.
 - (void)handleUntranslatedKeyEvent:(NSEvent*)theEvent;
 
 // Translates the location of |theEvent| to toolkit-views coordinates and passes
 // the event to NativeWidgetMac for handling.
 - (void)handleMouseEvent:(NSEvent*)theEvent;
 
+// Execute a command on the currently focused TextInputClient.
+// |commandId| should be a resource ID from ui_strings.grd.
+- (void)doCommandByID:(int)commandId;
+
 @end
 
 @implementation BridgedContentView
 
 @synthesize hostedView = hostedView_;
+@synthesize textInputClient = textInputClient_;
 
 - (id)initWithView:(views::View*)viewToHost {
   DCHECK(viewToHost);
   gfx::Rect bounds = viewToHost->bounds();
   // To keep things simple, assume the origin is (0, 0) until there exists a use
   // case for something other than that.
   DCHECK(bounds.origin().IsOrigin());
   NSRect initialFrame = NSMakeRect(0, 0, bounds.width(), bounds.height());
   if ((self = [super initWithFrame:initialFrame]))
     hostedView_ = viewToHost;
@@ skipping 16 matching lines @@
 }
 
 - (void)handleMouseEvent:(NSEvent*)theEvent {
   if (!hostedView_)
     return;
 
   ui::MouseEvent event(theEvent);
   hostedView_->GetWidget()->OnMouseEvent(&event);
 }
 
+- (void)doCommandByID:(int)commandId {
+  if (textInputClient_ && textInputClient_->IsEditingCommandEnabled(commandId))
+    textInputClient_->ExecuteEditingCommand(commandId);
+}
+
 // NSView implementation.
 
 - (BOOL)acceptsFirstResponder {
   return YES;
 }
 
 - (void)setFrameSize:(NSSize)newSize {
   [super setFrameSize:newSize];
   if (!hostedView_)
     return;
 
   hostedView_->SetSize(gfx::Size(newSize.width, newSize.height));
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
   if (!hostedView_)
     return;
 
   gfx::CanvasSkiaPaint canvas(dirtyRect, false /* opaque */);
   hostedView_->Paint(&canvas, views::CullSet());
 }
 
 - (void)keyDown:(NSEvent*)theEvent {
-  [self handleUntranslatedKeyEvent:theEvent];
+  if (textInputClient_)
+    [self interpretKeyEvents:@[ theEvent ]];
+  else
+    [super keyDown:theEvent];
 }
 
 - (void)keyUp:(NSEvent*)theEvent {

[tapted, 2014/06/25 10:38:08]

note you'll need to rebase against master (this chunk isn't in yet, so you'll
get a conflict). When I resolved it locally everything still looks good.

   [self handleUntranslatedKeyEvent:theEvent];
 }
 
 - (void)mouseDown:(NSEvent*)theEvent {
   [self handleMouseEvent:theEvent];
 }
 
 - (void)rightMouseDown:(NSEvent*)theEvent {
   [self handleMouseEvent:theEvent];
 }
@@ skipping 32 matching lines @@
   // and exited events for the view heirarchy.
   // TODO(tapted): Install/uninstall tracking areas when required so that the
   // NSView will receive these events outside of tests.
   [self handleMouseEvent:theEvent];
 }
 
 - (void)scrollWheel:(NSEvent*)theEvent {
   [self handleMouseEvent:theEvent];
 }
 
+- (void)deleteBackward:(id)sender {
+  [self doCommandByID:IDS_DELETE_BACKWARD];
+}
+
+- (void)deleteForward:(id)sender {
+  [self doCommandByID:IDS_DELETE_FORWARD];
+}
+
+- (void)moveLeft:(id)sender {
+  [self doCommandByID:IDS_MOVE_LEFT];
+}
+
+- (void)moveRight:(id)sender {
+  [self doCommandByID:IDS_MOVE_RIGHT];
+}
+
+// NSTextInputClient protocol implementation.
+
+- (NSAttributedString*)
+    attributedSubstringForProposedRange:(NSRange)range
+                            actualRange:(NSRangePointer)actualRange {
+  base::string16 substring;
+  if (textInputClient_) {
+    gfx::Range textRange;
+    textInputClient_->GetTextRange(&textRange);
+    gfx::Range subrange = textRange.Intersect(gfx::Range(range));
+    textInputClient_->GetTextFromRange(subrange, &substring);
+    if (actualRange)
+      *actualRange = subrange.ToNSRange();
+  }
+  return [[[NSAttributedString alloc]
+      initWithString:base::SysUTF16ToNSString(substring)] autorelease];
+}
+
+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+- (void)doCommandBySelector:(SEL)selector {
+  if ([self respondsToSelector:selector])
+    [self performSelector:selector withObject:nil];
+  else
+    [[self nextResponder] doCommandBySelector:selector];
+}
+
+- (NSRect)firstRectForCharacterRange:(NSRange)range
+                         actualRange:(NSRangePointer)actualRange {
+  NOTIMPLEMENTED();
+  return NSZeroRect;
+}
+
+- (BOOL)hasMarkedText {
+  return textInputClient_ && textInputClient_->HasCompositionText();
+}
+
+- (void)insertText:(id)text replacementRange:(NSRange)replacementRange {
+  if (!textInputClient_)
+    return;
+
+  if ([text isKindOfClass:[NSAttributedString class]])
+    text = [text string];
+  textInputClient_->DeleteRange(gfx::Range(replacementRange));
+  textInputClient_->InsertText(base::SysNSStringToUTF16(text));
+}
+
+- (NSRange)markedRange {
+  if (!textInputClient_)
+    return NSMakeRange(NSNotFound, 0);
+
+  gfx::Range range;
+  textInputClient_->GetCompositionTextRange(&range);
+  return range.ToNSRange();
+}
+
+- (NSRange)selectedRange {
+  if (!textInputClient_)
+    return NSMakeRange(NSNotFound, 0);
+
+  gfx::Range range;
+  textInputClient_->GetSelectionRange(&range);
+  return range.ToNSRange();
+}
+
+- (void)setMarkedText:(id)text
+        selectedRange:(NSRange)selectedRange
+     replacementRange:(NSRange)replacementRange {
+  if (!textInputClient_)
+    return;
+
+  if ([text isKindOfClass:[NSAttributedString class]])
+    text = [text string];
+  ui::CompositionText composition;
+  composition.text = base::SysNSStringToUTF16(text);
+  composition.selection = gfx::Range(selectedRange);
+  textInputClient_->SetCompositionText(composition);
+}
+
+- (void)unmarkText {
+  if (textInputClient_)
+    textInputClient_->ConfirmCompositionText();
+}
+
+- (NSArray*)validAttributesForMarkedText {
+  return @[];
+}
+
 @end