From 96d1cc570e31396039e4970d2bf75d5f00f1e550 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 9 Sep 2013 05:59:03 -0300 Subject: Use the same code for command line and gui for file handling. The Command line execution of Subsurface happened before the GUI was created, this leaded to various bugs by me(tm) over time. This patch seems to fix all of those, by reusing the same code for GUI interaction and CommandLine interaction. I had to rework how the main.c worked, it used to be C code calling C++ code, and this is non desirable, since C doesn't really understand C++. I Moved all of C-related code to 'subsurfacestartup.c/h' and created a tiny wrapper to call it, so all of the C code is still C code, and the new main.cpp calls the mainwindow->loadFiles and mainWindow->importFiles to get rid of the bugs that happened before. Signed-off-by: Tomaz Canabrava --- Makefile | 3 +- dive.h | 6 -- main.c | 252 --------------------------------------------------- main.cpp | 63 +++++++++++++ qt-gui.cpp | 21 ++--- qt-gui.h | 10 ++ qt-ui/mainwindow.cpp | 81 ++++++++++------- qt-ui/mainwindow.h | 2 + subsurfacestartup.c | 183 +++++++++++++++++++++++++++++++++++++ subsurfacestartup.h | 25 +++++ 10 files changed, 342 insertions(+), 304 deletions(-) delete mode 100644 main.c create mode 100644 main.cpp create mode 100644 qt-gui.h create mode 100644 subsurfacestartup.c create mode 100644 subsurfacestartup.h diff --git a/Makefile b/Makefile index 6728a89d2..17c553f3c 100644 --- a/Makefile +++ b/Makefile @@ -68,9 +68,10 @@ SOURCES = \ equipment.c \ file.c \ info.c \ - main.c \ + main.cpp \ parse-xml.c \ planner.c \ + subsurfacestartup.c \ profile.c \ save-xml.c \ sha1.c \ diff --git a/dive.h b/dive.h index 2c69cbff8..64da53c87 100644 --- a/dive.h +++ b/dive.h @@ -628,12 +628,6 @@ extern void add_event(struct divecomputer *dc, int time, int type, int flags, in /* UI related protopypes */ -extern void init_ui(int *argcp, char ***argvp); -extern void init_qt_ui(int *argcp, char ***argvp, char *errormessage); - -extern void run_ui(void); -extern void exit_ui(void); - extern void report_error(GError* error); extern void add_cylinder_description(cylinder_type_t *); diff --git a/main.c b/main.c deleted file mode 100644 index ca64b5518..000000000 --- a/main.c +++ /dev/null @@ -1,252 +0,0 @@ -/* main.c */ -#include -#include -#include -#include -#include -#include -#include - -#include "dive.h" -#include "divelist.h" -#include "libdivecomputer.h" -#include "version.h" - -struct preferences prefs; -struct preferences default_prefs = { - .units = SI_UNITS, - .unit_system = METRIC, - .visible_cols = { TRUE, FALSE, }, - .pp_graphs = { - .po2 = FALSE, - .pn2 = FALSE, - .phe = FALSE, - .po2_threshold = 1.6, - .pn2_threshold = 4.0, - .phe_threshold = 13.0, - }, - .mod = FALSE, - .mod_ppO2 = 1.6, - .ead = FALSE, - .profile_dc_ceiling = TRUE, - .profile_red_ceiling = FALSE, - .profile_calc_ceiling = FALSE, - .calc_ceiling_3m_incr = FALSE, - .gflow = 30, - .gfhigh = 75, - .font_size = 14.0, - .show_invalid = FALSE, -#ifdef USE_GTK_UI - .map_provider = OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID, -#endif -}; - -struct units *get_units() -{ - return &prefs.units; -} - -/* random helper functions, used here or elsewhere */ -static int sortfn(const void *_a, const void *_b) -{ - const struct dive *a = *(void **)_a; - const struct dive *b = *(void **)_b; - - if (a->when < b->when) - return -1; - if (a->when > b->when) - return 1; - return 0; -} - -void sort_table(struct dive_table *table) -{ - qsort(table->dives, table->nr, sizeof(struct dive *), sortfn); -} - -const char *weekday(int wday) -{ - static const char wday_array[7][7] = { - /*++GETTEXT: these are three letter days - we allow up to six code bytes */ - N_("Sun"), N_("Mon"), N_("Tue"), N_("Wed"), N_("Thu"), N_("Fri"), N_("Sat") - }; - return _(wday_array[wday]); -} - -const char *monthname(int mon) -{ - static const char month_array[12][7] = { - /*++GETTEXT: these are three letter months - we allow up to six code bytes*/ - N_("Jan"), N_("Feb"), N_("Mar"), N_("Apr"), N_("May"), N_("Jun"), - N_("Jul"), N_("Aug"), N_("Sep"), N_("Oct"), N_("Nov"), N_("Dec"), - }; - return _(month_array[mon]); -} - -/* - * track whether we switched to importing dives - */ -static gboolean imported = FALSE; - -static void print_version() { - printf("Subsurface v%s, ", VERSION_STRING); - printf("built with libdivecomputer v%s\n", dc_version(NULL)); -} - -static void print_help() { - print_version(); - printf("\nUsage: subsurface [options] [logfile ...] [--import logfile ...]"); - printf("\n\noptions include:"); - printf("\n --help|-h This help text"); - printf("\n --import logfile ... Logs before this option is treated as base, everything after is imported"); - printf("\n --verbose|-v Verbose debug (repeat to increase verbosity)"); - printf("\n --version Prints current version\n\n"); -} - -static void parse_argument(const char *arg) -{ - const char *p = arg+1; - - do { - switch (*p) { - case 'h': - print_help(); - exit(0); - case 'v': - verbose++; - continue; - case '-': - /* long options with -- */ - if (strcmp(arg, "--help") == 0) { - print_help(); - exit(0); - } - if (strcmp(arg, "--import") == 0) { - /* mark the dives so far as the base, - * everything after is imported */ - process_dives(FALSE, FALSE); - imported = TRUE; - return; - } - if (strcmp(arg, "--verbose") == 0) { - verbose++; - return; - } - if (strcmp(arg, "--version") == 0) { - print_version(); - exit(0); - } - /* fallthrough */ - case 'p': - /* ignore process serial number argument when run as native macosx app */ - if (strncmp(arg, "-psn_", 5) == 0) { - return; - } - /* fallthrough */ - default: - fprintf(stderr, "Bad argument '%s'\n", arg); - exit(1); - } - } while (*++p); -} - -void renumber_dives(int nr) -{ - int i; - - for (i = 0; i < dive_table.nr; i++) { - struct dive *dive = dive_table.dives[i]; - dive->number = nr + i; - } - mark_divelist_changed(TRUE); -} - -/* - * Under a POSIX setup, the locale string should have a format - * like [language[_territory][.codeset][@modifier]]. - * - * So search for the underscore, and see if the "territory" is - * US, and turn on imperial units by default. - * - * I guess Burma and Liberia should trigger this too. I'm too - * lazy to look up the territory names, though. - */ -static void setup_system_prefs(void) -{ - const char *env; - - default_prefs.divelist_font = strdup(system_divelist_default_font); - default_prefs.default_filename = system_default_filename(); - - env = getenv("LC_MEASUREMENT"); - if (!env) - env = getenv("LC_ALL"); - if (!env) - env = getenv("LANG"); - if (!env) - return; - env = strchr(env, '_'); - if (!env) - return; - env++; - if (strncmp(env, "US", 2)) - return; - - default_prefs.units = IMPERIAL_units; -} - -int main(int argc, char **argv) -{ - int i; - gboolean no_filenames = TRUE; - const char *path; - char *error_message = NULL; - - /* set up l18n - the search directory needs to change - * so that it uses the correct system directory when - * subsurface isn't run from the local directory */ - path = subsurface_gettext_domainpath(argv[0]); - setlocale(LC_ALL, ""); - bindtextdomain("subsurface", path); - bind_textdomain_codeset("subsurface", "utf-8"); - textdomain("subsurface"); - - setup_system_prefs(); - prefs = default_prefs; - - subsurface_command_line_init(&argc, &argv); - parse_xml_init(); - - init_ui(&argc, &argv); - - for (i = 1; i < argc; i++) { - const char *a = argv[i]; - if (a[0] == '-') { - parse_argument(a); - continue; - } - set_filename(NULL, TRUE); - - parse_file(a, &error_message); - if (no_filenames) - { - set_filename(a, TRUE); - no_filenames = FALSE; - } - } - if (no_filenames) { - const char *filename = prefs.default_filename; - parse_file(filename, NULL); - /* don't report errors - this file may not exist, but make - sure we remember this as the filename in use */ - set_filename(filename, FALSE); - } - process_dives(imported, FALSE); - parse_xml_exit(); - subsurface_command_line_exit(&argc, &argv); - - init_qt_ui(&argc, &argv, error_message); /* qt bit delayed until dives are parsed */ - run_ui(); - exit_ui(); - return 0; -} diff --git a/main.cpp b/main.cpp new file mode 100644 index 000000000..68e8c3708 --- /dev/null +++ b/main.cpp @@ -0,0 +1,63 @@ +/* main.c */ +#include +#include +#include +#include +#include +#include + +#include "qt-gui.h" +#include "version.h" +#include "subsurfacestartup.h" +#include "qt-ui/mainwindow.h" + +#include + +int main(int argc, char **argv) +{ + int i; + bool no_filenames = TRUE; + const char *path; + char *error_message = NULL; + + /* set up l18n - the search directory needs to change + * so that it uses the correct system directory when + * subsurface isn't run from the local directory */ + path = subsurface_gettext_domainpath(argv[0]); + setlocale(LC_ALL, ""); + bindtextdomain("subsurface", path); + bind_textdomain_codeset("subsurface", "utf-8"); + textdomain("subsurface"); + + setup_system_prefs(); + prefs = default_prefs; + + subsurface_command_line_init(&argc, &argv); + init_ui(&argc, &argv); + parse_xml_init(); + + QStringList files; + QStringList importedFiles; + for (i = 1; i < argc; i++) { + const char *a = argv[i]; + if (a[0] == '-') { + parse_argument(a); + continue; + } + if (imported) + importedFiles.push_back( QString(a) ); + else + files.push_back( QString(a) ); + } + if (no_filenames) { + files.push_back( QString(prefs.default_filename) ); + } + process_dives(imported, FALSE); + parse_xml_exit(); + subsurface_command_line_exit(&argc, &argv); + mainWindow()->loadFiles(files); + mainWindow()->importFiles(importedFiles); + run_ui(); + exit_ui(); + return 0; +} diff --git a/qt-gui.cpp b/qt-gui.cpp index eb199f0ab..7414ad426 100644 --- a/qt-gui.cpp +++ b/qt-gui.cpp @@ -70,18 +70,6 @@ static QApplication *application = NULL; int error_count; const char *existing_filename; -void init_qt_ui(int *argcp, char ***argvp, char *errormessage) -{ - application->installTranslator(new Translator(application)); - MainWindow *window = new MainWindow(); - window->showError(errormessage); - window->show(); - if (existing_filename && existing_filename[0] != '\0') - window->setTitle(MWTF_FILENAME); - else - window->setTitle(MWTF_DEFAULT); -} - const char *getSetting(QSettings &s, QString name) { QVariant v; @@ -127,6 +115,15 @@ void init_ui(int *argcp, char ***argvp) default_dive_computer_product = getSetting(s,"dive_computer_product"); default_dive_computer_device = getSetting(s, "dive_computer_device"); s.endGroup(); + + application->installTranslator(new Translator(application)); + MainWindow *window = new MainWindow(); + window->show(); + if (existing_filename && existing_filename[0] != '\0') + window->setTitle(MWTF_FILENAME); + else + window->setTitle(MWTF_DEFAULT); + return; } diff --git a/qt-gui.h b/qt-gui.h new file mode 100644 index 000000000..43a006a4c --- /dev/null +++ b/qt-gui.h @@ -0,0 +1,10 @@ +#ifndef QT_GUI_H +#define QT_GUI_H + +void init_ui(int *argcp, char ***argvp); +void init_qt_ui(int *argcp, char ***argvp, char *errormessage); + +void run_ui(void); +void exit_ui(void); + +#endif diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 245f4b347..4eead9616 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -117,22 +117,7 @@ void MainWindow::on_actionOpen_triggered() QByteArray fileNamePtr = filename.toLocal8Bit(); on_actionClose_triggered(); - - char *error = NULL; - parse_file(fileNamePtr.data(), &error); - set_filename(fileNamePtr.data(), TRUE); - setTitle(MWTF_FILENAME); - - if (error != NULL) { - showError(error); - free(error); - } - process_dives(FALSE, FALSE); - - ui->InfoWidget->reload(); - ui->globe->reload(); - ui->ListWidget->reload(DiveTripModel::TREE); - ui->ListWidget->setFocus(); + loadFiles( QStringList() << filename ); } void MainWindow::on_actionSave_triggered() @@ -193,23 +178,7 @@ void MainWindow::on_actionImport_triggered() settings.setValue("LastDir", fileInfo.dir().path()); settings.endGroup(); - QByteArray fileNamePtr; - char *error = NULL; - for (int i = 0; i < fileNames.size(); ++i) { - fileNamePtr = fileNames.at(i).toLocal8Bit(); - parse_file(fileNamePtr.data(), &error); - if (error != NULL) { - showError(error); - free(error); - error = NULL; - } - } - process_dives(FALSE, FALSE); - - ui->InfoWidget->reload(); - ui->globe->reload(); - ui->ListWidget->reload(DiveTripModel::TREE); - ui->ListWidget->setFocus(); + importFiles(fileNames); } void MainWindow::on_actionExportUDDF_triggered() @@ -755,3 +724,49 @@ void MainWindow::setTitle(enum MainWindowTitleFormat format) break; } } + +void MainWindow::importFiles(const QStringList fileNames) +{ + QByteArray fileNamePtr; + char *error = NULL; + for (int i = 0; i < fileNames.size(); ++i) { + fileNamePtr = fileNames.at(i).toLocal8Bit(); + parse_file(fileNamePtr.data(), &error); + if (error != NULL) { + showError(error); + free(error); + error = NULL; + } + } + process_dives(TRUE, FALSE); + + ui->InfoWidget->reload(); + ui->globe->reload(); + ui->ListWidget->reload(DiveTripModel::TREE); + ui->ListWidget->setFocus(); +} + +void MainWindow::loadFiles(const QStringList fileNames) +{ + char *error = NULL; + QByteArray fileNamePtr; + + for (int i = 0; i < fileNames.size(); ++i) { + fileNamePtr = fileNames.at(i).toLocal8Bit(); + parse_file(fileNamePtr.data(), &error); + set_filename(fileNamePtr.data(), TRUE); + setTitle(MWTF_FILENAME); + + if (error != NULL) { + showError(error); + free(error); + } + } + + process_dives(FALSE, FALSE); + + ui->InfoWidget->reload(); + ui->globe->reload(); + ui->ListWidget->reload(DiveTripModel::TREE); + ui->ListWidget->setFocus(); +} diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 0b0b0055d..6cc99db96 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -51,6 +51,8 @@ public: // when the profile's visible. void disableDcShortcuts(); void enableDcShortcuts(); + void loadFiles(const QStringList files); + void importFiles(const QStringList importFiles); private slots: /* file menu action */ diff --git a/subsurfacestartup.c b/subsurfacestartup.c new file mode 100644 index 000000000..bf093ed9c --- /dev/null +++ b/subsurfacestartup.c @@ -0,0 +1,183 @@ +#include "subsurfacestartup.h" +#include +#include + +struct preferences prefs; +struct preferences default_prefs = { + .units = SI_UNITS, + .unit_system = METRIC, + .visible_cols = { TRUE, FALSE, }, + .pp_graphs = { + .po2 = FALSE, + .pn2 = FALSE, + .phe = FALSE, + .po2_threshold = 1.6, + .pn2_threshold = 4.0, + .phe_threshold = 13.0, + }, + .mod = FALSE, + .mod_ppO2 = 1.6, + .ead = FALSE, + .profile_dc_ceiling = TRUE, + .profile_red_ceiling = FALSE, + .profile_calc_ceiling = FALSE, + .calc_ceiling_3m_incr = FALSE, + .gflow = 30, + .gfhigh = 75, + .font_size = 14.0, + .show_invalid = FALSE, +#ifdef USE_GTK_UI + .map_provider = OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_HYBRID, +#endif +}; + +struct units *get_units() +{ + return &prefs.units; +} + +/* random helper functions, used here or elsewhere */ +static int sortfn(const void *_a, const void *_b) +{ + const struct dive *a = (const struct dive*) *(void **)_a; + const struct dive *b = (const struct dive*) *(void **)_b; + + if (a->when < b->when) + return -1; + if (a->when > b->when) + return 1; + return 0; +} + +void sort_table(struct dive_table *table) +{ + qsort(table->dives, table->nr, sizeof(struct dive *), sortfn); +} + +const char *weekday(int wday) +{ + static const char wday_array[7][7] = { + /*++GETTEXT: these are three letter days - we allow up to six code bytes */ + N_("Sun"), N_("Mon"), N_("Tue"), N_("Wed"), N_("Thu"), N_("Fri"), N_("Sat") + }; + return _(wday_array[wday]); +} + +const char *monthname(int mon) +{ + static const char month_array[12][7] = { + /*++GETTEXT: these are three letter months - we allow up to six code bytes*/ + N_("Jan"), N_("Feb"), N_("Mar"), N_("Apr"), N_("May"), N_("Jun"), + N_("Jul"), N_("Aug"), N_("Sep"), N_("Oct"), N_("Nov"), N_("Dec"), + }; + return _(month_array[mon]); +} + +/* + * track whether we switched to importing dives + */ +bool imported = FALSE; + +static void print_version() { + printf("Subsurface v%s, ", VERSION_STRING); + printf("built with libdivecomputer v%s\n", dc_version(NULL)); +} + +static void print_help() { + print_version(); + printf("\nUsage: subsurface [options] [logfile ...] [--import logfile ...]"); + printf("\n\noptions include:"); + printf("\n --help|-h This help text"); + printf("\n --import logfile ... Logs before this option is treated as base, everything after is imported"); + printf("\n --verbose|-v Verbose debug (repeat to increase verbosity)"); + printf("\n --version Prints current version\n\n"); +} + +void parse_argument(const char *arg) +{ + const char *p = arg+1; + + do { + switch (*p) { + case 'h': + print_help(); + exit(0); + case 'v': + verbose++; + continue; + case '-': + /* long options with -- */ + if (strcmp(arg, "--help") == 0) { + print_help(); + exit(0); + } + if (strcmp(arg, "--import") == 0) { + imported = TRUE; /* mark the dives so far as the base, * everything after is imported */ + return; + } + if (strcmp(arg, "--verbose") == 0) { + verbose++; + return; + } + if (strcmp(arg, "--version") == 0) { + print_version(); + exit(0); + } + /* fallthrough */ + case 'p': + /* ignore process serial number argument when run as native macosx app */ + if (strncmp(arg, "-psn_", 5) == 0) { + return; + } + /* fallthrough */ + default: + fprintf(stderr, "Bad argument '%s'\n", arg); + exit(1); + } + } while (*++p); +} + +void renumber_dives(int nr) +{ + int i; + + for (i = 0; i < dive_table.nr; i++) { + struct dive *dive = dive_table.dives[i]; + dive->number = nr + i; + } + mark_divelist_changed(TRUE); +} + +/* + * Under a POSIX setup, the locale string should have a format + * like [language[_territory][.codeset][@modifier]]. + * + * So search for the underscore, and see if the "territory" is + * US, and turn on imperial units by default. + * + * I guess Burma and Liberia should trigger this too. I'm too + * lazy to look up the territory names, though. + */ +void setup_system_prefs(void) +{ + const char *env; + + default_prefs.divelist_font = strdup(system_divelist_default_font); + default_prefs.default_filename = system_default_filename(); + + env = getenv("LC_MEASUREMENT"); + if (!env) + env = getenv("LC_ALL"); + if (!env) + env = getenv("LANG"); + if (!env) + return; + env = strchr(env, '_'); + if (!env) + return; + env++; + if (strncmp(env, "US", 2)) + return; + + default_prefs.units = IMPERIAL_units; +} diff --git a/subsurfacestartup.h b/subsurfacestartup.h new file mode 100644 index 000000000..8a2420345 --- /dev/null +++ b/subsurfacestartup.h @@ -0,0 +1,25 @@ +#ifndef SUBSURFACESTARTUP_H +#define SUBSURFACESTARTUP_H + +#include "dive.h" +#include "divelist.h" +#include "libdivecomputer.h" +#include "version.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif + +extern struct preferences prefs; +extern struct preferences default_prefs; +extern bool imported; + +void setup_system_prefs(void); +void parse_argument(const char *arg); + +#ifdef __cplusplus +} +#endif + +#endif -- cgit v1.2.3-70-g09d2