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

annotate libgui/src/octave-gui.cc @ 17778:b5d58667d32d

new main program wrapper to handle giving up controlling tty * octave-gui.cc (octave_cli_thread): New class, from QtHandles. (dissociate_terminal): Delete. (octave_start_gui): Third arg is now START_GUI instead of FORK. Don't call dissociate_terminal. If start_gui is false, use octave_cli_thread to start Octave within a QApplication context. * sighandlers.cc (gui_driver_sig_handler): Move to src/main.in.cc. (install_gui_driver_signal_handlers): Move to src/main.in.cc and rename to octave_set_signal_handler. * octave.cc (no_fork_option): Delete. (process_command_line): Don't handle NO_FORK_OPTION. (octave_fork_gui): Move to src/main.in.cc and rename to have_controlling_terminal. * options-usage.h (usage_string, octave_print_verbose_usage_and_exit): Delete --no-fork from text. (long_opts): Delete no-fork from list. (NO_FORK_OPTION): Delete. * run-octave.in: Set OCTAVE_BINDIR in environment before exec-ing Octave binary. * src/Makefile.am: Build octave-gui, octave-cli, and octave instead of octave-cli and octave. * main-gui.cc: Rename from main.cc. Call octave_start_gui and pass START_GUI as parameter. * main.in.cc: New file.

author	John W. Eaton <jwe@octave.org>
date	Sun, 27 Oct 2013 18:47:22 -0400
parents	e4569ae06475
children	86c6ae5f969e

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>
17647 7ec70c575ad6 * octave-gui.cc: set the encoding of qt strings to utf8 Torsten <ttl@justmail.de> parents: 17569 diff changeset	28 #include <QTextCodec>
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	29 #include <QThread>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	30 #include <QTranslator>
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	31
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	32 #include <iostream>
9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	33
16657 c1d5bf2eb3b6 go back to fork and setsid, but not on OS X systems John W. Eaton <jwe@octave.org> parents: 16598 diff changeset	34 #include <unistd.h>
16597 49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	35 #include <fcntl.h>
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	36
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	37 #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	38 #include <sys/ioctl.h>
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	39 #endif
49832f60282e if available, use ioctl to give up controlling terminal Ben Abbott <bpabbott@mac.com> parents: 16486 diff changeset	40
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15209 diff changeset	41 #include "lo-utils.h"
15597 9046ee786fe1 Use octave_env instead of setenv. Michael Goffioul <michael.goffioul@gmail.com> parents: 15425 diff changeset	42 #include "oct-env.h"
17569 9d0992c6df30 arrange to pass signals to the GUI subprocess John W. Eaton <jwe@octave.org> parents: 17568 diff changeset	43 #include "oct-syscalls.h"
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15209 diff changeset	44 #include "syswait.h"
15155 9e62d5a3a45e partial cleanup of include files in gui sources John W. Eaton <jwe@octave.org> parents: 15139 diff changeset	45
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	46 #include "octave.h"
17569 9d0992c6df30 arrange to pass signals to the GUI subprocess John W. Eaton <jwe@octave.org> parents: 17568 diff changeset	47 #include "sighandlers.h"
9d0992c6df30 arrange to pass signals to the GUI subprocess John W. Eaton <jwe@octave.org> parents: 17568 diff changeset	48
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	49 #include "welcome-wizard.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	50 #include "resource-manager.h"
674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	51 #include "main-window.h"
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	52 #include "octave-gui.h"
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	53
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	54 // 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	55 // 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	56 // and UI widgets.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	57
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	58 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	59 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	60 public:
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 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	63 : 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	64
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	65 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	66
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	67 protected:
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 void run (void)
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 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	72
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	73 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	74
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	75 QApplication::exit (m_result);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	76 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	77
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	78 private:
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 int m_argc;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	81 char** m_argv;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	82 int m_result;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	83 };
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	84
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	85
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	86 // Custom message handler for filtering some messages from Qt.
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	87
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	88 void message_handler (QtMsgType type, const char *msg)
d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	89 {
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	90 switch (type)
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	91 {
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	92 case QtDebugMsg:
17748 e4569ae06475 fix filtering debug message from the editor's file watcher Torsten <ttl@justmail.de> parents: 17747 diff changeset	93 if (strncmp (msg, "QFileSystemWatcher: skipping native engine",42) != 0)
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	94 std::cerr << "Debug: " << msg << std::endl;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	95 break;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	96
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	97 case QtWarningMsg:
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	98 std::cerr << "Warning: " << msg << std::endl;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	99 break;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	100
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	101 case QtCriticalMsg:
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	102 std::cerr << "Critical: " << msg << std::endl;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	103 break;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	104
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	105 case QtFatalMsg:
17747 5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	106 std::cerr << "Fatal: " << msg << std::endl;
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	107 abort ();
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	108
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	109 default:
5f2fb93bdc8b maint: Style fixes. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	110 break;
17737 d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	111 }
d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	112 }
d3bb7f1e3971 prevent the editor's file watcher from signaling fasle alarms (bug #40312) Torsten <ttl@justmail.de> parents: 17647 diff changeset	113
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	114 // 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	115 // 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	116
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	117 int
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	118 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	119 {
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	120 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	121
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	122 QApplication application (argc, argv);
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	123
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	124 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	125 {
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	126 // Set the codec for all strings
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	127 QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	128
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	129 // 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	130 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	131 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	132 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	133 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	134 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	135
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	136 while (true)
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	137 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	138 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	139 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	140 welcome_wizard welcomeWizard;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	141 welcomeWizard.exec ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	142 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	143 }
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	144 else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	145 {
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	146 // update network-settings
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	147 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	148
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	149 #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	150 // 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	151 // 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	152 // capabilities.
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	153
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	154 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	155
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	156 if (term.empty ())
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	157 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	158 #else
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	159 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	160
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	161 if (term.empty ())
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	162 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	163 #endif
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 // 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	166 main_window w;
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	167 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	168 w.focus_command_window ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	169 w.connect_visibility_changed (); // connect signals for changes in
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	170 // visibility not before w is shown
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	171 return application.exec ();
b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	172 }
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	173 }
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	174 }
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	175 else
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15137 diff changeset	176 {
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	177 octave_cli_thread main_thread (argc, argv);
15137 16a6b0a6855d GUI: support for octave arguments and integrate with run-octave. John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	178
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	179 application.setQuitOnLastWindowClosed (false);
17543 dbda6edfe01d * octave-gui.cc: install translators before showing the wlecome wizard Torsten <ttl@justmail.de> parents: 17360 diff changeset	180
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	181 main_thread.start ();
16598 e84b77df8940 ensure TERM environment variable is set when GUI starts John W. Eaton <jwe@octave.org> parents: 16597 diff changeset	182
17778 b5d58667d32d new main program wrapper to handle giving up controlling tty John W. Eaton <jwe@octave.org> parents: 17748 diff changeset	183 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	184 }
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	185 }

Mercurial > octave-nkf

annotate libgui/src/octave-gui.cc @ 17778:b5d58667d32d