octave-nkf: libgui/src/octave-gui.cc annotate

annotate libgui/src/octave-gui.cc @ 17922:b5bf26a054bd

interrupt interpreter thread in GUI instead of calling "raise (SIGINT)" * thread-manager.h, thread-manager.cc: New files. * libgui/src/module.mk: Update file lists. * octave-gui.cc (octave_start_gui): Block SIGINT at startup. * octave-interpreter.h, octave-interpreter.cc (octave_interpreter::thread_manager): New data member. (octave_interpreter::execute): Register current thread and unblock interrupt signal. (octave_interpreter::interrupt): Call thread_manager::interrupt instead of calling ::raising (SIGINT).

author	John W. Eaton <jwe@octave.org>
date	Tue, 12 Nov 2013 19:24:49 -0500
parents	f3e25230b1f3
children	345a8027dc8b

rev	line source
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	1 /*
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	2
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17737 diff changeset	3 Copyright (C) 2011-2013 Jacob Dawid
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	4
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	5 This file is part of Octave.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	6
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 for more details.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	16
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	17 You should have received a copy of the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	18 along with Octave; see the file COPYING. If not, see
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 <http://www.gnu.org/licenses/>.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	20
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	21 */
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	22
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	23 #ifdef HAVE_CONFIG_H
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	24 #include <config.h>
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	25 #endif
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	26
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	27 #include <QApplication>
17804 f3e25230b1f3 use QCoreApplication if starting with --no-gui John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	28 #include <QCoreApplication>
17647 7ec70c575ad6 * octave-gui.cc: set the encoding of qt strings to utf8 Torsten <ttl@justmail.de> parents: 17569 diff changeset	29 #include <QTextCodec>
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	30 #include <QThread>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	31 #include <QTranslator>
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	32
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	33 #include <iostream>
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	34
16657 c1d5bf2eb3b6 go back to fork and setsid, but not on OS X systems John W. Eaton <jwe@octave.org> parents: 16598 diff changeset	35 #include <unistd.h>
16597 49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	36 #include <fcntl.h>
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	37
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	38 #if defined (HAVE_SYS_IOCTL_H)
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	39 #include <sys/ioctl.h>
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	40 #endif
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	41
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15209 diff changeset	42 #include "lo-utils.h"
15597 9046ee786fe1 Use octave_env instead of setenv. Michael Goffioul <michael.goffioul@gmail.com> parents: 15425 diff changeset	43 #include "oct-env.h"
17569 9d0992c6df30 arrange to pass signals to the GUI subprocess John W. Eaton <jwe@octave.org> parents: 17568 diff changeset	44 #include "oct-syscalls.h"
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15209 diff changeset	45 #include "syswait.h"
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	46
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	47 #include "octave.h"
17569 9d0992c6df30 arrange to pass signals to the GUI subprocess John W. Eaton <jwe@octave.org> parents: 17568 diff changeset	48 #include "sighandlers.h"
9d0992c6df30 arrange to pass signals to the GUI subprocess John W. Eaton <jwe@octave.org> parents: 17568 diff changeset	49
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	50 #include "welcome-wizard.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	51 #include "resource-manager.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	52 #include "main-window.h"
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	53 #include "octave-gui.h"
17922 b5bf26a054bd interrupt interpreter thread in GUI instead of calling "raise (SIGINT)" John W. Eaton <jwe@octave.org> parents: 17804 diff changeset	54 #include "thread-manager.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	55
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	56 // Allow the Octave interpreter to start as in CLI mode with a
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	57 // QApplication context so that it can use Qt for things like plotting
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	58 // and UI widgets.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	59
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	60 class octave_cli_thread : public QThread
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	61 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	62 public:
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	63
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	64 octave_cli_thread (int argc, char **argv)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	65 : m_argc (argc), m_argv (argv), m_result (0) { }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	66
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	67 int result (void) const { return m_result; }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	68
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	69 protected:
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	70
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	71 void run (void)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	72 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	73 octave_initialize_interpreter (m_argc, m_argv, 0);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	74
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	75 m_result = octave_execute_interpreter ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	76
17804 f3e25230b1f3 use QCoreApplication if starting with --no-gui John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	77 QCoreApplication::exit (m_result);
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	78 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	79
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	80 private:
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	81
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	82 int m_argc;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	83 char** m_argv;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	84 int m_result;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	85 };
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	86
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	87
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	88 // Custom message handler for filtering some messages from Qt.
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	89
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	90 void message_handler (QtMsgType type, const char *msg)
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	91 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	92 switch (type)
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	93 {
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	94 case QtDebugMsg:
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	95 if (strncmp (msg, "QFileSystemWatcher: skipping native engine",42) != 0)
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	96 std::cerr << "Debug: " << msg << std::endl;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	97 break;
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	98
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	99 case QtWarningMsg:
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	100 std::cerr << "Warning: " << msg << std::endl;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	101 break;
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	102
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	103 case QtCriticalMsg:
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	104 std::cerr << "Critical: " << msg << std::endl;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	105 break;
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	106
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	107 case QtFatalMsg:
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	108 std::cerr << "Fatal: " << msg << std::endl;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	109 abort ();
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	110
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	111 default:
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	112 break;
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	113 }
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	114 }
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	115
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	116 // If START_GUI is false, we still set up the QApplication so that we
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	117 // can use Qt widgets for plot windows.
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	118
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	119 int
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	120 octave_start_gui (int argc, char *argv[], bool start_gui)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	121 {
17922 b5bf26a054bd interrupt interpreter thread in GUI instead of calling "raise (SIGINT)" John W. Eaton <jwe@octave.org> parents: 17804 diff changeset	122 octave_thread_manager::block_interrupt_signal ();
b5bf26a054bd interrupt interpreter thread in GUI instead of calling "raise (SIGINT)" John W. Eaton <jwe@octave.org> parents: 17804 diff changeset	123
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	124 qInstallMsgHandler (message_handler);
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	125
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	126 if (start_gui)
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	127 {
17804 f3e25230b1f3 use QCoreApplication if starting with --no-gui John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	128 QApplication application (argc, argv);
f3e25230b1f3 use QCoreApplication if starting with --no-gui John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	129
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	130 // Set the codec for all strings
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	131 QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8"));
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	132
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	133 // install translators for the gui and qt text
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	134 QTranslator gui_tr, qt_tr, qsci_tr;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	135 resource_manager::config_translators (&qt_tr,&qsci_tr,&gui_tr);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	136 application.installTranslator (&qt_tr);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	137 application.installTranslator (&qsci_tr);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	138 application.installTranslator (&gui_tr);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	139
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	140 while (true)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	141 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	142 if (resource_manager::is_first_run ())
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	143 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	144 welcome_wizard welcomeWizard;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	145 welcomeWizard.exec ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	146 resource_manager::reload_settings ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	147 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	148 else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	149 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	150 // update network-settings
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	151 resource_manager::update_network_settings ();
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	152
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	153 #if ! defined (__WIN32__) \|\| defined (__CYGWIN__)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	154 // If we were started from a launcher, TERM might not be
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	155 // defined, but we provide a terminal with xterm
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	156 // capabilities.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	157
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	158 std::string term = octave_env::getenv ("TERM");
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	159
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	160 if (term.empty ())
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	161 octave_env::putenv ("TERM", "xterm");
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	162 #else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	163 std::string term = octave_env::getenv ("TERM");
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	164
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	165 if (term.empty ())
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	166 octave_env::putenv ("TERM", "cygwin");
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	167 #endif
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	168
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	169 // create main window, read settings, and show window
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	170 main_window w;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	171 w.read_settings (); // get widget settings and window layout
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	172 w.focus_command_window ();
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	173 w.connect_visibility_changed (); // connect signals for changes
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	174 // in visibility not before w
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17778 diff changeset	175 // is shown
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	176 return application.exec ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	177 }
14878 a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	178 }
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	179 }
a6c44c28dabe Added patch from jwe that forks the GUI process in order to have less work. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	180 else
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	181 {
17804 f3e25230b1f3 use QCoreApplication if starting with --no-gui John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	182 QCoreApplication application (argc, argv);
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	183
17804 f3e25230b1f3 use QCoreApplication if starting with --no-gui John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	184 octave_cli_thread main_thread (argc, argv);
17543 dbda6edfe01d * octave-gui.cc: install translators before showing the wlecome wizard Torsten <ttl@justmail.de> parents: 17360 diff changeset	185
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	186 main_thread.start ();
16598 e84b77df8940 ensure TERM environment variable is set when GUI starts John W. Eaton <jwe@octave.org> parents: 16597 diff changeset	187
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	188 return application.exec ();
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13658 diff changeset	189 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	190 }

Mercurial > octave-nkf

annotate libgui/src/octave-gui.cc @ 17922:b5bf26a054bd