octave-nkf: libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp annotate

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 17360:afc3d47f7704

Update windows GUI terminal handling * libgui/src/octave-gui.cc (octave_start_gui): set TERM environment variable to 'cygwin' in windows if no term is set. * libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp (translateKey): deocde delete key before non special keys using moveright \b, use \e[H for home, \e[F for end, decode esc key.

author	John Donoghue <john.donoghue@ieee.org>
date	Fri, 30 Aug 2013 15:43:39 -0400
parents	aa09b746fa16
children	d63878346099

rev	line source
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1 /*
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	2
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	3 Copyright (C) 2011 Michael Goffioul.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	4
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	5 This file is part of QConsole.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	6
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	7 Foobar is free software: you can redistribute it and/or modify
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	8 it under the terms of the GNU General Public License as published by
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	9 the Free Software Foundation, either version 3 of the License, or
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	10 (at your option) any later version.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	11
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	12 QConsole is distributed in the hope that it will be useful,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	13 but WITHOUT ANY WARRANTY; without even the implied warranty of
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	15 GNU General Public License for more details.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	16
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	17 You should have received a copy of the GNU General Public License
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	18 along with Foobar. If not, see <http://www.gnu.org/licenses/>.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	19
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	20 */
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	21
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22 #include <QApplication>
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	23 #include <QClipboard>
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	24 #include <QColor>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	25 #include <QFont>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	26 #include <QHBoxLayout>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	27 #include <QPaintEvent>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	28 #include <QPainter>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29 #include <QResizeEvent>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QScrollBar>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QtDebug>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QThread>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QTimer>
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	34 #include <QToolTip>
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	35 #include <QCursor>
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	36 #include <QMessageBox>
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	37
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	38 #include <fcntl.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	39 #include <io.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	40 #include <stdio.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41 #include <stdarg.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	42 #define WIN32_LEAN_AND_MEAN
16999 477ed3b55497 QWinTerminalImpl.cpp: Don't define _WIN32_WINNT unconditionally. Michael Goffioul <michael.goffioul@gmail.com> parents: 16970 diff changeset	43 #if ! defined (_WIN32_WINNT) && ! defined (NTDDI_VERSION)
477ed3b55497 QWinTerminalImpl.cpp: Don't define _WIN32_WINNT unconditionally. Michael Goffioul <michael.goffioul@gmail.com> parents: 16970 diff changeset	44 #define _WIN32_WINNT 0x0500
477ed3b55497 QWinTerminalImpl.cpp: Don't define _WIN32_WINNT unconditionally. Michael Goffioul <michael.goffioul@gmail.com> parents: 16970 diff changeset	45 #endif
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	46 #include <windows.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	47 #include <cstring>
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	48 #include <csignal>
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	49 #include <limits>
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	51 #include "QWinTerminalImpl.h"
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	52 #include "QTerminalColors.h"
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	53
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	54 // Uncomment to log activity to LOGFILENAME
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	55 // #define DEBUG_QCONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	56 #define LOGFILENAME "QConsole.log"
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57 // Uncomment to create hidden console window
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	58 #define HIDDEN_CONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	59
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	60 #ifdef _MSC_VER
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	61 # pragma warning(disable : 4996)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	62 #endif
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	63
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	64 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	65
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	66 class QConsoleView : public QWidget
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	67 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	68 public:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	69 QConsoleView (QWinTerminalImpl* parent = 0) : QWidget (parent), q (parent) { }
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	70 ~QConsoleView (void) { }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	71
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	72 protected:
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	73 void paintEvent (QPaintEvent* event) { q->viewPaintEvent (this, event); }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	74 void resizeEvent (QResizeEvent* event) { q->viewResizeEvent (this, event); }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	75
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	76 private:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	77 QWinTerminalImpl* q;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	78 };
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	79
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	80 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	81
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82 class QConsoleThread : public QThread
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	83 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	84 public:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	85 QConsoleThread (QWinTerminalImpl* console) : QThread (console), q (console) { }
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	86
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	87 protected:
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	88 void run (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	89 { q->start (); }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	90
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	91 private:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	92 QWinTerminalImpl* q;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	93 };
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	94
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	95 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	96
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	97 static QString translateKey (QKeyEvent *ev)
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	98 {
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	99 QString esc = "\x1b";
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	100 QString s;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	101
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	102 if (ev->key () == Qt::Key_Delete)
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	103 s = esc + "[C\b";
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	104 else if (!ev->text ().isEmpty ())
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	105 s = ev->text ();
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	106 else
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	107 {
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	108
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	109 switch (ev->key ())
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	110 {
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	111 case Qt::Key_Up:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	112 s = esc + "[A";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	113 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	114
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	115 case Qt::Key_Down:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	116 s = esc + "[B";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	117 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	118
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	119 case Qt::Key_Right:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	120 s = esc + "[C";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	121 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	122
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	123 case Qt::Key_Left:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	124 s = esc + "[D";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	125 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	126
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	127 case Qt::Key_Home:
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	128 s = esc + "[H";
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	129 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	130
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	131 case Qt::Key_End:
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	132 s = esc + "[F";
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	133 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	134
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	135 case Qt::Key_Insert:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	136 s = esc + "[2~";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	137 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	138
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	139 case Qt::Key_PageUp:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	140 s = esc + "[5~";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	141 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	142
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	143 case Qt::Key_PageDown:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	144 s = esc + "[6~";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	145 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	146
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	147 case Qt::Key_Escape:
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	148 s = esc;
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	149 break;
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	150
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	151 default:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	152 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	153 }
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	154 }
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	155
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	156 return s;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	157 }
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	158
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	159 class QConsolePrivate
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	160 {
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	161 friend class QWinTerminalImpl;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	162
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	163 public:
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	164
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	165 enum KeyboardCursorType
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	166 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	167 BlockCursor,
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	168 UnderlineCursor,
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	169 IBeamCursor
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	170 };
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	171
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	172 QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd = QString ());
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	173 ~QConsolePrivate (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	174
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	175 void updateConsoleSize (bool sync = false);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	176 void syncConsoleParameters (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	177 void grabConsoleBuffer (CHAR_INFO* buf = 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	178 void updateScrollBar (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	179 void setScrollValue (int value);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	180 void updateConsoleView (bool grab = true);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	181 void monitorConsole (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	182 void startCommand (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	183 void sendConsoleText (const QString& s);
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	184 QRect cursorRect (void);
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	185
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	186 void log (const char* fmt, ...);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	187
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	188 void closeStandardIO (int fd, DWORD stdHandleId, const char* name);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	189 void setupStandardIO (DWORD stdHandleId, int fd, const char* name,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	190 const char* devName);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	191
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	192 QPoint posToCell (const QPoint& pt);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	193 QString getSelection (void);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	194 void updateSelection (void);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	195 void clearSelection (void);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	196
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	197 QColor backgroundColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	198 QColor foregroundColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	199 QColor selectionColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	200 QColor cursorColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	201
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	202 void setBackgroundColor (const QColor& color);
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	203 void setForegroundColor (const QColor& color);
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	204 void setSelectionColor (const QColor& color);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	205 void setCursorColor (bool useForegroundColor, const QColor& color);
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	206
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	207 void drawTextBackground (QPainter& p, int cx1, int cy1, int cx2, int cy2,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	208 int cw, int ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	209
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	210 void drawSelection (QPainter& p, int cx1, int cy1, int cx2, int cy2,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	211 int cw, int ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	212
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	213 void drawCursor (QPainter& p);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	214
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	215 void drawText (QPainter& p, int cx1, int cy1, int cx2, int cy2,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	216 int cw, int ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	217
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	218 private:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	219 QWinTerminalImpl* q;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	220
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	221 private:
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	222 QFont m_font;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	223 QString m_command;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	224 QConsoleColors m_colors;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	225 bool m_inWheelEvent;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	226 QString m_title;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	227
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	228 QSize m_charSize;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	229 QSize m_bufferSize;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	230 QRect m_consoleRect;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	231 QPoint m_cursorPos;
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	232 bool m_cursorBlinking;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	233 bool m_hasBlinkingCursor;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	234 QTimer *m_blinkCursorTimer;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	235 KeyboardCursorType m_cursorType;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	236
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	237 QPoint m_beginSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	238 QPoint m_endSelection;
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	239 bool m_settingSelection;
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	240
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	241 QColor m_selectionColor;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	242 QColor m_cursorColor;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	243
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	244 HANDLE m_stdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	245 HWND m_consoleWindow;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	246 CHAR_INFO* m_buffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	247 CHAR_INFO* m_tmpBuffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	248 HANDLE m_process;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	249
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	250 QConsoleView* m_consoleView;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	251 QScrollBar* m_scrollBar;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	252 QTimer* m_consoleWatcher;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	253 QConsoleThread *m_consoleThread;
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	254
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	255 // The delay in milliseconds between redrawing blinking text.
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	256 static const int BLINK_DELAY = 500;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	257 };
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	258
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	259 static void maybeSwapPoints (QPoint& begin, QPoint& end)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	260 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	261 if (end.y () < begin.y ()
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	262 \|\| (end.y () == begin.y () && end.x () < begin.x ()))
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	263 qSwap (begin, end);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	264 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	265
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	266 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	267
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	268 QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd)
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	269 : q (parent), m_command (cmd), m_hasBlinkingCursor (true),
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	270 m_cursorType (BlockCursor), m_beginSelection (0, 0),
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	271 m_endSelection (0, 0), m_settingSelection (false),
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	272 m_process (NULL), m_inWheelEvent (false)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	273 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	274 log (NULL);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	275
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	276 // Possibly detach from any existing console
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	277 log ("Detaching from existing console (if any)...\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	278 FreeConsole ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	279 log ("Closing standard IO...\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	280 closeStandardIO (0, STD_INPUT_HANDLE, "STDIN");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	281 closeStandardIO (1, STD_OUTPUT_HANDLE, "STDOUT");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	282 closeStandardIO (2, STD_ERROR_HANDLE, "STDERR");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	283
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	284 #ifdef HIDDEN_CONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	285 HWINSTA hOrigSta, hNewSta;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	286
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	287 // Create new (hidden) console
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	288 hOrigSta = GetProcessWindowStation ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	289 hNewSta = CreateWindowStation (NULL, 0, GENERIC_ALL, NULL);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	290 log ("Current Windows station: %p.\nNew Windows station: %p.\n", hOrigSta,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	291 hNewSta);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	292 if (! SetProcessWindowStation (hNewSta))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	293 log ("Failed to switch to new Windows station.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	294 #endif
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	295 if (! AllocConsole ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	296 log ("Failed to create new console.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	297 #ifdef HIDDEN_CONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	298 if (! SetProcessWindowStation (hOrigSta))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	299 log ("Failed to restore original Windows station.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	300 if (! CloseWindowStation (hNewSta))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	301 log ("Failed to close new Windows station.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	302 #endif
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	303
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	304 log ("New (hidden) console created.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	305
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	306 setupStandardIO (STD_INPUT_HANDLE, 0, "STDIN", "CONIN$");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	307 setupStandardIO (STD_OUTPUT_HANDLE, 1, "STDOUT", "CONOUT$");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	308 setupStandardIO (STD_ERROR_HANDLE, 2, "STDERR", "CONOUT$");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	309
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	310 log ("Standard input/output/error set up.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	311
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	312 stdin = (fdopen (0, "rb"));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	313 stdout = (fdopen (1, "wb"));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	314 stderr = (fdopen (2, "wb"));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	315
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	316 log ("POSIX standard streams created.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	317
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	318 setvbuf (stdin, NULL, _IONBF, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	319 setvbuf (stdout, NULL, _IONBF, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	320 setvbuf (stderr, NULL, _IONBF, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	321
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	322 log ("POSIX standard stream buffers adjusted.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	323
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	324 HANDLE hStdOut = GetStdHandle (STD_OUTPUT_HANDLE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	325
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	326 log ("Console allocated: hStdOut: %p\n", hStdOut);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	327
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	328 m_stdOut = hStdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	329 m_consoleWindow = GetConsoleWindow ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	330
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	331 // In case the console window hasn't been created hidden...
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	332 ShowWindow (m_consoleWindow, SW_HIDE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	333
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	334 CONSOLE_SCREEN_BUFFER_INFO sbi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	335
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	336 GetConsoleScreenBufferInfo (hStdOut, &sbi);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	337 m_bufferSize = QSize (sbi.dwSize.X, qMax (sbi.dwSize.Y, (SHORT)500));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	338 m_consoleRect = QRect (sbi.srWindow.Left, sbi.srWindow.Top,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	339 sbi.srWindow.Right - sbi.srWindow.Left + 1,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	340 sbi.srWindow.Bottom - sbi.srWindow.Top + 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	341 m_cursorPos = QPoint (sbi.dwCursorPosition.X, sbi.dwCursorPosition.Y);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	342
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	343 log ("Initial console parameters:\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	344 log (" buffer size: %d x %d\n", m_bufferSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	345 m_bufferSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	346 log (" window: (%d, %d) -> (%d, %d) [%d x %d]\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	347 m_consoleRect.left (), m_consoleRect.top (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	348 m_consoleRect.right (), m_consoleRect.bottom (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	349 m_consoleRect.width (), m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	350
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	351 wchar_t titleBuf[260];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	352 GetConsoleTitleW (titleBuf, sizeof (titleBuf));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	353 q->setWindowTitle (QString::fromWCharArray (titleBuf));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	354
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	355 m_font.setFamily ("Lucida Console");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	356 m_font.setPointSize (9);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	357 m_font.setStyleHint (QFont::TypeWriter);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	358
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	359 m_buffer = m_tmpBuffer = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	360
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	361 m_consoleView = new QConsoleView (parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	362 m_scrollBar = new QScrollBar (Qt::Vertical, parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	363
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	364 QHBoxLayout* l = new QHBoxLayout (parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	365 l->setContentsMargins (0, 0, 0, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	366 l->setSpacing (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	367 l->addWidget (m_consoleView, 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	368 l->addWidget (m_scrollBar, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	369
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	370 // Choose 15 (0xF) as index into the Windows console color map for the
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	371 // background and 0 (0x0) as the index for the foreground. This
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	372 // selection corresponds to the indices used in the foregroundColor,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	373 // setForegroundColor, backgroundColor, and SetBackgroundColor
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	374 // functions.
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	375
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	376 SetConsoleTextAttribute (m_stdOut, 0xF0);
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	377
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	378 // Defaults.
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	379 setBackgroundColor (Qt::white);
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	380 setForegroundColor (Qt::black);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	381 setSelectionColor (Qt::lightGray);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	382 setCursorColor (false, Qt::darkGray);
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	383
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	384 // FIXME -- should we set the palette?
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	385 QPalette palette (backgroundColor ());
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	386 m_consoleView->setPalette (palette);
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	387
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	388 m_consoleView->setAutoFillBackground (true);
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	389
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	390 m_consoleView->setFont (m_font);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	391 parent->setFocusPolicy (Qt::StrongFocus);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	392 parent->winId ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	393
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	394 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	395
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	396 m_consoleWatcher = new QTimer (parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	397 m_consoleWatcher->setInterval (10);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	398 m_consoleWatcher->setSingleShot (false);
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	399
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	400 m_blinkCursorTimer = new QTimer (parent);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	401 QObject::connect (m_blinkCursorTimer, SIGNAL (timeout()),
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	402 q, SLOT (blinkCursorEvent ()));
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	403
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	404 QObject::connect (m_scrollBar, SIGNAL (valueChanged (int)),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	405 q, SLOT (scrollValueChanged (int)));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	406 QObject::connect (m_consoleWatcher, SIGNAL (timeout (void)),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	407 q, SLOT (monitorConsole (void)));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	408
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	409 m_consoleWatcher->start ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	410
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	411 if (m_command.isEmpty ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	412 m_consoleThread = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	413 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	414 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	415 m_consoleThread = new QConsoleThread (q);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	416 QObject::connect (m_consoleThread, SIGNAL (finished (void)),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	417 q, SIGNAL (terminated (void)));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	418 m_consoleThread->start ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	419 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	420 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	421
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	422 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	423
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	424 QConsolePrivate::~QConsolePrivate (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	425 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	426 if (m_consoleThread && m_consoleThread->isRunning () && m_process)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	427 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	428 TerminateProcess (m_process, (UINT)-1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	429 m_consoleThread->wait ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	430 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	431 if (m_buffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	432 delete [] m_buffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	433 if (m_tmpBuffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	434 delete [] m_tmpBuffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	435 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	436
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	437 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	438
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	439 void QConsolePrivate::setupStandardIO (DWORD stdHandleId, int targetFd,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	440 const char* name, const char* devName)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	441 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	442 log ("Opening %s...\n", devName);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	443
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	444 int fd = open (devName, _O_RDWR \| _O_BINARY);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	445
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	446 if (fd != -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	447 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	448 if (fd != targetFd)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	449 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	450 log ("Opened %s is not at target file descriptor %d, "
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	451 "duplicating...\n", name, targetFd);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	452 if (dup2 (fd, targetFd) == -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	453 log ("Failed to duplicate file descriptor: errno=%d.\n", errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	454 if (close (fd) == -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	455 log ("Failed to close original file descriptor: errno=%d.\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	456 errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	457 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	458 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	459 log ("%s opened and assigned to file descriptor %d.\n", devName, fd);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	460 if (! SetStdHandle (stdHandleId, (HANDLE) _get_osfhandle (targetFd)))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	461 log ("Failed to re-assign %s: error=%08x.\n", name, GetLastError ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	462 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	463 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	464 log ("Failed to open %s: errno=%d.\n", devName, errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	465 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	466
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	467 QPoint QConsolePrivate::posToCell (const QPoint& p)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	468 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	469 return QPoint (m_consoleRect.left () + p.x () / m_charSize.width (),
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	470 m_consoleRect.top () + p.y () / m_charSize.height ());
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	471 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	472
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	473 QString QConsolePrivate::getSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	474 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	475 QString selection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	476
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	477 QPoint begin = m_beginSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	478 QPoint end = m_endSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	479
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	480 maybeSwapPoints (begin, end);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	481
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	482 if (begin != end)
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	483 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	484 CHAR_INFO* buf;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	485 COORD bufSize, bufCoord;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	486 SMALL_RECT bufRect;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	487 int nr;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	488
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	489 nr = end.y () - begin.y () + 1;
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	490 buf = new CHAR_INFO[m_bufferSize.width () * nr];
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	491 bufSize.X = m_bufferSize.width ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	492 bufSize.Y = nr;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	493 bufCoord.X = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	494 bufCoord.Y = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	495
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	496 bufRect.Left = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	497 bufRect.Right = m_bufferSize.width ();
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	498 bufRect.Top = begin.y ();
a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	499 bufRect.Bottom = end.y ();
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	500
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	501 if (ReadConsoleOutput (m_stdOut, buf, bufSize, bufCoord, &bufRect))
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	502 {
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	503 int start_pos = begin.x ();
a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	504 int end_pos = (nr - 1) * m_bufferSize.width () + end.x ();
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	505 int lastNonSpace = -1;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	506
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	507 for (int i = start_pos; i <= end_pos; i++)
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	508 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	509 if (i && (i % m_bufferSize.width ()) == 0)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	510 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	511 if (lastNonSpace >= 0)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	512 selection.truncate (lastNonSpace);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	513 selection.append ('\n');
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	514 lastNonSpace = selection.length ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	515 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	516
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	517 QChar c (buf[i].Char.UnicodeChar);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	518
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	519 selection.append (c);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	520 if (! c.isSpace ())
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	521 lastNonSpace = selection.length ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	522 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	523
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	524 if (lastNonSpace >= 0)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	525 selection.truncate (lastNonSpace);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	526 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	527 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	528
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	529 return selection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	530 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	531
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	532 void QConsolePrivate::updateSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	533 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	534 QPoint begin = m_beginSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	535 QPoint end = m_endSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	536
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	537 maybeSwapPoints (begin, end);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	538
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	539 begin.rx () = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	540 end.rx () = m_consoleRect.width ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	541
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	542 m_consoleView->update ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	543 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	544
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	545 void QConsolePrivate::clearSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	546 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	547 m_beginSelection = m_endSelection = QPoint ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	548
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	549 m_consoleView->update ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	550 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	551
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	552 QColor QConsolePrivate::backgroundColor (void) const
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	553 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	554 return m_colors[15];
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	555 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	556
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	557 QColor QConsolePrivate::foregroundColor (void) const
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	558 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	559 return m_colors[0];
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	560 }
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	561
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	562 QColor QConsolePrivate::selectionColor (void) const
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	563 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	564 return m_selectionColor;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	565 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	566
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	567 QColor QConsolePrivate::cursorColor (void) const
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	568 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	569 return m_cursorColor.isValid () ? m_cursorColor : foregroundColor ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	570 }
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	571
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	572 void QConsolePrivate::setBackgroundColor (const QColor& color)
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	573 {
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	574 m_colors[15] = color;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	575 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	576
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	577 void QConsolePrivate::setForegroundColor (const QColor& color)
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	578 {
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	579 m_colors[0] = color;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	580 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	581
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	582 void QConsolePrivate::setSelectionColor (const QColor& color)
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	583 {
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	584 m_selectionColor = color;
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	585 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	586
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	587 void QConsolePrivate::setCursorColor (bool useForegroundColor,
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	588 const QColor& color)
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	589 {
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	590 m_cursorColor = useForegroundColor ? QColor () : color;
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	591 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	592
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	593 void QConsolePrivate::drawTextBackground (QPainter& p, int cx1, int cy1,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	594 int cx2, int cy2, int cw, int ch)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	595 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	596 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	597
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	598 int ascent = p.fontMetrics ().ascent ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	599 int stride = m_consoleRect.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	600 int y = ascent + cy1 * ch;;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	601
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	602 for (int j = cy1; j <= cy2; j++, y += ch)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	603 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	604 int len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	605 bool hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	606 int x = cx1 * cw;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	607 WORD attr = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	608
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	609 for (int i = cx1; i <= cx2; i++)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	610 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	611 CHAR_INFO* ci = &(m_buffer[stride*j+i]);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	612
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	613 if ((ci->Attributes & 0x00ff) != attr)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	614 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	615 // Character attributes changed
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	616 if (len != 0)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	617 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	618 // String buffer not empty -> draw it
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	619 if (hasChar \|\| (attr & 0x00f0))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	620 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	621 if (attr & 0x00f0)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	622 p.fillRect (x, y-ascent, len * cw, ch, p.brush ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	623 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	624
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	625 x += (len * cw);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	626 len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	627 hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	628 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	629 // Update current brush and store current attributes
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	630 attr = (ci->Attributes & 0x00ff);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	631 p.setBrush (m_colors[(attr >> 4) & 0x000f]);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	632 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	633
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	634 // Append current character to the string buffer
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	635 len++;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	636 if (ci->Char.UnicodeChar != L' ')
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	637 hasChar = true;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	638 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	639
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	640 if (len != 0 && (hasChar \|\| (attr & 0x00f0)))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	641 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	642 // Line end reached, but string buffer not empty -> draw it
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	643 // No need to update s or x, they will be reset on the next
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	644 // for-loop iteration
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	645
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	646 if (attr & 0x00f0)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	647 p.fillRect (x, y-ascent, len * cw, ch, p.brush ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	648 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	649 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	650
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	651 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	652 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	653
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	654 void QConsolePrivate::drawSelection (QPainter& p, int cx1, int cy1,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	655 int cx2, int cy2, int cw, int ch)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	656 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	657 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	658
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	659 QPoint begin = m_beginSelection;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	660 QPoint end = m_endSelection;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	661
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	662 bool haveSelection = (begin != end);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	663
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	664 if (haveSelection)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	665 maybeSwapPoints (begin, end);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	666
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	667 int scrollOffset = m_consoleRect.top ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	668
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	669 begin.ry () -= scrollOffset;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	670 end.ry () -= scrollOffset;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	671
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	672 int ascent = p.fontMetrics ().ascent ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	673 int stride = m_consoleRect.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	674
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	675 int y = ascent + cy1 * ch;;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	676 for (int j = cy1; j <= cy2; j++, y += ch)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	677 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	678 int charsThisLine = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	679 int len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	680 bool hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	681 WORD attr = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	682
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	683 for (int i = cx1; i <= cx2; i++)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	684 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	685 CHAR_INFO* ci = &(m_buffer[stride*j+i]);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	686
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	687 if ((ci->Attributes & 0x00ff) != attr)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	688 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	689 // Character attributes changed
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	690 if (len != 0)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	691 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	692 charsThisLine += len;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	693 len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	694 hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	695 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	696
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	697 // Store current attributes
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	698 attr = (ci->Attributes & 0x00ff);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	699 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	700
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	701 // Append current character to the string buffer
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	702 len++;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	703 if (ci->Char.UnicodeChar != L' ')
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	704 hasChar = true;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	705 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	706
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	707 if (len != 0 && (hasChar \|\| (attr & 0x00f0)))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	708 charsThisLine += len;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	709
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	710 if (haveSelection && j >= begin.y () && j <= end.y ())
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	711 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	712 int selectionBegin = j == begin.y () ? begin.x (): 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	713
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	714 int len = ((j == end.y () && end.x () < charsThisLine)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	715 ? end.x () - selectionBegin + 1
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	716 : stride - selectionBegin);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	717
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	718 p.fillRect (selectionBegin * cw, y-ascent, len * cw, ch,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	719 selectionColor ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	720 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	721 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	722
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	723 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	724 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	725
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	726 void QConsolePrivate::drawCursor (QPainter& p)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	727 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	728 if (! m_cursorBlinking)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	729 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	730 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	731
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	732 QRect rect = cursorRect ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	733 QColor color = cursorColor ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	734
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	735 p.setPen (color);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	736
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	737 if (m_cursorType == QConsolePrivate::BlockCursor)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	738 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	739 if (q->hasFocus ())
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	740 p.fillRect (rect, color);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	741 else
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	742 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	743 // draw the cursor outline, adjusting the area so that
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	744 // it is draw entirely inside 'rect'
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	745
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	746 int penWidth = qMax (1, p.pen().width());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	747
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	748 p.drawRect (rect.adjusted (penWidth/2, penWidth/2,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	749 - penWidth/2 - penWidth%2,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	750 - penWidth/2 - penWidth%2));
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	751 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	752 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	753 else if (m_cursorType == QConsolePrivate::UnderlineCursor)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	754 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	755 p.drawLine (rect.left (), rect.bottom (),
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	756 rect.right (), rect.bottom ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	757 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	758 else if (m_cursorType == QConsolePrivate::IBeamCursor)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	759 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	760 p.drawLine (rect.left (), rect.top (),
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	761 rect.left (), rect.bottom ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	762 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	763
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	764 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	765 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	766 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	767
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	768 void QConsolePrivate::drawText (QPainter& p, int cx1, int cy1,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	769 int cx2, int cy2, int cw, int ch)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	770 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	771 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	772
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	773 p.setFont (m_font);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	774 p.setPen (foregroundColor ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	775
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	776 QString s;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	777 s.reserve (cx2 - cx1 + 1);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	778
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	779 int ascent = p.fontMetrics ().ascent ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	780 int stride = m_consoleRect.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	781
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	782 int y = ascent + cy1 * ch;;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	783 for (int j = cy1; j <= cy2; j++, y += ch)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	784 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	785 // Reset string buffer and starting X coordinate
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	786 s.clear ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	787 bool hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	788 int x = cx1 * cw;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	789 WORD attr = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	790
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	791 for (int i = cx1; i <= cx2; i++)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	792 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	793 CHAR_INFO* ci = &(m_buffer[stride*j+i]);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	794
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	795 if ((ci->Attributes & 0x00ff) != attr)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	796 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	797 // Character attributes changed
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	798 if (! s.isEmpty ())
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	799 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	800 // String buffer not empty -> draw it
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	801 if (hasChar \|\| (attr & 0x00f0))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	802 p.drawText (x, y, s);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	803
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	804 x += (s.length () * cw);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	805 s.clear ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	806 hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	807 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	808 // Update current pen and store current attributes
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	809 attr = (ci->Attributes & 0x00ff);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	810 p.setPen (m_colors[attr & 0x000f]);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	811 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	812
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	813 // Append current character to the string buffer
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	814 s.append (ci->Char.UnicodeChar);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	815 if (ci->Char.UnicodeChar != L' ')
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	816 hasChar = true;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	817 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	818
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	819 if (! s.isEmpty () && (hasChar \|\| (attr & 0x00f0)))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	820 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	821 // Line end reached, but string buffer not empty -> draw it
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	822 // No need to update s or x, they will be reset on the next
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	823 // for-loop iteration
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	824
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	825 p.drawText (x, y, s);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	826 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	827 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	828
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	829 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	830 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	831
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	832 /////////////////////////////////////////////////////////////////////////////
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	833
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	834 void QConsolePrivate::closeStandardIO (int fd, DWORD stdHandleId,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	835 const char* name)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	836 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	837 if (close (fd) == -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	838 log ("Failed to close file descriptor %d: errno=%d.\n", fd, errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	839 if (! CloseHandle (GetStdHandle (stdHandleId)))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	840 log ("Failed to close Win32 %s: error=%08x.\n", name, GetLastError ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	841 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	842
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	843 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	844
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	845 void QConsolePrivate::log (const char* fmt, ...)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	846 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	847 #ifdef DEBUG_QCONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	848 if (fmt)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	849 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	850 va_list l;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	851 FILE* flog = fopen (LOGFILENAME, "ab");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	852
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	853 va_start (l, fmt);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	854 vfprintf (flog, fmt, l);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	855 va_end (l);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	856 fclose (flog);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	857 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	858 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	859 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	860 // Special case to re-initialize the log file
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	861 FILE* flog = fopen (LOGFILENAME, "w");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	862 fclose (flog);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	863 }
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	864 #else
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	865 Q_UNUSED (fmt);
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	866 #endif
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	867 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	868
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	869 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	870
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	871 void QConsolePrivate::updateConsoleSize (bool sync)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	872 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	873 QFontMetrics fm (m_font);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	874 QSize winSize = m_consoleView->size ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	875
16617 3a17dd5964e3 use average width for character size in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16612 diff changeset	876 m_charSize.rwidth () = fm.averageCharWidth ();
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	877 m_charSize.rheight () = fm.lineSpacing ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	878
16617 3a17dd5964e3 use average width for character size in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16612 diff changeset	879 m_consoleRect.setWidth (winSize.width () / fm.averageCharWidth ());
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	880 m_consoleRect.setHeight (winSize.height () / fm.lineSpacing ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	881
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	882 m_bufferSize.rwidth () = m_consoleRect.width ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	883 m_bufferSize.rheight () = qMax (m_bufferSize.height (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	884 m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	885
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	886 m_consoleRect.moveLeft (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	887 if (m_consoleRect.bottom () >= m_bufferSize.height ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	888 m_consoleRect.moveTop (m_bufferSize.height () - m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	889
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	890 log ("Console resized:\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	891 log (" widget size: %d x %d\n", winSize.width (), winSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	892 log (" buffer size: %d x %d\n", m_bufferSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	893 m_bufferSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	894 log (" window: (%d, %d) -> (%d, %d) [%d x %d]\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	895 m_consoleRect.left (), m_consoleRect.top (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	896 m_consoleRect.right (), m_consoleRect.bottom (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	897 m_consoleRect.width (), m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	898
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	899 if (sync)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	900 syncConsoleParameters ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	901
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	902 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	903 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	904
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	905 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	906
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	907 void QConsolePrivate::syncConsoleParameters (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	908 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	909 CONSOLE_SCREEN_BUFFER_INFO sbi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	910 HANDLE hStdOut = m_stdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	911
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	912 GetConsoleScreenBufferInfo (hStdOut, &sbi);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	913
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	914 COORD bs;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	915 SMALL_RECT sr;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	916
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	917 bs.X = sbi.dwSize.X;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	918 bs.Y = m_bufferSize.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	919 sr.Left = sbi.srWindow.Left;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	920 sr.Right = sbi.srWindow.Right;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	921 sr.Top = m_consoleRect.top ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	922 sr.Bottom = m_consoleRect.bottom ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	923
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	924 if (bs.Y > sbi.dwSize.Y)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	925 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	926 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	927 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	928 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	929 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	930 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	931 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	932 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	933 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	934
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	935 bs.X = m_bufferSize.width ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	936 sr.Left = m_consoleRect.left ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	937 sr.Right = m_consoleRect.right ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	938
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	939 if (bs.X > sbi.dwSize.X)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	940 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	941 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	942 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	943 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	944 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	945 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	946 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	947 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	948 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	949
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	950 log ("Sync'ing console parameters:\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	951 log (" buffer size: %d x %d\n", bs.X, bs.Y);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	952 log (" window: (%d, %d) -> (%d, %d)\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	953 sr.Left, sr.Top, sr.Right, sr.Bottom);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	954
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	955 if (m_buffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	956 delete [] m_buffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	957 if (m_tmpBuffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	958 delete [] m_tmpBuffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	959
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	960 int bufSize = m_consoleRect.width () * m_consoleRect.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	961
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	962 m_buffer = new CHAR_INFO[bufSize];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	963 m_tmpBuffer = new CHAR_INFO[bufSize];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	964 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	965
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	966 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	967
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	968 void QConsolePrivate::grabConsoleBuffer (CHAR_INFO* buf)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	969 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	970 COORD bs, bc;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	971 SMALL_RECT r;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	972
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	973 bs.X = m_consoleRect.width ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	974 bs.Y = m_consoleRect.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	975 bc.X = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	976 bc.Y = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	977
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	978 r.Left = m_consoleRect.left ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	979 r.Top = m_consoleRect.top ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	980 r.Right = m_consoleRect.right ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	981 r.Bottom = m_consoleRect.bottom ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	982
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	983 if (! ReadConsoleOutput (m_stdOut, (buf ? buf : m_buffer), bs, bc, &r))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	984 qCritical ("cannot read console output");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	985 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	986
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	987 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	988
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	989 void QConsolePrivate::updateScrollBar (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	990 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	991 m_scrollBar->setMinimum (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	992 if (m_bufferSize.height () > m_consoleRect.height ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	993 m_scrollBar->setMaximum (m_bufferSize.height () - m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	994 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	995 m_scrollBar->setMaximum (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	996 m_scrollBar->setSingleStep (1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	997 m_scrollBar->setPageStep (m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	998 m_scrollBar->setValue (m_consoleRect.top ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	999
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1000 log ("Scrollbar parameters updated: %d/%d/%d/%d\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1001 m_scrollBar->minimum (), m_scrollBar->maximum (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1002 m_scrollBar->singleStep (), m_scrollBar->pageStep ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1003 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1004
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1005 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1006
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1007 void QConsolePrivate::setScrollValue (int value)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1008 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1009 if (value == m_consoleRect.top ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1010 return;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1011
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1012 SMALL_RECT r;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1013 HANDLE hStdOut = m_stdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1014
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1015 if (value + m_consoleRect.height () > m_bufferSize.height ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1016 value = m_bufferSize.height () - m_consoleRect.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1017
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1018 r.Left = m_consoleRect.left ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1019 r.Top = value;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1020 r.Right = m_consoleRect.right ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1021 r.Bottom = value + m_consoleRect.height () - 1;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1022
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1023 log ("Scrolling window: (%d, %d) -> (%d, %d) [%d x %d]\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1024 r.Left, r.Top, r.Right, r.Bottom,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1025 r.Right - r.Left + 1, r.Bottom - r.Top + 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1026
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1027 if (SetConsoleWindowInfo (hStdOut, TRUE, &r))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1028 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1029 m_consoleRect.moveTop (value);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1030 updateConsoleView ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1031 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1032 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1033
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1034 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1035
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1036 void QConsolePrivate::updateConsoleView (bool grab)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1037 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1038 if (grab)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1039 grabConsoleBuffer ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1040 m_consoleView->update ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1041 m_consoleWatcher->start ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1042 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1043
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1044 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1045
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1046 void QConsolePrivate::monitorConsole (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1047 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1048 CONSOLE_SCREEN_BUFFER_INFO sbi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1049 HANDLE hStdOut = GetStdHandle (STD_OUTPUT_HANDLE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1050
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1051 static wchar_t titleBuf[260];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1052
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1053 GetConsoleTitleW (titleBuf, sizeof (titleBuf));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1054 QString title = QString::fromWCharArray (titleBuf);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1055
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1056 if (title != m_title)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1057 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1058 q->setWindowTitle (title);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1059 emit q->titleChanged (title);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1060 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1061
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1062 if (GetConsoleScreenBufferInfo (hStdOut, &sbi))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1063 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1064 if (m_bufferSize.width () != sbi.dwSize.X
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1065 \|\| m_bufferSize.height () != sbi.dwSize.Y)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1066 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1067 // Buffer size changed
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1068 m_bufferSize.rwidth () = sbi.dwSize.X;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1069 m_bufferSize.rheight () = sbi.dwSize.Y;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1070 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1071 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1072
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1073 if (m_cursorPos.x () != sbi.dwCursorPosition.X
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1074 \|\| m_cursorPos.y () != sbi.dwCursorPosition.Y)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1075 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1076 // Cursor position changed
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1077 m_consoleView->update
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1078 ((m_cursorPos.x () - sbi.srWindow.Left) * m_charSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1079 (m_cursorPos.y () - sbi.srWindow.Top) * m_charSize.height (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1080 m_charSize.width (), m_charSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1081 m_cursorPos.rx () = sbi.dwCursorPosition.X;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1082 m_cursorPos.ry () = sbi.dwCursorPosition.Y;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1083 m_consoleView->update
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1084 ((m_cursorPos.x () - sbi.srWindow.Left) * m_charSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1085 (m_cursorPos.y () - sbi.srWindow.Top) * m_charSize.height (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1086 m_charSize.width (), m_charSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1087 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1088
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1089 if (m_consoleRect.left () != sbi.srWindow.Left
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1090 \|\| m_consoleRect.right () != sbi.srWindow.Right
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1091 \|\| m_consoleRect.top () != sbi.srWindow.Top
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1092 \|\| m_consoleRect.bottom () != sbi.srWindow.Bottom)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1093 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1094 // Console window changed
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1095 m_consoleRect = QRect (sbi.srWindow.Left, sbi.srWindow.Top,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1096 sbi.srWindow.Right - sbi.srWindow.Left + 1,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1097 sbi.srWindow.Bottom - sbi.srWindow.Top + 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1098 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1099 updateConsoleView ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1100 return;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1101 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1102
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1103 if (m_tmpBuffer && m_buffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1104 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1105 grabConsoleBuffer (m_tmpBuffer);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1106 if (memcmp (m_tmpBuffer, m_buffer,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1107 sizeof (CHAR_INFO) * m_consoleRect.width () *
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1108 m_consoleRect.height ()))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1109 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1110 // FIXME: compute the area to update based on the
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1111 // difference between the 2 buffers.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1112 qSwap (m_buffer, m_tmpBuffer);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1113 updateConsoleView (false);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1114 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1115 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1116 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1117 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1118
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1119 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1120
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1121 void QConsolePrivate::startCommand (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1122 {
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1123 QString cmd = m_command;
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1124
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1125 if (cmd.isEmpty ())
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1126 cmd = qgetenv ("COMSPEC").constData ();
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1127
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1128 if (! cmd.isEmpty ())
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1129 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1130 STARTUPINFO si;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1131 PROCESS_INFORMATION pi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1132
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1133 ZeroMemory (&si, sizeof (si));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1134 si.cb = sizeof (si);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1135 ZeroMemory (&pi, sizeof (pi));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1136
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1137 if (CreateProcessW (NULL,
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1138 (LPWSTR)cmd.unicode (),
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1139 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1140 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1141 TRUE,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1142 0,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1143 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1144 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1145 &si,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1146 &pi))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1147 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1148 CloseHandle (pi.hThread);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1149 m_process = pi.hProcess;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1150 WaitForSingleObject (m_process, INFINITE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1151 CloseHandle (m_process);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1152 m_process = NULL;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1153 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1154 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1155 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1156
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1157 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1158
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1159 void QConsolePrivate::sendConsoleText (const QString& s)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1160 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1161 // Send the string in chunks of 512 characters. Each character is
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1162 // translated into an equivalent keypress event.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1163
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1164 #define TEXT_CHUNK_SIZE 512
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1165
17262 12e5fa85f1bb Windows GUI: clear any terminal selection when pressing a key/pasting to terminal. John Donoghue <john.donoghue@ieee.org> parents: 17248 diff changeset	1166 // clear any selection on inserting text
12e5fa85f1bb Windows GUI: clear any terminal selection when pressing a key/pasting to terminal. John Donoghue <john.donoghue@ieee.org> parents: 17248 diff changeset	1167 clearSelection();
12e5fa85f1bb Windows GUI: clear any terminal selection when pressing a key/pasting to terminal. John Donoghue <john.donoghue@ieee.org> parents: 17248 diff changeset	1168
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1169 int len = s.length ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1170 INPUT_RECORD events[TEXT_CHUNK_SIZE];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1171 DWORD nEvents = 0, written;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1172 HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1173
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1174 ZeroMemory (events, sizeof (events));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1175
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1176 for (int i = 0; i < len; i++)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1177 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1178 QChar c = s.at (i);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1179
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1180 if (c == L'\r' \|\| c == L'\n')
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1181 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1182 if (c == L'\r' && i < (len - 1) && s.at (i+1) == L'\n')
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1183 i++;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1184 if (nEvents)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1185 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1186 WriteConsoleInput (hStdIn, events, nEvents, &written);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1187 nEvents = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1188 ZeroMemory (events, sizeof (events));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1189 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1190 PostMessage (m_consoleWindow, WM_KEYDOWN, VK_RETURN, 0x001C0001);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1191 PostMessage (m_consoleWindow, WM_KEYDOWN, VK_RETURN, 0xC01C0001);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1192 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1193 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1194 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1195 events[nEvents].EventType = KEY_EVENT;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1196 events[nEvents].Event.KeyEvent.bKeyDown = TRUE;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1197 events[nEvents].Event.KeyEvent.wRepeatCount = 1;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1198 events[nEvents].Event.KeyEvent.wVirtualKeyCode =
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1199 LOBYTE (VkKeyScan (c.unicode ()));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1200 events[nEvents].Event.KeyEvent.wVirtualScanCode = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1201 events[nEvents].Event.KeyEvent.uChar.UnicodeChar = c.unicode ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1202 events[nEvents].Event.KeyEvent.dwControlKeyState = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1203 nEvents++;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1204 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1205
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1206 if (nEvents == TEXT_CHUNK_SIZE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1207 \|\| (nEvents > 0 && i == (len - 1)))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1208 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1209 WriteConsoleInput (hStdIn, events, nEvents, &written);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1210 nEvents = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1211 ZeroMemory (events, sizeof (events));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1212 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1213 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1214 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1215
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1216 QRect
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1217 QConsolePrivate::cursorRect (void)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1218 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1219 int cw = m_charSize.width ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1220 int ch = m_charSize.height ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1221
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1222 return QRect ((m_cursorPos.x () - m_consoleRect.x ()) * cw,
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1223 (m_cursorPos.y () - m_consoleRect.y ()) * ch,
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1224 cw, ch);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1225 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1226
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1227 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1228
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1229 QWinTerminalImpl::QWinTerminalImpl (QWidget* parent)
16639 ba808cd9d86c simplify QTerminal inheritance scheme John W. Eaton <jwe@octave.org> parents: 16629 diff changeset	1230 : QTerminal (parent), d (new QConsolePrivate (this))
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1231 {
17264 aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1232 installEventFilter (this);
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1233
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1234 connect (this, SIGNAL (set_global_shortcuts_signal (bool)),
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1235 parent, SLOT (set_global_shortcuts (bool)));
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1236 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1237
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1238 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1239
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1240 QWinTerminalImpl::QWinTerminalImpl (const QString& cmd, QWidget* parent)
16639 ba808cd9d86c simplify QTerminal inheritance scheme John W. Eaton <jwe@octave.org> parents: 16629 diff changeset	1241 : QTerminal (parent), d (new QConsolePrivate (this, cmd))
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1242 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1243 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1244
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1245 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1246
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1247 QWinTerminalImpl::~QWinTerminalImpl (void)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1248 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1249 delete d;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1250 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1251
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1252 void QWinTerminalImpl::mouseMoveEvent (QMouseEvent *event)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1253 {
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1254 if (d->m_settingSelection)
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1255 {
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1256 d->m_endSelection = d->posToCell (event->pos ());
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1257
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1258 updateSelection ();
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1259 }
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1260 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1261
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1262 void QWinTerminalImpl::mousePressEvent (QMouseEvent *event)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1263 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1264 if (event->button () == Qt::LeftButton)
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1265 {
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1266 d->m_settingSelection = true;
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1267
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1268 d->m_beginSelection = d->posToCell (event->pos ());
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1269 }
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1270 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1271
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1272 void QWinTerminalImpl::mouseReleaseEvent (QMouseEvent *event)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1273 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1274 if (event->button () == Qt::LeftButton)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1275 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1276 d->m_endSelection = d->posToCell (event->pos ());
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1277
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1278 updateSelection ();
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1279
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1280 d->m_settingSelection = false;
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1281 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1282 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1283
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1284 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1285
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1286 void QWinTerminalImpl::viewResizeEvent (QConsoleView, QResizeEvent)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1287 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1288 d->updateConsoleSize (true);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1289 d->grabConsoleBuffer ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1290 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1291
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1292 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1293
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1294 void QWinTerminalImpl::viewPaintEvent (QConsoleView* w, QPaintEvent* event)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1295 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1296 QPainter p (w);
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1297
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1298 int cw = d->m_charSize.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1299 int ch = d->m_charSize.height ();
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1300
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1301 QRect updateRect = event->rect ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1302
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1303 int cx1 = updateRect.left () / cw;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1304 int cy1 = updateRect.top () / ch;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1305 int cx2 = qMin (d->m_consoleRect.width () - 1, updateRect.right () / cw);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1306 int cy2 = qMin (d->m_consoleRect.height () - 1, updateRect.bottom () / ch);
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1307
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1308 if (cx1 > d->m_consoleRect.width () - 1
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1309 \|\| cy1 > d->m_consoleRect.height () - 1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1310 return;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1311
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1312 d->drawTextBackground (p, cx1, cy1, cx2, cy2, cw, ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1313 d->drawSelection (p, cx1, cy1, cx2, cy2, cw, ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1314 d->drawCursor (p);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1315 d->drawText (p, cx1, cy1, cx2, cy2, cw, ch);
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1316 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1317
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1318 void QWinTerminalImpl::blinkCursorEvent (void)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1319 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1320 if (d->m_hasBlinkingCursor)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1321 d->m_cursorBlinking = ! d->m_cursorBlinking;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1322 else
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1323 d->m_cursorBlinking = false;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1324
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1325 d->m_consoleView->update (d->cursorRect ());
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1326 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1327
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1328 void QWinTerminalImpl::setBlinkingCursor (bool blink)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1329 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1330 d->m_hasBlinkingCursor = blink;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1331
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1332 setBlinkingCursorState (blink);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1333 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1334
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1335 void QWinTerminalImpl::setBlinkingCursorState (bool blink)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1336 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1337 if (blink && ! d->m_blinkCursorTimer->isActive ())
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1338 d->m_blinkCursorTimer->start (d->BLINK_DELAY);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1339
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1340 if (! blink && d->m_blinkCursorTimer->isActive ())
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1341 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1342 d->m_blinkCursorTimer->stop ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1343
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1344 if (d->m_cursorBlinking)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1345 blinkCursorEvent ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1346 }
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1347 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1348
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1349 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1350
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1351 void QWinTerminalImpl::wheelEvent (QWheelEvent* event)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1352 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1353 if (! d->m_inWheelEvent)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1354 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1355 // Forward to the scrollbar (avoid recursion)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1356 d->m_inWheelEvent = true;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1357 QApplication::sendEvent (d->m_scrollBar, event);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1358 d->m_inWheelEvent = false;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1359 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1360 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1361
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1362 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1363
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1364 void QWinTerminalImpl::scrollValueChanged (int value)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1365 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1366 d->setScrollValue (value);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1367 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1368
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1369 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1370
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1371 void QWinTerminalImpl::monitorConsole (void)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1372 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1373 d->monitorConsole ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1374 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1375
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1376 void QWinTerminalImpl::updateSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1377 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1378 d->updateSelection ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1379 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1380
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1381 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1382
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1383 void QWinTerminalImpl::focusInEvent (QFocusEvent* event)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1384 {
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1385 emit set_global_shortcuts_signal (false); // disable some shortcuts
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1386
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1387 setBlinkingCursorState (true);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1388
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1389 QWidget::focusInEvent (event);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1390 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1391
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1392 void QWinTerminalImpl::focusOutEvent (QFocusEvent* event)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1393 {
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1394 emit set_global_shortcuts_signal (true); // re-enable shortcuts
78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1395
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1396 // Force the cursor to be redrawn.
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1397 d->m_cursorBlinking = true;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1398
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1399 setBlinkingCursorState (false);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1400
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1401 QWidget::focusOutEvent (event);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1402 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1403
17264 aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1404 bool QWinTerminalImpl::eventFilter (QObject obj, QEvent event)
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1405 {
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1406 // if a keypress, filter out tab keys so that the next/prev tabbing is
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1407 // disabled - but we still need to pass along to the console .
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1408 if (event->type () == QEvent::KeyPress)
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1409 {
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1410 QKeyEvent* k = static_cast<QKeyEvent*>(event);
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1411 if (k->key () == Qt::Key_Tab)
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1412 {
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1413 sendText ("\t");
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1414 return true;
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1415 }
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1416 }
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1417 return false;
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1418 }
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1419
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1420 void QWinTerminalImpl::keyPressEvent (QKeyEvent* event)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1421 {
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1422 QString s = translateKey (event);
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1423 if (!s.isEmpty ())
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1424 sendText (s);
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1425
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1426 if (d->m_hasBlinkingCursor)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1427 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1428 d->m_blinkCursorTimer->start (d->BLINK_DELAY);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1429
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1430 if (d->m_cursorBlinking)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1431 blinkCursorEvent ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1432 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1433
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1434 QWidget::keyPressEvent (event);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1435 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1436
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1437 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1438
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1439 void QWinTerminalImpl::start (void)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1440 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1441 d->startCommand ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1442 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1443
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1444 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1445
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1446 void QWinTerminalImpl::sendText (const QString& s)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1447 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1448 d->sendConsoleText (s);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1449 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1450
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1451 void QWinTerminalImpl::setCursorType (CursorType type, bool blinking)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1452 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1453 switch (type)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1454 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1455 case UnderlineCursor:
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1456 d->m_cursorType = QConsolePrivate::UnderlineCursor;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1457 break;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1458
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1459 case BlockCursor:
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1460 d->m_cursorType = QConsolePrivate::BlockCursor;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1461 break;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1462
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1463 case IBeamCursor:
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1464 d->m_cursorType = QConsolePrivate::IBeamCursor;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1465 break;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1466 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1467
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1468 setBlinkingCursor (blinking);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1469 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1470
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1471 void QWinTerminalImpl::setBackgroundColor (const QColor& color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1472 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1473 d->setBackgroundColor (color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1474 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1475
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1476 void QWinTerminalImpl::setForegroundColor (const QColor& color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1477 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1478 d->setForegroundColor (color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1479 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1480
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1481 void QWinTerminalImpl::setSelectionColor (const QColor& color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1482 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1483 d->setSelectionColor (color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1484 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1485
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1486 void QWinTerminalImpl::setCursorColor (bool useForegroundColor,
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1487 const QColor& color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1488 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1489 d->setCursorColor (useForegroundColor, color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1490 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1491
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1492 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1493
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1494 void QWinTerminalImpl::setTerminalFont (const QFont& f)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1495 {
15666 20299b92a64e Added patch that allows for changing the terminal font. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15665 diff changeset	1496 d->m_font = f;
20299b92a64e Added patch that allows for changing the terminal font. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15665 diff changeset	1497 d->m_consoleView->setFont (f);
20299b92a64e Added patch that allows for changing the terminal font. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15665 diff changeset	1498 d->updateConsoleSize (true);
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1499 }
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1500
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1501 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1502
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1503 void QWinTerminalImpl::setSize (int columns, int lines)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1504 {
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1505 Q_UNUSED (columns);
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1506 Q_UNUSED (lines);
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1507 }
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1508
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1509 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1510
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1511 void QWinTerminalImpl::copyClipboard (void)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1512 {
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16794 diff changeset	1513 if(!hasFocus()) return;
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16794 diff changeset	1514
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1515 QClipboard *clipboard = QApplication::clipboard ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1516
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1517 QString selection = d->getSelection ();
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1518
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1519 if (selection.isEmpty ())
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1520 {
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1521 ::raise (SIGINT);
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1522 }
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1523 else
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1524 {
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1525 clipboard->setText (selection);
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1526
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1527 emit report_status_message (tr ("copied selection to clipboard"));
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1528 }
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1529 }
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1530
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1531 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1532
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1533 void QWinTerminalImpl::pasteClipboard (void)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1534 {
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16794 diff changeset	1535 if(!hasFocus()) return;
944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16794 diff changeset	1536
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1537 QString text = QApplication::clipboard()->text (QClipboard::Clipboard);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1538
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1539 if (! text.isEmpty ())
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1540 sendText (text);
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1541 }
16794 1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1542
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1543
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1544 //////////////////////////////////////////////////////////////////////////////
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1545
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1546 QString QWinTerminalImpl::selectedText ()
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1547 {
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1548 QString selection = d->getSelection ();
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1549 return selection;
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1550 }

Mercurial > octave-nkf

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 17360:afc3d47f7704