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

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 17920:5c3f22dd0bbb

raise SIGINT in octave_interpreter instead of in QTerminal * QTerminal.h (QTerminal::interrupt_signal): New signal. (QTerminal::terminal_interrupt): New slot. * QUnixTerminalImpl.cpp (QUnixTerminalImpl::initialize): Connect m_terminalView::interrupt_signal to QTerminal::terminal_interrupt. * TerminalView.h (TerminalView::interrupt_signal): New signal. * TerminalView.cpp (TerminalView::copyClipboard): Emit interrupt_signal instead of calling raising SIGINT signal. * terminal-dock-widget.h, terminal-dock-widget.cc (terminal_dock_widget::interrupt_signal): New signal. (terminal_dock_widget::terminal_interrupt): New slot. (terminal_dock_widget::terminal_dock_widget): Connect terminal::interrupt_signal to terminal_dock_widget::terminal_interrupt slot. (terminal_dock_widget::terminal_interrupt): New function. Emit terminal_dock_widget::interrupt_signal. * QWinTerminalImpl.cpp (QWinTerminalImpl::copyClipboard): Call terminal_interrupt instead of raising SIGINT signal. main-window.cc (main_window::construct_octave_qt_link): Connect command_window::interrupt_signal to _octave_qt_link::terminal_interrupt slot. * octave-qt-link.h, octave-qt-link.cc (octave_qt_link::terminal_interrupt): New slot. * octave-interpreter.h, octave_interpreter.cc (octave_interpreter::interrupt): New slot. Raise SIGINT here.

author	John W. Eaton <jwe@octave.org>
date	Tue, 12 Nov 2013 15:46:59 -0500
parents	0a8c35ae5ce1
children	afeb233ea443

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

Mercurial > octave

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 17920:5c3f22dd0bbb