diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index c6e6b872b7c69ac074ab9a7efeda14d7d857a6cf..52d2f1189d3b9c2be4fece48c51bd3a40274d31a 100644 (file)
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
* Lauris Kaplinski <lauris@kaplinski.com>
* bulia byak <buliabyak@users.sf.net>
*
+ * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
* Copyright (C) 1999-2005 Authors
* Copyright (C) 2000-2001 Ximian, Inc.
*
#include "config.h"
-
-
-
#include "display/canvas-grid.h"
#include "helper/units.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
#include "xml/repr.h"
#include "attributes.h"
#include "document.h"
#include "desktop-events.h"
#include "desktop-handles.h"
+#include "event-log.h"
#include "sp-guide.h"
#include "sp-item-group.h"
#include "sp-namedview.h"
#include "prefs-utils.h"
#include "desktop.h"
+#include "conn-avoid-ref.h" // for defaultConnSpacing.
-#include "isnan.h" //temp fox for isnan(). include last
+#include "isnan.h" //temp fix for isnan(). include last
#define DEFAULTTOLERANCE 0.4
#define DEFAULTGRIDCOLOR 0x3f3fff25
static void sp_namedview_setup_guides(SPNamedView * nv);
-static void sp_namedview_setup_grid(SPNamedView * nv);
-static void sp_namedview_setup_grid_item(SPNamedView * nv, SPCanvasItem * item);
-
static gboolean sp_str_to_bool(const gchar *str);
static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, const SPUnit **unit);
static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color);
{
GObjectClass * gobject_class;
SPObjectClass * sp_object_class;
-
+
gobject_class = (GObjectClass *) klass;
sp_object_class = (SPObjectClass *) klass;
-
+
parent_class = (SPObjectGroupClass*) g_type_class_ref(SP_TYPE_OBJECTGROUP);
-
+
sp_object_class->build = sp_namedview_build;
sp_object_class->release = sp_namedview_release;
sp_object_class->set = sp_namedview_set;
static void sp_namedview_init(SPNamedView *nv)
{
nv->editable = TRUE;
- nv->showgrid = FALSE;
nv->showguides = TRUE;
nv->showborder = TRUE;
nv->showpageshadow = TRUE;
-
+
nv->guides = NULL;
nv->viewcount = 0;
-
+ nv->grids = NULL;
+
nv->default_layer_id = 0;
-
- new (&nv->grid_snapper) Inkscape::GridSnapper(nv, 0);
- new (&nv->guide_snapper) Inkscape::GuideSnapper(nv, 0);
- new (&nv->object_snapper) Inkscape::ObjectSnapper(nv, 0);
+
+ nv->connector_spacing = defaultConnSpacing;
+
+ new (&nv->snap_manager) SnapManager(nv);
}
static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
{
SPNamedView *nv = (SPNamedView *) object;
SPObjectGroup *og = (SPObjectGroup *) object;
-
+
if (((SPObjectClass *) (parent_class))->build) {
(* ((SPObjectClass *) (parent_class))->build)(object, document, repr);
}
-
+
sp_object_read_attr(object, "inkscape:document-units");
sp_object_read_attr(object, "viewonly");
- sp_object_read_attr(object, "showgrid");
sp_object_read_attr(object, "showguides");
sp_object_read_attr(object, "gridtolerance");
sp_object_read_attr(object, "guidetolerance");
sp_object_read_attr(object, "objecttolerance");
- sp_object_read_attr(object, "inkscape:has_abs_tolerance");
- sp_object_read_attr(object, "gridoriginx");
- sp_object_read_attr(object, "gridoriginy");
- sp_object_read_attr(object, "gridspacingx");
- sp_object_read_attr(object, "gridspacingy");
- sp_object_read_attr(object, "gridempspacing");
- sp_object_read_attr(object, "gridcolor");
- sp_object_read_attr(object, "gridempcolor");
- sp_object_read_attr(object, "gridopacity");
- sp_object_read_attr(object, "gridempopacity");
sp_object_read_attr(object, "guidecolor");
sp_object_read_attr(object, "guideopacity");
sp_object_read_attr(object, "guidehicolor");
@@ -167,18 +153,19 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape:
sp_object_read_attr(object, "inkscape:window-height");
sp_object_read_attr(object, "inkscape:window-x");
sp_object_read_attr(object, "inkscape:window-y");
- sp_object_read_attr(object, "inkscape:grid-bbox");
+/* sp_object_read_attr(object, "inkscape:grid-bbox");
sp_object_read_attr(object, "inkscape:guide-bbox");
sp_object_read_attr(object, "inkscape:object-bbox");
sp_object_read_attr(object, "inkscape:grid-points");
sp_object_read_attr(object, "inkscape:guide-points");
- sp_object_read_attr(object, "inkscape:object-points");
+ sp_object_read_attr(object, "inkscape:object-points");*/
sp_object_read_attr(object, "inkscape:object-paths");
sp_object_read_attr(object, "inkscape:object-nodes");
sp_object_read_attr(object, "inkscape:current-layer");
-
+ sp_object_read_attr(object, "inkscape:connector-spacing");
+
/* Construct guideline list */
-
+
for (SPObject *o = sp_object_first_child(SP_OBJECT(og)) ; o != NULL; o = SP_OBJECT_NEXT(o) ) {
if (SP_IS_GUIDE(o)) {
SPGuide * g = SP_GUIDE(o);
@@ -191,24 +178,24 @@ static void sp_namedview_build(SPObject *object, SPDocument *document, Inkscape:
static void sp_namedview_release(SPObject *object)
{
SPNamedView *namedview = (SPNamedView *) object;
-
+
if (namedview->guides) {
g_slist_free(namedview->guides);
namedview->guides = NULL;
}
-
- while (namedview->gridviews) {
- gtk_object_unref(GTK_OBJECT(namedview->gridviews->data));
- namedview->gridviews = g_slist_remove(namedview->gridviews, namedview->gridviews->data);
+
+ // delete grids:
+ while ( namedview->grids ) {
+ Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)namedview->grids->data;
+ delete gr;
+ namedview->grids = g_slist_remove_link(namedview->grids, namedview->grids);
}
-
- namedview->grid_snapper.~GridSnapper();
- namedview->guide_snapper.~GuideSnapper();
- namedview->object_snapper.~ObjectSnapper();
-
+
if (((SPObjectClass *) parent_class)->release) {
((SPObjectClass *) parent_class)->release(object);
}
+
+ namedview->snap_manager.~SnapManager();
}
static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *value)
@@ -221,31 +208,12 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->editable = (!value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_SHOWGRID:
- nv->showgrid = sp_str_to_bool(value);
- sp_namedview_setup_grid(nv);
- if (!nv->showgrid) { // grid goes off, disable snaps even if they are turned on
- nv->grid_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, false);
- nv->grid_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, false);
- } else { // grid goes on, enable snaps if they are turned on
- nv->grid_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, nv->snap_grid_bbox);
- nv->grid_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, nv->snap_grid_point);
- }
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
case SP_ATTR_SHOWGUIDES:
if (!value) { // show guides if not specified, for backwards compatibility
nv->showguides = TRUE;
} else {
nv->showguides = sp_str_to_bool(value);
}
- if (!nv->showguides) { // guides go off, disable snaps even if they are turned on
- nv->guide_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, false);
- nv->guide_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, false);
- } else { // guides go on, enable snaps if they are turned on
- nv->guide_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, nv->snap_guide_bbox);
- nv->guide_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, nv->snap_guide_point);
- }
sp_namedview_setup_guides(nv);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
@@ -265,7 +233,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_OBJECTTOLERANCE:
+ case SP_ATTR_OBJECTTOLERANCE:
nv->objecttoleranceunit = &px;
nv->objecttolerance = DEFAULTTOLERANCE;
if (value) {
@@ -273,76 +241,6 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_ABS_TOLERANCE:
- if (!value)
- nv->has_abs_tolerance = true;
- else
- nv->has_abs_tolerance = (sp_str_to_bool (value) == TRUE);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_GRIDORIGINX:
- case SP_ATTR_GRIDORIGINY:
- {
- unsigned const d = (key == SP_ATTR_GRIDORIGINY);
- nv->gridunit = nv->doc_units;
- nv->gridorigin[d] = 0.0;
- if (value) {
- sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->gridorigin[d], &nv->gridunit);
- }
- nv->gridorigin[d] = sp_units_get_pixels(nv->gridorigin[d], *(nv->gridunit));
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- }
- case SP_ATTR_GRIDSPACINGX:
- case SP_ATTR_GRIDSPACINGY:
- {
- unsigned const d = (key == SP_ATTR_GRIDSPACINGY);
- nv->gridunit = nv->doc_units;
- nv->gridspacing[d] = 1.0;
- if (value) {
- sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &nv->gridspacing[d], &nv->gridunit);
- }
- nv->gridspacing[d] = sp_units_get_pixels(nv->gridspacing[d], *(nv->gridunit));
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- }
- case SP_ATTR_GRIDCOLOR:
- nv->gridcolor = (nv->gridcolor & 0xff) | (DEFAULTGRIDCOLOR & 0xffffff00);
- if (value) {
- nv->gridcolor = (nv->gridcolor & 0xff) | sp_svg_read_color(value, nv->gridcolor);
- }
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_GRIDEMPCOLOR:
- nv->gridempcolor = (nv->gridempcolor & 0xff) | (DEFAULTGRIDEMPCOLOR & 0xffffff00);
- if (value) {
- nv->gridempcolor = (nv->gridempcolor & 0xff) | sp_svg_read_color(value, nv->gridempcolor);
- }
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_GRIDOPACITY:
- nv->gridcolor = (nv->gridcolor & 0xffffff00) | (DEFAULTGRIDCOLOR & 0xff);
- sp_nv_read_opacity(value, &nv->gridcolor);
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_GRIDEMPOPACITY:
- nv->gridempcolor = (nv->gridempcolor & 0xffffff00) | (DEFAULTGRIDEMPCOLOR & 0xff);
- sp_nv_read_opacity(value, &nv->gridempcolor);
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_GRIDEMPSPACING:
- nv->gridempspacing = DEFAULTGRIDEMPSPACING;
- if (value != NULL)
- nv->gridempspacing = atoi(value);
- sp_namedview_setup_grid(nv);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
case SP_ATTR_GUIDECOLOR:
nv->guidecolor = (nv->guidecolor & 0xff) | (DEFAULTGUIDECOLOR & 0xffffff00);
if (value) {
@@ -416,7 +314,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->pageshadow = value? atoi(value) : 2; // 2 is the default
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_SHOWPAGESHADOW:
+ case SP_ATTR_SHOWPAGESHADOW:
nv->showpageshadow = (value) ? sp_str_to_bool(value) : TRUE;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
@@ -448,50 +346,23 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
nv->window_y = value ? atoi(value) : -1; // -1 means not set
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_GRID_BBOX:
- nv->snap_grid_bbox = (value) ? sp_str_to_bool(value) : TRUE;
- nv->grid_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, nv->showgrid && nv->snap_grid_bbox);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_INKSCAPE_GRID_POINTS:
- nv->snap_grid_point = (value) ? sp_str_to_bool(value) : FALSE;
- nv->grid_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, nv->showgrid && nv->snap_grid_point);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_INKSCAPE_GUIDE_BBOX:
- nv->snap_guide_bbox = (value) ? sp_str_to_bool(value) : TRUE;
- nv->guide_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, nv->showguides && nv->snap_guide_bbox);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_INKSCAPE_GUIDE_POINTS:
- nv->snap_guide_point = (value) ? sp_str_to_bool(value) : FALSE;
- nv->guide_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, nv->showguides && nv->snap_guide_point);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_INKSCAPE_OBJECT_BBOX:
- nv->snap_object_bbox = (value) ? sp_str_to_bool(value) : FALSE;
- nv->object_snapper.setSnapTo(Inkscape::Snapper::BBOX_POINT, nv->snap_object_bbox);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_INKSCAPE_OBJECT_POINTS:
- nv->snap_object_point = (value) ? sp_str_to_bool(value) : FALSE;
- nv->object_snapper.setSnapTo(Inkscape::Snapper::SNAP_POINT, nv->snap_object_point);
+ case SP_ATTR_INKSCAPE_OBJECT_PATHS:
+ nv->snap_manager.object.setSnapToPaths(value ? sp_str_to_bool(value) : FALSE);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
- case SP_ATTR_INKSCAPE_OBJECT_PATHS:
- nv->snap_object_paths = (value) ? sp_str_to_bool(value) : TRUE;
- nv->object_snapper.setSnapToPaths(nv->snap_object_paths);
- object->requestModified(SP_OBJECT_MODIFIED_FLAG);
- break;
- case SP_ATTR_INKSCAPE_OBJECT_NODES:
- nv->snap_object_nodes = (value) ? sp_str_to_bool(value) : TRUE;
- nv->object_snapper.setSnapToNodes(nv->snap_object_nodes);
+ case SP_ATTR_INKSCAPE_OBJECT_NODES:
+ nv->snap_manager.object.setSnapToNodes(value ? sp_str_to_bool(value) : FALSE);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_ATTR_INKSCAPE_CURRENT_LAYER:
nv->default_layer_id = value ? g_quark_from_string(value) : 0;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
+ case SP_ATTR_INKSCAPE_CONNECTOR_SPACING:
+ nv->connector_spacing = value ? g_ascii_strtod(value, NULL) :
+ defaultConnSpacing;
+ object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+ break;
case SP_ATTR_INKSCAPE_DOCUMENT_UNITS: {
/* The default unit if the document doesn't override this: e.g. for files saved as
* `plain SVG', or non-inkscape files, or files created by an inkscape 0.40 &
@@ -511,7 +382,7 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
* doc_units.
*/
SPUnit const *new_unit = &sp_unit_get_by_id(SP_UNIT_PX);
-
+
if (value) {
SPUnit const *const req_unit = sp_unit_get_by_abbreviation(value);
if ( req_unit == NULL ) {
@@ -541,36 +412,82 @@ static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *va
}
}
+/**
+* add a grid item from SVG-repr. Check if this namedview already has a gridobject for this one! If desktop=null, add grid-canvasitem to all desktops of this namedview,
+* otherwise only add it to the specified desktop.
+*/
+static Inkscape::CanvasGrid*
+sp_namedview_add_grid(SPNamedView *nv, Inkscape::XML::Node *repr, SPDesktop *desktop) {
+ Inkscape::CanvasGrid* grid = NULL;
+ //check if namedview already has an object for this grid
+ for (GSList *l = nv->grids; l != NULL; l = l->next) {
+ Inkscape::CanvasGrid* g = (Inkscape::CanvasGrid*) l->data;
+ if (repr == g->repr) {
+ grid = g;
+ break;
+ }
+ }
+
+ if (!grid) {
+ //create grid object
+ Inkscape::GridType gridtype = Inkscape::CanvasGrid::getGridTypeFromSVGName(repr->attribute("type"));
+ SPDocument *doc = NULL;
+ if (desktop)
+ doc = sp_desktop_document(desktop);
+ else
+ doc = sp_desktop_document(static_cast<SPDesktop*>(nv->views->data));
+ grid = Inkscape::CanvasGrid::NewGrid(nv, repr, doc, gridtype);
+ nv->grids = g_slist_append(nv->grids, grid);
+ }
+
+ if (!desktop) {
+ //add canvasitem to all desktops
+ for (GSList *l = nv->views; l != NULL; l = l->next) {
+ SPDesktop *dt = static_cast<SPDesktop*>(l->data);
+ grid->createCanvasItem(dt);
+ }
+ } else {
+ //add canvasitem only for specified desktop
+ grid->createCanvasItem(desktop);
+ }
+
+ return grid;
+}
+
static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
{
SPNamedView *nv = (SPNamedView *) object;
-
+
if (((SPObjectClass *) (parent_class))->child_added) {
(* ((SPObjectClass *) (parent_class))->child_added)(object, child, ref);
}
-
+
const gchar *id = child->attribute("id");
- SPObject *no = object->document->getObjectById(id);
- g_assert(SP_IS_OBJECT(no));
-
- if (SP_IS_GUIDE(no)) {
- SPGuide *g = (SPGuide *) no;
- nv->guides = g_slist_prepend(nv->guides, g);
- g_object_set(G_OBJECT(g), "color", nv->guidecolor, "hicolor", nv->guidehicolor, NULL);
- if (nv->editable) {
- for (GSList *l = nv->views; l != NULL; l = l->next) {
- sp_guide_show(g, static_cast<SPDesktop*>(l->data)->guides, (GCallback) sp_dt_guide_event);
- if (static_cast<SPDesktop*>(l->data)->guides_active)
- sp_guide_sensitize(g,
- SP_DT_CANVAS(static_cast<SPDesktop*> (l->data)),
- TRUE);
- if (nv->showguides) {
- for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) {
- sp_canvas_item_show(SP_CANVAS_ITEM(v->data));
- }
- } else {
- for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) {
- sp_canvas_item_hide(SP_CANVAS_ITEM(v->data));
+ if (!strcmp(child->name(), "inkscape:grid")) {
+ sp_namedview_add_grid(nv, child, NULL);
+ } else {
+ SPObject *no = object->document->getObjectById(id);
+ g_assert(SP_IS_OBJECT(no));
+
+ if (SP_IS_GUIDE(no)) {
+ SPGuide *g = (SPGuide *) no;
+ nv->guides = g_slist_prepend(nv->guides, g);
+ g_object_set(G_OBJECT(g), "color", nv->guidecolor, "hicolor", nv->guidehicolor, NULL);
+ if (nv->editable) {
+ for (GSList *l = nv->views; l != NULL; l = l->next) {
+ sp_guide_show(g, static_cast<SPDesktop*>(l->data)->guides, (GCallback) sp_dt_guide_event);
+ if (static_cast<SPDesktop*>(l->data)->guides_active)
+ sp_guide_sensitize(g,
+ sp_desktop_canvas(static_cast<SPDesktop*> (l->data)),
+ TRUE);
+ if (nv->showguides) {
+ for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) {
+ sp_canvas_item_show(SP_CANVAS_ITEM(v->data));
+ }
+ } else {
+ for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) {
+ sp_canvas_item_hide(SP_CANVAS_ITEM(v->data));
+ }
}
}
}
@@ -581,18 +498,29 @@ static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *chil
static void sp_namedview_remove_child(SPObject *object, Inkscape::XML::Node *child)
{
SPNamedView *nv = (SPNamedView *) object;
-
- GSList **ref = &nv->guides;
- for ( GSList *iter = nv->guides ; iter ; iter = iter->next ) {
- if ( SP_OBJECT_REPR((SPObject *)iter->data) == child ) {
- *ref = iter->next;
- iter->next = NULL;
- g_slist_free_1(iter);
- break;
+
+ if (!strcmp(child->name(), "inkscape:grid")) {
+ for ( GSList *iter = nv->grids ; iter ; iter = iter->next ) {
+ Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)iter->data;
+ if ( gr->repr == child ) {
+ delete gr;
+ nv->grids = g_slist_remove_link(nv->grids, iter);
+ break;
+ }
+ }
+ } else {
+ GSList **ref = &nv->guides;
+ for ( GSList *iter = nv->guides ; iter ; iter = iter->next ) {
+ if ( SP_OBJECT_REPR((SPObject *)iter->data) == child ) {
+ *ref = iter->next;
+ iter->next = NULL;
+ g_slist_free_1(iter);
+ break;
+ }
+ ref = &iter->next;
}
- ref = &iter->next;
}
-
+
if (((SPObjectClass *) (parent_class))->remove_child) {
(* ((SPObjectClass *) (parent_class))->remove_child)(object, child);
}
@@ -606,10 +534,11 @@ static Inkscape::XML::Node *sp_namedview_write(SPObject *object, Inkscape::XML::
if (repr) {
repr->mergeFrom(SP_OBJECT_REPR(object), "id");
} else {
- repr = SP_OBJECT_REPR(object)->duplicate();
+ /// \todo FIXME: Plumb an appropriate XML::Document into this
+ repr = SP_OBJECT_REPR(object)->duplicate(NULL);
}
}
-
+
return repr;
}
for (GSList *l = guides; l != NULL; l = l->next) {
sp_guide_show(SP_GUIDE(l->data), desktop->guides, (GCallback) sp_dt_guide_event);
if (desktop->guides_active) {
- sp_guide_sensitize(SP_GUIDE(l->data), SP_DT_CANVAS(desktop), TRUE);
+ sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(desktop), TRUE);
}
if (showguides) {
for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) {
}
}
}
-
+
views = g_slist_prepend(views, desktop);
-
- SPCanvasItem *item = sp_canvas_item_new(SP_DT_GRID(desktop), SP_TYPE_CGRID, NULL);
- // since we're keeping a copy, we need to bump up the ref count
- gtk_object_ref(GTK_OBJECT(item));
- gridviews = g_slist_prepend(gridviews, item);
- sp_namedview_setup_grid_item(this, item);
+
+ // generate grids specified in SVG:
+ Inkscape::XML::Node *repr = SP_OBJECT_REPR(this);
+ if (repr) {
+ for (Inkscape::XML::Node * child = repr->firstChild() ; child != NULL; child = child->next() ) {
+ if (!strcmp(child->name(), "inkscape:grid")) {
+ sp_namedview_add_grid(this, child, desktop);
+ }
+ }
+ }
}
+#define MIN_ONSCREEN_DISTANCE 50
+
/*
- * Restores window geometry from the document settings
+ * Restores window geometry from the document settings or defaults in prefs
*/
void sp_namedview_window_from_document(SPDesktop *desktop)
{
SPNamedView *nv = desktop->namedview;
- gint save_geometry = prefs_get_int_attribute("options.savewindowgeometry", "value", 0);
-
- // restore window size and position
- if (save_geometry) {
- if (nv->window_width != -1 && nv->window_height != -1)
- desktop->setWindowSize(nv->window_width, nv->window_height);
- if (nv->window_x != -1 && nv->window_y != -1)
- desktop->setWindowPosition(NR::Point(nv->window_x, nv->window_y));
+ gint geometry_from_file =
+ (1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0));
+
+ // restore window size and position stored with the document
+ if (geometry_from_file) {
+ gint w = MIN(gdk_screen_width(), nv->window_width);
+ gint h = MIN(gdk_screen_height(), nv->window_height);
+ gint x = MIN(gdk_screen_width() - MIN_ONSCREEN_DISTANCE, nv->window_x);
+ gint y = MIN(gdk_screen_height() - MIN_ONSCREEN_DISTANCE, nv->window_y);
+ if (w>0 && h>0 && x>0 && y>0) {
+ x = MIN(gdk_screen_width() - w, x);
+ y = MIN(gdk_screen_height() - h, y);
+ }
+ if (w>0 && h>0) {
+ desktop->setWindowSize(w, h);
+ }
+ if (x>0 && y>0) {
+ desktop->setWindowPosition(NR::Point(x, y));
+ }
}
-
+
// restore zoom and view
if (nv->zoom != 0 && nv->zoom != HUGE_VAL && !isNaN(nv->zoom)
- && nv->cx != HUGE_VAL && !isNaN(nv->cx)
+ && nv->cx != HUGE_VAL && !isNaN(nv->cx)
&& nv->cy != HUGE_VAL && !isNaN(nv->cy)) {
desktop->zoom_absolute(nv->cx, nv->cy, nv->zoom);
- } else if (SP_DT_DOCUMENT(desktop)) { // document without saved zoom, zoom to its page
+ } else if (sp_desktop_document(desktop)) { // document without saved zoom, zoom to its page
desktop->zoom_page();
}
-
+
// cancel any history of zooms up to this point
if (desktop->zooms_past) {
g_list_free(desktop->zooms_past);
desktop->zooms_past = NULL;
}
-
+}
+
+void sp_namedview_update_layers_from_document (SPDesktop *desktop)
+{
SPObject *layer = NULL;
SPDocument *document = desktop->doc();
+ SPNamedView *nv = desktop->namedview;
if ( nv->default_layer_id != 0 ) {
layer = document->getObjectById(g_quark_to_string(nv->default_layer_id));
}
if (layer) {
desktop->setCurrentLayer(layer);
}
+
+ // FIXME: find a better place to do this
+ desktop->event_log->updateUndoVerbs();
}
void sp_namedview_document_from_window(SPDesktop *desktop)
{
- gint save_geometry = prefs_get_int_attribute("options.savewindowgeometry", "value", 0);
+ gint save_geometry_in_file =
+ (1==prefs_get_int_attribute("options.savewindowgeometry", "value", 0));
Inkscape::XML::Node *view = SP_OBJECT_REPR(desktop->namedview);
NR::Rect const r = desktop->get_display_area();
-
+
// saving window geometry is not undoable
- gboolean saved = sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop));
- sp_document_set_undo_sensitive(SP_DT_DOCUMENT(desktop), FALSE);
-
+ bool saved = sp_document_get_undo_sensitive(sp_desktop_document(desktop));
+ sp_document_set_undo_sensitive(sp_desktop_document(desktop), false);
+
sp_repr_set_svg_double(view, "inkscape:zoom", desktop->current_zoom());
sp_repr_set_svg_double(view, "inkscape:cx", r.midpoint()[NR::X]);
sp_repr_set_svg_double(view, "inkscape:cy", r.midpoint()[NR::Y]);
-
- if (save_geometry) {
+
+ if (save_geometry_in_file) {
gint w, h, x, y;
desktop->getWindowGeometry(x, y, w, h);
sp_repr_set_int(view, "inkscape:window-width", w);
sp_repr_set_int(view, "inkscape:window-x", x);
sp_repr_set_int(view, "inkscape:window-y", y);
}
-
+
view->setAttribute("inkscape:current-layer", SP_OBJECT_ID(desktop->currentLayer()));
-
+
// restore undoability
- sp_document_set_undo_sensitive(SP_DT_DOCUMENT(desktop), saved);
+ sp_document_set_undo_sensitive(sp_desktop_document(desktop), saved);
}
void SPNamedView::hide(SPDesktop const *desktop)
{
g_assert(desktop != NULL);
g_assert(g_slist_find(views, desktop));
-
+
for (GSList *l = guides; l != NULL; l = l->next) {
- sp_guide_hide(SP_GUIDE(l->data), SP_DT_CANVAS(desktop));
+ sp_guide_hide(SP_GUIDE(l->data), sp_desktop_canvas(desktop));
}
-
+
views = g_slist_remove(views, desktop);
- GSList *l;
- for (l = gridviews; l != NULL; l = l->next) {
- if (SP_CANVAS_ITEM(l->data)->canvas == SP_DT_CANVAS(desktop)) {
- break;
- }
+ // delete grids:
+ while ( grids ) {
+ Inkscape::CanvasGrid *gr = (Inkscape::CanvasGrid *)grids->data;
+ delete gr;
+ grids = g_slist_remove_link(grids, grids);
}
-
- g_assert(l);
-
- sp_canvas_item_hide(SP_CANVAS_ITEM(l->data));
- gtk_object_unref(GTK_OBJECT(l->data));
- gridviews = g_slist_remove(gridviews, l->data);
}
void SPNamedView::activateGuides(gpointer desktop, gboolean active)
{
g_assert(desktop != NULL);
g_assert(g_slist_find(views, desktop));
-
+
SPDesktop *dt = static_cast<SPDesktop*>(desktop);
-
+
for (GSList *l = guides; l != NULL; l = l->next) {
- sp_guide_sensitize(SP_GUIDE(l->data), SP_DT_CANVAS(dt), active);
+ sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(dt), active);
}
}
} else {
v = !v;
}
-
- gboolean saved = sp_document_get_undo_sensitive(doc);
- sp_document_set_undo_sensitive(doc, FALSE);
-
+
+ bool saved = sp_document_get_undo_sensitive(doc);
+ sp_document_set_undo_sensitive(doc, false);
+
sp_repr_set_boolean(repr, "showguides", v);
-
- doc->rroot->setAttribute("sodipodi:modified", "true");
- sp_document_set_undo_sensitive(doc, saved);
-}
-void sp_namedview_toggle_grid(SPDocument *doc, Inkscape::XML::Node *repr)
-{
- unsigned int v;
- sp_repr_get_boolean(repr, "showgrid", &v);
- v = !v;
-
- gboolean saved = sp_document_get_undo_sensitive(doc);
- sp_document_set_undo_sensitive(doc, FALSE);
-
- sp_repr_set_boolean(repr, "showgrid", v);
-
doc->rroot->setAttribute("sodipodi:modified", "true");
sp_document_set_undo_sensitive(doc, saved);
}
-static void sp_namedview_setup_grid(SPNamedView *nv)
-{
- for (GSList *l = nv->gridviews; l != NULL; l = l->next) {
- sp_namedview_setup_grid_item(nv, SP_CANVAS_ITEM(l->data));
- }
-}
-
-static void sp_namedview_setup_grid_item(SPNamedView *nv, SPCanvasItem *item)
-{
- if (nv->showgrid) {
- sp_canvas_item_show(item);
- } else {
- sp_canvas_item_hide(item);
- }
-
- sp_canvas_item_set((GtkObject *) item,
- "color", nv->gridcolor,
- "originx", nv->gridorigin[NR::X],
- "originy", nv->gridorigin[NR::Y],
- "spacingx", nv->gridspacing[NR::X],
- "spacingy", nv->gridspacing[NR::Y],
- "empcolor", nv->gridempcolor,
- "empspacing", nv->gridempspacing,
- NULL);
-}
-
gchar const *SPNamedView::getName() const
{
SPException ex;
return TRUE;
}
}
-
+
return FALSE;
}
@@ -884,13 +791,13 @@ static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, co
while (isspace(*u)) {
u += 1;
}
-
+
if (!*u) {
/* No unit specified - keep default */
*val = v;
return TRUE;
}
-
+
if (base & SP_UNIT_DEVICE) {
if (u[0] && u[1] && !isalnum(u[2]) && !strncmp(u, "px", 2)) {
*unit = &sp_unit_get_by_id(SP_UNIT_PX);
@@ -898,7 +805,7 @@ static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, co
return TRUE;
}
}
-
+
if (base & SP_UNIT_ABSOLUTE) {
if (!strncmp(u, "pt", 2)) {
*unit = &sp_unit_get_by_id(SP_UNIT_PT);
@@ -916,7 +823,7 @@ static gboolean sp_nv_read_length(const gchar *str, guint base, gdouble *val, co
*val = v;
return TRUE;
}
-
+
return FALSE;
}
}
gchar *u;
- gdouble v = strtod(str, &u);
+ gdouble v = g_ascii_strtod(str, &u);
if (!u) {
return FALSE;
}
v = CLAMP(v, 0.0, 1.0);
-
+
*color = (*color & 0xffffff00) | (guint32) floor(v * 255.9999);
-
+
return TRUE;
}
SPNamedView *sp_document_namedview(SPDocument *document, const gchar *id)
{
g_return_val_if_fail(document != NULL, NULL);
-
+
SPObject *nv = sp_item_group_get_child_by_name((SPGroup *) document->root, NULL, "sodipodi:namedview");
g_assert(nv != NULL);
-
+
if (id == NULL) {
return (SPNamedView *) nv;
}
-
+
while (nv && strcmp(nv->id, id)) {
nv = sp_item_group_get_child_by_name((SPGroup *) document->root, nv, "sodipodi:namedview");
}
-
+
return (SPNamedView *) nv;
}
}
}
-SPNamedView::SnapperList SPNamedView::getSnappers() const
-{
- SnapperList s;
- s.push_back(&grid_snapper);
- s.push_back(&guide_snapper);
- s.push_back(&object_snapper);
- return s;
-}
/*
Local Variables:
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :