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

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 18661:8b9e99c061f9 gui-release

GUI: Windows GUI terminal support for double click (Bug #41468) * libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp (QConsolePrivate::selectWord): New function. (QConsolePrivate::selectLine): New function. (QWinTerminalImpl::QWinTerminalImpl): init new allowTripleClick variable. (QWinTerminalImpl::mousePressEvent): call mouseTripleClickEvent ifallowTripleClick is set. (QWinTerminalImpl::mouseReleaseEvent): only process if settingSelection is true. (QWinTerminalImpl::mouseDoubleClickEvent): New function. (QWinTerminalImpl::mouseTripleClickEvent): New function. (QWinTerminalImpl::tripleClickTimeout): New slot.

author	John Donoghue <john.donoghue@ieee.org>
date	Fri, 18 Apr 2014 15:04:39 -0400
parents	41489b96ebca
children

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
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17360 diff changeset	3 Copyright (C) 2011, 2013 Michael Goffioul.
15651 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
17795 0a8c35ae5ce1 maint: Fix various problems with GPL copyright statements. Rik <rik@octave.org> parents: 17744 diff changeset	7 This program is free software: you can redistribute it and/or modify
15651 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
17795 0a8c35ae5ce1 maint: Fix various problems with GPL copyright statements. Rik <rik@octave.org> parents: 17744 diff changeset	12 This program is distributed in the hope that it will be useful,
15651 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
17795 0a8c35ae5ce1 maint: Fix various problems with GPL copyright statements. Rik <rik@octave.org> parents: 17744 diff changeset	18 along with this program. If not,
0a8c35ae5ce1 maint: Fix various problems with GPL copyright statements. Rik <rik@octave.org> parents: 17744 diff changeset	19 see <http://www.gnu.org/licenses/>.
15651 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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	23 #include <QApplication>
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	24 #include <QClipboard>
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	25 #include <QColor>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	26 #include <QFont>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	27 #include <QHBoxLayout>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	28 #include <QPaintEvent>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	29 #include <QPainter>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QResizeEvent>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QScrollBar>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	32 #include <QtDebug>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	33 #include <QThread>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34 #include <QTimer>
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	35 #include <QToolTip>
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	36 #include <QCursor>
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	37 #include <QMessageBox>
18655 41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	38 #include <QDragEnterEvent>
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	39 #include <QDropEvent>
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	40 #include <QUrl>
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	42 #include <fcntl.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	43 #include <io.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	44 #include <stdio.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	45 #include <stdarg.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	46 #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	47 #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	48 #define _WIN32_WINNT 0x0500
477ed3b55497 QWinTerminalImpl.cpp: Don't define _WIN32_WINNT unconditionally. Michael Goffioul <michael.goffioul@gmail.com> parents: 16970 diff changeset	49 #endif
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	50 #include <windows.h>
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	51 #include <cstring>
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	52 #include <csignal>
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	53 #include <limits>
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	54
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	55 #include "QWinTerminalImpl.h"
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	56 #include "QTerminalColors.h"
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	58 // Uncomment to log activity to LOGFILENAME
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	59 // #define DEBUG_QCONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	60 #define LOGFILENAME "QConsole.log"
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	61 // Uncomment to create hidden console window
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	62 #define HIDDEN_CONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	63
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	64 #ifdef _MSC_VER
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	65 # pragma warning(disable : 4996)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	66 #endif
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	67
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	68 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	69
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	70 class QConsoleView : public QWidget
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 public:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	73 QConsoleView (QWinTerminalImpl* parent = 0) : QWidget (parent), q (parent) { }
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	74 ~QConsoleView (void) { }
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 protected:
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	77 void paintEvent (QPaintEvent* event) { q->viewPaintEvent (this, event); }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	78 void resizeEvent (QResizeEvent* event) { q->viewResizeEvent (this, event); }
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 private:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	81 QWinTerminalImpl* q;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	82 };
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 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	85
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	86 class QConsoleThread : public QThread
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	87 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	88 public:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	89 QConsoleThread (QWinTerminalImpl* console) : QThread (console), q (console) { }
15651 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 protected:
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	92 void run (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	93 { q->start (); }
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 private:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	96 QWinTerminalImpl* q;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	97 };
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	98
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	99 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	100
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	101 static QString translateKey (QKeyEvent *ev)
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	102 {
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	103 QString esc = "\x1b";
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	104 QString s;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	105
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	106 if (ev->key () == Qt::Key_Delete)
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	107 s = esc + "[C\b";
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	108 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	109 s = ev->text ();
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	110 else
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	111 {
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	112
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	113 switch (ev->key ())
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_Up:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	116 s = esc + "[A";
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_Down:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	120 s = esc + "[B";
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_Right:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	124 s = esc + "[C";
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_Left:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	128 s = esc + "[D";
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_Home:
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	132 s = esc + "[H";
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_End:
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	136 s = esc + "[F";
17248 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_Insert:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	140 s = esc + "[2~";
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_PageUp:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	144 s = esc + "[5~";
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
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	147 case Qt::Key_PageDown:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	148 s = esc + "[6~";
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	149 break;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	150
17360 afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	151 case Qt::Key_Escape:
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	152 s = esc;
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	153 break;
afc3d47f7704 Update windows GUI terminal handling John Donoghue <john.donoghue@ieee.org> parents: 17264 diff changeset	154
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	155 default:
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	156 break;
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 }
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	159
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	160 return s;
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	161 }
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	162
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	163 class QConsolePrivate
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	164 {
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	165 friend class QWinTerminalImpl;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	166
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	167 public:
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	168
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	169 enum KeyboardCursorType
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 BlockCursor,
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	172 UnderlineCursor,
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	173 IBeamCursor
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	174 };
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	175
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	176 QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd = QString ());
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	177 ~QConsolePrivate (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	178
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	179 void updateConsoleSize (bool sync = false);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	180 void syncConsoleParameters (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	181 void grabConsoleBuffer (CHAR_INFO* buf = 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	182 void updateScrollBar (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	183 void setScrollValue (int value);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	184 void updateConsoleView (bool grab = true);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	185 void monitorConsole (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	186 void startCommand (void);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	187 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	188 QRect cursorRect (void);
18555 2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	189 void selectAll();
18661 8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	190 void selectWord(const QPoint& cellPos);
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	191 void selectLine(const QPoint& cellPos);
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	192
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	193 void log (const char* fmt, ...);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	194
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	195 void closeStandardIO (int fd, DWORD stdHandleId, const char* name);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	196 void setupStandardIO (DWORD stdHandleId, int fd, const char* name,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	197 const char* devName);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	198
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	199 QPoint posToCell (const QPoint& pt);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	200 QString getSelection (void);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	201 void updateSelection (void);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	202 void clearSelection (void);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	203
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	204 QColor backgroundColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	205 QColor foregroundColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	206 QColor selectionColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	207 QColor cursorColor (void) const;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	208
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	209 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	210 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	211 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	212 void setCursorColor (bool useForegroundColor, const QColor& color);
18610 6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	213 void setScrollBufferSize (int value);
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	214
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	215 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	216 int cw, int ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	217
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	218 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	219 int cw, int ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	220
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	221 void drawCursor (QPainter& p);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	222
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	223 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	224 int cw, int ch);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	225
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	226 private:
15658 eaa7da75d202 Added QTerminalInteface class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15653 diff changeset	227 QWinTerminalImpl* q;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	228
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	229 private:
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	230 QFont m_font;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	231 QString m_command;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	232 QConsoleColors m_colors;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	233 bool m_inWheelEvent;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	234 QString m_title;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	235
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	236 QSize m_charSize;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	237 QSize m_bufferSize;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	238 QRect m_consoleRect;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	239 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	240 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	241 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	242 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	243 KeyboardCursorType m_cursorType;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	244
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	245 QPoint m_beginSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	246 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	247 bool m_settingSelection;
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	248
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	249 QColor m_selectionColor;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	250 QColor m_cursorColor;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	251
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	252 HANDLE m_stdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	253 HWND m_consoleWindow;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	254 CHAR_INFO* m_buffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	255 CHAR_INFO* m_tmpBuffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	256 HANDLE m_process;
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 QConsoleView* m_consoleView;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	259 QScrollBar* m_scrollBar;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	260 QTimer* m_consoleWatcher;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	261 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	262
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	263 // 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	264 static const int BLINK_DELAY = 500;
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	265 };
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	266
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	267 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	268 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	269 if (end.y () < begin.y ()
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	270 \|\| (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	271 qSwap (begin, end);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	272 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	273
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	274 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	275
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	276 QConsolePrivate::QConsolePrivate (QWinTerminalImpl* parent, const QString& cmd)
18626 6535cb2b8e23 libqterminal: Initialize m_cursorBlinking value (Bug #41814) John Donoghue <john.donoghue@ieee.org> parents: 18242 diff changeset	277 : q (parent), m_command (cmd), m_cursorBlinking (false),
6535cb2b8e23 libqterminal: Initialize m_cursorBlinking value (Bug #41814) John Donoghue <john.donoghue@ieee.org> parents: 18242 diff changeset	278 m_hasBlinkingCursor (true), m_cursorType (BlockCursor),
6535cb2b8e23 libqterminal: Initialize m_cursorBlinking value (Bug #41814) John Donoghue <john.donoghue@ieee.org> parents: 18242 diff changeset	279 m_beginSelection (0, 0), m_endSelection (0, 0), m_settingSelection (false),
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	280 m_process (NULL), m_inWheelEvent (false)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	281 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	282 log (NULL);
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 // Possibly detach from any existing console
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	285 log ("Detaching from existing console (if any)...\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	286 FreeConsole ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	287 log ("Closing standard IO...\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	288 closeStandardIO (0, STD_INPUT_HANDLE, "STDIN");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	289 closeStandardIO (1, STD_OUTPUT_HANDLE, "STDOUT");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	290 closeStandardIO (2, STD_ERROR_HANDLE, "STDERR");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	291
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	292 #ifdef HIDDEN_CONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	293 HWINSTA hOrigSta, hNewSta;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	294
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	295 // Create new (hidden) console
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	296 hOrigSta = GetProcessWindowStation ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	297 hNewSta = CreateWindowStation (NULL, 0, GENERIC_ALL, NULL);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	298 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	299 hNewSta);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	300 if (! SetProcessWindowStation (hNewSta))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	301 log ("Failed to switch to 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 if (! AllocConsole ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	304 log ("Failed to create new console.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	305 #ifdef HIDDEN_CONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	306 if (! SetProcessWindowStation (hOrigSta))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	307 log ("Failed to restore original Windows station.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	308 if (! CloseWindowStation (hNewSta))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	309 log ("Failed to close new Windows station.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	310 #endif
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 log ("New (hidden) console created.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	313
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	314 setupStandardIO (STD_INPUT_HANDLE, 0, "STDIN", "CONIN$");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	315 setupStandardIO (STD_OUTPUT_HANDLE, 1, "STDOUT", "CONOUT$");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	316 setupStandardIO (STD_ERROR_HANDLE, 2, "STDERR", "CONOUT$");
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 log ("Standard input/output/error set up.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	319
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	320 stdin = (fdopen (0, "rb"));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	321 stdout = (fdopen (1, "wb"));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	322 stderr = (fdopen (2, "wb"));
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 log ("POSIX standard streams created.\n");
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 setvbuf (stdin, NULL, _IONBF, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	327 setvbuf (stdout, NULL, _IONBF, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	328 setvbuf (stderr, NULL, _IONBF, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	329
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	330 log ("POSIX standard stream buffers adjusted.\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	331
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	332 HANDLE hStdOut = GetStdHandle (STD_OUTPUT_HANDLE);
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 log ("Console allocated: hStdOut: %p\n", hStdOut);
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 m_stdOut = hStdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	337 m_consoleWindow = GetConsoleWindow ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	338
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	339 // In case the console window hasn't been created hidden...
17972 afeb233ea443 [Win32] Keep console shown when HIDDEN_CONSOLE is not defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 17920 diff changeset	340 #ifdef HIDDEN_CONSOLE
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	341 ShowWindow (m_consoleWindow, SW_HIDE);
17972 afeb233ea443 [Win32] Keep console shown when HIDDEN_CONSOLE is not defined. Michael Goffioul <michael.goffioul@gmail.com> parents: 17920 diff changeset	342 #endif
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	343
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	344 CONSOLE_SCREEN_BUFFER_INFO sbi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	345
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	346 GetConsoleScreenBufferInfo (hStdOut, &sbi);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	347 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	348 m_consoleRect = QRect (sbi.srWindow.Left, sbi.srWindow.Top,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	349 sbi.srWindow.Right - sbi.srWindow.Left + 1,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	350 sbi.srWindow.Bottom - sbi.srWindow.Top + 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	351 m_cursorPos = QPoint (sbi.dwCursorPosition.X, sbi.dwCursorPosition.Y);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	352
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	353 log ("Initial console parameters:\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	354 log (" buffer size: %d x %d\n", m_bufferSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	355 m_bufferSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	356 log (" window: (%d, %d) -> (%d, %d) [%d x %d]\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	357 m_consoleRect.left (), m_consoleRect.top (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	358 m_consoleRect.right (), m_consoleRect.bottom (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	359 m_consoleRect.width (), m_consoleRect.height ());
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 wchar_t titleBuf[260];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	362 GetConsoleTitleW (titleBuf, sizeof (titleBuf));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	363 q->setWindowTitle (QString::fromWCharArray (titleBuf));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	364
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	365 m_font.setFamily ("Lucida Console");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	366 m_font.setPointSize (9);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	367 m_font.setStyleHint (QFont::TypeWriter);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	368
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	369 m_buffer = m_tmpBuffer = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	370
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	371 m_consoleView = new QConsoleView (parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	372 m_scrollBar = new QScrollBar (Qt::Vertical, parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	373
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	374 QHBoxLayout* l = new QHBoxLayout (parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	375 l->setContentsMargins (0, 0, 0, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	376 l->setSpacing (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	377 l->addWidget (m_consoleView, 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	378 l->addWidget (m_scrollBar, 0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	379
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	380 // 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	381 // 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	382 // 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	383 // setForegroundColor, backgroundColor, and SetBackgroundColor
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	384 // functions.
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	385
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	386 SetConsoleTextAttribute (m_stdOut, 0xF0);
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	387
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	388 // Defaults.
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	389 setBackgroundColor (Qt::white);
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	390 setForegroundColor (Qt::black);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	391 setSelectionColor (Qt::lightGray);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	392 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	393
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	394 // 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	395 QPalette palette (backgroundColor ());
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	396 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	397
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	398 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	399
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	400 m_consoleView->setFont (m_font);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	401 parent->setFocusPolicy (Qt::StrongFocus);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	402 parent->winId ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	403
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	404 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	405
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	406 m_consoleWatcher = new QTimer (parent);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	407 m_consoleWatcher->setInterval (10);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	408 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	409
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	410 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	411 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	412 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	413
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	414 QObject::connect (m_scrollBar, SIGNAL (valueChanged (int)),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	415 q, SLOT (scrollValueChanged (int)));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	416 QObject::connect (m_consoleWatcher, SIGNAL (timeout (void)),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	417 q, SLOT (monitorConsole (void)));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	418
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	419 m_consoleWatcher->start ();
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 if (m_command.isEmpty ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	422 m_consoleThread = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	423 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	424 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	425 m_consoleThread = new QConsoleThread (q);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	426 QObject::connect (m_consoleThread, SIGNAL (finished (void)),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	427 q, SIGNAL (terminated (void)));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	428 m_consoleThread->start ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	429 }
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	432 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	433
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	434 QConsolePrivate::~QConsolePrivate (void)
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 if (m_consoleThread && m_consoleThread->isRunning () && m_process)
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 TerminateProcess (m_process, (UINT)-1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	439 m_consoleThread->wait ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	440 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	441 if (m_buffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	442 delete [] m_buffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	443 if (m_tmpBuffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	444 delete [] m_tmpBuffer;
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
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	449 void QConsolePrivate::setupStandardIO (DWORD stdHandleId, int targetFd,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	450 const char* name, const char* devName)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	451 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	452 log ("Opening %s...\n", devName);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	453
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	454 int fd = open (devName, _O_RDWR \| _O_BINARY);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	455
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	456 if (fd != -1)
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 if (fd != targetFd)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	459 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	460 log ("Opened %s is not at target file descriptor %d, "
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	461 "duplicating...\n", name, targetFd);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	462 if (dup2 (fd, targetFd) == -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	463 log ("Failed to duplicate file descriptor: errno=%d.\n", errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	464 if (close (fd) == -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	465 log ("Failed to close original file descriptor: errno=%d.\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	466 errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	467 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	468 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	469 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	470 if (! SetStdHandle (stdHandleId, (HANDLE) _get_osfhandle (targetFd)))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	471 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	472 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	473 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	474 log ("Failed to open %s: errno=%d.\n", devName, errno);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	475 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	476
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	477 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	478 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	479 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	480 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	481 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	482
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	483 QString QConsolePrivate::getSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	484 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	485 QString selection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	486
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	487 QPoint begin = m_beginSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	488 QPoint end = m_endSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	489
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	490 maybeSwapPoints (begin, end);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	491
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	492 if (begin != end)
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	493 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	494 CHAR_INFO* buf;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	495 COORD bufSize, bufCoord;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	496 SMALL_RECT bufRect;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	497 int nr;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	498
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	499 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	500 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	501 bufSize.X = m_bufferSize.width ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	502 bufSize.Y = nr;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	503 bufCoord.X = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	504 bufCoord.Y = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	505
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	506 bufRect.Left = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	507 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	508 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	509 bufRect.Bottom = end.y ();
16612 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 (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	512 {
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	513 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	514 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	515 int lastNonSpace = -1;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	516
16628 a66c285729a6 use swapped points when getting selection text in Windows terminal John W. Eaton <jwe@octave.org> parents: 16620 diff changeset	517 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	518 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	519 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	520 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	521 if (lastNonSpace >= 0)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	522 selection.truncate (lastNonSpace);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	523 selection.append ('\n');
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	524 lastNonSpace = selection.length ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	525 }
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 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	528
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	529 selection.append (c);
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	530 if (! c.isSpace ())
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	531 lastNonSpace = selection.length ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	532 }
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 if (lastNonSpace >= 0)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	535 selection.truncate (lastNonSpace);
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 }
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 return selection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	540 }
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 void QConsolePrivate::updateSelection (void)
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 QPoint begin = m_beginSelection;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	545 QPoint end = m_endSelection;
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 maybeSwapPoints (begin, end);
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 begin.rx () = 0;
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	550 end.rx () = m_consoleRect.width ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	551
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	552 m_consoleView->update ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	553 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	554
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	555 void QConsolePrivate::clearSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	556 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	557 m_beginSelection = m_endSelection = QPoint ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	558
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	559 m_consoleView->update ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	560 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 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::backgroundColor (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_colors[15];
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::foregroundColor (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_colors[0];
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	570 }
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	571
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	572 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	573 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	574 return m_selectionColor;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	575 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	576
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	577 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	578 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	579 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	580 }
16618 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::setBackgroundColor (const QColor& color)
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	583 {
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	584 m_colors[15] = color;
18271 8449cc186059 Set terminal palette background color (Bug #41206) John Donoghue <john.donoghue@ieee.org> parents: 18242 diff changeset	585
8449cc186059 Set terminal palette background color (Bug #41206) John Donoghue <john.donoghue@ieee.org> parents: 18242 diff changeset	586 QPalette palette (color);
8449cc186059 Set terminal palette background color (Bug #41206) John Donoghue <john.donoghue@ieee.org> parents: 18242 diff changeset	587 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	588 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	589
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	590 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	591 {
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	592 m_colors[0] = color;
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	593 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	594
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	595 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	596 {
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	597 m_selectionColor = color;
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	598 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	599
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	600 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	601 const QColor& color)
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	602 {
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	603 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	604 }
13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	605
18610 6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	606 void QConsolePrivate::setScrollBufferSize (int value)
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	607 {
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	608 // FIXME: not tested code follows
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	609 // CONSOLE_SCREEN_BUFFER_INFO sbi;
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	610 // GetConsoleScreenBufferInfo (m_stdOut, &sbi);
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	611 // m_bufferSize = QSize (sbi.dwSize.X, qMax (sbi.dwSize.Y, (SHORT)value));
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	612 }
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	613
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	614 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	615 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	616 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	617 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	618
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	619 int ascent = p.fontMetrics ().ascent ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	620 int stride = m_consoleRect.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	621 int y = ascent + cy1 * ch;;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	622
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	623 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	624 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	625 int len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	626 bool hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	627 int x = cx1 * cw;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	628 WORD attr = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	629
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	630 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	631 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	632 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	633
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	634 if ((ci->Attributes & 0x00ff) != attr)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	635 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	636 // Character attributes changed
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	637 if (len != 0)
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 // String buffer not empty -> draw it
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	640 if (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 if (attr & 0x00f0)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	643 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	644 }
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 x += (len * cw);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	647 len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	648 hasChar = false;
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 // 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	651 attr = (ci->Attributes & 0x00ff);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	652 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	653 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	654
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	655 // 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	656 len++;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	657 if (ci->Char.UnicodeChar != L' ')
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	658 hasChar = true;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	659 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	660
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	661 if (len != 0 && (hasChar \|\| (attr & 0x00f0)))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	662 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	663 // 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	664 // 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	665 // for-loop iteration
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 if (attr & 0x00f0)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	668 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	669 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	670 }
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 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	673 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	674
18555 2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	675 void QConsolePrivate::selectAll()
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	676 {
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	677 m_beginSelection = QPoint (0,0);
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	678 m_endSelection = QPoint(m_bufferSize.width (),
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	679 m_cursorPos.y());
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	680 updateSelection();
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	681 }
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	682
18661 8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	683 void QConsolePrivate::selectWord (const QPoint & cellpos)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	684 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	685 QPoint begin = cellpos;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	686 QPoint end = cellpos;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	687
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	688 int scrollOffset = m_consoleRect.top ();
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	689 int stride = m_consoleRect.width ();
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	690
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	691 // get begin, end in buffer offsets
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	692 begin.ry () -= scrollOffset;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	693 end.ry () -= scrollOffset;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	694
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	695 // loog at current clicked on char to determinate ig getting space chunk or nonspace chunk
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	696 if (QChar(m_buffer[begin.y ()*stride + begin.x ()].Char.UnicodeChar).isSpace () == false)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	697 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	698 // from current char, go back and fwd to find start and end of block
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	699 while(begin.x () > 0 &&
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	700 QChar(m_buffer[begin.y ()*stride + begin.x () -1].Char.UnicodeChar).isSpace() == false)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	701 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	702 begin.rx () --;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	703 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	704
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	705 while(end.x () < m_consoleRect.width () &&
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	706 QChar(m_buffer[end.y ()*stride + end.x () +1].Char.UnicodeChar).isSpace() == false)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	707 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	708 end.rx () ++;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	709 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	710 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	711 else
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	712 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	713 while(begin.x () > 0 &&
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	714 QChar(m_buffer[begin.y ()*stride + begin.x () -1].Char.UnicodeChar).isSpace())
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	715 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	716 begin.rx () --;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	717 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	718
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	719 while(end.x () < m_consoleRect.width () &&
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	720 QChar(m_buffer[end.y ()*stride + end.x () +1].Char.UnicodeChar).isSpace ())
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	721 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	722 end.rx () ++;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	723 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	724 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	725
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	726 // convert console offsets to absolute cell positions
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	727 begin.ry () += scrollOffset;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	728 end.ry () += scrollOffset;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	729
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	730 m_beginSelection = begin;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	731 m_endSelection = end;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	732
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	733 updateSelection ();
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	734 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	735
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	736 void QConsolePrivate::selectLine (const QPoint & cellpos)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	737 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	738 m_beginSelection = QPoint (0, cellpos.y ());
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	739 m_endSelection = QPoint (m_bufferSize.width ()-1, cellpos.y ());
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	740 updateSelection ();
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	741 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	742
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	743
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	744 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	745 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	746 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	747 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	748
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	749 QPoint begin = m_beginSelection;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	750 QPoint end = m_endSelection;
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 bool haveSelection = (begin != end);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	753
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	754 if (haveSelection)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	755 maybeSwapPoints (begin, end);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	756
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	757 int scrollOffset = m_consoleRect.top ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	758
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	759 begin.ry () -= scrollOffset;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	760 end.ry () -= scrollOffset;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	761
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	762 int ascent = p.fontMetrics ().ascent ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	763 int stride = m_consoleRect.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	764
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	765 int y = ascent + cy1 * ch;;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	766 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	767 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	768 int charsThisLine = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	769 int len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	770 bool hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	771 WORD attr = 0;
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 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	774 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	775 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	776
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	777 if ((ci->Attributes & 0x00ff) != attr)
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 // Character attributes changed
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	780 if (len != 0)
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 charsThisLine += len;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	783 len = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	784 hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	785 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	786
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	787 // Store current attributes
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	788 attr = (ci->Attributes & 0x00ff);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	789 }
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 // 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	792 len++;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	793 if (ci->Char.UnicodeChar != L' ')
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	794 hasChar = true;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	795 }
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 if (len != 0 && (hasChar \|\| (attr & 0x00f0)))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	798 charsThisLine += len;
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 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	801 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	802 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	803
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	804 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	805 ? end.x () - selectionBegin + 1
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	806 : stride - selectionBegin);
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 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	809 selectionColor ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	810 }
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 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	814 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	815
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	816 void QConsolePrivate::drawCursor (QPainter& p)
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 if (! m_cursorBlinking)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	819 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	820 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	821
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	822 QRect rect = cursorRect ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	823 QColor color = cursorColor ();
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.setPen (color);
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 if (m_cursorType == QConsolePrivate::BlockCursor)
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 if (q->hasFocus ())
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	830 p.fillRect (rect, color);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	831 else
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	832 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	833 // 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	834 // it is draw entirely inside 'rect'
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	835
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	836 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	837
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	838 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	839 - penWidth/2 - penWidth%2,
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	840 - penWidth/2 - penWidth%2));
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	841 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	842 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	843 else if (m_cursorType == QConsolePrivate::UnderlineCursor)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	844 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	845 p.drawLine (rect.left (), rect.bottom (),
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	846 rect.right (), rect.bottom ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	847 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	848 else if (m_cursorType == QConsolePrivate::IBeamCursor)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	849 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	850 p.drawLine (rect.left (), rect.top (),
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	851 rect.left (), rect.bottom ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	852 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	853
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	854 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	855 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	856 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	857
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	858 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	859 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	860 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	861 p.save ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	862
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	863 p.setFont (m_font);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	864 p.setPen (foregroundColor ());
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	865
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	866 QString s;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	867 s.reserve (cx2 - cx1 + 1);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	868
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	869 int ascent = p.fontMetrics ().ascent ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	870 int stride = m_consoleRect.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	871
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	872 int y = ascent + cy1 * ch;;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	873 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	874 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	875 // 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	876 s.clear ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	877 bool hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	878 int x = cx1 * cw;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	879 WORD attr = 0;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	880
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	881 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	882 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	883 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	884
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	885 if ((ci->Attributes & 0x00ff) != attr)
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	886 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	887 // Character attributes changed
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	888 if (! s.isEmpty ())
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	889 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	890 // String buffer not empty -> draw it
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	891 if (hasChar \|\| (attr & 0x00f0))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	892 p.drawText (x, y, s);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	893
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	894 x += (s.length () * cw);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	895 s.clear ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	896 hasChar = false;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	897 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	898 // 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	899 attr = (ci->Attributes & 0x00ff);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	900 p.setPen (m_colors[attr & 0x000f]);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	901 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	902
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	903 // 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	904 s.append (ci->Char.UnicodeChar);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	905 if (ci->Char.UnicodeChar != L' ')
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	906 hasChar = true;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	907 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	908
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	909 if (! s.isEmpty () && (hasChar \|\| (attr & 0x00f0)))
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	910 {
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	911 // 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	912 // 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	913 // for-loop iteration
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	914
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	915 p.drawText (x, y, s);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	916 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	917 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	918
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	919 p.restore ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	920 }
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	921
16618 13728d41fb6a use functions to handle colors in Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16617 diff changeset	922 /////////////////////////////////////////////////////////////////////////////
15651 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 void QConsolePrivate::closeStandardIO (int fd, DWORD stdHandleId,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	925 const char* name)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	926 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	927 if (close (fd) == -1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	928 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	929 if (! CloseHandle (GetStdHandle (stdHandleId)))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	930 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	931 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	932
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 void QConsolePrivate::log (const char* fmt, ...)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	936 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	937 #ifdef DEBUG_QCONSOLE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	938 if (fmt)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	939 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	940 va_list l;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	941 FILE* flog = fopen (LOGFILENAME, "ab");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	942
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	943 va_start (l, fmt);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	944 vfprintf (flog, fmt, l);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	945 va_end (l);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	946 fclose (flog);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	947 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	948 else
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 // Special case to re-initialize the log file
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	951 FILE* flog = fopen (LOGFILENAME, "w");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	952 fclose (flog);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	953 }
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	954 #else
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	955 Q_UNUSED (fmt);
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	956 #endif
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	957 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	958
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	961 void QConsolePrivate::updateConsoleSize (bool sync)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	962 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	963 QFontMetrics fm (m_font);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	964 QSize winSize = m_consoleView->size ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	965
16617 3a17dd5964e3 use average width for character size in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16612 diff changeset	966 m_charSize.rwidth () = fm.averageCharWidth ();
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	967 m_charSize.rheight () = fm.lineSpacing ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	968
16617 3a17dd5964e3 use average width for character size in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16612 diff changeset	969 m_consoleRect.setWidth (winSize.width () / fm.averageCharWidth ());
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	970 m_consoleRect.setHeight (winSize.height () / fm.lineSpacing ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	971
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	972 m_bufferSize.rwidth () = m_consoleRect.width ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	973 m_bufferSize.rheight () = qMax (m_bufferSize.height (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	974 m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	975
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	976 m_consoleRect.moveLeft (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	977 if (m_consoleRect.bottom () >= m_bufferSize.height ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	978 m_consoleRect.moveTop (m_bufferSize.height () - m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	979
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	980 log ("Console resized:\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	981 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	982 log (" buffer size: %d x %d\n", m_bufferSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	983 m_bufferSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	984 log (" window: (%d, %d) -> (%d, %d) [%d x %d]\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	985 m_consoleRect.left (), m_consoleRect.top (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	986 m_consoleRect.right (), m_consoleRect.bottom (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	987 m_consoleRect.width (), m_consoleRect.height ());
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 if (sync)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	990 syncConsoleParameters ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	991
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	992 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	993 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	994
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	995 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	996
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	997 void QConsolePrivate::syncConsoleParameters (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	998 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	999 CONSOLE_SCREEN_BUFFER_INFO sbi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1000 HANDLE hStdOut = m_stdOut;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1001
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1002 GetConsoleScreenBufferInfo (hStdOut, &sbi);
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 COORD bs;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1005 SMALL_RECT sr;
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 bs.X = sbi.dwSize.X;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1008 bs.Y = m_bufferSize.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1009 sr.Left = sbi.srWindow.Left;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1010 sr.Right = sbi.srWindow.Right;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1011 sr.Top = m_consoleRect.top ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1012 sr.Bottom = m_consoleRect.bottom ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1013
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1014 if (bs.Y > sbi.dwSize.Y)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1015 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1016 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1017 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1018 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1019 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1020 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1021 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1022 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1023 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1024
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1025 bs.X = m_bufferSize.width ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1026 sr.Left = m_consoleRect.left ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1027 sr.Right = m_consoleRect.right ();
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 if (bs.X > sbi.dwSize.X)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1030 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1031 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1032 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
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 else
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 SetConsoleWindowInfo (hStdOut, TRUE, &sr);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1037 SetConsoleScreenBufferSize (hStdOut, bs);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1038 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1039
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1040 log ("Sync'ing console parameters:\n");
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1041 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	1042 log (" window: (%d, %d) -> (%d, %d)\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1043 sr.Left, sr.Top, sr.Right, sr.Bottom);
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 if (m_buffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1046 delete [] m_buffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1047 if (m_tmpBuffer)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1048 delete [] m_tmpBuffer;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1049
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1050 int bufSize = m_consoleRect.width () * m_consoleRect.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1051
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1052 m_buffer = new CHAR_INFO[bufSize];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1053 m_tmpBuffer = new CHAR_INFO[bufSize];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1054 }
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 //////////////////////////////////////////////////////////////////////////////
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 void QConsolePrivate::grabConsoleBuffer (CHAR_INFO* buf)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1059 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1060 COORD bs, bc;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1061 SMALL_RECT r;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1062
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1063 bs.X = m_consoleRect.width ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1064 bs.Y = m_consoleRect.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1065 bc.X = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1066 bc.Y = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1067
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1068 r.Left = m_consoleRect.left ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1069 r.Top = m_consoleRect.top ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1070 r.Right = m_consoleRect.right ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1071 r.Bottom = m_consoleRect.bottom ();
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 (! ReadConsoleOutput (m_stdOut, (buf ? buf : m_buffer), bs, bc, &r))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1074 qCritical ("cannot read console output");
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1077 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1078
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1079 void QConsolePrivate::updateScrollBar (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1080 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1081 m_scrollBar->setMinimum (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1082 if (m_bufferSize.height () > m_consoleRect.height ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1083 m_scrollBar->setMaximum (m_bufferSize.height () - m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1084 else
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1085 m_scrollBar->setMaximum (0);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1086 m_scrollBar->setSingleStep (1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1087 m_scrollBar->setPageStep (m_consoleRect.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1088 m_scrollBar->setValue (m_consoleRect.top ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1089
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1090 log ("Scrollbar parameters updated: %d/%d/%d/%d\n",
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1091 m_scrollBar->minimum (), m_scrollBar->maximum (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1092 m_scrollBar->singleStep (), m_scrollBar->pageStep ());
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1095 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1096
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1097 void QConsolePrivate::setScrollValue (int value)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1098 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1099 if (value == m_consoleRect.top ())
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 SMALL_RECT r;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1103 HANDLE hStdOut = m_stdOut;
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 if (value + m_consoleRect.height () > m_bufferSize.height ())
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1106 value = m_bufferSize.height () - m_consoleRect.height ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1107
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1108 r.Left = m_consoleRect.left ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1109 r.Top = value;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1110 r.Right = m_consoleRect.right ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1111 r.Bottom = value + m_consoleRect.height () - 1;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1112
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1113 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	1114 r.Left, r.Top, r.Right, r.Bottom,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1115 r.Right - r.Left + 1, r.Bottom - r.Top + 1);
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 if (SetConsoleWindowInfo (hStdOut, TRUE, &r))
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 m_consoleRect.moveTop (value);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1120 updateConsoleView ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1121 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1122 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1123
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1124 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1125
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1126 void QConsolePrivate::updateConsoleView (bool grab)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1127 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1128 if (grab)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1129 grabConsoleBuffer ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1130 m_consoleView->update ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1131 m_consoleWatcher->start ();
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1134 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1135
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1136 void QConsolePrivate::monitorConsole (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1137 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1138 CONSOLE_SCREEN_BUFFER_INFO sbi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1139 HANDLE hStdOut = GetStdHandle (STD_OUTPUT_HANDLE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1140
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1141 static wchar_t titleBuf[260];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1142
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1143 GetConsoleTitleW (titleBuf, sizeof (titleBuf));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1144 QString title = QString::fromWCharArray (titleBuf);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1145
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1146 if (title != m_title)
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 q->setWindowTitle (title);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1149 emit q->titleChanged (title);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1150 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1151
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1152 if (GetConsoleScreenBufferInfo (hStdOut, &sbi))
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 if (m_bufferSize.width () != sbi.dwSize.X
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1155 \|\| m_bufferSize.height () != sbi.dwSize.Y)
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 // Buffer size changed
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1158 m_bufferSize.rwidth () = sbi.dwSize.X;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1159 m_bufferSize.rheight () = sbi.dwSize.Y;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1160 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1161 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1162
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1163 if (m_cursorPos.x () != sbi.dwCursorPosition.X
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1164 \|\| m_cursorPos.y () != sbi.dwCursorPosition.Y)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1165 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1166 // Cursor position changed
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1167 m_consoleView->update
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1168 ((m_cursorPos.x () - sbi.srWindow.Left) * m_charSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1169 (m_cursorPos.y () - sbi.srWindow.Top) * m_charSize.height (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1170 m_charSize.width (), m_charSize.height ());
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1171 m_cursorPos.rx () = sbi.dwCursorPosition.X;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1172 m_cursorPos.ry () = sbi.dwCursorPosition.Y;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1173 m_consoleView->update
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1174 ((m_cursorPos.x () - sbi.srWindow.Left) * m_charSize.width (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1175 (m_cursorPos.y () - sbi.srWindow.Top) * m_charSize.height (),
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1176 m_charSize.width (), m_charSize.height ());
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1179 if (m_consoleRect.left () != sbi.srWindow.Left
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1180 \|\| m_consoleRect.right () != sbi.srWindow.Right
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1181 \|\| m_consoleRect.top () != sbi.srWindow.Top
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1182 \|\| m_consoleRect.bottom () != sbi.srWindow.Bottom)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1183 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1184 // Console window changed
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1185 m_consoleRect = QRect (sbi.srWindow.Left, sbi.srWindow.Top,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1186 sbi.srWindow.Right - sbi.srWindow.Left + 1,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1187 sbi.srWindow.Bottom - sbi.srWindow.Top + 1);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1188 updateScrollBar ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1189 updateConsoleView ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1190 return;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1191 }
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 if (m_tmpBuffer && m_buffer)
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 grabConsoleBuffer (m_tmpBuffer);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1196 if (memcmp (m_tmpBuffer, m_buffer,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1197 sizeof (CHAR_INFO) * m_consoleRect.width () *
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1198 m_consoleRect.height ()))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1199 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1200 // FIXME: compute the area to update based on the
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1201 // difference between the 2 buffers.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1202 qSwap (m_buffer, m_tmpBuffer);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1203 updateConsoleView (false);
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 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1207 }
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 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1210
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1211 void QConsolePrivate::startCommand (void)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1212 {
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1213 QString cmd = m_command;
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1214
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1215 if (cmd.isEmpty ())
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1216 cmd = qgetenv ("COMSPEC").constData ();
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1217
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1218 if (! cmd.isEmpty ())
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1219 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1220 STARTUPINFO si;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1221 PROCESS_INFORMATION pi;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1222
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1223 ZeroMemory (&si, sizeof (si));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1224 si.cb = sizeof (si);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1225 ZeroMemory (&pi, sizeof (pi));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1226
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1227 if (CreateProcessW (NULL,
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1228 (LPWSTR)cmd.unicode (),
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1229 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1230 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1231 TRUE,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1232 0,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1233 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1234 NULL,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1235 &si,
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1236 &pi))
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 CloseHandle (pi.hThread);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1239 m_process = pi.hProcess;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1240 WaitForSingleObject (m_process, INFINITE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1241 CloseHandle (m_process);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1242 m_process = NULL;
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
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1247 //////////////////////////////////////////////////////////////////////////////
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 void QConsolePrivate::sendConsoleText (const QString& s)
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 // 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	1252 // translated into an equivalent keypress event.
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1253
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1254 #define TEXT_CHUNK_SIZE 512
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1255
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	1256 // 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	1257 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	1258
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1259 int len = s.length ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1260 INPUT_RECORD events[TEXT_CHUNK_SIZE];
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1261 DWORD nEvents = 0, written;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1262 HANDLE hStdIn = GetStdHandle (STD_INPUT_HANDLE);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1263
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1264 ZeroMemory (events, sizeof (events));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1265
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1266 for (int i = 0; i < len; i++)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1267 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1268 QChar c = s.at (i);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1269
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1270 if (c == L'\r' \|\| c == L'\n')
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1271 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1272 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	1273 i++;
18242 450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1274
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1275 // add new line
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1276 events[nEvents].EventType = KEY_EVENT;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1277 events[nEvents].Event.KeyEvent.bKeyDown = TRUE;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1278 events[nEvents].Event.KeyEvent.wRepeatCount = 1;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1279 events[nEvents].Event.KeyEvent.wVirtualKeyCode =
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1280 VK_RETURN;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1281 events[nEvents].Event.KeyEvent.wVirtualScanCode = 0;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1282 events[nEvents].Event.KeyEvent.uChar.UnicodeChar = c.unicode ();
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1283 events[nEvents].Event.KeyEvent.dwControlKeyState = 0;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1284 nEvents++;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1285
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1286 WriteConsoleInput (hStdIn, events, nEvents, &written);
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1287 nEvents = 0;
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1288 ZeroMemory (events, sizeof (events));
450f50d3eb18 GUI: Use WriteConsoleInput for sending terminal newline (Bug #41123) John Donoghue <john.donoghue@ieee.org> parents: 17972 diff changeset	1289
15651 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 else
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 events[nEvents].EventType = KEY_EVENT;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1294 events[nEvents].Event.KeyEvent.bKeyDown = TRUE;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1295 events[nEvents].Event.KeyEvent.wRepeatCount = 1;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1296 events[nEvents].Event.KeyEvent.wVirtualKeyCode =
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1297 LOBYTE (VkKeyScan (c.unicode ()));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1298 events[nEvents].Event.KeyEvent.wVirtualScanCode = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1299 events[nEvents].Event.KeyEvent.uChar.UnicodeChar = c.unicode ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1300 events[nEvents].Event.KeyEvent.dwControlKeyState = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1301 nEvents++;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1302 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1303
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1304 if (nEvents == TEXT_CHUNK_SIZE
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1305 \|\| (nEvents > 0 && i == (len - 1)))
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1306 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1307 WriteConsoleInput (hStdIn, events, nEvents, &written);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1308 nEvents = 0;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1309 ZeroMemory (events, sizeof (events));
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1310 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1311 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1312 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1313
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1314 QRect
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1315 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	1316 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1317 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	1318 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	1319
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1320 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	1321 (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	1322 cw, ch);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1323 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1324
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1325 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1326
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1327 QWinTerminalImpl::QWinTerminalImpl (QWidget* parent)
18661 8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1328 : QTerminal (parent), d (new QConsolePrivate (this)),
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1329 allowTripleClick (false)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1330 {
17264 aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1331 installEventFilter (this);
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1332
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1333 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	1334 parent, SLOT (set_global_shortcuts (bool)));
18655 41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1335
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1336 setAcceptDrops (true);
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1337 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1338
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1339 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1340
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1341 QWinTerminalImpl::QWinTerminalImpl (const QString& cmd, QWidget* parent)
16639 ba808cd9d86c simplify QTerminal inheritance scheme John W. Eaton <jwe@octave.org> parents: 16629 diff changeset	1342 : QTerminal (parent), d (new QConsolePrivate (this, cmd))
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1343 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1344 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1345
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1346 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1347
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1348 QWinTerminalImpl::~QWinTerminalImpl (void)
15651 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 delete d;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1351 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1352
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1353 void QWinTerminalImpl::mouseMoveEvent (QMouseEvent *event)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1354 {
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1355 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	1356 {
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1357 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	1358
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1359 updateSelection ();
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1360 }
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1361 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1362
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1363 void QWinTerminalImpl::mousePressEvent (QMouseEvent *event)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1364 {
18661 8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1365 if (allowTripleClick)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1366 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1367 mouseTripleClickEvent (event);
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1368 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1369 else 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	1370 {
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1371 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	1372
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1373 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	1374 }
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1375 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1376
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1377 void QWinTerminalImpl::mouseReleaseEvent (QMouseEvent *event)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1378 {
18661 8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1379 if (event->button () == Qt::LeftButton && d->m_settingSelection)
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1380 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1381 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	1382
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1383 updateSelection ();
16647 d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1384
d446e99f89f7 disallow setting selection with right mouse button in windows terminal John W. Eaton <jwe@octave.org> parents: 16639 diff changeset	1385 d->m_settingSelection = false;
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1386 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1387 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1388
18661 8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1389 void QWinTerminalImpl::mouseDoubleClickEvent (QMouseEvent *event)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1390 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1391 if (event->button () == Qt::LeftButton)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1392 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1393 // doubleclick - select word
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1394 d->m_settingSelection = false;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1395
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1396 d->selectWord (d->posToCell (event->pos ()));
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1397
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1398 allowTripleClick = true;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1399
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1400 QTimer::singleShot (QApplication::doubleClickInterval (),this,
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1401 SLOT (tripleClickTimeout ()));
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1402
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1403 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1404 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1405
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1406 void QWinTerminalImpl::mouseTripleClickEvent (QMouseEvent *event)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1407 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1408 if (event->button () == Qt::LeftButton)
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1409 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1410 d->selectLine (d->posToCell (event->pos ()));
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1411 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1412 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1413
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1414 void QWinTerminalImpl::tripleClickTimeout ()
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1415 {
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1416 allowTripleClick = false;
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1417 }
8b9e99c061f9 GUI: Windows GUI terminal support for double click (Bug #41468) John Donoghue <john.donoghue@ieee.org> parents: 18655 diff changeset	1418
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1419 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1420
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1421 void QWinTerminalImpl::viewResizeEvent (QConsoleView, QResizeEvent)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1422 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1423 d->updateConsoleSize (true);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1424 d->grabConsoleBuffer ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1425 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1426
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1427 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1428
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1429 void QWinTerminalImpl::viewPaintEvent (QConsoleView* w, QPaintEvent* event)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1430 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1431 QPainter p (w);
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1432
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1433 int cw = d->m_charSize.width ();
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1434 int ch = d->m_charSize.height ();
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1435
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1436 QRect updateRect = event->rect ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1437
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1438 int cx1 = updateRect.left () / cw;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1439 int cy1 = updateRect.top () / ch;
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1440 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	1441 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	1442
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1443 if (cx1 > d->m_consoleRect.width () - 1
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1444 \|\| cy1 > d->m_consoleRect.height () - 1)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1445 return;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1446
16619 db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1447 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	1448 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	1449 d->drawCursor (p);
db31d1e77d7b split drawing apart to avoid XOR operation John W. Eaton <jwe@octave.org> parents: 16618 diff changeset	1450 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	1451 }
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 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	1454 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1455 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	1456 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	1457 else
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1458 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	1459
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_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	1461 }
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 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	1464 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1465 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	1466
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1467 setBlinkingCursorState (blink);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1468 }
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 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	1471 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1472 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	1473 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	1474
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1475 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	1476 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1477 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	1478
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1479 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	1480 blinkCursorEvent ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1481 }
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1482 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1483
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1484 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1485
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1486 void QWinTerminalImpl::wheelEvent (QWheelEvent* event)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1487 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1488 if (! d->m_inWheelEvent)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1489 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1490 // Forward to the scrollbar (avoid recursion)
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1491 d->m_inWheelEvent = true;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1492 QApplication::sendEvent (d->m_scrollBar, event);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1493 d->m_inWheelEvent = false;
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1494 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1495 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1496
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1497 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1498
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1499 void QWinTerminalImpl::scrollValueChanged (int value)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1500 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1501 d->setScrollValue (value);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1502 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1503
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1504 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1505
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1506 void QWinTerminalImpl::monitorConsole (void)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1507 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1508 d->monitorConsole ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1509 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1510
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1511 void QWinTerminalImpl::updateSelection (void)
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1512 {
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1513 d->updateSelection ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1514 }
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1515
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1516 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1517
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1518 void QWinTerminalImpl::focusInEvent (QFocusEvent* event)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1519 {
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1520 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	1521
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1522 setBlinkingCursorState (true);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1523
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1524 QWidget::focusInEvent (event);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1525 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1526
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1527 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	1528 {
16970 78116b88dbf5 enable readline key bindings in terminal widget of gui (bug #36986) Torsten <ttl@justmail.de> parents: 16881 diff changeset	1529 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	1530
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1531 // 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	1532 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	1533
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1534 setBlinkingCursorState (false);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1535
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1536 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	1537 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1538
17264 aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1539 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	1540 {
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1541 // 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	1542 // 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	1543 if (event->type () == QEvent::KeyPress)
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1544 {
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1545 QKeyEvent* k = static_cast<QKeyEvent*>(event);
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1546 if (k->key () == Qt::Key_Tab)
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1547 {
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1548 sendText ("\t");
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1549 return true;
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1550 }
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1551 }
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1552 return false;
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1553 }
aa09b746fa16 Windows GUI: Reimplement tabbing in terminal window John Donoghue <john.donoghue@ieee.org> parents: 17262 diff changeset	1554
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1555 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	1556 {
17248 0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1557 QString s = translateKey (event);
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1558 if (!s.isEmpty ())
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1559 sendText (s);
0b2a0acd0315 Use keyPressEvent instead of winEvent for keyboard input John Donoghue <john.donoghue@ieee.org> parents: 17224 diff changeset	1560
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1561 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	1562 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1563 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	1564
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1565 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	1566 blinkCursorEvent ();
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1567 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1568
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1569 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	1570 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1571
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1572 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1573
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1574 void QWinTerminalImpl::start (void)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1575 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1576 d->startCommand ();
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1577 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1578
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1579 //////////////////////////////////////////////////////////////////////////////
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1580
15660 a6df0e2a082a Corrections for windows code. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15658 diff changeset	1581 void QWinTerminalImpl::sendText (const QString& s)
15651 845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1582 {
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1583 d->sendConsoleText (s);
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1584 }
845cebf281aa Added files of QConsole. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	1585
16608 739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1586 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	1587 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1588 switch (type)
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1589 {
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1590 case UnderlineCursor:
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1591 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	1592 break;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1593
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1594 case BlockCursor:
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1595 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	1596 break;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1597
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1598 case IBeamCursor:
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1599 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	1600 break;
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1601 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1602
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1603 setBlinkingCursor (blinking);
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1604 }
739d7eb97b85 make blinking cursor and different cursor styles for Windows GUI terminal John W. Eaton <jwe@octave.org> parents: 16513 diff changeset	1605
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1606 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	1607 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1608 d->setBackgroundColor (color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1609 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1610
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1611 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	1612 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1613 d->setForegroundColor (color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1614 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1615
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1616 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	1617 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1618 d->setSelectionColor (color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1619 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1620
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1621 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	1622 const QColor& color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1623 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1624 d->setCursorColor (useForegroundColor, color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1625 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16619 diff changeset	1626
18610 6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1627 void QWinTerminalImpl::setScrollBufferSize(int value)
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1628 {
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1629 // FIXME: not tested code follows
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1630 // d->setScrollBufferSize (value);
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1631 }
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1632
6e81b59d657c Add preference for terminal windows buffer size (bug #41474) Ahsan Ali Shahid <ahsan.ali.shahid@gmail.com> parents: 18555 diff changeset	1633
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1634 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1635
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1636 void QWinTerminalImpl::setTerminalFont (const QFont& f)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1637 {
15666 20299b92a64e Added patch that allows for changing the terminal font. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15665 diff changeset	1638 d->m_font = f;
20299b92a64e Added patch that allows for changing the terminal font. Jacob Dawid <jacob.dawid@googlemail.com> parents: 15665 diff changeset	1639 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	1640 d->updateConsoleSize (true);
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1641 }
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1642
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1643 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1644
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1645 void QWinTerminalImpl::setSize (int columns, int lines)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1646 {
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1647 Q_UNUSED (columns);
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1648 Q_UNUSED (lines);
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1649 }
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1650
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1651 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1652
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1653 void QWinTerminalImpl::copyClipboard (void)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1654 {
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16794 diff changeset	1655 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	1656
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1657 QClipboard *clipboard = QApplication::clipboard ();
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1658
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1659 QString selection = d->getSelection ();
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1660
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1661 if (selection.isEmpty ())
17920 5c3f22dd0bbb raise SIGINT in octave_interpreter instead of in QTerminal John W. Eaton <jwe@octave.org> parents: 17795 diff changeset	1662 terminal_interrupt ();
16648 b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1663 else
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1664 {
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1665 clipboard->setText (selection);
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1666
b04413e5a811 improve handling of interrupts, copy and paste shortcuts John W. Eaton <jwe@octave.org> parents: 16647 diff changeset	1667 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	1668 }
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1669 }
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1670
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1671 //////////////////////////////////////////////////////////////////////////////
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1672
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1673 void QWinTerminalImpl::pasteClipboard (void)
5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1674 {
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16794 diff changeset	1675 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	1676
16612 dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1677 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	1678
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1679 if (! text.isEmpty ())
dae674adf045 handle text selection in GUI terminal for Windows John W. Eaton <jwe@octave.org> parents: 16608 diff changeset	1680 sendText (text);
15662 5758e0013246 Enable compilation on Win32-native platform. Michael Goffioul <michael.goffioul@gmail.com> parents: 15660 diff changeset	1681 }
16794 1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1682
18555 2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1683 //////////////////////////////////////////////////////////////////////////////
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1684
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1685 void QWinTerminalImpl::selectAll (void)
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1686 {
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1687 if(!hasFocus()) return;
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1688
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1689 d->selectAll();
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1690 }
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1691
2d5d0d86432e gui: Add select all menu (Bug #41797) John Donoghue <john.donoghue@ieee.org> parents: 18271 diff changeset	1692
16794 1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1693
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1694 //////////////////////////////////////////////////////////////////////////////
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1695
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1696 QString QWinTerminalImpl::selectedText ()
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1697 {
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1698 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	1699 return selection;
1d1f02e0f6b4 GUI: enable clipboard content detection for terminal window context menu John Donoghue <john.donoghue@ieee.org> parents: 16648 diff changeset	1700 }
18655 41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1701
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1702 //////////////////////////////////////////////////////////////////////////////
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1703
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1704 void QWinTerminalImpl::dragEnterEvent (QDragEnterEvent *event)
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1705 {
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1706 if (event->mimeData ()->hasUrls ())
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1707 {
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1708 event->acceptProposedAction();
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1709 }
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1710 }
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1711
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1712 //////////////////////////////////////////////////////////////////////////////
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1713
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1714 void QWinTerminalImpl::dropEvent (QDropEvent *event)
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1715 {
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1716 QString dropText;
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1717
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1718 if (event->mimeData ()->hasUrls ())
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1719 {
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1720 foreach (QUrl url, event->mimeData ()->urls ())
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1721 {
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1722 if(dropText.length () > 0)
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1723 dropText += "\n";
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1724 dropText += url.toLocalFile ();
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1725 }
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1726 sendText (dropText);
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1727 }
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1728 }
41489b96ebca GUI: allow drag and drop to win32 GUI command window (Bug #41443) John Donoghue <john.donoghue@ieee.org> parents: 18634 diff changeset	1729

Mercurial > octave-dspies

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 18661:8b9e99c061f9 gui-release