[Wesnoth-cvs-commits] wesnoth/src/widgets textbox.cpp

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/09/14 20:57:32

Modified files:
        src/widgets    : textbox.cpp 

Log message:
        revert reversion on textbox

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.cpp.diff?tr1=1.86&tr2=1.87&r1=text&r2=text

Patches:
Index: wesnoth/src/widgets/textbox.cpp
diff -u wesnoth/src/widgets/textbox.cpp:1.86 
wesnoth/src/widgets/textbox.cpp:1.87
--- wesnoth/src/widgets/textbox.cpp:1.86        Tue Sep 13 19:58:34 2005
+++ wesnoth/src/widgets/textbox.cpp     Wed Sep 14 20:57:32 2005
@@ -1,4 +1,4 @@
-/* $Id: textbox.cpp,v 1.86 2005/09/13 19:58:34 gruikya Exp $ */
+/* $Id: textbox.cpp,v 1.87 2005/09/14 20:57:32 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -448,10 +448,11 @@
        if(c == SDLK_RIGHT && cursor_ < text_.size())
                ++cursor_;
 
-       if(c == SDLK_END || (c == SDLK_e && (modifiers & copypaste_modifier)))
+       // ctrl-a, ctrl-e and ctrl-u are readline style shortcuts, even on Macs
+       if(c == SDLK_END || (c == SDLK_e && (modifiers & KMOD_CTRL)))
                cursor_ = text_.size();
 
-       if(c == SDLK_HOME || (c == SDLK_a && (modifiers & copypaste_modifier)))
+       if(c == SDLK_HOME || (c == SDLK_a && (modifiers & KMOD_CTRL)))
                cursor_ = 0;
 
        if((old_cursor != cursor_) && (modifiers & KMOD_SHIFT)) {
@@ -470,7 +471,7 @@
                }
        }
 
-       if(c == SDLK_u && (modifiers & copypaste_modifier)) {
+       if(c == SDLK_u && (modifiers & KMOD_CTRL)) { // clear line
                changed = true;
                cursor_ = 0;
                text_.resize(0);
@@ -501,7 +502,7 @@
 
                if(event.key.keysym.mod & copypaste_modifier) {
                        switch(c) {
-                       case SDLK_v:
+                       case SDLK_v: // paste
                                {
                                changed = true;
                                if(is_selection())
@@ -526,7 +527,7 @@
 
                                break;
 
-                       case SDLK_c:
+                       case SDLK_c: // copy
                                {
                                const size_t beg = 
minimum<size_t>(size_t(selstart_),size_t(selend_));
                                const size_t end = 
maximum<size_t>(size_t(selstart_),size_t(selend_));