/*! \file workarea.cpp
** \brief Template Header
**
-** $Id: workarea.cpp,v 1.3 2005/01/16 19:55:57 darco Exp $
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright 2006 Yue Shi Lai
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include <synfig/target_scanline.h>
#include <synfig/target_tile.h>
#include <synfig/surface.h>
+#include <synfig/valuenode_composite.h>
#include <synfigapp/canvasinterface.h>
#include "event_mouse.h"
#include "event_layerclick.h"
}
- virtual bool start_frame(synfig::ProgressCallback *cb)
+ virtual bool start_frame(synfig::ProgressCallback */*cb*/)
{
synfig::Mutex::Lock lock(mutex);
}
- virtual bool start_frame(synfig::ProgressCallback *cb)
+ virtual bool start_frame(synfig::ProgressCallback */*cb*/)
{
return true;
}
dragging(DRAG_NONE),
show_grid(false),
tile_w(128),
- tile_h(128)
+ tile_h(128),
+ timecode_width(0),
+ timecode_height(0)
{
show_guides=true;
curr_input_device=0;
if(!data.empty())
{
if(!load_sketch(data))
- load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPERATOR+basename(data));
+ load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPARATOR+basename(data));
}
}
WorkArea::~WorkArea()
{
// delete [] buffer;
+
+ // don't leave the render function queued if we are about to vanish;
+ // that causes crashes
+ if(render_idle_func_id)
+ render_idle_func_id=0;
+}
+
+bool
+WorkArea::get_updating()const
+{
+ return App::single_threaded && async_renderer && async_renderer->updating;
+}
+
+void
+WorkArea::stop_updating(bool cancel)
+{
+ async_renderer->stop();
+ if (cancel) canceled_=true;
}
void
WorkArea::set_focus_point(const synfig::Point &point)
{
// These next three lines try to ensure that we place the
- // focus on a pixel boundry
+ // focus on a pixel boundary
/*Point adjusted(point[0]/abs(get_pw()),point[1]/abs(get_ph()));
adjusted[0]=(abs(adjusted[0]-floor(adjusted[0]))<0.5)?floor(adjusted[0])*abs(get_pw()):ceil(adjusted[0])*abs(get_ph());
adjusted[1]=(abs(adjusted[1]-floor(adjusted[1]))<0.5)?floor(adjusted[1])*abs(get_ph()):ceil(adjusted[1])*abs(get_ph());
modifier=Gdk::ModifierType(event->button.state);
}
- // Make sure we recognise the device
+ // Make sure we recognize the device
if(curr_input_device)
{
if(curr_input_device!=device)
// GDK mouse scrolling events
else if(event->any.type==GDK_SCROLL)
{
- // GDK information needed to properly interprete mouse
+ // GDK information needed to properly interpret mouse
// scrolling events are: scroll.state, scroll.x/scroll.y, and
// scroll.direction. The value of scroll.direction will be
// obtained later.
if(duck)
{
- clicked_duck=0;
+ // make a note of whether the duck we click on was selected or not
if(duck_is_selected(duck))
- {
clicked_duck=duck;
- }
else
{
- if(modifier&GDK_SHIFT_MASK)
- {
- select_duck(duck);
- }
- else if(modifier&GDK_CONTROL_MASK)
- {
- select_duck(duck);
- }
- else
- {
+ clicked_duck=0;
+ // if CTRL isn't pressed, clicking an unselected duck will unselect all other ducks
+ if(!(modifier&GDK_CONTROL_MASK))
clear_selected_ducks();
- select_duck(duck);
- }
+ select_duck(duck);
}
}
}
{
//get_selected_duck()->signal_user_click(0)();
//if(clicked_duck)clicked_duck->signal_user_click(0)();
+
+ // if the user is holding shift while clicking on a tangent duck, consider splitting the tangent
+ if (event->motion.state&GDK_SHIFT_MASK && duck->get_type() == Duck::TYPE_TANGENT)
+ {
+ synfigapp::ValueDesc value_desc = duck->get_value_desc();
+
+ // we have the tangent, but need the vertex - that's the parent
+ if (value_desc.parent_is_value_node()) {
+ ValueNode_Composite::Handle parent_value_node = value_desc.get_parent_value_node();
+
+ // if the tangent isn't split, then split it
+ if (!((*(parent_value_node->get_link("split")))(get_time()).get(bool())))
+ {
+ get_canvas_view()->canvas_interface()->
+ change_value(synfigapp::ValueDesc(parent_value_node,
+ parent_value_node->get_link_index_from_name("split")),
+ true);
+ // rebuild the ducks from scratch, so the tangents ducks aren't connected
+ get_canvas_view()->rebuild_ducks();
+
+ // reprocess the mouse click
+ return on_drawing_area_event(event);
+ }
+ } else {
+ // I don't know how to access the vertex from the tangent duck when originally drawing the bline in the bline tool
+
+ // synfig::ValueNode::Handle vn = value_desc.get_value_node();
+ synfig::info("parent isn't value node? shift-drag-tangent doesn't work in bline tool yet...");
+ }
+ }
+
dragging=DRAG_DUCK;
drag_point=mouse_pos;
//drawing_area->queue_draw();
if(get_selected_ducks().size()<=1)
duck->signal_user_click(2)();
else
- {
canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MULTIPLE_DUCKS_CLICKED,BUTTON_RIGHT,mouse_pos,pressure,modifier));
- }
return true;
}
- else
- if(bezier)
+ else if(bezier)
{
bezier->signal_user_click(2)(bezier_click_pos);
return true;
}
- else
- if(layer)
+ else if (layer)
{
if(canvas_view->get_smach().process_event(EventLayerClick(layer,BUTTON_RIGHT,mouse_pos))==Smach::RESULT_OK)
return false;
signal_cursor_moved_();
- // Guide/Duck hilights on hover
+ // Guide/Duck highlights on hover
if(dragging==DRAG_NONE)
{
GuideList::iterator iter;
drawing_area->queue_draw();
}
+
if(dragging==DRAG_BOX)
{
curr_point=mouse_pos;
drawing_area->queue_draw();
}
+
if(dragging==DRAG_GUIDE)
{
if(curr_guide_is_x)
*curr_guide=mouse_pos[1];
drawing_area->queue_draw();
}
+
if(dragging!=DRAG_WINDOW)
{ // Update those triangle things on the rulers
const synfig::Point point(mouse_pos);
hruler->property_position()=Distance(point[0],Distance::SYSTEM_UNITS).get(App::distance_system,get_canvas()->rend_desc());
vruler->property_position()=Distance(point[1],Distance::SYSTEM_UNITS).get(App::distance_system,get_canvas()->rend_desc());
}
- if(dragging==DRAG_WINDOW)
- {
- set_focus_point(get_focus_point()+mouse_pos-drag_point);
- }
- else
- if(event->motion.state&GDK_BUTTON1_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_LEFT,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+
+ if(dragging == DRAG_WINDOW)
+ set_focus_point(get_focus_point() + mouse_pos-drag_point);
+ else if (event->motion.state & GDK_BUTTON1_MASK &&
+ canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_LEFT,
+ mouse_pos,pressure,modifier)) == Smach::RESULT_ACCEPT)
return true;
- else
- if(event->motion.state&GDK_BUTTON2_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_MIDDLE,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+ else if (event->motion.state & GDK_BUTTON2_MASK &&
+ canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_MIDDLE,
+ mouse_pos, pressure, modifier)) == Smach::RESULT_ACCEPT)
return true;
- else
- if(event->motion.state&GDK_BUTTON3_MASK && canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG,BUTTON_RIGHT,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+ else if (event->motion.state & GDK_BUTTON3_MASK &&
+ canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_BUTTON_DRAG, BUTTON_RIGHT,
+ mouse_pos, pressure, modifier)) == Smach::RESULT_ACCEPT)
return true;
- else
- if(canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_MOTION,BUTTON_NONE,mouse_pos,pressure,modifier))==Smach::RESULT_ACCEPT)
+ else if(canvas_view->get_smach().process_event(EventMouse(EVENT_WORKAREA_MOUSE_MOTION, BUTTON_NONE,
+ mouse_pos, pressure,modifier)) == Smach::RESULT_ACCEPT)
return true;
break;
+
case GDK_BUTTON_RELEASE:
{
bool ret(false);
get_canvas_view()->duck_refresh_flag=true;
if(!drag_did_anything)
{
- //etl::handle<Duck> duck=find_duck(mouse_pos,radius);
-
- if(modifier&GDK_SHIFT_MASK)
+ // if we originally clicked on a selected duck ...
+ if(clicked_duck)
{
- //synfig::info("DUCK_DRAG_RELEASE: SHIFT-MASK ON!");
- if(clicked_duck)
- {
- //synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
+ // ... and CTRL is pressed, then just toggle the clicked duck
+ // otherwise make the clicked duck the only selected duck
+ if(modifier&GDK_CONTROL_MASK)
unselect_duck(clicked_duck);
- }
- }
- else if(modifier&GDK_CONTROL_MASK)
- {
- //synfig::info("DUCK_DRAG_RELEASE: CONTROL-MASK ON!");
- if(clicked_duck)
- {
- //synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
- unselect_duck(clicked_duck);
- }
- }
- else
- {
- //synfig::info("DUCK_DRAG_RELEASE: NO MASK!");
- if(clicked_duck)
+ else
{
- //synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
clear_selected_ducks();
select_duck(clicked_duck);
}
+ clicked_duck->signal_user_click(0)();
}
- if(clicked_duck)clicked_duck->signal_user_click(0)();
}
else
{
if(canvas_view->get_smach().process_event(EventBox(drag_point,mouse_pos,MouseButton(event->button.button),modifier))==Smach::RESULT_ACCEPT)
return true;
- if(!(modifier&GDK_CONTROL_MASK) && !(modifier&GDK_SHIFT_MASK))
+ // when dragging a box around some ducks:
+ // SHIFT selects; CTRL toggles; SHIFT+CTRL unselects; <none> clears all then selects
+ if(modifier&GDK_SHIFT_MASK)
+ select_ducks_in_box(drag_point,mouse_pos);
+
+ if(modifier&GDK_CONTROL_MASK)
+ toggle_select_ducks_in_box(drag_point,mouse_pos);
+ else if(!(modifier&GDK_SHIFT_MASK))
+ {
clear_selected_ducks();
- select_ducks_in_box(drag_point,mouse_pos);
+ select_ducks_in_box(drag_point,mouse_pos);
+ }
ret=true;
}
else
switch(event->scroll.direction)
{
case GDK_SCROLL_UP:
+ case GDK_SCROLL_RIGHT:
get_scrollx_adjustment()->set_value(scroll_point[0]+(mouse_pos[0]-scroll_point[0])*(1.25-(1+drift)));
get_scrolly_adjustment()->set_value(scroll_point[1]-(mouse_pos[1]+scroll_point[1])*(1.25-(1+drift)));
zoom_in();
break;
case GDK_SCROLL_DOWN:
+ case GDK_SCROLL_LEFT:
get_scrollx_adjustment()->set_value(scroll_point[0]+(mouse_pos[0]-scroll_point[0])*(1/1.25-(1+drift)));
get_scrolly_adjustment()->set_value(scroll_point[1]-(mouse_pos[1]+scroll_point[1])*(1/1.25-(1+drift)));
zoom_out();
case GDK_SCROLL_DOWN:
get_scrollx_adjustment()->set_value(get_scrollx_adjustment()->get_value()+scroll_pixel*pw);
break;
+ case GDK_SCROLL_LEFT:
+ get_scrolly_adjustment()->set_value(get_scrolly_adjustment()->get_value()+scroll_pixel*ph);
+ break;
+ case GDK_SCROLL_RIGHT:
+ get_scrolly_adjustment()->set_value(get_scrolly_adjustment()->get_value()-scroll_pixel*ph);
+ break;
default:
break;
}
case GDK_SCROLL_DOWN:
get_scrolly_adjustment()->set_value(get_scrolly_adjustment()->get_value()-scroll_pixel*ph);
break;
+ case GDK_SCROLL_LEFT:
+ get_scrollx_adjustment()->set_value(get_scrollx_adjustment()->get_value()-scroll_pixel*pw);
+ break;
+ case GDK_SCROLL_RIGHT:
+ get_scrollx_adjustment()->set_value(get_scrollx_adjustment()->get_value()+scroll_pixel*pw);
+ break;
default:
break;
}
}
bool
-WorkArea::on_hruler_event(GdkEvent *event)
+WorkArea::on_hruler_event(GdkEvent */*event*/)
{
/*
switch(event->type)
}
bool
-WorkArea::on_vruler_event(GdkEvent *event)
+WorkArea::on_vruler_event(GdkEvent */*event*/)
{
/*
switch(event->type)
}
synfig::Point
-WorkArea::comp_to_screen_coords(synfig::Point pos)const
+WorkArea::comp_to_screen_coords(synfig::Point /*pos*/)const
{
synfig::warning("WorkArea::comp_to_screen_coords: Not yet implemented");
return synfig::Point();
}
}
-
// Calculate the window coordinates of the top-left
// corner of the canvas.
//const synfig::Vector::value_type
Glib::RefPtr<Gdk::GC> gc=Gdk::GC::create(drawing_area->get_window());
-
-
// If we are in animate mode, draw a red border around the screen
if(canvas_interface->get_mode()&synfigapp::MODE_ANIMATE)
{
- /*gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
+// #define USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+#ifdef USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+ // This method of drawing the red border doesn't work on any
+ // Gtk theme which uses the crux-engine, hcengine, industrial,
+ // mist, or ubuntulooks engine, such as the default ubuntu
+ // 'Human' theme.
+ drawing_frame->modify_bg(Gtk::STATE_NORMAL,Gdk::Color("#FF0000"));
+#else
+ // So let's do it in a more primitive fashion.
+ gc->set_rgb_fg_color(Gdk::Color("#FF0000"));
gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
drawing_area->get_window()->draw_rectangle(
gc,
false, // Fill?
0,0, // x,y
- drawing_area->get_width()-1,drawing_area->get_height()-1 //w,h
- );
- */
- drawing_frame->modify_bg(Gtk::STATE_NORMAL,Gdk::Color("#FF0000"));
- //get_window()->set_background(Gdk::Color("#FF0000"));
+ drawing_area->get_width()-1,drawing_area->get_height()-1); // w,h
+#endif
}
+#ifdef USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
else
drawing_frame->unset_bg(Gtk::STATE_NORMAL);
-
-
+#endif
previous_focus=get_focus_point();
}
+namespace studio
+{
class WorkAreaProgress : public synfig::ProgressCallback
{
WorkArea *work_area;
return cb->amount_complete(current,total);
}
};
+}
bool
studio::WorkArea::async_update_preview()
{
+ if (get_updating())
+ {
+ stop_updating();
+ queue_render_preview();
+ return false;
+ }
+
async_renderer=0;
queued=false;
if(!async_renderer)
return;
- // If we completed successfuly, then
+ // If we completed successfully, then
// we aren't dirty anymore
if(async_renderer->has_success())
{
dirty=false;
get_canvas_view()->reset_cancel_status();
- bool ret=false;
RendDesc desc=get_canvas()->rend_desc();
//newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
if(cb)
cb->task(strprintf("Rendering canvas %s...",get_canvas()->get_name().c_str()));
- target->render(cb);
+ bool ret = target->render(cb);
if(!ret && !get_canvas_view()->get_cancel_status() && dirty)
{
// it is being displayed correctly
drawing_area->queue_draw();
- // If we completed successfuly, then
+ // If we completed successfully, then
// we aren't dirty anymore
if(ret)
{
drawing_area->get_window()->scroll(-dx,-dy);
- /*drawing_area->queue_draw_area(
- 0,
- 0,
- 128,
- 64
- );
- */
+ if (timecode_width && timecode_height)
+ {
+ drawing_area->queue_draw_area(4, 4, 4+timecode_width, 4+timecode_height);
+ drawing_area->queue_draw_area(4-dx, 4-dy, 4-dx+timecode_width, 4-dy+timecode_height);
+ }
+
+#ifndef USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+ if(canvas_interface->get_mode()&synfigapp::MODE_ANIMATE)
+ {
+ int maxx = drawing_area->get_width()-1;
+ int maxy = drawing_area->get_height()-1;
+
+ if (dx > 0)
+ {
+ drawing_area->queue_draw_area( 0, 0, 1, maxy);
+ drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy);
+ }
+ else if (dx < 0)
+ {
+ drawing_area->queue_draw_area( maxx, 0, maxx, maxy);
+ drawing_area->queue_draw_area( -dx, 0, -dx, maxy);
+ }
+ if (dy > 0)
+ {
+ drawing_area->queue_draw_area(0, 0, maxx, 1);
+ drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy);
+ }
+ else if (dy < 0)
+ {
+ drawing_area->queue_draw_area(0, maxy, maxx, maxy);
+ drawing_area->queue_draw_area(0, -dy, maxx, -dy);
+ }
+ }
+#endif // USE_FRAME_BACKGROUND_TO_SHOW_EDIT_MODE
+
last_focus_point=focus_point;
}
gboolean
studio::WorkArea::__render_preview(gpointer data)
{
-
WorkArea *work_area(static_cast<WorkArea*>(data));
+ // there's no point anyone trying to cancel the timer now - it's gone off already
+ work_area->render_idle_func_id = 0;
+
work_area->queued=false;
work_area->async_render_preview(work_area->get_canvas_view()->get_time());
{
//synfig::info("queue_render_preview(): (re)queuing...");
//render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL);
- render_idle_func_id=g_timeout_add_full(G_PRIORITY_DEFAULT,queue_time,__render_preview,this,NULL);
+ render_idle_func_id=g_timeout_add_full(
+ G_PRIORITY_DEFAULT, // priority -
+ queue_time, // interval - the time between calls to the function, in milliseconds (1/1000ths of a second)
+ __render_preview, // function - function to call
+ this, // data - data to pass to function
+ NULL); // notify - function to call when the idle is removed, or NULL
queued=true;
}
/* else if(rendering)
drawing_area->get_window()->set_cursor(Gdk::Cursor(x));
}
-#include "iconcontroler.h"
+#include "iconcontroller.h"
void
studio::WorkArea::refresh_cursor()
{
-// set_cursor(IconControler::get_tool_cursor(canvas_view->get_smach().get_state_name(),drawing_area->get_window()));
+// set_cursor(IconController::get_tool_cursor(canvas_view->get_smach().get_state_name(),drawing_area->get_window()));
}
void