MacViews: Implement move and move*AndModifySelection commands.

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"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 618 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NSResponder Action Messages. Keep sorted according NSResponder.h (from the
 // 10.9 SDK). The list should eventually be complete. Anything not defined will
 // beep when interpretKeyEvents: would otherwise call it.
 // TODO(tapted): Make this list complete, except for insert* methods which are
 // dispatched as regular key events in doCommandBySelector:.
 
 // views::Textfields are single-line only, map Paragraph and Document commands
 // to Line.

[tapted, 2016/05/16 05:34:40]

perhaps expand on this with a note that Up/Down also map to beginning/end of
line commands.

[karandeepb, 2016/05/16 11:18:06]

Done.

 
 // The insertText action message forwards to the TextInputClient unless a menu
 // is active. Note that NSResponder's interpretKeyEvents: implementation doesn't
 // direct insertText: through doCommandBySelector:, so this is still needed to
 // handle the case when inputContext: is nil. When inputContext: returns non-nil
 // text goes directly to insertText:replacementRange:.
 - (void)insertText:(id)text {
   [self insertText:text replacementRange:NSMakeRange(NSNotFound, 0)];
 }
 
 // Selection movement and scrolling.
 
-- (void)moveRight:(id)sender {
+- (void)moveForward:(nullable id)sender {

[tapted, 2016/05/16 05:34:40]

were the nullable annotations necessary? We haven't really started using them in
chrome yet.

[karandeepb, 2016/05/16 11:18:06]

Removed.

+  IsTextRTL(textInputClient_) ? [self moveLeft:sender]
+                              : [self moveRight:sender];
+}
+
+- (void)moveRight:(nullable id)sender {
   [self handleAction:IDS_MOVE_RIGHT
              keyCode:ui::VKEY_RIGHT
              domCode:ui::DomCode::ARROW_RIGHT
           eventFlags:0];
 }
 
-- (void)moveLeft:(id)sender {
+- (void)moveBackward:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveRight:sender]
+                              : [self moveLeft:sender];
+}
+
+- (void)moveLeft:(nullable id)sender {
   [self handleAction:IDS_MOVE_LEFT
              keyCode:ui::VKEY_LEFT
              domCode:ui::DomCode::ARROW_LEFT
           eventFlags:0];
 }
 
-- (void)moveUp:(id)sender {
-  [self handleAction:0
+- (void)moveUp:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE
              keyCode:ui::VKEY_UP
              domCode:ui::DomCode::ARROW_UP
           eventFlags:0];
 }
 
-- (void)moveDown:(id)sender {
-  [self handleAction:0
+- (void)moveDown:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE
              keyCode:ui::VKEY_DOWN
              domCode:ui::DomCode::ARROW_DOWN
           eventFlags:0];
 }
 
