Merge pull request #1227 from aodhneine/1219

(#1219) Added more conventional edit keys

diff --git a/src/ui/edit_field.c b/src/ui/edit_field.c
index fa77390784938420cd9f09ddce95f640569f3f4c..f902b8f7cb91128c815030739f4b1a94531663ff 100644 (file)
--- a/src/ui/edit_field.c
+++ b/src/ui/edit_field.c
@@ -281,8 +281,6 @@ static void handle_keydown_alt(Edit_field *edit_field, const SDL_Event *event)
         kill_word(edit_field);
     } break;
 
-    // TODO(#1219): edit_field should also support more conventional copy/paste/cut keys like Ctrl+C,Ctrl+V,Ctrl+X
-    //   Emacs keybindings support is cool and all, but we also need to be more reflex inclusive.
     // TODO(#1220): edit_field doesn't support selections for copy/cut operations
     case SDLK_w: {
         field_buffer_copy(edit_field);
@@ -333,13 +331,19 @@ static void handle_keydown_ctrl(Edit_field *edit_field, const SDL_Event *event)
         kill_to_end_of_line(edit_field);
     } break;
 
-    case SDLK_w: {
+    case SDLK_w:
+    case SDLK_x: {
         field_buffer_cut(edit_field);
     } break;
 
-    case SDLK_y: {
+    case SDLK_y:
+    case SDLK_v: {
         field_buffer_paste(edit_field);
     } break;
+
+    case SDLK_c: {
+        field_buffer_copy(edit_field);
+    } break;
     }
 }