Ticket #7674: backward-kill-word-and-backward-word.diff

src/kits/interface/TextView.cpp

@@ -3271 +3271 @@
 void
 BTextView::_HandleBackspace()
 {
+    int32 modifiers = 0;
+    BMessage *message = Window()->CurrentMessage();
+    if (message != NULL)
+            message->FindInt32("modifiers", &modifiers);
+    
+    bool optDown = modifiers & B_OPTION_KEY;
+    
     if (fUndo) {
         TypingUndoBuffer *undoBuffer = dynamic_cast<TypingUndoBuffer*>(
             fUndo);
@@ -3284 +3291 @@
     if (fSelStart == fSelEnd) {
         if (fSelStart == 0)
             return;
+        else if (optDown)
+            fSelStart = _PreviousWordStart(fSelStart);
         else
             fSelStart = _PreviousInitialByte(fSelStart);
     } else
@@ -3315 +3324 @@
         message->FindInt32("modifiers", &modifiers);
 
     bool shiftDown = modifiers & B_SHIFT_KEY;
-    bool ctrlDown = modifiers & B_CONTROL_KEY;
+    bool optDown = modifiers & B_OPTION_KEY;
 
     int32 lastClickOffset = fCaretOffset;
     switch (inArrowKey) {
@@ -3326 +3335 @@
                 fCaretOffset = fSelStart;
             else {
                 fCaretOffset
-                    = ctrlDown
+                    = optDown
                         ? _PreviousWordStart(fCaretOffset - 1)
                         : _PreviousInitialByte(fCaretOffset);
                 if (shiftDown && fCaretOffset != lastClickOffset) {
@@ -3352 +3361 @@
                 fCaretOffset = fSelEnd;
             else {
                 fCaretOffset
-                    = ctrlDown
+                    = optDown
                         ? _NextWordEnd(fCaretOffset)
                         : _NextInitialByte(fCaretOffset);
                 if (shiftDown && fCaretOffset != lastClickOffset) {