Merge lp:~wenjoseph/nux/fix-for-bug-737752 into lp:nux

[Joseph Wen]

This branch fixed bug #737752

[Jay Taoko (jaytaoko)]

Approved!

review: Approve

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2011-03-25 18:03:38 +0000
+++ Nux/TextEntry.cpp	2011-03-25 18:03:38 +0000
@@ -460,11 +460,17 @@
       }
       else if (keyval == NUX_VK_BACKSPACE)
       {
-        BackSpace();
+        if (!ctrl)
+          BackSpace(VISUALLY);
+        else
+          BackSpace(WORDS);
       }
       else if ((keyval == NUX_VK_DELETE) && (!shift))
       {
-        Delete();
+        if (!ctrl)
+          Delete(VISUALLY);
+        else
+          Delete(WORDS);
       }
       else if ((keyval == NUX_VK_INSERT) && (!shift) && (!ctrl))
       {
@@ -1537,7 +1543,7 @@
 //     }
   }
 
-  void TextEntry::BackSpace()
+  void TextEntry::BackSpace(MovementStep step)
   {
     if (GetSelectionBounds(NULL, NULL))
     {
@@ -1547,11 +1553,20 @@
     {
       if (cursor_ == 0)
         return;
-      DeleteText(cursor_ - GetPrevCharLength(cursor_), cursor_);
+      if (step == VISUALLY)
+      {
+        DeleteText(cursor_ - GetPrevCharLength(cursor_), cursor_);
+      } 
+      else if (step == WORDS)
+      {
+        int new_cursor;
+        new_cursor = MoveWords(cursor_, -1);
+        DeleteText(new_cursor, cursor_);
+      }
     }
   }
 
-  void TextEntry::Delete()
+  void TextEntry::Delete(MovementStep step)
   {
     if (GetSelectionBounds(NULL, NULL))
     {
@@ -1561,7 +1576,16 @@
     {
       if (cursor_ == static_cast<int>(_text.length()))
         return;
-      DeleteText(cursor_, cursor_ + GetCharLength(cursor_));
+      if (step == VISUALLY)
+      {
+        DeleteText(cursor_, cursor_ + GetCharLength(cursor_));
+      }
+      else if (step == WORDS)
+      {
+        int new_cursor;
+        new_cursor = MoveWords(cursor_, 1);
+        DeleteText(cursor_, new_cursor);
+      }
     }
   }
 

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2011-03-23 16:48:18 +0000
+++ Nux/TextEntry.h	2011-03-25 18:03:38 +0000
@@ -294,9 +294,9 @@
     /** Paste the text in the clipboard to current offset */
     void PasteClipboard();
     /** Delete a character before the offset of the cursor */
-    void BackSpace();
+    void BackSpace(MovementStep step);
     /** Delete a character at the offset of the cursor */
-    void Delete();
+    void Delete(MovementStep step);
     /** Switch between the overwrite mode and the insert mode*/
     void ToggleOverwrite();
 //