Changeset 9658 for ps

Timestamp:

06/25/11 02:04:41 (14 years ago)

Author:

ben

Message:

Applies Kenny's patch for CInput pasting behavior (fixes #640)
Simplifies some clipboard hotkeys

Location:

ps/trunk

Files:

• binaries/data/config/default.cfg (modified) (3 diffs)
• source/gui/CInput.cpp (modified) (8 diffs)
• source/ps/CConsole.cpp (modified) (1 diff)

ps/trunk/binaries/data/config/default.cfg

@@ -128 +128 @@
 ; > CONSOLE SETTINGS
 hotkey.console.toggle = BackQuote, F9       ; Open/close console
-hotkey.console.copy = "Ctrl+C"              ; Copy from console to clipboard
-hotkey.console.paste = "Ctrl+V"             ; Paste clipboard to console
-hotkey.console.cut = "Ctrl+X"               ; Cut the selected text and copy it to the clipboard
+
+; > CLIPBOARD CONTROLS
+hotkey.copy = "Ctrl+C"              ; Copy to clipboard
+hotkey.paste = "Ctrl+V"             ; Paste from clipboard
+hotkey.cut = "Ctrl+X"               ; Cut selected text and copy to the clipboard
 
 ; > ENTITY SELECTION
@@ -176 +178 @@
 hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
 hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
-hotkey.timewarp.fastforward = Space
-hotkey.timewarp.rewind = Backspace
+hotkey.timewarp.fastforward = Space         ; If timewarp mode enabled, speed up the game
+hotkey.timewarp.rewind = Backspace          ; If timewarp mode enabled, go back to earlier point in the game
 
 ; > OVERLAY KEYS
@@ -189 +191 @@
 
 ; > GUI TEXTBOX HOTKEYS
-hotkey.text.delete.word.left = "Ctrl+Backspace"    ; Used in text input boxes to delete word to the left of cursor
-hotkey.text.delete.word.right = "Ctrl+Del"         ; Used in text input boxes to delete word to the right of cursor
-hotkey.text.move.word.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
-hotkey.text.move.word.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the left of cursor
+hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
+hotkey.text.delete.right = "Ctrl+Del"         ; Delete word to the right of cursor
+hotkey.text.move.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
+hotkey.text.move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of cursor
 
 ; > PROFILER

ps/trunk/source/gui/CInput.cpp

@@ -444 +444 @@
 
     std::string hotkey = static_cast<const char*>(ev->ev.user.data1);
-    if (hotkey == "console.paste")
+    if (hotkey == "paste")
     {
         m_WantedX=0.0f;
@@ -451 +451 @@
         if (text)
         {
+            if (SelectingText())
+            {
+                DeleteCurSelection();
+            }
+
             if (m_iBufferPos == (int)pCaption->length())
                 *pCaption += text;
@@ -466 +471 @@
         return IN_HANDLED;
     }
-    else if (hotkey == "console.copy" || hotkey == "console.cut")
+    else if (hotkey == "copy" || hotkey == "cut")
     {
         m_WantedX=0.0f;
@@ -490 +495 @@
             sys_clipboard_set(&text[0]);
 
-            if (hotkey == "console.cut")
+            if (hotkey == "cut")
             {
                 DeleteCurSelection();
@@ -498 +503 @@
         return IN_HANDLED;
     }
-    else if (hotkey == "text.delete.word.left")
+    else if (hotkey == "text.delete.left")
     {
         m_WantedX=0.0f;
@@ -539 +544 @@
         return IN_HANDLED;
     } 
-    else if (hotkey == "text.delete.word.right")
+    else if (hotkey == "text.delete.right")
     {
         m_WantedX=0.0f;
@@ -571 +576 @@
         return IN_HANDLED;          
     }
-    else if (hotkey == "text.move.word.left")
+    else if (hotkey == "text.move.left")
     {
         m_WantedX=0.0f;
@@ -627 +632 @@
         return IN_HANDLED;
     }
-    else if (hotkey == "text.move.word.right")
+    else if (hotkey == "text.move.right")
     {
         m_WantedX=0.0f;

ps/trunk/source/ps/CConsole.cpp

@@ -699 +699 @@
             return IN_HANDLED;
         }
-        else if (g_Console->IsActive() && hotkey == "console.copy")
+        else if (g_Console->IsActive() && hotkey == "copy")
         {
             sys_clipboard_set(g_Console->GetBuffer());
             return IN_HANDLED;
         }
-        else if (g_Console->IsActive() && hotkey == "console.paste")
+        else if (g_Console->IsActive() && hotkey == "paste")
         {
             wchar_t* text = sys_clipboard_get();