From c21611294dea99e78017f770feb78684573cce89 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 5 Jun 2012 13:34:43 +0100 Subject: Header cleaning for GTK+3 migration (bzr r11460) --- src/arc-context.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index b913ab9f0..dfd2ca9d9 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -35,7 +35,6 @@ #include "sp-metrics.h" #include "xml/repr.h" #include "xml/node-event-vector.h" -#include "object-edit.h" #include "preferences.h" #include "message-context.h" #include "desktop.h" -- cgit v1.2.3 From 9abd33133650d77714fccf09d0c9ff27c9b75a78 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 5 Jul 2012 22:39:08 +0100 Subject: Drop GTK+ 2.20 support. Fixed bugs: - https://launchpad.net/bugs/1020494 (bzr r11529) --- src/arc-context.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index dfd2ca9d9..c9bad6b4a 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -47,11 +47,6 @@ #include "arc-context.h" #include "display/sp-canvas-item.h" -// Define new form of key macros if we're using an old GTK+ version -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - using Inkscape::DocumentUndo; static void sp_arc_context_class_init(SPArcContextClass *klass); -- cgit v1.2.3 From 701002a149020e89d9023dbe56c6d0ccdb5c3aca Mon Sep 17 00:00:00 2001 From: John Smith Date: Thu, 6 Sep 2012 11:25:16 +0900 Subject: Fix for 580160 : Deleting a gradient stop using Shape tools deletes the object (bzr r11655) --- src/arc-context.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index c9bad6b4a..95ff05b37 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -370,6 +370,11 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent // do not return true, so that space would work switching to selector } break; + case GDK_KEY_Delete: + case GDK_KEY_KP_Delete: + case GDK_KEY_BackSpace: + ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + break; default: break; -- cgit v1.2.3 From 370a3f5cc9e39352a081e5d5dd8c43676547a6e6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 11:45:44 +1000 Subject: code cleanup: add own includes to cpp files or make the functions static if they are not used elsewhere. (bzr r11735) --- src/arc-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 95ff05b37..9675df8e3 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -159,7 +159,7 @@ static void sp_arc_context_dispose(GObject *object) * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -void sp_arc_context_selection_changed(Inkscape::Selection * selection, gpointer data) +static void sp_arc_context_selection_changed(Inkscape::Selection * selection, gpointer data) { SPArcContext *ac = SP_ARC_CONTEXT(data); SPEventContext *ec = SP_EVENT_CONTEXT(ac); -- cgit v1.2.3 From 4cff9f1b30d110eba814d9adc0689fa073c79157 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 31 Dec 2012 12:20:39 +0000 Subject: Replace C-style pointer casts in event contexts (bzr r12001) --- src/arc-context.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 9675df8e3..c35e0041f 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -86,10 +86,10 @@ GType sp_arc_context_get_type() static void sp_arc_context_class_init(SPArcContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*) g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_arc_context_dispose; @@ -127,8 +127,8 @@ static void sp_arc_context_finish(SPEventContext *ec) sp_arc_finish(ac); ac->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); } } @@ -174,8 +174,8 @@ static void sp_arc_context_setup(SPEventContext *ec) SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } ec->shape_editor = new ShapeEditor(ec->desktop); @@ -219,8 +219,8 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i break; } - if (((SPEventContextClass *) parent_class)->item_handler) { - ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); } return ret; @@ -401,8 +401,8 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } -- cgit v1.2.3 From d5640b0cc2463ee3470d18891fbd8304ba3339ee Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 24 Jan 2013 11:43:26 +0000 Subject: More GObject boilerplate cleanup (bzr r12059) --- src/arc-context.cpp | 44 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index c35e0041f..b5bdf58ef 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -49,8 +49,6 @@ using Inkscape::DocumentUndo; -static void sp_arc_context_class_init(SPArcContextClass *klass); -static void sp_arc_context_init(SPArcContext *arc_context); static void sp_arc_context_dispose(GObject *object); static void sp_arc_context_setup(SPEventContext *ec); @@ -62,35 +60,13 @@ static void sp_arc_drag(SPArcContext *ec, Geom::Point pt, guint state); static void sp_arc_finish(SPArcContext *ec); static void sp_arc_cancel(SPArcContext *ec); -static SPEventContextClass *parent_class; - -GType sp_arc_context_get_type() -{ - static GType type = 0; - if (!type) { - GTypeInfo info = { - sizeof(SPArcContextClass), - NULL, NULL, - (GClassInitFunc) sp_arc_context_class_init, - NULL, NULL, - sizeof(SPArcContext), - 4, - (GInstanceInitFunc) sp_arc_context_init, - NULL, /* value_table */ - }; - type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPArcContext", &info, (GTypeFlags) 0); - } - return type; -} +G_DEFINE_TYPE(SPArcContext, sp_arc_context, SP_TYPE_EVENT_CONTEXT); static void sp_arc_context_class_init(SPArcContextClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS(klass); SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); - object_class->dispose = sp_arc_context_dispose; event_context_class->setup = sp_arc_context_setup; @@ -127,8 +103,8 @@ static void sp_arc_context_finish(SPEventContext *ec) sp_arc_finish(ac); ac->sel_changed_connection.disconnect(); - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { - (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish(ec); } } @@ -152,7 +128,7 @@ static void sp_arc_context_dispose(GObject *object) delete ac->_message_context; - G_OBJECT_CLASS(parent_class)->dispose(object); + G_OBJECT_CLASS(sp_arc_context_parent_class)->dispose(object); } /** @@ -174,8 +150,8 @@ static void sp_arc_context_setup(SPEventContext *ec) SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { - (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup(ec); } ec->shape_editor = new ShapeEditor(ec->desktop); @@ -219,8 +195,8 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i break; } - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) { - ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); } return ret; @@ -401,8 +377,8 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { - ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler(event_context, event); } } -- cgit v1.2.3 From e58cac52b258e64c2cc88b0044bf9cfbaecedce2 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 00:23:07 +0200 Subject: Started conversion of SPEventContext tree; added virtual pads to all classes. (bzr r11608.1.89) --- src/arc-context.cpp | 61 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 12 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index b5bdf58ef..9ebce7fac 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -75,8 +75,16 @@ static void sp_arc_context_class_init(SPArcContextClass *klass) event_context_class->item_handler = sp_arc_context_item_handler; } +CArcContext::CArcContext(SPArcContext* arccontext) : CEventContext(arccontext) { + this->sparccontext = arccontext; +} + static void sp_arc_context_init(SPArcContext *arc_context) { + arc_context->carccontext = new CArcContext(arc_context); + delete arc_context->ceventcontext; + arc_context->ceventcontext = arc_context->carccontext; + SPEventContext *event_context = SP_EVENT_CONTEXT(arc_context); event_context->cursor_shape = cursor_ellipse_xpm; @@ -96,6 +104,12 @@ static void sp_arc_context_init(SPArcContext *arc_context) static void sp_arc_context_finish(SPEventContext *ec) { + ec->ceventcontext->finish(); +} + +void CArcContext::finish() { + SPEventContext* ec = this->speventcontext; + SPArcContext *ac = SP_ARC_CONTEXT(ec); SPDesktop *desktop = ec->desktop; @@ -103,9 +117,10 @@ static void sp_arc_context_finish(SPEventContext *ec) sp_arc_finish(ac); ac->sel_changed_connection.disconnect(); - if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish) { - (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish(ec); - } +// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish) { +// (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish(ec); +// } + CEventContext::finish(); } static void sp_arc_context_dispose(GObject *object) @@ -147,12 +162,19 @@ static void sp_arc_context_selection_changed(Inkscape::Selection * selection, gp static void sp_arc_context_setup(SPEventContext *ec) { + ec->ceventcontext->setup(); +} + +void CArcContext::setup() { + SPEventContext* ec = this->speventcontext; + SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup) { - (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup(ec); - } +// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup) { +// (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup(ec); +// } + CEventContext::setup(); ec->shape_editor = new ShapeEditor(ec->desktop); @@ -180,6 +202,12 @@ static void sp_arc_context_setup(SPEventContext *ec) static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) { + return event_context->ceventcontext->item_handler(item, event); +} + +gint CArcContext::item_handler(SPItem* item, GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + SPDesktop *desktop = event_context->desktop; gint ret = FALSE; @@ -195,15 +223,23 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i break; } - if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler) { - ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); - } +// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler) { +// ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); +// } + // CPPIFY: ret is overwritten... + ret = CEventContext::item_handler(item, event); return ret; } static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent *event) { + return event_context->ceventcontext->root_handler(event); +} + +gint CArcContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + static bool dragging; SPDesktop *desktop = event_context->desktop; @@ -377,9 +413,10 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler) { - ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler(event_context, event); - } +// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler) { +// ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler(event_context, event); +// } + ret = CEventContext::root_handler(event); } return ret; -- cgit v1.2.3 From 1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 22:12:07 +0200 Subject: Added constructors to EventContext tree / some missing virtual pads. (bzr r11608.1.90) --- src/arc-context.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 9ebce7fac..d28296ed8 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -69,22 +69,25 @@ static void sp_arc_context_class_init(SPArcContextClass *klass) object_class->dispose = sp_arc_context_dispose; - event_context_class->setup = sp_arc_context_setup; - event_context_class->finish = sp_arc_context_finish; - event_context_class->root_handler = sp_arc_context_root_handler; - event_context_class->item_handler = sp_arc_context_item_handler; +// event_context_class->setup = sp_arc_context_setup; +// event_context_class->finish = sp_arc_context_finish; +// event_context_class->root_handler = sp_arc_context_root_handler; +// event_context_class->item_handler = sp_arc_context_item_handler; } CArcContext::CArcContext(SPArcContext* arccontext) : CEventContext(arccontext) { this->sparccontext = arccontext; } -static void sp_arc_context_init(SPArcContext *arc_context) -{ +SPArcContext::SPArcContext() : SPEventContext() { + SPArcContext* arc_context = this; + arc_context->carccontext = new CArcContext(arc_context); delete arc_context->ceventcontext; arc_context->ceventcontext = arc_context->carccontext; + arc_context->_message_context = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT(arc_context); event_context->cursor_shape = cursor_ellipse_xpm; @@ -102,6 +105,11 @@ static void sp_arc_context_init(SPArcContext *arc_context) new (&arc_context->sel_changed_connection) sigc::connection(); } +static void sp_arc_context_init(SPArcContext *arc_context) +{ + new (arc_context) SPArcContext(); +} + static void sp_arc_context_finish(SPEventContext *ec) { ec->ceventcontext->finish(); -- cgit v1.2.3 From fbb85064cfaaf03cc09bacedb16a8561f61f2b3d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 00:37:18 +0200 Subject: Added prefPaths to contexts; modified SPFactory (bzr r11608.1.94) --- src/arc-context.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index d28296ed8..cd9adece0 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -60,6 +60,8 @@ static void sp_arc_drag(SPArcContext *ec, Geom::Point pt, guint state); static void sp_arc_finish(SPArcContext *ec); static void sp_arc_cancel(SPArcContext *ec); +const std::string SPArcContext::prefsPath = "/tools/shapes/arc"; + G_DEFINE_TYPE(SPArcContext, sp_arc_context, SP_TYPE_EVENT_CONTEXT); static void sp_arc_context_class_init(SPArcContextClass *klass) -- cgit v1.2.3 From fbdc8b84ff670c684dafc7d7d403ed01e7077e70 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 18:13:17 +0200 Subject: Replaced casting macros for EventContext tree; added contructors. (bzr r11608.1.96) --- src/arc-context.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index cd9adece0..21fd41a49 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -60,6 +60,21 @@ static void sp_arc_drag(SPArcContext *ec, Geom::Point pt, guint state); static void sp_arc_finish(SPArcContext *ec); static void sp_arc_cancel(SPArcContext *ec); + +#include "sp-factory.h" + +namespace { + SPEventContext* createArcContext() { + return new SPArcContext(); + } + + bool arcContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/arc", createArcContext); +} + +const std::string& CArcContext::getPrefsPath() { + return SPArcContext::prefsPath; +} + const std::string SPArcContext::prefsPath = "/tools/shapes/arc"; G_DEFINE_TYPE(SPArcContext, sp_arc_context, SP_TYPE_EVENT_CONTEXT); @@ -87,6 +102,7 @@ SPArcContext::SPArcContext() : SPEventContext() { arc_context->carccontext = new CArcContext(arc_context); delete arc_context->ceventcontext; arc_context->ceventcontext = arc_context->carccontext; + types.insert(typeid(SPArcContext)); arc_context->_message_context = 0; -- cgit v1.2.3 From 1227ca0189590b281116fcc808bdd8c674b2196c Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 21:16:13 +0200 Subject: Further changes to EventContexts; they work without GObject (bzr r11608.1.97) --- src/arc-context.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 21fd41a49..31e05a6ca 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -149,6 +149,28 @@ void CArcContext::finish() { CEventContext::finish(); } +SPArcContext::~SPArcContext() { + SPEventContext *ec = SP_EVENT_CONTEXT(this); + SPArcContext *ac = SP_ARC_CONTEXT(this); + + ec->enableGrDrag(false); + + ac->sel_changed_connection.disconnect(); + ac->sel_changed_connection.~connection(); + + delete ec->shape_editor; + ec->shape_editor = NULL; + + /* fixme: This is necessary because we do not grab */ + if (ac->item) { + sp_arc_finish(ac); + } + + delete ac->_message_context; + + //G_OBJECT_CLASS(sp_arc_context_parent_class)->dispose(object); +} + static void sp_arc_context_dispose(GObject *object) { SPEventContext *ec = SP_EVENT_CONTEXT(object); -- cgit v1.2.3 From 65ba6ad9a82f8f47974eb10665478fd783692bb5 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:19:46 +0200 Subject: Merging of EventContext classes complete. (bzr r11608.1.98) --- src/arc-context.cpp | 108 ++++++++-------------------------------------------- 1 file changed, 15 insertions(+), 93 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 31e05a6ca..3a90ddba3 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -49,13 +49,6 @@ using Inkscape::DocumentUndo; -static void sp_arc_context_dispose(GObject *object); - -static void sp_arc_context_setup(SPEventContext *ec); -static void sp_arc_context_finish(SPEventContext *ec); -static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent *event); -static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); - static void sp_arc_drag(SPArcContext *ec, Geom::Point pt, guint state); static void sp_arc_finish(SPArcContext *ec); static void sp_arc_cancel(SPArcContext *ec); @@ -71,39 +64,16 @@ namespace { bool arcContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/arc", createArcContext); } -const std::string& CArcContext::getPrefsPath() { +const std::string& SPArcContext::getPrefsPath() { return SPArcContext::prefsPath; } const std::string SPArcContext::prefsPath = "/tools/shapes/arc"; -G_DEFINE_TYPE(SPArcContext, sp_arc_context, SP_TYPE_EVENT_CONTEXT); - -static void sp_arc_context_class_init(SPArcContextClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS(klass); - SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - - object_class->dispose = sp_arc_context_dispose; - -// event_context_class->setup = sp_arc_context_setup; -// event_context_class->finish = sp_arc_context_finish; -// event_context_class->root_handler = sp_arc_context_root_handler; -// event_context_class->item_handler = sp_arc_context_item_handler; -} - -CArcContext::CArcContext(SPArcContext* arccontext) : CEventContext(arccontext) { - this->sparccontext = arccontext; -} SPArcContext::SPArcContext() : SPEventContext() { SPArcContext* arc_context = this; - arc_context->carccontext = new CArcContext(arc_context); - delete arc_context->ceventcontext; - arc_context->ceventcontext = arc_context->carccontext; - types.insert(typeid(SPArcContext)); - arc_context->_message_context = 0; SPEventContext *event_context = SP_EVENT_CONTEXT(arc_context); @@ -120,21 +90,11 @@ SPArcContext::SPArcContext() : SPEventContext() { arc_context->item = NULL; - new (&arc_context->sel_changed_connection) sigc::connection(); -} - -static void sp_arc_context_init(SPArcContext *arc_context) -{ - new (arc_context) SPArcContext(); -} - -static void sp_arc_context_finish(SPEventContext *ec) -{ - ec->ceventcontext->finish(); + //new (&arc_context->sel_changed_connection) sigc::connection(); } -void CArcContext::finish() { - SPEventContext* ec = this->speventcontext; +void SPArcContext::finish() { + SPEventContext* ec = this; SPArcContext *ac = SP_ARC_CONTEXT(ec); SPDesktop *desktop = ec->desktop; @@ -146,7 +106,7 @@ void CArcContext::finish() { // if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish) { // (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish(ec); // } - CEventContext::finish(); + SPEventContext::finish(); } SPArcContext::~SPArcContext() { @@ -156,7 +116,7 @@ SPArcContext::~SPArcContext() { ec->enableGrDrag(false); ac->sel_changed_connection.disconnect(); - ac->sel_changed_connection.~connection(); + //ac->sel_changed_connection.~connection(); delete ec->shape_editor; ec->shape_editor = NULL; @@ -171,29 +131,6 @@ SPArcContext::~SPArcContext() { //G_OBJECT_CLASS(sp_arc_context_parent_class)->dispose(object); } -static void sp_arc_context_dispose(GObject *object) -{ - SPEventContext *ec = SP_EVENT_CONTEXT(object); - SPArcContext *ac = SP_ARC_CONTEXT(object); - - ec->enableGrDrag(false); - - ac->sel_changed_connection.disconnect(); - ac->sel_changed_connection.~connection(); - - delete ec->shape_editor; - ec->shape_editor = NULL; - - /* fixme: This is necessary because we do not grab */ - if (ac->item) { - sp_arc_finish(ac); - } - - delete ac->_message_context; - - G_OBJECT_CLASS(sp_arc_context_parent_class)->dispose(object); -} - /** * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. @@ -208,13 +145,8 @@ static void sp_arc_context_selection_changed(Inkscape::Selection * selection, gp ec->shape_editor->set_item(item, SH_KNOTHOLDER); } -static void sp_arc_context_setup(SPEventContext *ec) -{ - ec->ceventcontext->setup(); -} - -void CArcContext::setup() { - SPEventContext* ec = this->speventcontext; +void SPArcContext::setup() { + SPEventContext* ec = this; SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); @@ -222,7 +154,7 @@ void CArcContext::setup() { // if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup) { // (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup(ec); // } - CEventContext::setup(); + SPEventContext::setup(); ec->shape_editor = new ShapeEditor(ec->desktop); @@ -248,13 +180,8 @@ void CArcContext::setup() { ac->_message_context = new Inkscape::MessageContext(ec->desktop->messageStack()); } -static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) -{ - return event_context->ceventcontext->item_handler(item, event); -} - -gint CArcContext::item_handler(SPItem* item, GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPArcContext::item_handler(SPItem* item, GdkEvent* event) { + SPEventContext* event_context = this; SPDesktop *desktop = event_context->desktop; gint ret = FALSE; @@ -275,18 +202,13 @@ gint CArcContext::item_handler(SPItem* item, GdkEvent* event) { // ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); // } // CPPIFY: ret is overwritten... - ret = CEventContext::item_handler(item, event); + ret = SPEventContext::item_handler(item, event); return ret; } -static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent *event) -{ - return event_context->ceventcontext->root_handler(event); -} - -gint CArcContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPArcContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this; static bool dragging; @@ -464,7 +386,7 @@ gint CArcContext::root_handler(GdkEvent* event) { // if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler) { // ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler(event_context, event); // } - ret = CEventContext::root_handler(event); + ret = SPEventContext::root_handler(event); } return ret; -- cgit v1.2.3 From 5512f857e2f33f1aa40124dc82b353e5f2e5a0b0 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:58:53 +0200 Subject: Moved factories to different files. (bzr r11608.1.100) --- src/arc-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 3a90ddba3..bb24cba28 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -54,7 +54,7 @@ static void sp_arc_finish(SPArcContext *ec); static void sp_arc_cancel(SPArcContext *ec); -#include "sp-factory.h" +#include "tool-factory.h" namespace { SPEventContext* createArcContext() { -- cgit v1.2.3 From 389b871cdea29ace85567863c439eb0537a36f54 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 20:45:27 +0200 Subject: Cleaned up a bit. (bzr r11608.1.102) --- src/arc-context.cpp | 280 +++++++++++++++++++++++----------------------------- 1 file changed, 121 insertions(+), 159 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index bb24cba28..5851df26f 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -49,11 +49,6 @@ using Inkscape::DocumentUndo; -static void sp_arc_drag(SPArcContext *ec, Geom::Point pt, guint state); -static void sp_arc_finish(SPArcContext *ec); -static void sp_arc_cancel(SPArcContext *ec); - - #include "tool-factory.h" namespace { @@ -72,124 +67,89 @@ const std::string SPArcContext::prefsPath = "/tools/shapes/arc"; SPArcContext::SPArcContext() : SPEventContext() { - SPArcContext* arc_context = this; - - arc_context->_message_context = 0; - - SPEventContext *event_context = SP_EVENT_CONTEXT(arc_context); - - event_context->cursor_shape = cursor_ellipse_xpm; - event_context->hot_x = 4; - event_context->hot_y = 4; - event_context->xp = 0; - event_context->yp = 0; - event_context->tolerance = 0; - event_context->within_tolerance = false; - event_context->item_to_select = NULL; - event_context->tool_url = "/tools/shapes/arc"; - - arc_context->item = NULL; - - //new (&arc_context->sel_changed_connection) sigc::connection(); + this->_message_context = 0; + this->cursor_shape = cursor_ellipse_xpm; + this->hot_x = 4; + this->hot_y = 4; + this->xp = 0; + this->yp = 0; + this->tolerance = 0; + this->within_tolerance = false; + this->item_to_select = NULL; + this->tool_url = "/tools/shapes/arc"; + + this->arc = NULL; } void SPArcContext::finish() { - SPEventContext* ec = this; - - SPArcContext *ac = SP_ARC_CONTEXT(ec); - SPDesktop *desktop = ec->desktop; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); - sp_arc_finish(ac); - ac->sel_changed_connection.disconnect(); + this->finishItem(); + this->sel_changed_connection.disconnect(); -// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish) { -// (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->finish(ec); -// } SPEventContext::finish(); } SPArcContext::~SPArcContext() { - SPEventContext *ec = SP_EVENT_CONTEXT(this); - SPArcContext *ac = SP_ARC_CONTEXT(this); - - ec->enableGrDrag(false); + this->enableGrDrag(false); - ac->sel_changed_connection.disconnect(); - //ac->sel_changed_connection.~connection(); + this->sel_changed_connection.disconnect(); - delete ec->shape_editor; - ec->shape_editor = NULL; + delete this->shape_editor; + this->shape_editor = NULL; /* fixme: This is necessary because we do not grab */ - if (ac->item) { - sp_arc_finish(ac); + if (this->arc) { + this->finishItem(); } - delete ac->_message_context; - - //G_OBJECT_CLASS(sp_arc_context_parent_class)->dispose(object); + delete this->_message_context; } /** * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -static void sp_arc_context_selection_changed(Inkscape::Selection * selection, gpointer data) -{ - SPArcContext *ac = SP_ARC_CONTEXT(data); - SPEventContext *ec = SP_EVENT_CONTEXT(ac); - - ec->shape_editor->unset_item(SH_KNOTHOLDER); - SPItem *item = selection->singleItem(); - ec->shape_editor->set_item(item, SH_KNOTHOLDER); +void SPArcContext::selection_changed(Inkscape::Selection* selection) { + this->shape_editor->unset_item(SH_KNOTHOLDER); + this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); } void SPArcContext::setup() { - SPEventContext* ec = this; - - SPArcContext *ac = SP_ARC_CONTEXT(ec); - Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - -// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup) { -// (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->setup(ec); -// } SPEventContext::setup(); - ec->shape_editor = new ShapeEditor(ec->desktop); + Inkscape::Selection *selection = sp_desktop_selection(this->desktop); - SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); + this->shape_editor = new ShapeEditor(this->desktop); + + SPItem *item = sp_desktop_selection(this->desktop)->singleItem(); if (item) { - ec->shape_editor->set_item(item, SH_KNOTHOLDER); + this->shape_editor->set_item(item, SH_KNOTHOLDER); } - ac->sel_changed_connection.disconnect(); - ac->sel_changed_connection = selection->connectChanged( - sigc::bind(sigc::ptr_fun(&sp_arc_context_selection_changed), (gpointer) ac) - ); + this->sel_changed_connection.disconnect(); + this->sel_changed_connection = selection->connectChanged( + sigc::mem_fun(this, &SPArcContext::selection_changed) + ); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/tools/shapes/selcue")) { - ec->enableSelectionCue(); + this->enableSelectionCue(); } if (prefs->getBool("/tools/shapes/gradientdrag")) { - ec->enableGrDrag(); + this->enableGrDrag(); } - ac->_message_context = new Inkscape::MessageContext(ec->desktop->messageStack()); + this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } gint SPArcContext::item_handler(SPItem* item, GdkEvent* event) { - SPEventContext* event_context = this; - - SPDesktop *desktop = event_context->desktop; gint ret = FALSE; switch (event->type) { case GDK_BUTTON_PRESS: - if (event->button.button == 1 && !event_context->space_panning) { - Inkscape::setup_for_drag_start(desktop, event_context, event); + if (event->button.button == 1 && !this->space_panning) { + Inkscape::setup_for_drag_start(desktop, this, event); ret = TRUE; } break; @@ -208,30 +168,26 @@ gint SPArcContext::item_handler(SPItem* item, GdkEvent* event) { } gint SPArcContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this; - static bool dragging; - SPDesktop *desktop = event_context->desktop; Inkscape::Selection *selection = sp_desktop_selection(desktop); - SPArcContext *ac = SP_ARC_CONTEXT(event_context); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + this->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); gint ret = FALSE; switch (event->type) { case GDK_BUTTON_PRESS: - if (event->button.button == 1 && !event_context->space_panning) { - + if (event->button.button == 1 && !this->space_panning) { dragging = true; - ac->center = Inkscape::setup_for_drag_start(desktop, event_context, event); + + this->center = Inkscape::setup_for_drag_start(desktop, this, event); /* Snap center */ SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop); - m.freeSnapReturnByRef(ac->center, Inkscape::SNAPSOURCE_NODE_HANDLE); + m.freeSnapReturnByRef(this->center, Inkscape::SNAPSOURCE_NODE_HANDLE); sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -242,27 +198,26 @@ gint SPArcContext::root_handler(GdkEvent* event) { } break; case GDK_MOTION_NOTIFY: - if (dragging && (event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning) { - - if ( event_context->within_tolerance - && ( abs( (gint) event->motion.x - event_context->xp ) < event_context->tolerance ) - && ( abs( (gint) event->motion.y - event_context->yp ) < event_context->tolerance ) ) { + if (dragging && (event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning) { + if ( this->within_tolerance + && ( abs( (gint) event->motion.x - this->xp ) < this->tolerance ) + && ( abs( (gint) event->motion.y - this->yp ) < this->tolerance ) ) { break; // do not drag if we're within tolerance from origin } // Once the user has moved farther than tolerance from the original location // (indicating they intend to draw, not click), then always process the // motion notify coordinates as given (no snapping back to origin) - event_context->within_tolerance = false; + this->within_tolerance = false; Geom::Point const motion_w(event->motion.x, event->motion.y); Geom::Point motion_dt(desktop->w2d(motion_w)); - sp_arc_drag(ac, motion_dt, event->motion.state); + this->drag(motion_dt, event->motion.state); gobble_motion_events(GDK_BUTTON1_MASK); ret = TRUE; - } else if (!sp_event_context_knot_mouseover(ac)){ + } else if (!sp_event_context_knot_mouseover(this)){ SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop); @@ -273,31 +228,34 @@ gint SPArcContext::root_handler(GdkEvent* event) { } break; case GDK_BUTTON_RELEASE: - event_context->xp = event_context->yp = 0; - if (event->button.button == 1 && !event_context->space_panning) { + this->xp = this->yp = 0; + if (event->button.button == 1 && !this->space_panning) { dragging = false; - sp_event_context_discard_delayed_snap_event(event_context); - if (!event_context->within_tolerance) { + sp_event_context_discard_delayed_snap_event(this); + + if (!this->within_tolerance) { // we've been dragging, finish the arc - sp_arc_finish(ac); - } else if (event_context->item_to_select) { + this->finishItem(); + } else if (this->item_to_select) { // no dragging, select clicked item if any if (event->button.state & GDK_SHIFT_MASK) { - selection->toggle(event_context->item_to_select); + selection->toggle(this->item_to_select); } else { - selection->set(event_context->item_to_select); + selection->set(this->item_to_select); } } else { // click in an empty space selection->clear(); } - event_context->xp = 0; - event_context->yp = 0; - event_context->item_to_select = NULL; + + this->xp = 0; + this->yp = 0; + this->item_to_select = NULL; ret = TRUE; } sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); break; + case GDK_KEY_PRESS: switch (get_group0_keyval (&event->key)) { case GDK_KEY_Alt_L: @@ -309,12 +267,13 @@ gint SPArcContext::root_handler(GdkEvent* event) { case GDK_KEY_Meta_L: // Meta is when you press Shift+Alt (at least on my machine) case GDK_KEY_Meta_R: if (!dragging) { - sp_event_show_modifier_tip(event_context->defaultMessageContext(), event, + sp_event_show_modifier_tip(this->defaultMessageContext(), event, _("Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle"), _("Shift: draw around the starting point"), NULL); } break; + case GDK_KEY_Up: case GDK_KEY_Down: case GDK_KEY_KP_Up: @@ -323,6 +282,7 @@ gint SPArcContext::root_handler(GdkEvent* event) { if (!MOD__CTRL_ONLY) ret = TRUE; break; + case GDK_KEY_x: case GDK_KEY_X: if (MOD__ALT_ONLY) { @@ -330,38 +290,42 @@ gint SPArcContext::root_handler(GdkEvent* event) { ret = TRUE; } break; + case GDK_KEY_Escape: if (dragging) { dragging = false; - sp_event_context_discard_delayed_snap_event(event_context); + sp_event_context_discard_delayed_snap_event(this); // if drawing, cancel, otherwise pass it up for deselecting - sp_arc_cancel(ac); + this->cancel(); ret = TRUE; } break; + case GDK_KEY_space: if (dragging) { - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), - event->button.time); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); dragging = false; - sp_event_context_discard_delayed_snap_event(event_context); - if (!event_context->within_tolerance) { + sp_event_context_discard_delayed_snap_event(this); + + if (!this->within_tolerance) { // we've been dragging, finish the arc - sp_arc_finish(ac); + this->finishItem(); } // do not return true, so that space would work switching to selector } break; + case GDK_KEY_Delete: case GDK_KEY_KP_Delete: case GDK_KEY_BackSpace: - ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + ret = this->deleteSelectedDrag(MOD__CTRL_ONLY); break; default: break; } break; + case GDK_KEY_RELEASE: switch (event->key.keyval) { case GDK_KEY_Alt_L: @@ -372,33 +336,28 @@ gint SPArcContext::root_handler(GdkEvent* event) { case GDK_KEY_Shift_R: case GDK_KEY_Meta_L: // Meta is when you press Shift+Alt case GDK_KEY_Meta_R: - event_context->defaultMessageContext()->clear(); + this->defaultMessageContext()->clear(); break; + default: break; } break; + default: break; } if (!ret) { -// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler) { -// ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->root_handler(event_context, event); -// } ret = SPEventContext::root_handler(event); } return ret; } -static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) -{ - SPDesktop *desktop = SP_EVENT_CONTEXT(ac)->desktop; - - if (!ac->item) { - - if (Inkscape::have_viable_layer(desktop, ac->_message_context) == false) { +void SPArcContext::drag(Geom::Point pt, guint state) { + if (!this->arc) { + if (Inkscape::have_viable_layer(desktop, this->_message_context) == false) { return; } @@ -410,33 +369,38 @@ static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) // Set style sp_desktop_apply_style_tool(desktop, repr, "/tools/shapes/arc", false); - ac->item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr)); + this->arc = SP_ARC(desktop->currentLayer()->appendChildRepr(repr)); Inkscape::GC::release(repr); - ac->item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); - ac->item->updateRepr(); + this->arc->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); + this->arc->updateRepr(); desktop->canvas->forceFullRedrawAfterInterruptions(5); } bool ctrl_save = false; + if ((state & GDK_MOD1_MASK) && (state & GDK_CONTROL_MASK) && !(state & GDK_SHIFT_MASK)) { // if Alt is pressed without Shift in addition to Control, temporarily drop the CONTROL mask // so that the ellipse is not constrained to integer ratios ctrl_save = true; state = state ^ GDK_CONTROL_MASK; } - Geom::Rect r = Inkscape::snap_rectangular_box(desktop, ac->item, pt, ac->center, state); + + Geom::Rect r = Inkscape::snap_rectangular_box(desktop, this->arc, pt, this->center, state); + if (ctrl_save) { state = state ^ GDK_CONTROL_MASK; } Geom::Point dir = r.dimensions() / 2; + if (state & GDK_MOD1_MASK) { /* With Alt let the ellipse pass through the mouse pointer */ Geom::Point c = r.midpoint(); + if (!ctrl_save) { if (fabs(dir[Geom::X]) > 1E-6 && fabs(dir[Geom::Y]) > 1E-6) { - Geom::Affine const i2d ( (ac->item)->i2dt_affine() ); + Geom::Affine const i2d ( (this->arc)->i2dt_affine() ); Geom::Point new_dir = pt * i2d - c; new_dir[Geom::X] *= dir[Geom::Y] / dir[Geom::X]; double lambda = new_dir.length() / dir[Geom::Y]; @@ -451,7 +415,7 @@ static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) } } - sp_arc_position_set(SP_ARC(ac->item), + sp_arc_position_set(SP_ARC(this->arc), r.midpoint()[Geom::X], r.midpoint()[Geom::Y], r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); @@ -459,8 +423,10 @@ static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) double rdimy = r.dimensions()[Geom::Y]; GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric()); GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric()); + if (state & GDK_CONTROL_MASK) { int ratio_x, ratio_y; + if (fabs (rdimx) > fabs (rdimy)) { ratio_x = (int) rint (rdimx / rdimy); ratio_y = 1; @@ -468,56 +434,52 @@ static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) ratio_x = 1; ratio_y = (int) rint (rdimy / rdimx); } - ac->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); + + this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); } else { - ac->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str); + this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str); } + g_string_free(xs, FALSE); g_string_free(ys, FALSE); } -static void sp_arc_finish(SPArcContext *ac) -{ - ac->_message_context->clear(); - - if (ac->item != NULL) { +void SPArcContext::finishItem() { + this->_message_context->clear(); - SPGenericEllipse *ge = SP_GENERICELLIPSE(SP_ARC(ac->item)); - if (ge->rx.computed == 0 || ge->ry.computed == 0) { - sp_arc_cancel(ac); // Don't allow the creating of zero sized arc, for example when the start and and point snap to the snap grid point + if (this->arc != NULL) { + if (this->arc->rx.computed == 0 || this->arc->ry.computed == 0) { + this->cancel(); // Don't allow the creating of zero sized arc, for example when the start and and point snap to the snap grid point return; } - SPDesktop *desktop = SP_EVENT_CONTEXT(ac)->desktop; + SPDesktop *desktop = SP_EVENT_CONTEXT(this)->desktop; - SP_OBJECT(ac->item)->updateRepr(); + this->arc->updateRepr(); desktop->canvas->endForcedFullRedraws(); - sp_desktop_selection(desktop)->set(ac->item); - DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_ARC, - _("Create ellipse")); + sp_desktop_selection(desktop)->set(this->arc); - ac->item = NULL; + DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_ARC, _("Create ellipse")); + + this->arc = NULL; } } -static void sp_arc_cancel(SPArcContext *ac) -{ - SPDesktop *desktop = SP_EVENT_CONTEXT(ac)->desktop; - +void SPArcContext::cancel() { sp_desktop_selection(desktop)->clear(); sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0); - if (ac->item != NULL) { - SP_OBJECT(ac->item)->deleteObject(); - ac->item = NULL; + if (this->arc != NULL) { + this->arc->deleteObject(); + this->arc = NULL; } - ac->within_tolerance = false; - ac->xp = 0; - ac->yp = 0; - ac->item_to_select = NULL; + this->within_tolerance = false; + this->xp = 0; + this->yp = 0; + this->item_to_select = NULL; desktop->canvas->endForcedFullRedraws(); -- cgit v1.2.3 From d483730f7dbad0c29366354b32b4b2a1020eba0d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 21:32:53 +0200 Subject: More cleaning. (bzr r11608.1.103) --- src/arc-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 5851df26f..1c8e7c860 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -76,7 +76,7 @@ SPArcContext::SPArcContext() : SPEventContext() { this->tolerance = 0; this->within_tolerance = false; this->item_to_select = NULL; - this->tool_url = "/tools/shapes/arc"; + //this->tool_url = "/tools/shapes/arc"; this->arc = NULL; } -- cgit v1.2.3 From bdde74bbab299f2ee448f1c55469c56a66fb01f7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 23:58:15 +0200 Subject: Removed some unused files; more refactoring in EventContext tree. (bzr r11608.1.104) --- src/arc-context.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 1c8e7c860..13b75db98 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -453,8 +453,6 @@ void SPArcContext::finishItem() { return; } - SPDesktop *desktop = SP_EVENT_CONTEXT(this)->desktop; - this->arc->updateRepr(); desktop->canvas->endForcedFullRedraws(); -- cgit v1.2.3 From 192d134e8283fadf349eb41d66f63206c98c33d1 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 28 Apr 2013 15:48:03 -0700 Subject: Temporily fix abiguous macros before later removal. (bzr r12310) --- src/arc-context.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index b5bdf58ef..34e4bbeab 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -314,12 +314,12 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_KEY_KP_Up: case GDK_KEY_KP_Down: // prevent the zoom field from activation - if (!MOD__CTRL_ONLY) + if (!MOD__CTRL_ONLY(event)) ret = TRUE; break; case GDK_KEY_x: case GDK_KEY_X: - if (MOD__ALT_ONLY) { + if (MOD__ALT_ONLY(event)) { desktop->setToolboxFocusTo ("altx-arc"); ret = TRUE; } @@ -349,7 +349,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_KEY_Delete: case GDK_KEY_KP_Delete: case GDK_KEY_BackSpace: - ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event)); break; default: -- cgit v1.2.3 From fdf69629c66f6c1a69d88a00bb6c1311c97b631b Mon Sep 17 00:00:00 2001 From: Matthew Petroff Date: Sat, 20 Jul 2013 15:08:31 -0400 Subject: Ported away from and removed "sp-metrics.*". (bzr r12380.1.47) --- src/arc-context.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 34e4bbeab..115f45493 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -32,7 +32,6 @@ #include "desktop-handles.h" #include "snap.h" #include "pixmaps/cursor-ellipse.xpm" -#include "sp-metrics.h" #include "xml/repr.h" #include "xml/node-event-vector.h" #include "preferences.h" @@ -450,8 +449,10 @@ static void sp_arc_drag(SPArcContext *ac, Geom::Point pt, guint state) double rdimx = r.dimensions()[Geom::X]; double rdimy = r.dimensions()[Geom::Y]; - GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric()); - GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric()); + Inkscape::Util::Quantity rdimx_q = Inkscape::Util::Quantity(rdimx, "px"); + Inkscape::Util::Quantity rdimy_q = Inkscape::Util::Quantity(rdimy, "px"); + GString *xs = g_string_new(rdimx_q.string(*desktop->namedview->doc_units).c_str()); + GString *ys = g_string_new(rdimy_q.string(*desktop->namedview->doc_units).c_str()); if (state & GDK_CONTROL_MASK) { int ratio_x, ratio_y; if (fabs (rdimx) > fabs (rdimy)) { -- cgit v1.2.3 From b2dd3583e7372d23d18bbc6e861f4f645ec3dc37 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 30 Jul 2013 23:17:21 +0200 Subject: Further refactoring of EventContexts. (bzr r11608.1.109) --- src/arc-context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index ade624365..827a0eb35 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -143,7 +143,7 @@ void SPArcContext::setup() { this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } -gint SPArcContext::item_handler(SPItem* item, GdkEvent* event) { +bool SPArcContext::item_handler(SPItem* item, GdkEvent* event) { gint ret = FALSE; switch (event->type) { @@ -167,7 +167,7 @@ gint SPArcContext::item_handler(SPItem* item, GdkEvent* event) { return ret; } -gint SPArcContext::root_handler(GdkEvent* event) { +bool SPArcContext::root_handler(GdkEvent* event) { static bool dragging; Inkscape::Selection *selection = sp_desktop_selection(desktop); -- cgit v1.2.3 From 989abbac025a8b3349748d19a613a08586c5fdcd Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Wed, 31 Jul 2013 21:11:20 +0200 Subject: Fixed SPObject ctor and dtor; removed singleton.h; some smaller changes. (bzr r11608.1.110) --- src/arc-context.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 827a0eb35..1f14bd270 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -67,7 +67,6 @@ const std::string SPArcContext::prefsPath = "/tools/shapes/arc"; SPArcContext::SPArcContext() : SPEventContext() { - this->_message_context = 0; this->cursor_shape = cursor_ellipse_xpm; this->hot_x = 4; this->hot_y = 4; @@ -101,8 +100,6 @@ SPArcContext::~SPArcContext() { if (this->arc) { this->finishItem(); } - - delete this->_message_context; } /** @@ -139,8 +136,6 @@ void SPArcContext::setup() { if (prefs->getBool("/tools/shapes/gradientdrag")) { this->enableGrDrag(); } - - this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } bool SPArcContext::item_handler(SPItem* item, GdkEvent* event) { @@ -357,7 +352,7 @@ bool SPArcContext::root_handler(GdkEvent* event) { void SPArcContext::drag(Geom::Point pt, guint state) { if (!this->arc) { - if (Inkscape::have_viable_layer(desktop, this->_message_context) == false) { + if (Inkscape::have_viable_layer(desktop, this->message_context) == false) { return; } @@ -435,9 +430,9 @@ void SPArcContext::drag(Geom::Point pt, guint state) { ratio_y = (int) rint (rdimy / rdimx); } - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); + this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); } else { - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str); + this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str); } g_string_free(xs, FALSE); @@ -445,7 +440,7 @@ void SPArcContext::drag(Geom::Point pt, guint state) { } void SPArcContext::finishItem() { - this->_message_context->clear(); + this->message_context->clear(); if (this->arc != NULL) { if (this->arc->rx.computed == 0 || this->arc->ry.computed == 0) { -- cgit v1.2.3 From 632414c7cdd5f8992c6d6439d25128b82e93d499 Mon Sep 17 00:00:00 2001 From: Matthew Petroff Date: Mon, 2 Sep 2013 15:51:04 -0400 Subject: Fix bug that added transforms to new objects. (bzr r12475.1.11) --- src/arc-context.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 115f45493..ee79933bb 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -485,6 +485,7 @@ static void sp_arc_finish(SPArcContext *ac) SPDesktop *desktop = SP_EVENT_CONTEXT(ac)->desktop; SP_OBJECT(ac->item)->updateRepr(); + ac->item->doWriteTransform(ac->item->getRepr(), ac->item->transform, NULL, true); desktop->canvas->endForcedFullRedraws(); -- cgit v1.2.3 From 2ed673e7554d0fd8b775978a0ef80c9aa529f7de Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 27 Sep 2013 01:45:12 +0200 Subject: Further refactored SPEllipse. (bzr r12601) --- src/arc-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 350df908b..046541b9b 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -409,7 +409,7 @@ void SPArcContext::drag(Geom::Point pt, guint state) { } } - sp_arc_position_set(SP_ARC(this->arc), + this->arc->sp_arc_position_set( r.midpoint()[Geom::X], r.midpoint()[Geom::Y], r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); -- cgit v1.2.3 From f5d74fe46345673252807be3b6812bbb0469e457 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 8 Oct 2013 12:22:49 +0200 Subject: Seamlessly switch between SVG circle, ellipse, and path (arc) elements while using the Circle, Ellipse, and Arc tool. (bzr r12670) --- src/arc-context.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 046541b9b..dc869ce60 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -363,7 +363,7 @@ void SPArcContext::drag(Geom::Point pt, guint state) { // Set style sp_desktop_apply_style_tool(desktop, repr, "/tools/shapes/arc", false); - this->arc = SP_ARC(desktop->currentLayer()->appendChildRepr(repr)); + this->arc = SP_GENERICELLIPSE(desktop->currentLayer()->appendChildRepr(repr)); Inkscape::GC::release(repr); this->arc->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); this->arc->updateRepr(); @@ -409,9 +409,9 @@ void SPArcContext::drag(Geom::Point pt, guint state) { } } - this->arc->sp_arc_position_set( - r.midpoint()[Geom::X], r.midpoint()[Geom::Y], - r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); + this->arc->position_set( + r.midpoint()[Geom::X], r.midpoint()[Geom::Y], + r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); double rdimx = r.dimensions()[Geom::X]; double rdimy = r.dimensions()[Geom::Y]; -- cgit v1.2.3 From a970dc423d59ea844bdb1af48d5d9419a5e2a287 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 13 Oct 2013 00:24:05 +0200 Subject: Units: stop newing Unit objects. pass around pointers to "undeletable" Unit objects in the UnitTable. I think we should move to using indexed units, and pass around the index of the unit in the unittable, or smth like that... ? (bzr r12679) --- src/arc-context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index dc869ce60..a14562a32 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -418,8 +418,8 @@ void SPArcContext::drag(Geom::Point pt, guint state) { Inkscape::Util::Quantity rdimx_q = Inkscape::Util::Quantity(rdimx, "px"); Inkscape::Util::Quantity rdimy_q = Inkscape::Util::Quantity(rdimy, "px"); - GString *xs = g_string_new(rdimx_q.string(*desktop->namedview->doc_units).c_str()); - GString *ys = g_string_new(rdimy_q.string(*desktop->namedview->doc_units).c_str()); + GString *xs = g_string_new(rdimx_q.string(desktop->namedview->doc_units).c_str()); + GString *ys = g_string_new(rdimy_q.string(desktop->namedview->doc_units).c_str()); if (state & GDK_CONTROL_MASK) { int ratio_x, ratio_y; -- cgit v1.2.3 From 55b451bf382e0c3d5ed8728e42fbb535acfa8a33 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Thu, 7 Nov 2013 21:44:00 +0100 Subject: First step of moving tools into appropriate namespaces. (bzr r12782) --- src/arc-context.cpp | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp index a14562a32..4e99953f6 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -50,22 +50,26 @@ using Inkscape::DocumentUndo; #include "tool-factory.h" +namespace Inkscape { +namespace UI { +namespace Tools { + namespace { - SPEventContext* createArcContext() { - return new SPArcContext(); + ToolBase* createArcContext() { + return new ArcTool(); } bool arcContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/arc", createArcContext); } -const std::string& SPArcContext::getPrefsPath() { - return SPArcContext::prefsPath; +const std::string& ArcTool::getPrefsPath() { + return ArcTool::prefsPath; } -const std::string SPArcContext::prefsPath = "/tools/shapes/arc"; +const std::string ArcTool::prefsPath = "/tools/shapes/arc"; -SPArcContext::SPArcContext() : SPEventContext() { +ArcTool::ArcTool() : ToolBase() { this->cursor_shape = cursor_ellipse_xpm; this->hot_x = 4; this->hot_y = 4; @@ -79,15 +83,15 @@ SPArcContext::SPArcContext() : SPEventContext() { this->arc = NULL; } -void SPArcContext::finish() { +void ArcTool::finish() { sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); this->finishItem(); this->sel_changed_connection.disconnect(); - SPEventContext::finish(); + ToolBase::finish(); } -SPArcContext::~SPArcContext() { +ArcTool::~ArcTool() { this->enableGrDrag(false); this->sel_changed_connection.disconnect(); @@ -105,13 +109,13 @@ SPArcContext::~SPArcContext() { * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -void SPArcContext::selection_changed(Inkscape::Selection* selection) { +void ArcTool::selection_changed(Inkscape::Selection* selection) { this->shape_editor->unset_item(SH_KNOTHOLDER); this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); } -void SPArcContext::setup() { - SPEventContext::setup(); +void ArcTool::setup() { + ToolBase::setup(); Inkscape::Selection *selection = sp_desktop_selection(this->desktop); @@ -124,7 +128,7 @@ void SPArcContext::setup() { this->sel_changed_connection.disconnect(); this->sel_changed_connection = selection->connectChanged( - sigc::mem_fun(this, &SPArcContext::selection_changed) + sigc::mem_fun(this, &ArcTool::selection_changed) ); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -137,7 +141,7 @@ void SPArcContext::setup() { } } -bool SPArcContext::item_handler(SPItem* item, GdkEvent* event) { +bool ArcTool::item_handler(SPItem* item, GdkEvent* event) { gint ret = FALSE; switch (event->type) { @@ -156,12 +160,12 @@ bool SPArcContext::item_handler(SPItem* item, GdkEvent* event) { // ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); // } // CPPIFY: ret is overwritten... - ret = SPEventContext::item_handler(item, event); + ret = ToolBase::item_handler(item, event); return ret; } -bool SPArcContext::root_handler(GdkEvent* event) { +bool ArcTool::root_handler(GdkEvent* event) { static bool dragging; Inkscape::Selection *selection = sp_desktop_selection(desktop); @@ -343,13 +347,13 @@ bool SPArcContext::root_handler(GdkEvent* event) { } if (!ret) { - ret = SPEventContext::root_handler(event); + ret = ToolBase::root_handler(event); } return ret; } -void SPArcContext::drag(Geom::Point pt, guint state) { +void ArcTool::drag(Geom::Point pt, guint state) { if (!this->arc) { if (Inkscape::have_viable_layer(desktop, this->message_context) == false) { return; @@ -441,7 +445,7 @@ void SPArcContext::drag(Geom::Point pt, guint state) { g_string_free(ys, FALSE); } -void SPArcContext::finishItem() { +void ArcTool::finishItem() { this->message_context->clear(); if (this->arc != NULL) { @@ -463,7 +467,7 @@ void SPArcContext::finishItem() { } } -void SPArcContext::cancel() { +void ArcTool::cancel() { sp_desktop_selection(desktop)->clear(); sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0); @@ -482,6 +486,10 @@ void SPArcContext::cancel() { DocumentUndo::cancel(sp_desktop_document(desktop)); } +} +} +} + /* Local Variables: -- cgit v1.2.3 From c04e30df241a3ee039077425bab9b9c37abe2854 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 9 Nov 2013 23:36:13 +0100 Subject: Moved and renamed some tool-related files. (bzr r12785) --- src/arc-context.cpp | 503 ---------------------------------------------------- 1 file changed, 503 deletions(-) delete mode 100644 src/arc-context.cpp (limited to 'src/arc-context.cpp') diff --git a/src/arc-context.cpp b/src/arc-context.cpp deleted file mode 100644 index 4e99953f6..000000000 --- a/src/arc-context.cpp +++ /dev/null @@ -1,503 +0,0 @@ -/** - * @file - * Ellipse drawing context. - */ -/* Authors: - * Mitsuru Oka - * Lauris Kaplinski - * bulia byak - * Johan Engelen - * Abhishek Sharma - * Jon A. Cruz - * - * Copyright (C) 2000-2006 Authors - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#ifdef HAVE_CONFIG_H -# include -#endif -#include - -#include "macros.h" -#include -#include "display/sp-canvas.h" -#include "sp-ellipse.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" -#include "desktop-handles.h" -#include "snap.h" -#include "pixmaps/cursor-ellipse.xpm" -#include "xml/repr.h" -#include "xml/node-event-vector.h" -#include "preferences.h" -#include "message-context.h" -#include "desktop.h" -#include "desktop-style.h" -#include "context-fns.h" -#include "verbs.h" -#include "shape-editor.h" -#include "event-context.h" - -#include "arc-context.h" -#include "display/sp-canvas-item.h" - -using Inkscape::DocumentUndo; - -#include "tool-factory.h" - -namespace Inkscape { -namespace UI { -namespace Tools { - -namespace { - ToolBase* createArcContext() { - return new ArcTool(); - } - - bool arcContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/arc", createArcContext); -} - -const std::string& ArcTool::getPrefsPath() { - return ArcTool::prefsPath; -} - -const std::string ArcTool::prefsPath = "/tools/shapes/arc"; - - -ArcTool::ArcTool() : ToolBase() { - this->cursor_shape = cursor_ellipse_xpm; - this->hot_x = 4; - this->hot_y = 4; - this->xp = 0; - this->yp = 0; - this->tolerance = 0; - this->within_tolerance = false; - this->item_to_select = NULL; - //this->tool_url = "/tools/shapes/arc"; - - this->arc = NULL; -} - -void ArcTool::finish() { - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); - this->finishItem(); - this->sel_changed_connection.disconnect(); - - ToolBase::finish(); -} - -ArcTool::~ArcTool() { - this->enableGrDrag(false); - - this->sel_changed_connection.disconnect(); - - delete this->shape_editor; - this->shape_editor = NULL; - - /* fixme: This is necessary because we do not grab */ - if (this->arc) { - this->finishItem(); - } -} - -/** - * Callback that processes the "changed" signal on the selection; - * destroys old and creates new knotholder. - */ -void ArcTool::selection_changed(Inkscape::Selection* selection) { - this->shape_editor->unset_item(SH_KNOTHOLDER); - this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); -} - -void ArcTool::setup() { - ToolBase::setup(); - - Inkscape::Selection *selection = sp_desktop_selection(this->desktop); - - this->shape_editor = new ShapeEditor(this->desktop); - - SPItem *item = sp_desktop_selection(this->desktop)->singleItem(); - if (item) { - this->shape_editor->set_item(item, SH_KNOTHOLDER); - } - - this->sel_changed_connection.disconnect(); - this->sel_changed_connection = selection->connectChanged( - sigc::mem_fun(this, &ArcTool::selection_changed) - ); - - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - if (prefs->getBool("/tools/shapes/selcue")) { - this->enableSelectionCue(); - } - - if (prefs->getBool("/tools/shapes/gradientdrag")) { - this->enableGrDrag(); - } -} - -bool ArcTool::item_handler(SPItem* item, GdkEvent* event) { - gint ret = FALSE; - - switch (event->type) { - case GDK_BUTTON_PRESS: - if (event->button.button == 1 && !this->space_panning) { - Inkscape::setup_for_drag_start(desktop, this, event); - ret = TRUE; - } - break; - // motion and release are always on root (why?) - default: - break; - } - -// if ((SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler) { -// ret = (SP_EVENT_CONTEXT_CLASS(sp_arc_context_parent_class))->item_handler(event_context, item, event); -// } - // CPPIFY: ret is overwritten... - ret = ToolBase::item_handler(item, event); - - return ret; -} - -bool ArcTool::root_handler(GdkEvent* event) { - static bool dragging; - - Inkscape::Selection *selection = sp_desktop_selection(desktop); - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - - this->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); - - gint ret = FALSE; - - switch (event->type) { - case GDK_BUTTON_PRESS: - if (event->button.button == 1 && !this->space_panning) { - dragging = true; - - this->center = Inkscape::setup_for_drag_start(desktop, this, event); - - /* Snap center */ - SnapManager &m = desktop->namedview->snap_manager; - m.setup(desktop); - m.freeSnapReturnByRef(this->center, Inkscape::SNAPSOURCE_NODE_HANDLE); - - sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, - NULL, event->button.time); - ret = TRUE; - m.unSetup(); - } - break; - case GDK_MOTION_NOTIFY: - if (dragging && (event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning) { - if ( this->within_tolerance - && ( abs( (gint) event->motion.x - this->xp ) < this->tolerance ) - && ( abs( (gint) event->motion.y - this->yp ) < this->tolerance ) ) { - break; // do not drag if we're within tolerance from origin - } - // Once the user has moved farther than tolerance from the original location - // (indicating they intend to draw, not click), then always process the - // motion notify coordinates as given (no snapping back to origin) - this->within_tolerance = false; - - Geom::Point const motion_w(event->motion.x, event->motion.y); - Geom::Point motion_dt(desktop->w2d(motion_w)); - - this->drag(motion_dt, event->motion.state); - - gobble_motion_events(GDK_BUTTON1_MASK); - - ret = TRUE; - } else if (!sp_event_context_knot_mouseover(this)){ - SnapManager &m = desktop->namedview->snap_manager; - m.setup(desktop); - - Geom::Point const motion_w(event->motion.x, event->motion.y); - Geom::Point motion_dt(desktop->w2d(motion_w)); - m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_NODE_HANDLE)); - m.unSetup(); - } - break; - case GDK_BUTTON_RELEASE: - this->xp = this->yp = 0; - if (event->button.button == 1 && !this->space_panning) { - dragging = false; - sp_event_context_discard_delayed_snap_event(this); - - if (!this->within_tolerance) { - // we've been dragging, finish the arc - this->finishItem(); - } else if (this->item_to_select) { - // no dragging, select clicked item if any - if (event->button.state & GDK_SHIFT_MASK) { - selection->toggle(this->item_to_select); - } else { - selection->set(this->item_to_select); - } - } else { - // click in an empty space - selection->clear(); - } - - this->xp = 0; - this->yp = 0; - this->item_to_select = NULL; - ret = TRUE; - } - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); - break; - - case GDK_KEY_PRESS: - switch (get_group0_keyval (&event->key)) { - case GDK_KEY_Alt_L: - case GDK_KEY_Alt_R: - case GDK_KEY_Control_L: - case GDK_KEY_Control_R: - case GDK_KEY_Shift_L: - case GDK_KEY_Shift_R: - case GDK_KEY_Meta_L: // Meta is when you press Shift+Alt (at least on my machine) - case GDK_KEY_Meta_R: - if (!dragging) { - sp_event_show_modifier_tip(this->defaultMessageContext(), event, - _("Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle"), - _("Shift: draw around the starting point"), - NULL); - } - break; - - case GDK_KEY_Up: - case GDK_KEY_Down: - case GDK_KEY_KP_Up: - case GDK_KEY_KP_Down: - // prevent the zoom field from activation - if (!MOD__CTRL_ONLY(event)) - ret = TRUE; - break; - - case GDK_KEY_x: - case GDK_KEY_X: - if (MOD__ALT_ONLY(event)) { - desktop->setToolboxFocusTo ("altx-arc"); - ret = TRUE; - } - break; - - case GDK_KEY_Escape: - if (dragging) { - dragging = false; - sp_event_context_discard_delayed_snap_event(this); - // if drawing, cancel, otherwise pass it up for deselecting - this->cancel(); - ret = TRUE; - } - break; - - case GDK_KEY_space: - if (dragging) { - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); - dragging = false; - sp_event_context_discard_delayed_snap_event(this); - - if (!this->within_tolerance) { - // we've been dragging, finish the arc - this->finishItem(); - } - // do not return true, so that space would work switching to selector - } - break; - - case GDK_KEY_Delete: - case GDK_KEY_KP_Delete: - case GDK_KEY_BackSpace: - ret = this->deleteSelectedDrag(MOD__CTRL_ONLY(event)); - break; - - default: - break; - } - break; - - case GDK_KEY_RELEASE: - switch (event->key.keyval) { - case GDK_KEY_Alt_L: - case GDK_KEY_Alt_R: - case GDK_KEY_Control_L: - case GDK_KEY_Control_R: - case GDK_KEY_Shift_L: - case GDK_KEY_Shift_R: - case GDK_KEY_Meta_L: // Meta is when you press Shift+Alt - case GDK_KEY_Meta_R: - this->defaultMessageContext()->clear(); - break; - - default: - break; - } - break; - - default: - break; - } - - if (!ret) { - ret = ToolBase::root_handler(event); - } - - return ret; -} - -void ArcTool::drag(Geom::Point pt, guint state) { - if (!this->arc) { - if (Inkscape::have_viable_layer(desktop, this->message_context) == false) { - return; - } - - // Create object - Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc(); - Inkscape::XML::Node *repr = xml_doc->createElement("svg:path"); - repr->setAttribute("sodipodi:type", "arc"); - - // Set style - sp_desktop_apply_style_tool(desktop, repr, "/tools/shapes/arc", false); - - this->arc = SP_GENERICELLIPSE(desktop->currentLayer()->appendChildRepr(repr)); - Inkscape::GC::release(repr); - this->arc->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); - this->arc->updateRepr(); - - desktop->canvas->forceFullRedrawAfterInterruptions(5); - } - - bool ctrl_save = false; - - if ((state & GDK_MOD1_MASK) && (state & GDK_CONTROL_MASK) && !(state & GDK_SHIFT_MASK)) { - // if Alt is pressed without Shift in addition to Control, temporarily drop the CONTROL mask - // so that the ellipse is not constrained to integer ratios - ctrl_save = true; - state = state ^ GDK_CONTROL_MASK; - } - - Geom::Rect r = Inkscape::snap_rectangular_box(desktop, this->arc, pt, this->center, state); - - if (ctrl_save) { - state = state ^ GDK_CONTROL_MASK; - } - - Geom::Point dir = r.dimensions() / 2; - - if (state & GDK_MOD1_MASK) { - /* With Alt let the ellipse pass through the mouse pointer */ - Geom::Point c = r.midpoint(); - - if (!ctrl_save) { - if (fabs(dir[Geom::X]) > 1E-6 && fabs(dir[Geom::Y]) > 1E-6) { - Geom::Affine const i2d ( (this->arc)->i2dt_affine() ); - Geom::Point new_dir = pt * i2d - c; - new_dir[Geom::X] *= dir[Geom::Y] / dir[Geom::X]; - double lambda = new_dir.length() / dir[Geom::Y]; - r = Geom::Rect (c - lambda*dir, c + lambda*dir); - } - } else { - /* with Alt+Ctrl (without Shift) we generate a perfect circle - with diameter click point <--> mouse pointer */ - double l = dir.length(); - Geom::Point d (l, l); - r = Geom::Rect (c - d, c + d); - } - } - - this->arc->position_set( - r.midpoint()[Geom::X], r.midpoint()[Geom::Y], - r.dimensions()[Geom::X] / 2, r.dimensions()[Geom::Y] / 2); - - double rdimx = r.dimensions()[Geom::X]; - double rdimy = r.dimensions()[Geom::Y]; - - Inkscape::Util::Quantity rdimx_q = Inkscape::Util::Quantity(rdimx, "px"); - Inkscape::Util::Quantity rdimy_q = Inkscape::Util::Quantity(rdimy, "px"); - GString *xs = g_string_new(rdimx_q.string(desktop->namedview->doc_units).c_str()); - GString *ys = g_string_new(rdimy_q.string(desktop->namedview->doc_units).c_str()); - - if (state & GDK_CONTROL_MASK) { - int ratio_x, ratio_y; - - if (fabs (rdimx) > fabs (rdimy)) { - ratio_x = (int) rint (rdimx / rdimy); - ratio_y = 1; - } else { - ratio_x = 1; - ratio_y = (int) rint (rdimy / rdimx); - } - - this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); - } else { - this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point"), xs->str, ys->str); - } - - g_string_free(xs, FALSE); - g_string_free(ys, FALSE); -} - -void ArcTool::finishItem() { - this->message_context->clear(); - - if (this->arc != NULL) { - if (this->arc->rx.computed == 0 || this->arc->ry.computed == 0) { - this->cancel(); // Don't allow the creating of zero sized arc, for example when the start and and point snap to the snap grid point - return; - } - - this->arc->updateRepr(); - this->arc->doWriteTransform(this->arc->getRepr(), this->arc->transform, NULL, true); - - desktop->canvas->endForcedFullRedraws(); - - sp_desktop_selection(desktop)->set(this->arc); - - DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_ARC, _("Create ellipse")); - - this->arc = NULL; - } -} - -void ArcTool::cancel() { - sp_desktop_selection(desktop)->clear(); - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0); - - if (this->arc != NULL) { - this->arc->deleteObject(); - this->arc = NULL; - } - - this->within_tolerance = false; - this->xp = 0; - this->yp = 0; - this->item_to_select = NULL; - - desktop->canvas->endForcedFullRedraws(); - - DocumentUndo::cancel(sp_desktop_document(desktop)); -} - -} -} -} - - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3