Mercurial > mxe-octave

changeset 3574:37d705830a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stable-octave: Add patch for terminal cursor from stable branch. * src/stable-octave-3-termfocus.patch: New file * dist-files.mk: Add stable-octave-3-termfocus.patch to dist files.
author John Donoghue <john.donoghue@ieee.org>
date Sat, 05 Apr 2014 07:33:41 -0400
parents da8c477d3041
children a247dc2d32c0
files dist-files.mk src/stable-octave-3-termfocus.patch
diffstat 2 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Apr 05 07:25:52 2014 -0400
+++ b/dist-files.mk	Sat Apr 05 07:33:41 2014 -0400
@@ -547,6 +547,7 @@
   stable-octave-1-fixes.patch \
   stable-octave-1-xerror.patch \
   stable-octave-2-xerror.patch \
+  stable-octave-3-termfocus.patch \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-3-termfocus.patch	Sat Apr 05 07:33:41 2014 -0400
@@ -0,0 +1,16 @@
+diff -r 3283ce934648 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
+--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 04 11:40:40 2014 -0700
++++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Apr 04 20:38:10 2014 -0400
+@@ -267,9 +267,9 @@
+ //////////////////////////////////////////////////////////////////////////////
+ 
+ QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd)
+-  : q (parent), m_command (cmd), m_hasBlinkingCursor (true),
+-    m_cursorType (BlockCursor), m_beginSelection (0, 0),
+-    m_endSelection (0, 0), m_settingSelection (false),
++  : q (parent), m_command (cmd), m_cursorBlinking (false),
++    m_hasBlinkingCursor (true), m_cursorType (BlockCursor), 
++    m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false),
+     m_process (NULL), m_inWheelEvent (false)
+ {
+   log (NULL);