X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fsvg%2Fsvgwin.C;h=028a9307772c470aa2645bcf02f72064bda947ba;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hp=9b4ec70720b5b8ed125d3d21dd7370c369f20e96;hpb=49b1cbd236ac6c593d4fc85ed3f4a6344cbb9279;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/svg/svgwin.C b/cinelerra-5.1/plugins/svg/svgwin.C index 9b4ec707..028a9307 100644 --- a/cinelerra-5.1/plugins/svg/svgwin.C +++ b/cinelerra-5.1/plugins/svg/svgwin.C @@ -2,34 +2,37 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ -#include "bcdisplayinfo.h" -#include "clip.h" #include "svgwin.h" #include "filexml.h" #include "language.h" +#include "mainerror.h" + #include #include #include #include #include #include +#include +#include + #include #include "empty_svg.h" @@ -41,9 +44,9 @@ struct fifo_struct { }; SvgWin::SvgWin(SvgMain *client) - : PluginClientWindow(client, 300, 180, 300, 180, 1) -{ - this->client = client; + : PluginClientWindow(client, 420, 210, 420, 210, 1) +{ + this->client = client; this->editing = 0; } @@ -54,22 +57,51 @@ SvgWin::~SvgWin() void SvgWin::create_objects() { BC_Title *title; - int x = 10, y = 10; - add_tool(title = new BC_Title(x, y, _("Out X:"))); - int x1 = x + title->get_w() + 10; + int x0 = 10, y = 10; + + add_tool(title = new BC_Title(x0, y, _("Out X:"))); + int x1 = x0 + title->get_w() + 10; out_x = new SvgCoord(this, client, x1, y, &client->config.out_x); out_x->create_objects(); + int x2 = x1 + out_x->get_w() + 15; + add_tool(title = new BC_Title(x2, y, _("Out W:"))); + int x3 = x2 + title->get_w() + 10; + out_w = new SvgCoord(this, client, x3, y, &client->config.out_w); + out_w->create_objects(); y += out_x->get_h() + 5; - add_tool(new BC_Title(x, y, _("Out Y:"))); + + add_tool(new BC_Title(x0, y, _("Out Y:"))); out_y = new SvgCoord(this, client, x1, y, &client->config.out_y); out_y->create_objects(); + add_tool(title = new BC_Title(x2, y, _("Out H:"))); + out_h = new SvgCoord(this, client, x3, y, &client->config.out_h); + out_h->create_objects(); y += out_y->get_h() + 20; - add_tool(new_svg_button = new NewSvgButton(client, this, x, y)); - add_tool(edit_svg_button = new EditSvgButton(client, this, x+190, y)); + add_tool(title = new BC_Title(x0, y, _("DPI:"))); + dpi = new DpiValue(this, client, x1, y, &client->config.dpi); + dpi->create_objects(); + add_tool(dpi_button = new DpiButton(this, client, x2, y)); + dpi_button->create_objects(); + y += dpi->get_h() + 20; - add_tool(svg_file_title = new BC_Title(x, y+=42, client->config.svg_file)); - add_tool(svg_file_mstime = new BC_Title(x, y+=26, "")); + add_tool(svg_file_title = new BC_Title(x0, y, client->config.svg_file)); + y += svg_file_title->get_h() + 5; + struct stat st; + int64_t ms_time = stat(client->config.svg_file, &st) ? 0 : + st.st_mtim.tv_sec*1000 + st.st_mtim.tv_nsec/1000000; + char mtime[BCSTRLEN]; mtime[0] = 0; + if( ms_time > 0 ) { + time_t tm = ms_time/1000; + ctime_r(&tm ,mtime); + } + add_tool(svg_file_mstime = new BC_Title(x0, y, mtime)); + y += svg_file_mstime->get_h() + 15; + + y = get_h() - NewSvgButton::calculate_h() - 5; + add_tool(new_svg_button = new NewSvgButton(client, this, x0, y)); + y = get_h() - EditSvgButton::calculate_h() - 5; + add_tool(edit_svg_button = new EditSvgButton(client, this, x0+300, y)); show_window(); flush(); @@ -77,17 +109,28 @@ void SvgWin::create_objects() int SvgWin::close_event() { + new_svg_button->stop(); edit_svg_button->stop(); set_done(1); return 1; } +int SvgWin::hide_window(int flush) +{ + new_svg_button->stop(); + edit_svg_button->stop(); + return BC_WindowBase::hide_window(flush); +} + void SvgWin::update_gui(SvgConfig &config) { lock_window("SvgWin::update_gui"); out_x->update(config.out_x); out_y->update(config.out_y); + out_w->update(config.out_w); + out_h->update(config.out_h); + dpi->update(config.dpi); svg_file_title->update(config.svg_file); char mtime[BCSTRLEN]; mtime[0] = 0; if( config.ms_time > 0 ) { @@ -98,17 +141,6 @@ void SvgWin::update_gui(SvgConfig &config) unlock_window(); } -static void flicker(BC_GenericButton *btn, int n, int clr) -{ - int color = btn->get_color(); - while( --n >= 0 ) { - btn->text_color(clr); btn->draw_face(1); - btn->sync_display(); usleep(100000); - btn->text_color(color); btn->draw_face(1); - btn->sync_display(); usleep(100000); - } -} - SvgCoord::SvgCoord(SvgWin *win, SvgMain *client, int x, int y, float *value) : BC_TumbleTextBox(win, *value, (float)0, (float)3000, x, y, 100) { @@ -134,8 +166,14 @@ NewSvgButton::NewSvgButton(SvgMain *client, SvgWin *window, int x, int y) { this->client = client; this->window = window; + new_window = 0; +} +NewSvgButton::~NewSvgButton() +{ + stop(); } + int NewSvgButton::handle_event() { window->editing_lock.lock(); @@ -145,7 +183,7 @@ int NewSvgButton::handle_event() start(); } else { - flicker(this, 5, RED); + flicker(); window->editing_lock.unlock(); } @@ -170,23 +208,22 @@ void NewSvgButton::run() char *cp = getenv("HOME"); if( cp ) strncpy(directory, cp, sizeof(directory)); } - NewSvgWindow *new_window = new NewSvgWindow(client, window, directory); + new_window = new NewSvgWindow(client, window, directory); new_window->create_objects(); new_window->update_filter("*.svg"); result = new_window->run_window(); const char *filepath = new_window->get_path(0); - strcpy(filename, filepath); - delete new_window; - if( result || !filepath || !*filepath ) { - window->editing_lock.lock(); + strcpy(filename, filepath ? filepath : "" ); + delete new_window; new_window = 0; + window->editing_lock.lock(); + if( result || !filename[0] ) window->editing = 0; - window->editing_lock.unlock(); - return; // cancel or no filename given - } + window->editing_lock.unlock(); + if( !window->editing ) return; // cancel or no filename given // Extend the filename with .svg - if(strlen(filename) < 4 || - strcasecmp(&filename[strlen(filename) - 4], ".svg")) { + if( strlen(filename) < 4 || + strcasecmp(&filename[strlen(filename) - 4], ".svg") ) { strcat(filename, ".svg"); } @@ -202,11 +239,9 @@ void NewSvgButton::run() } } } while(result); // file doesn't exist so repeat - + strcpy(client->config.svg_file, filename); - struct stat st; - client->config.ms_time = stat(filename, &st) ? 0 : - st.st_mtim.tv_sec*1000 + st.st_mtim.tv_nsec/1000000; + client->config.ms_time = 0; window->update_gui(client->config); client->send_configure_change(); @@ -217,6 +252,14 @@ void NewSvgButton::run() return; } +void NewSvgButton::stop() +{ + if( new_window ) { + new_window->set_done(1); + } + join(); +} + EditSvgButton::EditSvgButton(SvgMain *client, SvgWin *window, int x, int y) : BC_GenericButton(x, y, _("Edit")), Thread(1) { @@ -245,16 +288,15 @@ void EditSvgButton::stop() int EditSvgButton::handle_event() { - + window->editing_lock.lock(); - if (!window->editing && client->config.svg_file[0] != 0) - { + if( !window->editing && client->config.svg_file[0] != 0 ) { window->editing = 1; window->editing_lock.unlock(); start(); } else { - flicker(this, 5, RED); + flicker(); window->editing_lock.unlock(); } return 1; @@ -269,7 +311,7 @@ void EditSvgButton::run() strcat(filename_png, ".png"); remove(filename_png); strcpy(filename_fifo, filename_png); - strcat(filename_fifo, ".fifo"); + strcat(filename_fifo, ".fifo"); remove(filename_fifo); if( !mkfifo(filename_fifo, S_IRWXU) && (fh_fifo = ::open(filename_fifo, O_RDWR+O_NONBLOCK)) >= 0 ) { @@ -329,15 +371,40 @@ SvgInkscapeThread::~SvgInkscapeThread() join(); } +static int exec_command(char* const*argv) +{ + pid_t pid = vfork(); + if( pid < 0 ) return -1; + if( pid > 0 ) { + int stat = 0; + waitpid(pid, &stat, 0); + if( stat ) { + char msg[BCTEXTLEN]; + sprintf(msg, "%s: error exit status %d", argv[0], stat); + MainError::show_error(msg); + } + return 0; + } + execvp(argv[0], &argv[0]); + return -1; +} + void SvgInkscapeThread::run() { // Runs the inkscape char command[1024]; - sprintf(command, "inkscape --with-gui %s", edit->client->config.svg_file); + snprintf(command, sizeof(command), + "inkscape --with-gui %s", edit->client->config.svg_file); printf(_("Running external SVG editor: %s\n"), command); + char *const argv[] = { + (char*) "inkscape", + (char*)"--with-gui", + edit->client->config.svg_file, + 0, + }; enable_cancel(); - system(command); + exec_command(argv); printf(_("External SVG editor finished\n")); struct fifo_struct fifo_buf; fifo_buf.pid = getpid(); @@ -349,22 +416,53 @@ void SvgInkscapeThread::run() } - NewSvgWindow::NewSvgWindow(SvgMain *client, SvgWin *window, char *init_directory) : BC_FileBox(0, BC_WindowBase::get_resources()->filebox_h / 2, - init_directory, - _("SVG Plugin: Pick SVG file"), + init_directory, + _("SVG Plugin: Pick SVG file"), _("Open an existing SVG file or create a new one")) -{ - this->window = window; +{ + this->window = window; } NewSvgWindow::~NewSvgWindow() {} +DpiValue::DpiValue(SvgWin *win, SvgMain *client, int x, int y, float *value) + : BC_TumbleTextBox(win, *value, (float)10, (float)1000, x, y, 100) +{ +//printf("SvgWidth::SvgWidth %f\n", client->config.w); + this->client = client; + this->win = win; + this->value = value; +} +DpiValue::~DpiValue() +{ +} +int DpiValue::handle_event() +{ + *value = atof(get_text()); + return 1; +} + + +DpiButton::DpiButton( SvgWin *window, SvgMain *client, int x, int y) + : BC_GenericButton(x, y, _("update dpi")) +{ + this->client = client; + this->window = window; +} +DpiButton::~DpiButton() +{ +} +int DpiButton::handle_event() +{ + client->send_configure_change(); + return 1; +};