Mercurial > octave-nkf

changeset 16628:a66c285729a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use swapped points when getting selection text in Windows terminal * QWinTerminalImpl.cpp (QConsolePrivagte::getSelection): Extract text using swapped points, not original points.
author John W. Eaton <jwe@octave.org>
date Tue, 07 May 2013 15:52:13 -0400
parents de91b1621260
children cbaf19edc4ee
files libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Tue May 07 15:29:00 2013 -0400
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Tue May 07 15:52:13 2013 -0400
@@ -412,14 +412,14 @@
 
   maybeSwapPoints (begin, end);
 
-  if (m_beginSelection != m_endSelection)
+  if (begin != end)
     {
       CHAR_INFO* buf;
       COORD bufSize, bufCoord;
       SMALL_RECT bufRect;
       int nr;
 
-      nr = m_endSelection.y () - m_beginSelection.y () + 1;
+      nr = end.y () - begin.y () + 1;
       buf =  new CHAR_INFO[m_bufferSize.width () * nr];
       bufSize.X = m_bufferSize.width ();
       bufSize.Y = nr;
@@ -428,16 +428,16 @@
 
       bufRect.Left = 0;
       bufRect.Right = m_bufferSize.width ();
-      bufRect.Top = m_beginSelection.y ();
-      bufRect.Bottom = m_endSelection.y ();
+      bufRect.Top = begin.y ();
+      bufRect.Bottom = end.y ();
 
       if (ReadConsoleOutput (m_stdOut, buf, bufSize, bufCoord, &bufRect))
         {
-          int start = m_beginSelection.x ();
-          int end = (nr - 1) * m_bufferSize.width () + m_endSelection.x ();
+          int start_pos = begin.x ();
+          int end_pos = (nr - 1) * m_bufferSize.width () + end.x ();
           int lastNonSpace = -1;
 
-          for (int i = start; i <= end; i++)
+          for (int i = start_pos; i <= end_pos; i++)
             {
               if (i && (i % m_bufferSize.width ()) == 0)
                 {