![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index cceea8267272a4887eb0933b054bd159f65d5335..d8e7b879710430e9cf72a80dd36b7335ed9fbecb 100644 (file)
* for both endpoints, even if only one is moving.
* o Cleanup to remove unecessary borrowed DrawContext code.
* o Allow user-placeable connection points.
- * o Deal sanely with connectors with both endpoints attached to the
+ * o Deal sanely with connectors with both endpoints attached to the
* same connection point, and drawing of connectors attaching
* overlaping shapes (currently tries to adjust connector to be
* outside both bounding boxes).
* attached to each other.
* e.g., detach connector when it is moved or transformed in
* one of the other contexts.
- * o Cope with shapes whose ids change when they have attached
+ * o Cope with shapes whose ids change when they have attached
* connectors.
* o gobble_motion_events(GDK_BUTTON1_MASK)?;
*
ec->yp = 0;
cc->red_color = 0xff00007f;
-
+
cc->newconn = NULL;
cc->newConnRef = NULL;
-
+
cc->sel_changed_connection = sigc::connection();
-
+
cc->active_shape = NULL;
cc->active_shape_repr = NULL;
cc->active_shape_layer_repr = NULL;
cc->active_conn_repr = NULL;
cc->active_handle = NULL;
-
+
cc->clickeditem = NULL;
cc->clickedhandle = NULL;
-
+
cc->connpthandle = NULL;
for (int i = 0; i < 2; ++i) {
cc->endpt_handle[i] = NULL;
((SPEventContextClass *) parent_class)->setup(ec);
}
- cc->selection = SP_DT_SELECTION(dt);
+ cc->selection = sp_desktop_selection(dt);
cc->sel_changed_connection.disconnect();
cc->sel_changed_connection = cc->selection->connectChanged(
sigc::bind(sigc::ptr_fun(&cc_selection_changed),
(gpointer) cc));
-
+
/* Create red bpath */
- cc->red_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL);
+ cc->red_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cc->red_bpath), cc->red_color,
1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cc->red_bpath), 0x00000000,
// Notice the initial selection.
cc_selection_changed(cc->selection, (gpointer) cc);
-
+
if (prefs_get_int_attribute("tools.connector", "selcue", 0) != 0) {
ec->enableSelectionCue();
}
+
+ // Make sure we see all enter events for canvas items,
+ // even if a mouse button is depressed.
+ dt->canvas->gen_all_enter_events = true;
}
sp_connector_context_finish(SPEventContext *ec)
{
SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(ec);
-
+
spcc_connector_finish(cc);
if (((SPEventContextClass *) parent_class)->finish) {
((SPEventContextClass *) parent_class)->finish(ec);
}
-
+
if (cc->selection) {
cc->selection = NULL;
}
cc_clear_active_shape(cc);
cc_clear_active_conn(cc);
+
+ // Restore the default event generating behaviour.
+ SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(ec);
+ desktop->canvas->gen_all_enter_events = false;
}
sp_repr_remove_listener_by_data(cc->active_shape_repr, cc);
Inkscape::GC::release(cc->active_shape_repr);
cc->active_shape_repr = NULL;
-
+
sp_repr_remove_listener_by_data(cc->active_shape_layer_repr, cc);
Inkscape::GC::release(cc->active_shape_layer_repr);
cc->active_shape_layer_repr = NULL;
{
// TODO: this will need to change when there are more connection
// points available for each shape.
-
+
SPKnot *centerpt = cc->connpthandle;
if (cc->active_handle && (cc->active_handle == centerpt))
{
@@ -485,7 +493,7 @@ connector_handle_button_press(SPConnectorContext *const cc, GdkEventButton const
if (Inkscape::have_viable_layer(desktop, cc->_message_context) == false) {
return TRUE;
}
-
+
NR::Point const event_w(bevent.x,
bevent.y);
connector_drag_origin_w = event_w;
@@ -500,35 +508,35 @@ connector_handle_button_press(SPConnectorContext *const cc, GdkEventButton const
if ( cc->npoints == 0 ) {
/* Set start anchor */
NR::Point p;
-
+
cc_clear_active_conn(cc);
SP_EVENT_CONTEXT_DESKTOP(cc)->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating new connector"));
/* Create green anchor */
p = event_dt;
-
+
// Test whether we clicked on a connection point
cc->sid = conn_pt_handle_test(cc, p);
-
+
if (!cc->sid) {
// This is the first point, so just snap it to the grid
// as there's no other points to go off.
SnapManager const m(cc->desktop->namedview);
p = m.freeSnap(Inkscape::Snapper::SNAP_POINT | Inkscape::Snapper::BBOX_POINT,
p, NULL).getPoint();
- }
+ }
spcc_connector_set_initial_point(cc, p);
-
+
}
cc->state = SP_CONNECTOR_CONTEXT_DRAGGING;
ret = TRUE;
break;
- }
+ }
case SP_CONNECTOR_CONTEXT_DRAGGING:
{
// This is the second click of a connector creation.
-
+
spcc_connector_set_subsequent_point(cc, p);
spcc_connector_finish_segment(cc, p);
// Test whether we clicked on a connection point
@@ -592,7 +600,7 @@ connector_handle_motion_notify(SPConnectorContext *const cc, GdkEventMotion cons
case SP_CONNECTOR_CONTEXT_DRAGGING:
{
// This is movement during a connector creation.
-
+
if ( cc->npoints > 0 ) {
cc->selection->clear();
spcc_connector_set_subsequent_point(cc, p);
@@ -645,7 +653,7 @@ connector_handle_button_release(SPConnectorContext *const cc, GdkEventButton con
if ( revent.button == 1 ) {
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
NR::Point const event_w(revent.x, revent.y);
@@ -695,7 +703,7 @@ connector_handle_button_release(SPConnectorContext *const cc, GdkEventButton con
}
cc->clickeditem->setHidden(false);
sp_conn_adjust_path(SP_PATH(cc->clickeditem));
- cc->clickeditem->updateRepr();
+ cc->clickeditem->updateRepr();
sp_document_done(doc);
cc_set_active_conn(cc, cc->clickeditem);
sp_document_ensure_up_to_date(doc);
/* Red */
sp_curve_reset(cc->red_curve);
sp_canvas_bpath_set_bpath(SP_CANVAS_BPATH(cc->red_bpath), NULL);
-
+
sp_curve_reset(cc->green_curve);
cc->npoints = 0;
}
@@ -780,7 +788,8 @@ spcc_connector_set_subsequent_point(SPConnectorContext *const cc, NR::Point cons
Avoid::Point dst = { d[NR::X], d[NR::Y] };
if (!cc->newConnRef) {
- cc->newConnRef = new Avoid::ConnRef(0, src, dst);
+ Avoid::Router *router = sp_desktop_document(dt)->router;
+ cc->newConnRef = new Avoid::ConnRef(router, 0, src, dst);
cc->newConnRef->updateEndPoint(Avoid::VertID::src, src);
}
cc->newConnRef->updateEndPoint(Avoid::VertID::tar, dst);
sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(cc)));
SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc);
- SPDocument *doc = SP_DT_DOCUMENT(desktop);
+ SPDocument *doc = sp_desktop_document(desktop);
if ( c && !sp_curve_empty(c) ) {
/* We actually have something to write */
spcc_concat_colors_and_flush(cc);
cc->npoints = 0;
-
+
if (cc->newConnRef) {
cc->newConnRef->removeFromGraph();
delete cc->newConnRef;
knot->fill [SP_KNOT_STATE_NORMAL], NULL);
gtk_object_set (GTK_OBJECT (knot->item), "stroke_color",
knot->stroke [SP_KNOT_STATE_NORMAL], NULL);
-
+
cc->active_handle = NULL;
if (knot->tip) {
}
-static gboolean
+static gboolean
endpt_handler(SPKnot *knot, GdkEvent *event, SPConnectorContext *cc)
{
g_assert( SP_IS_CONNECTOR_CONTEXT(cc) );
cc->clickedhandle = cc->active_handle;
cc_clear_active_conn(cc);
cc->state = SP_CONNECTOR_CONTEXT_REROUTING;
-
+
// Disconnect from attached shape
unsigned ind = (cc->active_handle == cc->endpt_handle[0]) ? 0 : 1;
sp_conn_end_detach(cc->clickeditem, ind);
-
+
NR::Point origin;
if (cc->clickedhandle == cc->endpt_handle[0]) {
origin = cc->endpt_handle[1]->pos;
static void cc_set_active_shape(SPConnectorContext *cc, SPItem *item)
{
g_assert(item != NULL );
-
+
cc->active_shape = item;
// Remove existing active shape listeners
if (cc->active_shape_repr) {
sp_repr_remove_listener_by_data(cc->active_shape_repr, cc);
Inkscape::GC::release(cc->active_shape_repr);
-
+
sp_repr_remove_listener_by_data(cc->active_shape_layer_repr, cc);
Inkscape::GC::release(cc->active_shape_layer_repr);
}
-
+
// Listen in case the active shape changes
- cc->active_shape_repr = SP_OBJECT_REPR(item);
+ cc->active_shape_repr = SP_OBJECT_REPR(item);
if (cc->active_shape_repr) {
Inkscape::GC::anchor(cc->active_shape_repr);
sp_repr_add_listener(cc->active_shape_repr, &shape_repr_events, cc);
-
+
cc->active_shape_layer_repr = cc->active_shape_repr->parent();
Inkscape::GC::anchor(cc->active_shape_layer_repr);
sp_repr_add_listener(cc->active_shape_layer_repr, &layer_repr_events, cc);
}
-
+
// Set center connection point.
if ( cc->connpthandle == NULL ) {
SPKnot * knot = (SPKnot*)g_object_new (SP_TYPE_KNOT, 0);
knot->desktop = cc->desktop;
knot->flags = SP_KNOT_VISIBLE;
- knot->item = sp_canvas_item_new (SP_DT_CONTROLS(cc->desktop),
+ knot->item = sp_canvas_item_new (sp_desktop_controls(cc->desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"filled", TRUE,
"anchor", GTK_ANCHOR_CENTER,
"tip", _("<b>Connection point</b>: click or drag to create a new connector"),
NULL);
-
+
cc->connpthandle = knot;
}
-
+
NR::Rect bbox = sp_item_bbox_desktop(cc->active_shape);
NR::Point center = bbox.midpoint();
sp_knot_set_position(cc->connpthandle, ¢er, 0);
sp_knot_show(cc->connpthandle);
-
+
}
SPCurve *curve = SP_SHAPE(SP_PATH(item))->curve;
NR::Matrix i2d = sp_item_i2d_affine(item);
-
+
if (cc->active_conn == item)
{
// Just adjust handle positions.
NR::Point startpt = sp_curve_first_point(curve) * i2d;
sp_knot_set_position(cc->endpt_handle[0], &startpt, 0);
-
+
NR::Point endpt = sp_curve_last_point(curve) * i2d;
sp_knot_set_position(cc->endpt_handle[1], &endpt, 0);
-
+
return;
}
-
+
cc->active_conn = item;
// Remove existing active conn listeners
Inkscape::GC::release(cc->active_conn_repr);
cc->active_conn_repr = NULL;
}
-
+
// Listen in case the active conn changes
- cc->active_conn_repr = SP_OBJECT_REPR(item);
+ cc->active_conn_repr = SP_OBJECT_REPR(item);
if (cc->active_conn_repr) {
Inkscape::GC::anchor(cc->active_conn_repr);
sp_repr_add_listener(cc->active_conn_repr, &shape_repr_events, cc);
knot->desktop = cc->desktop;
knot->flags = SP_KNOT_VISIBLE;
- knot->item = sp_canvas_item_new (SP_DT_CONTROLS (cc->desktop),
+ knot->item = sp_canvas_item_new (sp_desktop_controls (cc->desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"filled", TRUE,
cc->endpt_handle[i] = knot;
}
-
+
// Remove any existing handlers
if (cc->endpt_handler_id[i]) {
g_signal_handlers_disconnect_by_func(
cc->endpt_handler_id[i] = 0;
}
- // Setup handlers for connector endpoints, this is
+ // Setup handlers for connector endpoints, this is
// is as 'after' so that cc_generic_knot_handler is
// triggered first for any endpoint.
cc->endpt_handler_id[i] = g_signal_connect_after(
G_OBJECT(cc->endpt_handle[i]->item), "event",
G_CALLBACK(endpt_handler), cc);
}
-
+
NR::Point startpt = sp_curve_first_point(curve) * i2d;
sp_knot_set_position(cc->endpt_handle[0], &startpt, 0);
-
+
NR::Point endpt = sp_curve_last_point(curve) * i2d;
sp_knot_set_position(cc->endpt_handle[1], &endpt, 0);
-
+
sp_knot_show(cc->endpt_handle[0]);
sp_knot_show(cc->endpt_handle[1]);
}
return false;
}
-
+
void cc_selection_set_avoid(bool const set_avoid)
{
SPDesktop *desktop = inkscape_active_desktop();
return;
}
- SPDocument *document = SP_DT_DOCUMENT(desktop);
+ SPDocument *document = sp_desktop_document(desktop);
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
+ Inkscape::Selection *selection = sp_desktop_selection(desktop);
GSList *l = (GSList *) selection->itemList();
SPItem *item = (SPItem *) l->data;
char const *value = (set_avoid) ? "true" : NULL;
-
+
if (cc_item_is_shape(item)) {
sp_object_setAttribute(item, "inkscape:connector-avoid",
value, false);
item->avoidRef->handleSettingChange();
changes++;
}
-
+
l = l->next;
}
sp_document_done(document);
}
-
+
static void
cc_selection_changed(Inkscape::Selection *selection, gpointer data)
//SPEventContext *ec = SP_EVENT_CONTEXT(cc);
SPItem *item = selection->singleItem();
-
+
if (cc->active_conn == item)
{
// Nothing to change.
cc_clear_active_conn(cc);
return;
}
-
+
if (cc_item_is_connector(item)) {
cc_set_active_conn(cc, item);
}
{
g_assert(data);
SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(data);
-
+
// Look for changes than result in onscreen movement.
if (!strcmp(name, "d") || !strcmp(name, "x") || !strcmp(name, "y") ||
!strcmp(name, "width") || !strcmp(name, "height") ||