-- (void)moveWordRight:(id)sender {
+- (void)moveWordForward:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveWordLeft:sender]
+                              : [self moveWordRight:sender];
+}
+
+- (void)moveWordBackward:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveWordRight:sender]
+                              : [self moveWordLeft:sender];
+}
+
+- (void)moveToBeginningOfLine:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE
+             keyCode:ui::VKEY_HOME
+             domCode:ui::DomCode::HOME
+          eventFlags:0];
+}
+
+- (void)moveToEndOfLine:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE
+             keyCode:ui::VKEY_END
+             domCode:ui::DomCode::END
+          eventFlags:0];
+}
+
+- (void)moveToBeginningOfParagraph:(nullable id)sender {
+  [self moveToBeginningOfLine:sender];
+}
+
+- (void)moveToEndOfParagraph:(nullable id)sender {
+  [self moveToEndOfLine:sender];
+}
+
+- (void)moveToEndOfDocument:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE
+             keyCode:ui::VKEY_END
+             domCode:ui::DomCode::END
+          eventFlags:ui::EF_CONTROL_DOWN];
+}
+
+- (void)moveToBeginningOfDocument:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE
+             keyCode:ui::VKEY_HOME
+             domCode:ui::DomCode::HOME
+          eventFlags:ui::EF_CONTROL_DOWN];
+}
+
+- (void)pageDown:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE
+             keyCode:ui::VKEY_NEXT
+             domCode:ui::DomCode::PAGE_DOWN
+          eventFlags:0];
+}
+
+- (void)pageUp:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE
+             keyCode:ui::VKEY_PRIOR
+             domCode:ui::DomCode::PAGE_UP
+          eventFlags:0];
+}
+
+- (void)moveBackwardAndModifySelection:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveRightAndModifySelection:sender]
+                              : [self moveLeftAndModifySelection:sender];
+}
+
+- (void)moveForwardAndModifySelection:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveLeftAndModifySelection:sender]
+                              : [self moveRightAndModifySelection:sender];
+}
+
+- (void)moveWordForwardAndModifySelection:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveWordLeftAndModifySelection:sender]
+                              : [self moveWordRightAndModifySelection:sender];
+}
+
+- (void)moveWordBackwardAndModifySelection:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveWordRightAndModifySelection:sender]
+                              : [self moveWordLeftAndModifySelection:sender];
+}
+
+- (void)moveUpAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_UP
+             domCode:ui::DomCode::ARROW_UP
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveDownAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_DOWN
+             domCode:ui::DomCode::ARROW_DOWN
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveToBeginningOfLineAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_HOME
+             domCode:ui::DomCode::HOME
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveToEndOfLineAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_END
+             domCode:ui::DomCode::END
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveToBeginningOfParagraphAndModifySelection:(nullable id)sender {
+  [self moveToBeginningOfLineAndModifySelection:sender];
+}
+
+- (void)moveToEndOfParagraphAndModifySelection:(nullable id)sender {
+  [self moveToEndOfLineAndModifySelection:sender];
+}
+
+- (void)moveToEndOfDocumentAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_END
+             domCode:ui::DomCode::END
+          eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveToBeginningOfDocumentAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_HOME
+             domCode:ui::DomCode::HOME
+          eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
+}
+
+- (void)pageDownAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_NEXT
+             domCode:ui::DomCode::PAGE_DOWN
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)pageUpAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_PRIOR
+             domCode:ui::DomCode::PAGE_UP
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveParagraphForwardAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_DOWN
+             domCode:ui::DomCode::ARROW_DOWN
+          eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveParagraphBackwardAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_UP
+             domCode:ui::DomCode::ARROW_UP
+          eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveWordRight:(nullable id)sender {
   [self handleAction:IDS_MOVE_WORD_RIGHT
              keyCode:ui::VKEY_RIGHT
              domCode:ui::DomCode::ARROW_RIGHT
           eventFlags:ui::EF_CONTROL_DOWN];
 }
 
