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

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 16639:ba808cd9d86c

simplify QTerminal inheritance scheme * Qterminal.h, Qterminal.cc: Merge QTerminalInterface class into QTerminal. (QTerminal::create): New function. (QTerminal::Qterminal): Now protected. * QUnixTerminal.h, QUnixTerminal.cpp, QWinTerminal.h, QWinTerminal.cpp: Derive from QTerminal, not QTerminalInterface. * QTerminalInterface.h: Delete. * libgui/qterminal-module.mk: Update file lists. * terminal-dock-widget.cc (terminal_dock_widget::terminal_dock_widget): Use QTerminal::create to create terminal object.

author	John W. Eaton <jwe@octave.org>
date	Sun, 12 May 2013 15:23:14 -0400
parents	cbaf19edc4ee
children	d446e99f89f7

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

Mercurial > octave-nkf

annotate libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp @ 16639:ba808cd9d86c