X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmain.cpp;h=991a95adda6554cdfb1eee20e3f3145480c661f1;hb=6c595e36654ecec0439ccae1289925017641dc1b;hp=6e184f4d713380a762335b55815b0d18b77506a1;hpb=d067a873246bc4e8a1dd7170c1831113167c80aa;p=inkscape.git diff --git a/src/main.cpp b/src/main.cpp index 6e184f4d7..991a95add 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,13 +28,18 @@ #endif #include "path-prefix.h" +// This has to be included prior to anything that includes setjmp.h, it croaks otherwise +#include + #include #ifdef HAVE_IEEEFP_H #include #endif -#include +#include +#include #include +#include #include #ifndef POPT_TABLEEND @@ -43,13 +48,12 @@ #include #include +#include #include #include #include #include -#include - #include "gc-core.h" #include "macros.h" @@ -58,7 +62,6 @@ #include "sp-object.h" #include "interface.h" #include "print.h" -#include "slideshow.h" #include "color.h" #include "sp-item.h" #include "sp-root.h" @@ -69,8 +72,7 @@ #include "svg/stringstream.h" #include "inkscape-private.h" -#include "inkscape-stock.h" -#include "inkscape_version.h" +#include "inkscape-version.h" #include "sp-namedview.h" #include "sp-guide.h" @@ -80,8 +82,10 @@ #include "io/sys.h" #include "debug/logger.h" +#include "debug/log-display-config.h" #include "helper/png-write.h" +#include "helper/geom.h" #include #include @@ -109,6 +113,11 @@ using Inkscape::Extension::Internal::PrintWin32; #endif #include "application/application.h" +#include "main-cmdlineact.h" +#include "widgets/icon.h" +#include "ui/widget/panel.h" + +#include enum { SP_ARG_NONE, @@ -133,31 +142,39 @@ enum { SP_ARG_EXPORT_PS, SP_ARG_EXPORT_EPS, SP_ARG_EXPORT_PDF, +#ifdef WIN32 + SP_ARG_EXPORT_EMF, +#endif //WIN32 SP_ARG_EXPORT_TEXT_TO_PATH, - SP_ARG_EXPORT_BBOX_PAGE, + SP_ARG_EXPORT_IGNORE_FILTERS, SP_ARG_EXTENSIONDIR, - SP_ARG_SLIDESHOW, SP_ARG_QUERY_X, SP_ARG_QUERY_Y, SP_ARG_QUERY_WIDTH, SP_ARG_QUERY_HEIGHT, + SP_ARG_QUERY_ALL, SP_ARG_QUERY_ID, + SP_ARG_SHELL, SP_ARG_VERSION, - SP_ARG_NEW_GUI, SP_ARG_VACUUM_DEFS, + SP_ARG_VERB_LIST, + SP_ARG_VERB, + SP_ARG_SELECT, SP_ARG_LAST }; int sp_main_gui(int argc, char const **argv); int sp_main_console(int argc, char const **argv); static void sp_do_export_png(SPDocument *doc); -static void do_export_ps(SPDocument* doc, gchar const* uri, char const *mime); -static void do_export_pdf(SPDocument* doc, gchar const* uri, char const *mime); -static void do_query_dimension (SPDocument *doc, bool extent, NR::Dim2 const axis, const gchar *id); - +static void do_export_ps_pdf(SPDocument* doc, gchar const* uri, char const *mime); +#ifdef WIN32 +static void do_export_emf(SPDocument* doc, gchar const* uri, char const *mime); +#endif //WIN32 +static void do_query_dimension (SPDocument *doc, bool extent, Geom::Dim2 const axis, const gchar *id); +static void do_query_all (SPDocument *doc); +static void do_query_all_recurse (SPObject *o); static gchar *sp_global_printer = NULL; -static gboolean sp_global_slideshow = FALSE; static gchar *sp_export_png = NULL; static gchar *sp_export_dpi = NULL; static gchar *sp_export_area = NULL; @@ -175,20 +192,68 @@ static gchar *sp_export_svg = NULL; static gchar *sp_export_ps = NULL; static gchar *sp_export_eps = NULL; static gchar *sp_export_pdf = NULL; +#ifdef WIN32 +static gchar *sp_export_emf = NULL; +#endif //WIN32 static gboolean sp_export_text_to_path = FALSE; -static gboolean sp_export_bbox_page = FALSE; +static gboolean sp_export_ignore_filters = FALSE; +static gboolean sp_export_font = FALSE; static gboolean sp_query_x = FALSE; static gboolean sp_query_y = FALSE; static gboolean sp_query_width = FALSE; static gboolean sp_query_height = FALSE; +static gboolean sp_query_all = FALSE; static gchar *sp_query_id = NULL; static int sp_new_gui = FALSE; +static gboolean sp_shell = FALSE; static gboolean sp_vacuum_defs = FALSE; static gchar *sp_export_png_utf8 = NULL; static gchar *sp_export_svg_utf8 = NULL; static gchar *sp_global_printer_utf8 = NULL; + +/** + * Reset variables to default values. + */ +static void resetCommandlineGlobals() { + sp_global_printer = NULL; + sp_export_png = NULL; + sp_export_dpi = NULL; + sp_export_area = NULL; + sp_export_area_drawing = FALSE; + sp_export_area_canvas = FALSE; + sp_export_width = NULL; + sp_export_height = NULL; + sp_export_id = NULL; + sp_export_background = NULL; + sp_export_background_opacity = NULL; + sp_export_area_snap = FALSE; + sp_export_use_hints = FALSE; + sp_export_id_only = FALSE; + sp_export_svg = NULL; + sp_export_ps = NULL; + sp_export_eps = NULL; + sp_export_pdf = NULL; +#ifdef WIN32 + sp_export_emf = NULL; +#endif //WIN32 + sp_export_text_to_path = FALSE; + sp_export_ignore_filters = FALSE; + sp_export_font = FALSE; + sp_query_x = FALSE; + sp_query_y = FALSE; + sp_query_width = FALSE; + sp_query_height = FALSE; + sp_query_all = FALSE; + sp_query_id = NULL; + sp_vacuum_defs = FALSE; + + sp_export_png_utf8 = NULL; + sp_export_svg_utf8 = NULL; + sp_global_printer_utf8 = NULL; +} + #ifdef WIN32 static bool replaceArgs( int& argc, char**& argv ); #endif @@ -306,14 +371,21 @@ struct poptOption options[] = { N_("Export document to a PDF file"), N_("FILENAME")}, +#ifdef WIN32 + {"export-emf", 'M', + POPT_ARG_STRING, &sp_export_emf, SP_ARG_EXPORT_EMF, + N_("Export document to an Enhanced Metafile (EMF) File"), + N_("FILENAME")}, +#endif //WIN32 + {"export-text-to-path", 'T', POPT_ARG_NONE, &sp_export_text_to_path, SP_ARG_EXPORT_TEXT_TO_PATH, - N_("Convert text object to paths on export (EPS)"), + N_("Convert text object to paths on export (PS, EPS, PDF)"), NULL}, - {"export-bbox-page", 'B', - POPT_ARG_NONE, &sp_export_bbox_page, SP_ARG_EXPORT_BBOX_PAGE, - N_("Export files with the bounding box set to the page size (EPS)"), + {"export-ignore-filters", 0, + POPT_ARG_NONE, &sp_export_ignore_filters, SP_ARG_EXPORT_IGNORE_FILTERS, + N_("Render filtered objects without filters, instead of rasterizing (PS, EPS, PDF)"), NULL}, {"query-x", 'X', @@ -340,6 +412,11 @@ struct poptOption options[] = { N_("Query the height of the drawing or, if specified, of the object with --query-id"), NULL}, + {"query-all", 'S', + POPT_ARG_NONE, &sp_query_all, SP_ARG_QUERY_ALL, + N_("List id,x,y,w,h for all objects"), + NULL}, + {"query-id", 'I', POPT_ARG_STRING, &sp_query_id, SP_ARG_QUERY_ID, N_("The ID of the object whose dimensions are queried"), @@ -351,27 +428,118 @@ struct poptOption options[] = { N_("Print out the extension directory and exit"), NULL}, - {"slideshow", 's', - POPT_ARG_NONE, &sp_global_slideshow, SP_ARG_SLIDESHOW, - N_("Show given files one-by-one, switch to next on any key/mouse event"), + {"vacuum-defs", 0, + POPT_ARG_NONE, &sp_vacuum_defs, SP_ARG_VACUUM_DEFS, + N_("Remove unused definitions from the defs section(s) of the document"), NULL}, - {"new-gui", 'G', - POPT_ARG_NONE, &sp_new_gui, SP_ARG_NEW_GUI, - N_("Use the new Gtkmm GUI interface"), + {"verb-list", 0, + POPT_ARG_NONE, NULL, SP_ARG_VERB_LIST, + N_("List the IDs of all the verbs in Inkscape"), NULL}, - {"vacuum-defs", 0, - POPT_ARG_NONE, &sp_vacuum_defs, SP_ARG_VACUUM_DEFS, - N_("Remove unused definitions from the defs section(s) of the document"), + {"verb", 0, + POPT_ARG_STRING, NULL, SP_ARG_VERB, + N_("Verb to call when Inkscape opens."), + N_("VERB-ID")}, + + {"select", 0, + POPT_ARG_STRING, NULL, SP_ARG_SELECT, + N_("Object ID to select when Inkscape opens."), + N_("OBJECT-ID")}, + + {"shell", 0, + POPT_ARG_NONE, &sp_shell, SP_ARG_SHELL, + N_("Start Inkscape in interative shell mode."), NULL}, POPT_AUTOHELP POPT_TABLEEND }; static bool needToRecodeParams = true; -gchar* blankParam = ""; +gchar * blankParam = g_strdup(""); + + + +#ifdef WIN32 +/** + * Return the directory of the .exe that is currently running + */ +static Glib::ustring _win32_getExePath() +{ + char exeName[MAX_PATH+1]; + GetModuleFileName(NULL, exeName, MAX_PATH); + char *slashPos = strrchr(exeName, '\\'); + if (slashPos) + *slashPos = '\0'; + Glib::ustring s = exeName; + return s; +} + +/** + * Set up the PATH and PYTHONPATH environment variables on + * win32 + */ +static int _win32_set_inkscape_env(const Glib::ustring &exePath) +{ + + char *oldenv = getenv("PATH"); + Glib::ustring tmp = "PATH="; + tmp += exePath; + tmp += ";"; + tmp += exePath; + tmp += "\\python;"; + tmp += exePath; + tmp += "\\python\\Scripts;"; // for uniconv.cmd + tmp += exePath; + tmp += "\\perl"; + if(oldenv != NULL) { + tmp += ";"; + tmp += oldenv; + } + _putenv(tmp.c_str()); + + oldenv = getenv("PYTHONPATH"); + tmp = "PYTHONPATH="; + tmp += exePath; + tmp += "\\python;"; + tmp += exePath; + tmp += "\\python\\Lib;"; + tmp += exePath; + tmp += "\\python\\DLLs"; + if(oldenv != NULL) { + tmp += ";"; + tmp += oldenv; + } + _putenv(tmp.c_str()); + + return 0; +} +#endif + +/** + * Add INKSCAPE_EXTENSIONDIR to PYTHONPATH so that extensions in users home + * can find inkex.py et al. (Bug #197475) + */ +static int set_extensions_env() +{ + char *oldenv = getenv("PYTHONPATH"); + Glib::ustring tmp = INKSCAPE_EXTENSIONDIR; + if (oldenv != NULL) { + tmp += G_SEARCHPATH_SEPARATOR; + tmp += oldenv; + } + g_setenv("PYTHONPATH", tmp.c_str(), TRUE); + + return 0; +} + + +/** + * This is the classic main() entry point of the program, though on some + * architectures it might be called by something else. + */ int main(int argc, char **argv) { @@ -382,13 +550,36 @@ main(int argc, char **argv) fpsetmask(fpgetmask() & ~(FP_X_DZ | FP_X_INV)); #endif -#ifdef ENABLE_NLS #ifdef WIN32 + /* + Set the current directory to the directory of the + executable. This seems redundant, but is needed for + when inkscape.exe is executed from another directory. + We use relative paths on win32. + HKCR\svgfile\shell\open\command is a good example + */ + Glib::ustring homedir = _win32_getExePath(); + SetCurrentDirectory(homedir.c_str()); + _win32_set_inkscape_env(homedir); RegistryTool rt; rt.setPathInfo(); - gchar *pathBuf = g_strconcat(g_path_get_dirname(argv[0]), "\\", PACKAGE_LOCALE_DIR, NULL); - bindtextdomain(GETTEXT_PACKAGE, pathBuf); - g_free(pathBuf); +#endif + + // Prevents errors like "Unable to wrap GdkPixbuf..." (in nr-filter-image.cpp for example) + Gtk::Main::init_gtkmm_internals(); + + // Bug #197475 + set_extensions_env(); + + /** + * Call bindtextdomain() for various machines's paths + */ +#ifdef ENABLE_NLS +#ifdef WIN32 + Glib::ustring localePath = homedir; + localePath += "\\"; + localePath += PACKAGE_LOCALE_DIR; + bindtextdomain(GETTEXT_PACKAGE, localePath.c_str()); #else #ifdef ENABLE_BINRELOC bindtextdomain(GETTEXT_PACKAGE, BR_LOCALEDIR("")); @@ -396,6 +587,12 @@ main(int argc, char **argv) bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); #endif #endif + // Allow the user to override the locale directory by setting + // the environment variable INKSCAPE_LOCALEDIR. + char *inkscape_localedir = getenv("INKSCAPE_LOCALEDIR"); + if (inkscape_localedir != NULL) { + bindtextdomain(GETTEXT_PACKAGE, inkscape_localedir); + } #endif bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); @@ -411,21 +608,10 @@ main(int argc, char **argv) Inkscape::Debug::Logger::init(); gboolean use_gui; + #ifndef WIN32 use_gui = (getenv("DISPLAY") != NULL); #else - /* - Set the current directory to the directory of the - executable. This seems redundant, but is needed for - when inkscape.exe is executed from another directory. - We use relative paths on win32. - HKCR\svgfile\shell\open\command is a good example - */ - /// \todo FIXME BROKEN - non-UTF-8 sneaks in here. - char *homedir = g_path_get_dirname(argv[0]); - SetCurrentDirectory(homedir); - g_free(homedir); - use_gui = TRUE; #endif /* Test whether with/without GUI is forced */ @@ -450,15 +636,22 @@ main(int argc, char **argv) || !strncmp(argv[i], "--export-eps", 12) || !strcmp(argv[i], "-A") || !strncmp(argv[i], "--export-pdf", 12) +#ifdef WIN32 + || !strcmp(argv[i], "-M") + || !strncmp(argv[i], "--export-emf", 12) +#endif //WIN32 || !strcmp(argv[i], "-W") || !strncmp(argv[i], "--query-width", 13) || !strcmp(argv[i], "-H") || !strncmp(argv[i], "--query-height", 14) + || !strcmp(argv[i], "-S") + || !strncmp(argv[i], "--query-all", 11) || !strcmp(argv[i], "-X") || !strncmp(argv[i], "--query-x", 13) || !strcmp(argv[i], "-Y") || !strncmp(argv[i], "--query-y", 14) || !strcmp(argv[i], "--vacuum-defs") + || !strncmp(argv[i], "--shell", 7) ) { /* main_console handles any exports -- not the gui */ @@ -467,9 +660,6 @@ main(int argc, char **argv) } else if (!strcmp(argv[i], "-g") || !strcmp(argv[i], "--with-gui")) { use_gui = TRUE; break; - } else if (!strcmp(argv[i], "-G") || !strcmp(argv[i], "--new-gui")) { - sp_new_gui = TRUE; - break; } } @@ -489,6 +679,9 @@ main(int argc, char **argv) return app.run(); } + + + void fixupSingleFilename( gchar **orig, gchar **spare ) { if ( orig && *orig && **orig ) { @@ -505,6 +698,8 @@ void fixupSingleFilename( gchar **orig, gchar **spare ) } } + + GSList *fixupFilenameEncoding( GSList* fl ) { GSList *newFl = NULL; @@ -604,6 +799,34 @@ int sp_common_main( int argc, char const **argv, GSList **flDest ) return 0; } +static void +snooper(GdkEvent *event, gpointer /*data*/) { + if(inkscape_mapalt()) /* returns the map of the keyboard modifier to map to Alt, zero if no mapping */ + { + GdkModifierType mapping=(GdkModifierType)inkscape_mapalt(); + switch (event->type) { + case GDK_MOTION_NOTIFY: + if(event->motion.state & mapping) { + event->motion.state|=GDK_MOD1_MASK; + } + break; + case GDK_BUTTON_PRESS: + if(event->button.state & mapping) { + event->button.state|=GDK_MOD1_MASK; + } + break; + case GDK_KEY_PRESS: + if(event->key.state & mapping) { + event->key.state|=GDK_MOD1_MASK; + } + break; + default: + break; + } + } + gtk_main_do_event (event); +} + int sp_main_gui(int argc, char const **argv) { @@ -613,44 +836,37 @@ sp_main_gui(int argc, char const **argv) int retVal = sp_common_main( argc, argv, &fl ); g_return_val_if_fail(retVal == 0, 1); - inkscape_gtk_stock_init(); + // Add our icon directory to the search path for icon theme lookups. + gchar *usericondir = profile_path("icons"); + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), usericondir); + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), INKSCAPE_PIXMAPDIR); + g_free(usericondir); - /* Set default icon */ - gchar *filename = (gchar *) g_build_filename (INKSCAPE_APPICONDIR, "inkscape.png", NULL); - if (Inkscape::IO::file_test(filename, (GFileTest)(G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK))) { - gtk_window_set_default_icon_from_file(filename, NULL); - } - g_free (filename); - filename = 0; + gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); + Inkscape::Debug::log_display_config(); - if (!sp_global_slideshow) { - gboolean create_new = TRUE; + // Set default window icon. Obeys the theme. + gtk_window_set_default_icon_name("inkscape"); + // Do things that were previously in inkscape_gtk_stock_init(). + sp_icon_get_phys_size(GTK_ICON_SIZE_MENU); + Inkscape::UI::Widget::Panel::prep(); - /// \todo FIXME BROKEN - non-UTF-8 sneaks in here. - inkscape_application_init(argv[0], true); + gboolean create_new = TRUE; - while (fl) { - if (sp_file_open((gchar *)fl->data,NULL)) { - create_new=FALSE; - } - fl = g_slist_remove(fl, fl->data); - } - if (create_new) { - sp_file_new_default(); - } - } else { - if (fl) { - GtkWidget *ss; - /// \todo FIXME BROKEN - non-UTF-8 sneaks in here. - inkscape_application_init(argv[0], true); - ss = sp_slideshow_new(fl); - if (ss) gtk_widget_show(ss); - } else { - g_warning ("No slides to display"); - exit(0); + /// \todo FIXME BROKEN - non-UTF-8 sneaks in here. + inkscape_application_init(argv[0], true); + + while (fl) { + if (sp_file_open((gchar *)fl->data,NULL)) { + create_new=FALSE; } + fl = g_slist_remove(fl, fl->data); + } + if (create_new) { + sp_file_new_default(); } + Glib::signal_idle().connect(sigc::ptr_fun(&Inkscape::CmdLineAction::idle)); main_instance.run(); #ifdef WIN32 @@ -661,53 +877,31 @@ sp_main_gui(int argc, char const **argv) return 0; } -int -sp_main_console(int argc, char const **argv) +/** + * Process file list + */ +void sp_process_file_list(GSList *fl) { - /* We are started in text mode */ - - /* Do this g_type_init(), so that we can use Xft/Freetype2 (Pango) - * in a non-Gtk environment. Used in libnrtype's - * FontInstance.cpp and FontFactory.cpp. - * http://mail.gnome.org/archives/gtk-list/2003-December/msg00063.html - */ - g_type_init(); - char **argv2 = const_cast(argv); - gtk_init_check( &argc, &argv2 ); - //setlocale(LC_ALL, ""); - - GSList *fl = NULL; - int retVal = sp_common_main( argc, argv, &fl ); - g_return_val_if_fail(retVal == 0, 1); - - if (fl == NULL) { - g_print("Nothing to do!\n"); - exit(0); - } - - inkscape_application_init(argv[0], false); - while (fl) { - SPDocument *doc; - - doc = Inkscape::Extension::open(NULL, (gchar *)fl->data); + const gchar *filename = (gchar *)fl->data; + SPDocument *doc = Inkscape::Extension::open(NULL, filename); if (doc == NULL) { - doc = Inkscape::Extension::open(Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG), (gchar *)fl->data); + doc = Inkscape::Extension::open(Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG), filename); } if (doc == NULL) { - g_warning("Specified document %s cannot be opened (is it valid SVG file?)", (gchar *) fl->data); + g_warning("Specified document %s cannot be opened (is it a valid SVG file?)", filename); } else { if (sp_vacuum_defs) { vacuum_document(doc); } if (sp_vacuum_defs && !sp_export_svg) { // save under the name given in the command line - sp_repr_save_file(doc->rdoc, (gchar *)fl->data, SP_SVG_NS_URI); + sp_repr_save_file(doc->rdoc, filename, SP_SVG_NS_URI); } if (sp_global_printer) { sp_print_document_to_file(doc, sp_global_printer); } - if (sp_export_png || sp_export_id || sp_export_area_drawing) { + if (sp_export_png) { sp_do_export_png(doc); } if (sp_export_svg) { @@ -715,34 +909,146 @@ sp_main_console(int argc, char const **argv) Inkscape::XML::Node *repr; rdoc = sp_repr_document_new("svg:svg"); repr = rdoc->root(); - repr = sp_document_root(doc)->updateRepr(repr, SP_OBJECT_WRITE_BUILD); + repr = sp_document_root(doc)->updateRepr(rdoc, repr, SP_OBJECT_WRITE_BUILD); sp_repr_save_file(repr->document(), sp_export_svg, SP_SVG_NS_URI); } if (sp_export_ps) { - do_export_ps(doc, sp_export_ps, "image/x-postscript"); + do_export_ps_pdf(doc, sp_export_ps, "image/x-postscript"); } if (sp_export_eps) { - do_export_ps(doc, sp_export_eps, "image/x-e-postscript"); + do_export_ps_pdf(doc, sp_export_eps, "image/x-e-postscript"); } if (sp_export_pdf) { - do_export_pdf(doc, sp_export_pdf, "application/pdf"); + do_export_ps_pdf(doc, sp_export_pdf, "application/pdf"); + } +#ifdef WIN32 + if (sp_export_emf) { + do_export_emf(doc, sp_export_emf, "image/x-emf"); } - if (sp_query_width || sp_query_height) { - do_query_dimension (doc, true, sp_query_width? NR::X : NR::Y, sp_query_id); +#endif //WIN32 + if (sp_query_all) { + do_query_all (doc); + } else if (sp_query_width || sp_query_height) { + do_query_dimension (doc, true, sp_query_width? Geom::X : Geom::Y, sp_query_id); } else if (sp_query_x || sp_query_y) { - do_query_dimension (doc, false, sp_query_x? NR::X : NR::Y, sp_query_id); + do_query_dimension (doc, false, sp_query_x? Geom::X : Geom::Y, sp_query_id); } + + delete doc; } fl = g_slist_remove(fl, fl->data); } +} - inkscape_unref(); +/** + * Run the application as an interactive shell, parsing command lines from stdin + * Returns -1 on error. + */ +int sp_main_shell(char const* command_name) +{ + int retval = 0; + + const unsigned int buffer_size = 4096; + gchar *command_line = g_strnfill(buffer_size, 0); + g_strlcpy(command_line, command_name, buffer_size); + gsize offset = g_strlcat(command_line, " ", buffer_size); + gsize sizeLeft = buffer_size - offset; + gchar *useme = command_line + offset; + + fprintf(stdout, "Inkscape %s interactive shell mode. Type 'quit' to quit.\n", Inkscape::version_string); + fflush(stdout); + char* linedata = 0; + do { + fprintf(stdout, ">"); + fflush(stdout); + if ((linedata = fgets(useme, sizeLeft, stdin))) { + size_t len = strlen(useme); + if ( (len >= sizeLeft - 1) || (useme[len - 1] != '\n') ) { + fprintf(stdout, "ERROR: Command line too long\n"); + // Consume rest of line + retval = -1; // If the while loop completes, this remains -1 + while (fgets(useme, sizeLeft, stdin) && retval) { + len = strlen(command_line); + if ( (len < buffer_size) && (command_line[len-1] == '\n') ) { + retval = 0; + } + } + } else { + useme[--len] = '\0'; // Strip newline + if (useme[len - 1] == '\r') { + useme[--len] = '\0'; + } + if ( strcmp(useme, "quit") == 0 ) { + // Time to quit + fflush(stdout); + linedata = 0; // mark for exit + } else if ( len < 1 ) { + // blank string. Do nothing. + } else { + GError* parseError = 0; + gchar** argv = 0; + gint argc = 0; + if ( g_shell_parse_argv(command_line, &argc, &argv, &parseError) ) { + poptContext ctx = poptGetContext(NULL, argc, const_cast(argv), options, 0); + poptSetOtherOptionHelp(ctx, _("[OPTIONS...] [FILE...]\n\nAvailable options:")); + if ( ctx ) { + GSList *fl = sp_process_args(ctx); + sp_process_file_list(fl); + poptFreeContext(ctx); + } else { + retval = 1; // not sure why. But this was the previous return value + } + resetCommandlineGlobals(); + g_strfreev(argv); + } else { + g_warning("Cannot parse commandline: %s", useme); + } + } + } + } // if (linedata... + } while (linedata && (retval == 0)); + + g_free(command_line); + return retval; +} + +int sp_main_console(int argc, char const **argv) +{ + /* We are started in text mode */ + + /* Do this g_type_init(), so that we can use Xft/Freetype2 (Pango) + * in a non-Gtk environment. Used in libnrtype's + * FontInstance.cpp and FontFactory.cpp. + * http://mail.gnome.org/archives/gtk-list/2003-December/msg00063.html + */ + g_type_init(); + char **argv2 = const_cast(argv); + gtk_init_check( &argc, &argv2 ); + //setlocale(LC_ALL, ""); + + GSList *fl = NULL; + int retVal = sp_common_main( argc, argv, &fl ); + g_return_val_if_fail(retVal == 0, 1); + + if (fl == NULL && !sp_shell) { + g_print("Nothing to do!\n"); + exit(0); + } + + inkscape_application_init(argv[0], false); + + if (sp_shell) { + sp_main_shell(argv[0]); // Run as interactive shell + exit(0); + } else { + sp_process_file_list(fl); // Normal command line invokation + } return 0; } static void -do_query_dimension (SPDocument *doc, bool extent, NR::Dim2 const axis, const gchar *id) +do_query_dimension (SPDocument *doc, bool extent, Geom::Dim2 const axis, const gchar *id) { SPObject *o = NULL; @@ -764,15 +1070,57 @@ do_query_dimension (SPDocument *doc, bool extent, NR::Dim2 const axis, const gch if (o) { sp_document_ensure_up_to_date (doc); SPItem *item = ((SPItem *) o); - NR::Rect area = item->invokeBbox(sp_item_i2doc_affine(item)); // "true" SVG bbox for scripting - Inkscape::SVGOStringStream os; - if (extent) { - os << area.extent(axis); + // "true" SVG bbox for scripting + Geom::OptRect area = item->getBounds(sp_item_i2doc_affine(item)); + if (area) { + Inkscape::SVGOStringStream os; + if (extent) { + os << area->dimensions()[axis]; + } else { + os << area->min()[axis]; + } + g_print ("%s", os.str().c_str()); } else { - os << area.min()[axis]; + g_print("0"); + } + } +} + +static void +do_query_all (SPDocument *doc) +{ + SPObject *o = NULL; + + o = SP_DOCUMENT_ROOT(doc); + + if (o) { + sp_document_ensure_up_to_date (doc); + do_query_all_recurse(o); + } +} + +static void +do_query_all_recurse (SPObject *o) +{ + SPItem *item = ((SPItem *) o); + if (o->id && SP_IS_ITEM(item)) { + Geom::OptRect area = item->getBounds(sp_item_i2doc_affine(item)); + if (area) { + Inkscape::SVGOStringStream os; + os << o->id; + os << "," << area->min()[Geom::X]; + os << "," << area->min()[Geom::Y]; + os << "," << area->dimensions()[Geom::X]; + os << "," << area->dimensions()[Geom::Y]; + g_print ("%s\n", os.str().c_str()); } - g_print ("%s", os.str().c_str()); + } + + SPObject *child = o->children; + while (child) { + do_query_all_recurse (child); + child = child->next; } } @@ -789,7 +1137,7 @@ sp_do_export_png(SPDocument *doc) GSList *items = NULL; - NRRect area; + Geom::Rect area; if (sp_export_id || sp_export_area_drawing) { SPObject *o = NULL; @@ -803,7 +1151,7 @@ sp_do_export_png(SPDocument *doc) } else if (sp_export_area_drawing) { o = SP_DOCUMENT_ROOT (doc); o_area = o; - } + } if (o) { if (!SP_IS_ITEM (o)) { @@ -849,30 +1197,33 @@ sp_do_export_png(SPDocument *doc) // write object bbox to area sp_document_ensure_up_to_date (doc); - sp_item_invoke_bbox((SPItem *) o_area, &area, sp_item_i2r_affine((SPItem *) o_area), TRUE); + Geom::OptRect areaMaybe; + sp_item_invoke_bbox((SPItem *) o_area, areaMaybe, sp_item_i2d_affine((SPItem *) o_area), TRUE); + if (areaMaybe) { + area = *areaMaybe; + } else { + g_warning("Unable to determine a valid bounding box. Nothing exported."); + return; + } } else { g_warning("Object with id=\"%s\" was not found in the document. Nothing exported.", sp_export_id); return; } } - + if (sp_export_area) { /* Try to parse area (given in SVG pixels) */ - if (!sscanf(sp_export_area, "%lg:%lg:%lg:%lg", &area.x0, &area.y0, &area.x1, &area.y1) == 4) { + gdouble x0,y0,x1,y1; + if (!sscanf(sp_export_area, "%lg:%lg:%lg:%lg", &x0, &y0, &x1, &y1) == 4) { g_warning("Cannot parse export area '%s'; use 'x0:y0:x1:y1'. Nothing exported.", sp_export_area); return; } - if ((area.x0 >= area.x1) || (area.y0 >= area.y1)) { - g_warning("Export area '%s' has negative width or height. Nothing exported.", sp_export_area); - return; - } + area = Geom::Rect(Geom::Interval(x0,x1), Geom::Interval(y0,y1)); } else if (sp_export_area_canvas || !(sp_export_id || sp_export_area_drawing)) { /* Export the whole canvas */ sp_document_ensure_up_to_date (doc); - area.x0 = SP_ROOT(doc->root)->x.computed; - area.y0 = SP_ROOT(doc->root)->y.computed; - area.x1 = area.x0 + sp_document_width (doc); - area.y1 = area.y0 + sp_document_height (doc); + Geom::Point origin (SP_ROOT(doc->root)->x.computed, SP_ROOT(doc->root)->y.computed); + area = Geom::Rect(origin, origin + sp_document_dimensions(doc)); } // set filename and dpi from options, if not yet set from the hints @@ -894,43 +1245,43 @@ sp_do_export_png(SPDocument *doc) } if (sp_export_area_snap) { - area.x0 = std::floor (area.x0); - area.y0 = std::floor (area.y0); - area.x1 = std::ceil (area.x1); - area.y1 = std::ceil (area.y1); + round_rectangle_outwards(area); } // default dpi - if (dpi == 0.0) + if (dpi == 0.0) { dpi = PX_PER_IN; + } - gint width = 0; - gint height = 0; + unsigned long int width = 0; + unsigned long int height = 0; if (sp_export_width) { - width = atoi(sp_export_width); - if ((width < 1) || (width > 65536)) { - g_warning("Export width %d out of range (1 - 65536). Nothing exported.", width); + errno=0; + width = strtoul(sp_export_width, NULL, 0); + if ((width < 1) || (width > PNG_UINT_31_MAX) || (errno == ERANGE) ) { + g_warning("Export width %lu out of range (1 - %lu). Nothing exported.", width, (unsigned long int)PNG_UINT_31_MAX); return; } - dpi = (gdouble) width * PX_PER_IN / (area.x1 - area.x0); + dpi = (gdouble) width * PX_PER_IN / area.width(); } if (sp_export_height) { - height = atoi(sp_export_height); - if ((height < 1) || (height > 65536)) { - g_warning("Export height %d out of range (1 - 65536). Nothing exported.", width); + errno=0; + height = strtoul(sp_export_height, NULL, 0); + if ((height < 1) || (height > PNG_UINT_31_MAX)) { + g_warning("Export height %lu out of range (1 - %lu). Nothing exported.", height, (unsigned long int)PNG_UINT_31_MAX); return; } - dpi = (gdouble) height * PX_PER_IN / (area.y1 - area.y0); + dpi = (gdouble) height * PX_PER_IN / area.height(); } if (!sp_export_width) { - width = (gint) ((area.x1 - area.x0) * dpi / PX_PER_IN + 0.5); + width = (unsigned long int) (area.width() * dpi / PX_PER_IN + 0.5); } if (!sp_export_height) { - height = (gint) ((area.y1 - area.y0) * dpi / PX_PER_IN + 0.5); + height = (unsigned long int) (area.height() * dpi / PX_PER_IN + 0.5); } guint32 bgcolor = 0x00000000; @@ -965,14 +1316,14 @@ sp_do_export_png(SPDocument *doc) g_print("Background RRGGBBAA: %08x\n", bgcolor); - g_print("Area %g:%g:%g:%g exported to %d x %d pixels (%g dpi)\n", area.x0, area.y0, area.x1, area.y1, width, height, dpi); + g_print("Area %g:%g:%g:%g exported to %lu x %lu pixels (%g dpi)\n", area[Geom::X][0], area[Geom::Y][0], area[Geom::X][1], area[Geom::Y][1], width, height, dpi); g_print("Bitmap saved as: %s\n", filename); - if ((width >= 1) && (height >= 1) && (width < 65536) && (height < 65536)) { - sp_export_png_file(doc, filename, area.x0, area.y0, area.x1, area.y1, width, height, dpi, dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : NULL); + if ((width >= 1) && (height >= 1) && (width <= PNG_UINT_31_MAX) && (height <= PNG_UINT_31_MAX)) { + sp_export_png_file(doc, filename, area, width, height, dpi, dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : NULL); } else { - g_warning("Calculated bitmap dimensions %d %d are out of range (1 - 65535). Nothing exported.", width, height); + g_warning("Calculated bitmap dimensions %lu %lu are out of range (1 - %lu). Nothing exported.", width, height, (unsigned long int)PNG_UINT_31_MAX); } g_slist_free (items); @@ -980,14 +1331,14 @@ sp_do_export_png(SPDocument *doc) /** - * Perform an export of either PS or EPS. + * Perform a PDF/PS/EPS export * * \param doc Document to export. * \param uri URI to export to. * \param mime MIME type to export as. */ -static void do_export_ps(SPDocument* doc, gchar const* uri, char const* mime) +static void do_export_ps_pdf(SPDocument* doc, gchar const* uri, char const* mime) { Inkscape::Extension::DB::OutputList o; Inkscape::Extension::db.get_output_list(o); @@ -998,49 +1349,75 @@ static void do_export_ps(SPDocument* doc, gchar const* uri, char const* mime) if (i == o.end()) { - g_warning ("Could not find an extension to export this file."); + g_warning ("Could not find an extension to export to MIME type %s.", mime); return; } - bool old_text_to_path = false; - bool old_bbox_page = false; - - try { - old_text_to_path = (*i)->get_param_bool("textToPath"); - (*i)->set_param_bool("textToPath", sp_export_text_to_path); + if (sp_export_id) { + SPObject *o = doc->getObjectById(sp_export_id); + if (o == NULL) { + g_warning("Object with id=\"%s\" was not found in the document. Nothing exported.", sp_export_id); + return; + } + (*i)->set_param_string ("exportId", sp_export_id); + } else { + (*i)->set_param_string ("exportId", ""); } - catch (...) { - g_warning ("Could not set export-text-to-path option for this export."); + + if (sp_export_area_canvas && sp_export_area_drawing) { + g_warning ("You cannot use --export-area-canvas and --export-area-drawing at the same time; only the former will take effect."); + sp_export_area_drawing = false; } - try { - old_bbox_page = (*i)->get_param_bool("pageBoundingBox"); - (*i)->set_param_bool("pageBoundingBox", sp_export_bbox_page); + if (sp_export_area_drawing) { + (*i)->set_param_bool ("areaDrawing", TRUE); + } else { + (*i)->set_param_bool ("areaDrawing", FALSE); } - catch (...) { - g_warning ("Could not set export-bbox-page option for this export."); + + if (sp_export_area_canvas) { + if (sp_export_eps) { + g_warning ("EPS cannot have its bounding box extend beyond its content, so if your drawing is smaller than the canvas, --export-area-canvas will clip it to drawing."); + } + (*i)->set_param_bool ("areaCanvas", TRUE); + } else { + (*i)->set_param_bool ("areaCanvas", FALSE); } - (*i)->save(doc, uri); + if (!sp_export_area_drawing && !sp_export_area_canvas && !sp_export_id) { + // neither is set, set canvas as default for ps/pdf and drawing for eps + if (sp_export_eps) { + try { + (*i)->set_param_bool("areaDrawing", TRUE); + } catch (...) {} + } + } - try { - (*i)->set_param_bool("textToPath", old_text_to_path); - (*i)->set_param_bool("pageBoundingBox", old_bbox_page); + if (sp_export_text_to_path) { + (*i)->set_param_bool("textToPath", TRUE); + } else { + (*i)->set_param_bool("textToPath", FALSE); } - catch (...) { + if (sp_export_ignore_filters) { + (*i)->set_param_bool("blurToBitmap", FALSE); + } else { + (*i)->set_param_bool("blurToBitmap", TRUE); } + + (*i)->save(doc, uri); } +#ifdef WIN32 /** - * Perform a PDF export + * Export a document to EMF * * \param doc Document to export. * \param uri URI to export to. - * \param mime MIME type to export as. + * \param mime MIME type to export as (should be "image/x-emf") */ -static void do_export_pdf(SPDocument* doc, gchar const* uri, char const* mime) +static void do_export_emf(SPDocument* doc, gchar const* uri, char const* mime) { Inkscape::Extension::DB::OutputList o; Inkscape::Extension::db.get_output_list(o); @@ -1051,12 +1428,13 @@ static void do_export_pdf(SPDocument* doc, gchar const* uri, char const* mime) if (i == o.end()) { - g_warning ("Could not find an extension to export this file."); + g_warning ("Could not find an extension to export to MIME type %s.", mime); return; } (*i)->save(doc, uri); } +#endif //WIN32 #ifdef WIN32 bool replaceArgs( int& argc, char**& argv ) @@ -1172,11 +1550,13 @@ bool replaceArgs( int& argc, char**& argv ) if ( wildcarded ) { #ifdef REPLACEARGS_ANSI - WIN32_FIND_DATAA data = {0}; + WIN32_FIND_DATAA data; #else - WIN32_FIND_DATAW data = {0}; + WIN32_FIND_DATAW data; #endif // REPLACEARGS_ANSI + memset((void *)&data, 0, sizeof(data)); + int baseLen = wcslen(parsed[i1]) + 2; wchar_t* base = new wchar_t[baseLen]; wcsncpy( base, parsed[i1], baseLen ); @@ -1338,7 +1718,7 @@ sp_process_args(poptContext ctx) GSList *fl = NULL; gint a; - while ((a = poptGetNextOpt(ctx)) >= 0) { + while ((a = poptGetNextOpt(ctx)) != -1) { switch (a) { case SP_ARG_FILE: { gchar const *fn = poptGetOptArg(ctx); @@ -1348,7 +1728,7 @@ sp_process_args(poptContext ctx) break; } case SP_ARG_VERSION: { - printf("Inkscape %s (%s)\n", INKSCAPE_VERSION, __DATE__); + printf("Inkscape %s (%s)\n", Inkscape::version_string, __DATE__); exit(0); break; } @@ -1357,6 +1737,30 @@ sp_process_args(poptContext ctx) exit(0); break; } + case SP_ARG_VERB_LIST: { + // This really shouldn't go here, we should init the app. + // But, since we're just exiting in this path, there is + // no harm, and this is really a better place to put + // everything else. + Inkscape::Extension::init(); + Inkscape::Verb::list(); + exit(0); + break; + } + case SP_ARG_VERB: + case SP_ARG_SELECT: { + gchar const *arg = poptGetOptArg(ctx); + if (arg != NULL) { + // printf("Adding in: %s\n", arg); + new Inkscape::CmdLineAction((a == SP_ARG_VERB), arg); + } + break; + } + case POPT_ERROR_BADOPT: { + g_warning ("Invalid option %s", poptBadOption(ctx, 0)); + exit(1); + break; + } default: { break; }