-- (void)moveWordLeft:(id)sender {
+- (void)moveWordLeft:(nullable id)sender {
   [self handleAction:IDS_MOVE_WORD_LEFT
              keyCode:ui::VKEY_LEFT
              domCode:ui::DomCode::ARROW_LEFT
           eventFlags:ui::EF_CONTROL_DOWN];
 }
 
-- (void)moveLeftAndModifySelection:(id)sender {
+- (void)moveRightAndModifySelection:(nullable id)sender {
+  [self handleAction:IDS_MOVE_RIGHT_AND_MODIFY_SELECTION
+             keyCode:ui::VKEY_RIGHT
+             domCode:ui::DomCode::ARROW_RIGHT
+          eventFlags:ui::EF_SHIFT_DOWN];
+}
+
+- (void)moveLeftAndModifySelection:(nullable id)sender {
   [self handleAction:IDS_MOVE_LEFT_AND_MODIFY_SELECTION
              keyCode:ui::VKEY_LEFT
              domCode:ui::DomCode::ARROW_LEFT
           eventFlags:ui::EF_SHIFT_DOWN];
 }
 
-- (void)moveRightAndModifySelection:(id)sender {
-  [self handleAction:IDS_MOVE_RIGHT_AND_MODIFY_SELECTION
-             keyCode:ui::VKEY_RIGHT
-             domCode:ui::DomCode::ARROW_RIGHT
-          eventFlags:ui::EF_SHIFT_DOWN];
-}
-
-- (void)moveWordRightAndModifySelection:(id)sender {
+- (void)moveWordRightAndModifySelection:(nullable id)sender {
   [self handleAction:IDS_MOVE_WORD_RIGHT_AND_MODIFY_SELECTION
              keyCode:ui::VKEY_RIGHT
              domCode:ui::DomCode::ARROW_RIGHT
           eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
 }
 
-- (void)moveWordLeftAndModifySelection:(id)sender {
+- (void)moveWordLeftAndModifySelection:(nullable id)sender {
   [self handleAction:IDS_MOVE_WORD_LEFT_AND_MODIFY_SELECTION
              keyCode:ui::VKEY_LEFT
              domCode:ui::DomCode::ARROW_LEFT
           eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
 }
 
-- (void)moveToLeftEndOfLine:(id)sender {
-  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE
-             keyCode:ui::VKEY_HOME
-             domCode:ui::DomCode::HOME
-          eventFlags:0];
-}
-
-- (void)moveToRightEndOfLine:(id)sender {
-  [self handleAction:IDS_MOVE_TO_END_OF_LINE
-             keyCode:ui::VKEY_END
-             domCode:ui::DomCode::END
-          eventFlags:0];
-}
-
-- (void)moveToLeftEndOfLineAndModifySelection:(id)sender {
-  [self handleAction:IDS_MOVE_TO_BEGINNING_OF_LINE_AND_MODIFY_SELECTION
-             keyCode:ui::VKEY_HOME
-             domCode:ui::DomCode::HOME
-          eventFlags:ui::EF_SHIFT_DOWN];
-}
-
-- (void)moveToRightEndOfLineAndModifySelection:(id)sender {
-  [self handleAction:IDS_MOVE_TO_END_OF_LINE_AND_MODIFY_SELECTION
-             keyCode:ui::VKEY_END
-             domCode:ui::DomCode::END
-          eventFlags:ui::EF_SHIFT_DOWN];
+- (void)moveToLeftEndOfLine:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveToEndOfLine:sender]
+                              : [self moveToBeginningOfLine:sender];
+}
+
+- (void)moveToRightEndOfLine:(nullable id)sender {
+  IsTextRTL(textInputClient_) ? [self moveToBeginningOfLine:sender]
+                              : [self moveToEndOfLine:sender];
+}
+
+- (void)moveToLeftEndOfLineAndModifySelection:(nullable id)sender {
+  IsTextRTL(textInputClient_)
+      ? [self moveToEndOfLineAndModifySelection:sender]
+      : [self moveToBeginningOfLineAndModifySelection:sender];
+}
+
+- (void)moveToRightEndOfLineAndModifySelection:(nullable id)sender {
+  IsTextRTL(textInputClient_)
+      ? [self moveToBeginningOfLineAndModifySelection:sender]
+      : [self moveToEndOfLineAndModifySelection:sender];
 }
 
 // Deletions.
 
-- (void)deleteForward:(id)sender {
+- (void)deleteForward:(nullable id)sender {
   [self handleAction:IDS_DELETE_FORWARD
              keyCode:ui::VKEY_DELETE
              domCode:ui::DomCode::DEL
           eventFlags:0];
 }
 
-- (void)deleteBackward:(id)sender {
+- (void)deleteBackward:(nullable id)sender {
   [self handleAction:IDS_DELETE_BACKWARD
              keyCode:ui::VKEY_BACK
              domCode:ui::DomCode::BACKSPACE
           eventFlags:0];
 }
 
-- (void)deleteWordForward:(id)sender {
+- (void)deleteWordForward:(nullable id)sender {
   [self handleAction:IDS_DELETE_WORD_FORWARD
              keyCode:ui::VKEY_DELETE
              domCode:ui::DomCode::DEL
           eventFlags:ui::EF_CONTROL_DOWN];
 }
 
-- (void)deleteWordBackward:(id)sender {
+- (void)deleteWordBackward:(nullable id)sender {
   [self handleAction:IDS_DELETE_WORD_BACKWARD
              keyCode:ui::VKEY_BACK
              domCode:ui::DomCode::BACKSPACE
           eventFlags:ui::EF_CONTROL_DOWN];
 }
 
-- (void)deleteToBeginningOfLine:(id)sender {
+- (void)deleteToBeginningOfLine:(nullable id)sender {
   [self handleAction:IDS_DELETE_TO_BEGINNING_OF_LINE
              keyCode:ui::VKEY_BACK
              domCode:ui::DomCode::BACKSPACE
           eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
 }
 
-- (void)deleteToEndOfLine:(id)sender {
+- (void)deleteToEndOfLine:(nullable id)sender {
   [self handleAction:IDS_DELETE_TO_END_OF_LINE
              keyCode:ui::VKEY_DELETE
              domCode:ui::DomCode::DEL
           eventFlags:ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN];
 }
 
-- (void)deleteToBeginningOfParagraph:(id)sender {
+- (void)deleteToBeginningOfParagraph:(nullable id)sender {
   [self deleteToBeginningOfLine:sender];
 }
 
-- (void)deleteToEndOfParagraph:(id)sender {
+- (void)deleteToEndOfParagraph:(nullable id)sender {
   [self deleteToEndOfLine:sender];
 }
 
 // Cancellation.
 
-- (void)cancelOperation:(id)sender {
+- (void)cancelOperation:(nullable id)sender {
   [self handleAction:0
              keyCode:ui::VKEY_ESCAPE
              domCode:ui::DomCode::ESCAPE
           eventFlags:0];
 }
 
 // Support for Services in context menus.
 // Currently we only support reading and writing plain strings.
 - (id)validRequestorForSendType:(NSString*)sendType
                      returnType:(NSString*)returnType {
@@ skipping 208 matching lines @@
   }
 
   return [super accessibilityAttributeValue:attribute];
 }
 
 - (id)accessibilityHitTest:(NSPoint)point {
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 @end