Mercurial > octave-nkf
diff libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 19628:fe689210525c gui-release
maint: Periodic merge of stable to gui-release.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 20 Jan 2015 10:05:42 -0500 |
| parents | 9c719c504e8d 446c46af4b42 |
| children | be7ac98fab43 |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Mon Jan 19 07:04:12 2015 +0100 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Tue Jan 20 10:05:42 2015 -0500 @@ -279,7 +279,7 @@ QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd) : q (parent), m_command (cmd), m_cursorBlinking (false), - m_hasBlinkingCursor (true), m_cursorType (BlockCursor), + m_hasBlinkingCursor (true), m_cursorType (BlockCursor), m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false), m_process (NULL), m_inWheelEvent (false) { @@ -416,7 +416,7 @@ m_blinkCursorTimer = new QTimer (parent); QObject::connect (m_blinkCursorTimer, SIGNAL (timeout()), - q, SLOT (blinkCursorEvent ())); + q, SLOT (blinkCursorEvent ())); QObject::connect (m_horizontalScrollBar, SIGNAL (valueChanged (int)), q, SLOT (horizontalScrollValueChanged (int))); @@ -857,9 +857,9 @@ { // draw the cursor outline, adjusting the area so that // it is draw entirely inside 'rect' - + int penWidth = qMax (1, p.pen().width()); - + p.drawRect (rect.adjusted (penWidth/2, penWidth/2, - penWidth/2 - penWidth%2, - penWidth/2 - penWidth%2)); @@ -1376,11 +1376,11 @@ events[nEvents].Event.KeyEvent.uChar.UnicodeChar = c.unicode (); events[nEvents].Event.KeyEvent.dwControlKeyState = 0; nEvents++; - + WriteConsoleInput (hStdIn, events, nEvents, &written); nEvents = 0; ZeroMemory (events, sizeof (events)); - + } else {