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/rect-context.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 86c466df7..537ab5c19 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -37,7 +37,6 @@ #include "rect-context.h" #include "sp-metrics.h" #include -#include "object-edit.h" #include "xml/repr.h" #include "xml/node-event-vector.h" #include "preferences.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/rect-context.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 537ab5c19..43194a1ae 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -45,10 +45,6 @@ #include "verbs.h" #include "display/sp-canvas-item.h" -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - using Inkscape::DocumentUndo; //static const double goldenratio = 1.61803398874989484820; // golden ratio -- 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/rect-context.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 43194a1ae..d96ddf09a 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -427,6 +427,12 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent } 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/rect-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index d96ddf09a..33ccee93c 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -168,7 +168,7 @@ static void sp_rect_context_dispose(GObject *object) * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -void sp_rect_context_selection_changed(Inkscape::Selection *selection, gpointer data) +static void sp_rect_context_selection_changed(Inkscape::Selection *selection, gpointer data) { SPRectContext *rc = SP_RECT_CONTEXT(data); SPEventContext *ec = SP_EVENT_CONTEXT(rc); -- cgit v1.2.3 From 55b2e59196c6e980bdb3f03379de6707dd91082b Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 26 Jan 2013 16:18:08 +0000 Subject: More GObject boilerplate reduction (bzr r12064) --- src/rect-context.cpp | 44 ++++++++++---------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 33ccee93c..040127ae3 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -49,8 +49,6 @@ using Inkscape::DocumentUndo; //static const double goldenratio = 1.61803398874989484820; // golden ratio -static void sp_rect_context_class_init(SPRectContextClass *klass); -static void sp_rect_context_init(SPRectContext *rect_context); static void sp_rect_context_dispose(GObject *object); static void sp_rect_context_setup(SPEventContext *ec); @@ -64,35 +62,13 @@ static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state); static void sp_rect_finish(SPRectContext *rc); static void sp_rect_cancel(SPRectContext *rc); -static SPEventContextClass *parent_class; - - -GType sp_rect_context_get_type() -{ - static GType type = 0; - if (!type) { - GTypeInfo info = { - sizeof(SPRectContextClass), - NULL, NULL, - (GClassInitFunc) sp_rect_context_class_init, - NULL, NULL, - sizeof(SPRectContext), - 4, - (GInstanceInitFunc) sp_rect_context_init, - NULL, /* value_table */ - }; - type = g_type_register_static(SP_TYPE_EVENT_CONTEXT, "SPRectContext", &info, (GTypeFlags) 0); - } - return type; -} +G_DEFINE_TYPE(SPRectContext, sp_rect_context, SP_TYPE_EVENT_CONTEXT); static void sp_rect_context_class_init(SPRectContextClass *klass) { GObjectClass *object_class = (GObjectClass *) klass; SPEventContextClass *event_context_class = (SPEventContextClass *) klass; - parent_class = (SPEventContextClass *) g_type_class_peek_parent(klass); - object_class->dispose = sp_rect_context_dispose; event_context_class->setup = sp_rect_context_setup; @@ -133,8 +109,8 @@ static void sp_rect_context_finish(SPEventContext *ec) sp_rect_finish(rc); rc->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); + if (((SPEventContextClass *) sp_rect_context_parent_class)->finish) { + ((SPEventContextClass *) sp_rect_context_parent_class)->finish(ec); } } @@ -161,7 +137,7 @@ static void sp_rect_context_dispose(GObject *object) delete rc->_message_context; } - G_OBJECT_CLASS(parent_class)->dispose(object); + G_OBJECT_CLASS(sp_rect_context_parent_class)->dispose(object); } /** @@ -182,8 +158,8 @@ static void sp_rect_context_setup(SPEventContext *ec) { SPRectContext *rc = SP_RECT_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if (((SPEventContextClass *) sp_rect_context_parent_class)->setup) { + ((SPEventContextClass *) sp_rect_context_parent_class)->setup(ec); } ec->shape_editor = new ShapeEditor(ec->desktop); @@ -245,8 +221,8 @@ static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem * break; } - if (((SPEventContextClass *) parent_class)->item_handler) { - ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event); + if (((SPEventContextClass *) sp_rect_context_parent_class)->item_handler) { + ret = ((SPEventContextClass *) sp_rect_context_parent_class)->item_handler(event_context, item, event); } return ret; @@ -458,8 +434,8 @@ static gint sp_rect_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 (((SPEventContextClass *) sp_rect_context_parent_class)->root_handler) { + ret = ((SPEventContextClass *) sp_rect_context_parent_class)->root_handler(event_context, event); } } -- cgit v1.2.3 From f51227a487f3d80e096c04470a969f5efa911a98 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 30 Mar 2013 21:49:36 +0100 Subject: Turned all functions concerning SPRect into member functions. (bzr r11608.1.60) --- src/rect-context.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 040127ae3..40e1d5b2a 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -469,15 +469,17 @@ static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state) Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); - sp_rect_position_set(SP_RECT(rc.item), r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); + SP_RECT(rc.item)->setPosition(r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); + if ( rc.rx != 0.0 ) { - sp_rect_set_rx (SP_RECT(rc.item), TRUE, rc.rx); + SP_RECT(rc.item)->setRx(true, rc.rx); } + if ( rc.ry != 0.0 ) { if (rc.rx == 0.0) - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); + SP_RECT(rc.item)->setRy(true, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); else - sp_rect_set_ry (SP_RECT(rc.item), TRUE, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); + SP_RECT(rc.item)->setRy(true, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); } // status text -- 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/rect-context.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 13 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 40e1d5b2a..a53a9c7b4 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -78,10 +78,18 @@ static void sp_rect_context_class_init(SPRectContextClass *klass) event_context_class->item_handler = sp_rect_context_item_handler; } +CRectContext::CRectContext(SPRectContext* rectcontext) : CEventContext(rectcontext) { + this->sprectcontext = rectcontext; +} + static void sp_rect_context_init(SPRectContext *rect_context) { SPEventContext *event_context = SP_EVENT_CONTEXT(rect_context); + rect_context->crectcontext = new CRectContext(rect_context); + delete rect_context->ceventcontext; + rect_context->ceventcontext = rect_context->crectcontext; + event_context->cursor_shape = cursor_rect_xpm; event_context->hot_x = 4; event_context->hot_y = 4; @@ -102,6 +110,12 @@ static void sp_rect_context_init(SPRectContext *rect_context) static void sp_rect_context_finish(SPEventContext *ec) { + ec->ceventcontext->finish(); +} + +void CRectContext::finish() { + SPEventContext* ec = this->speventcontext; + SPRectContext *rc = SP_RECT_CONTEXT(ec); SPDesktop *desktop = ec->desktop; @@ -109,12 +123,12 @@ static void sp_rect_context_finish(SPEventContext *ec) sp_rect_finish(rc); rc->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) sp_rect_context_parent_class)->finish) { - ((SPEventContextClass *) sp_rect_context_parent_class)->finish(ec); - } +// if (((SPEventContextClass *) sp_rect_context_parent_class)->finish) { +// ((SPEventContextClass *) sp_rect_context_parent_class)->finish(ec); +// } + CEventContext::finish(); } - static void sp_rect_context_dispose(GObject *object) { SPRectContext *rc = SP_RECT_CONTEXT(object); @@ -156,11 +170,18 @@ static void sp_rect_context_selection_changed(Inkscape::Selection *selection, gp static void sp_rect_context_setup(SPEventContext *ec) { + ec->ceventcontext->setup(); +} + +void CRectContext::setup() { + SPRectContext* ec = this->sprectcontext; + SPRectContext *rc = SP_RECT_CONTEXT(ec); - if (((SPEventContextClass *) sp_rect_context_parent_class)->setup) { - ((SPEventContextClass *) sp_rect_context_parent_class)->setup(ec); - } +// if (((SPEventContextClass *) sp_rect_context_parent_class)->setup) { +// ((SPEventContextClass *) sp_rect_context_parent_class)->setup(ec); +// } + CEventContext::setup(); ec->shape_editor = new ShapeEditor(ec->desktop); @@ -191,6 +212,12 @@ static void sp_rect_context_setup(SPEventContext *ec) static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val) { + ec->ceventcontext->set(val); +} + +void CRectContext::set(Inkscape::Preferences::Entry* val) { + SPEventContext* ec = this->speventcontext; + SPRectContext *rc = SP_RECT_CONTEXT(ec); /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like @@ -205,6 +232,12 @@ static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) { + return event_context->ceventcontext->item_handler(item, event); +} + +gint CRectContext::item_handler(SPItem* item, GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + SPDesktop *desktop = event_context->desktop; gint ret = FALSE; @@ -221,15 +254,23 @@ static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem * break; } - if (((SPEventContextClass *) sp_rect_context_parent_class)->item_handler) { - ret = ((SPEventContextClass *) sp_rect_context_parent_class)->item_handler(event_context, item, event); - } +// if (((SPEventContextClass *) sp_rect_context_parent_class)->item_handler) { +// ret = ((SPEventContextClass *) sp_rect_context_parent_class)->item_handler(event_context, item, event); +// } + // CPPIFY: ret is always overwritten... + ret = CEventContext::item_handler(item, event); return ret; } static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent *event) { + return event_context->ceventcontext->root_handler(event); +} + +gint CRectContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + static bool dragging; SPDesktop *desktop = event_context->desktop; @@ -434,9 +475,10 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if (((SPEventContextClass *) sp_rect_context_parent_class)->root_handler) { - ret = ((SPEventContextClass *) sp_rect_context_parent_class)->root_handler(event_context, event); - } +// if (((SPEventContextClass *) sp_rect_context_parent_class)->root_handler) { +// ret = ((SPEventContextClass *) sp_rect_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/rect-context.cpp | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index a53a9c7b4..45fc5a87e 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -71,25 +71,28 @@ static void sp_rect_context_class_init(SPRectContextClass *klass) object_class->dispose = sp_rect_context_dispose; - event_context_class->setup = sp_rect_context_setup; - event_context_class->finish = sp_rect_context_finish; - event_context_class->set = sp_rect_context_set; - event_context_class->root_handler = sp_rect_context_root_handler; - event_context_class->item_handler = sp_rect_context_item_handler; +// event_context_class->setup = sp_rect_context_setup; +// event_context_class->finish = sp_rect_context_finish; +// event_context_class->set = sp_rect_context_set; +// event_context_class->root_handler = sp_rect_context_root_handler; +// event_context_class->item_handler = sp_rect_context_item_handler; } CRectContext::CRectContext(SPRectContext* rectcontext) : CEventContext(rectcontext) { this->sprectcontext = rectcontext; } -static void sp_rect_context_init(SPRectContext *rect_context) -{ +SPRectContext::SPRectContext() : SPEventContext() { + SPRectContext* rect_context = this; + SPEventContext *event_context = SP_EVENT_CONTEXT(rect_context); rect_context->crectcontext = new CRectContext(rect_context); delete rect_context->ceventcontext; rect_context->ceventcontext = rect_context->crectcontext; + rect_context->_message_context = 0; + event_context->cursor_shape = cursor_rect_xpm; event_context->hot_x = 4; event_context->hot_y = 4; @@ -108,6 +111,11 @@ static void sp_rect_context_init(SPRectContext *rect_context) new (&rect_context->sel_changed_connection) sigc::connection(); } +static void sp_rect_context_init(SPRectContext *rect_context) +{ + new (rect_context) SPRectContext(); +} + static void sp_rect_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/rect-context.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 45fc5a87e..b5149ea22 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -62,6 +62,9 @@ static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state); static void sp_rect_finish(SPRectContext *rc); static void sp_rect_cancel(SPRectContext *rc); + +const std::string SPRectContext::prefsPath = "/tools/shapes/rect"; + G_DEFINE_TYPE(SPRectContext, sp_rect_context, SP_TYPE_EVENT_CONTEXT); static void sp_rect_context_class_init(SPRectContextClass *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/rect-context.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index b5149ea22..e0c0af2c9 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -47,6 +47,20 @@ using Inkscape::DocumentUndo; +#include "sp-factory.h" + +namespace { + SPEventContext* createRectContext() { + return new SPRectContext(); + } + + bool rectContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/rect", createRectContext); +} + +const std::string& CRectContext::getPrefsPath() { + return SPRectContext::prefsPath; +} + //static const double goldenratio = 1.61803398874989484820; // golden ratio static void sp_rect_context_dispose(GObject *object); @@ -93,6 +107,7 @@ SPRectContext::SPRectContext() : SPEventContext() { rect_context->crectcontext = new CRectContext(rect_context); delete rect_context->ceventcontext; rect_context->ceventcontext = rect_context->crectcontext; + types.insert(typeid(SPRectContext)); rect_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/rect-context.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index e0c0af2c9..2a1dfcd55 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -155,6 +155,31 @@ void CRectContext::finish() { CEventContext::finish(); } + +SPRectContext::~SPRectContext() { + SPRectContext *rc = SP_RECT_CONTEXT(this); + SPEventContext *ec = SP_EVENT_CONTEXT(this); + + ec->enableGrDrag(false); + + rc->sel_changed_connection.disconnect(); + rc->sel_changed_connection.~connection(); + + delete ec->shape_editor; + ec->shape_editor = NULL; + + /* fixme: This is necessary because we do not grab */ + if (rc->item) { + sp_rect_finish(rc); + } + + if (rc->_message_context) { + delete rc->_message_context; + } + + //G_OBJECT_CLASS(sp_rect_context_parent_class)->dispose(object); +} + static void sp_rect_context_dispose(GObject *object) { SPRectContext *rc = SP_RECT_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/rect-context.cpp | 124 +++++++-------------------------------------------- 1 file changed, 17 insertions(+), 107 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 2a1dfcd55..382048a3d 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -57,21 +57,12 @@ namespace { bool rectContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/rect", createRectContext); } -const std::string& CRectContext::getPrefsPath() { +const std::string& SPRectContext::getPrefsPath() { return SPRectContext::prefsPath; } //static const double goldenratio = 1.61803398874989484820; // golden ratio -static void sp_rect_context_dispose(GObject *object); - -static void sp_rect_context_setup(SPEventContext *ec); -static void sp_rect_context_finish(SPEventContext *ec); -static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val); - -static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent *event); -static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event); - static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state); static void sp_rect_finish(SPRectContext *rc); static void sp_rect_cancel(SPRectContext *rc); @@ -79,36 +70,11 @@ static void sp_rect_cancel(SPRectContext *rc); const std::string SPRectContext::prefsPath = "/tools/shapes/rect"; -G_DEFINE_TYPE(SPRectContext, sp_rect_context, SP_TYPE_EVENT_CONTEXT); - -static void sp_rect_context_class_init(SPRectContextClass *klass) -{ - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; - - object_class->dispose = sp_rect_context_dispose; - -// event_context_class->setup = sp_rect_context_setup; -// event_context_class->finish = sp_rect_context_finish; -// event_context_class->set = sp_rect_context_set; -// event_context_class->root_handler = sp_rect_context_root_handler; -// event_context_class->item_handler = sp_rect_context_item_handler; -} - -CRectContext::CRectContext(SPRectContext* rectcontext) : CEventContext(rectcontext) { - this->sprectcontext = rectcontext; -} - SPRectContext::SPRectContext() : SPEventContext() { SPRectContext* rect_context = this; SPEventContext *event_context = SP_EVENT_CONTEXT(rect_context); - rect_context->crectcontext = new CRectContext(rect_context); - delete rect_context->ceventcontext; - rect_context->ceventcontext = rect_context->crectcontext; - types.insert(typeid(SPRectContext)); - rect_context->_message_context = 0; event_context->cursor_shape = cursor_rect_xpm; @@ -126,21 +92,11 @@ SPRectContext::SPRectContext() : SPEventContext() { rect_context->rx = 0.0; rect_context->ry = 0.0; - new (&rect_context->sel_changed_connection) sigc::connection(); -} - -static void sp_rect_context_init(SPRectContext *rect_context) -{ - new (rect_context) SPRectContext(); + //new (&rect_context->sel_changed_connection) sigc::connection(); } -static void sp_rect_context_finish(SPEventContext *ec) -{ - ec->ceventcontext->finish(); -} - -void CRectContext::finish() { - SPEventContext* ec = this->speventcontext; +void SPRectContext::finish() { + SPEventContext* ec = this; SPRectContext *rc = SP_RECT_CONTEXT(ec); SPDesktop *desktop = ec->desktop; @@ -152,10 +108,9 @@ void CRectContext::finish() { // if (((SPEventContextClass *) sp_rect_context_parent_class)->finish) { // ((SPEventContextClass *) sp_rect_context_parent_class)->finish(ec); // } - CEventContext::finish(); + SPEventContext::finish(); } - SPRectContext::~SPRectContext() { SPRectContext *rc = SP_RECT_CONTEXT(this); SPEventContext *ec = SP_EVENT_CONTEXT(this); @@ -163,7 +118,7 @@ SPRectContext::~SPRectContext() { ec->enableGrDrag(false); rc->sel_changed_connection.disconnect(); - rc->sel_changed_connection.~connection(); + //rc->sel_changed_connection.~connection(); delete ec->shape_editor; ec->shape_editor = NULL; @@ -180,31 +135,6 @@ SPRectContext::~SPRectContext() { //G_OBJECT_CLASS(sp_rect_context_parent_class)->dispose(object); } -static void sp_rect_context_dispose(GObject *object) -{ - SPRectContext *rc = SP_RECT_CONTEXT(object); - SPEventContext *ec = SP_EVENT_CONTEXT(object); - - ec->enableGrDrag(false); - - rc->sel_changed_connection.disconnect(); - rc->sel_changed_connection.~connection(); - - delete ec->shape_editor; - ec->shape_editor = NULL; - - /* fixme: This is necessary because we do not grab */ - if (rc->item) { - sp_rect_finish(rc); - } - - if (rc->_message_context) { - delete rc->_message_context; - } - - G_OBJECT_CLASS(sp_rect_context_parent_class)->dispose(object); -} - /** * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. @@ -219,20 +149,15 @@ static void sp_rect_context_selection_changed(Inkscape::Selection *selection, gp ec->shape_editor->set_item(item, SH_KNOTHOLDER); } -static void sp_rect_context_setup(SPEventContext *ec) -{ - ec->ceventcontext->setup(); -} - -void CRectContext::setup() { - SPRectContext* ec = this->sprectcontext; +void SPRectContext::setup() { + SPRectContext* ec = this; SPRectContext *rc = SP_RECT_CONTEXT(ec); // if (((SPEventContextClass *) sp_rect_context_parent_class)->setup) { // ((SPEventContextClass *) sp_rect_context_parent_class)->setup(ec); // } - CEventContext::setup(); + SPEventContext::setup(); ec->shape_editor = new ShapeEditor(ec->desktop); @@ -261,13 +186,8 @@ void CRectContext::setup() { rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -static void sp_rect_context_set(SPEventContext *ec, Inkscape::Preferences::Entry *val) -{ - ec->ceventcontext->set(val); -} - -void CRectContext::set(Inkscape::Preferences::Entry* val) { - SPEventContext* ec = this->speventcontext; +void SPRectContext::set(Inkscape::Preferences::Entry* val) { + SPEventContext* ec = this; SPRectContext *rc = SP_RECT_CONTEXT(ec); @@ -281,13 +201,8 @@ void CRectContext::set(Inkscape::Preferences::Entry* val) { } } -static gint sp_rect_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEvent *event) -{ - return event_context->ceventcontext->item_handler(item, event); -} - -gint CRectContext::item_handler(SPItem* item, GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { + SPEventContext* event_context = this; SPDesktop *desktop = event_context->desktop; @@ -309,18 +224,13 @@ gint CRectContext::item_handler(SPItem* item, GdkEvent* event) { // ret = ((SPEventContextClass *) sp_rect_context_parent_class)->item_handler(event_context, item, event); // } // CPPIFY: ret is always overwritten... - ret = CEventContext::item_handler(item, event); + ret = SPEventContext::item_handler(item, event); return ret; } -static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent *event) -{ - return event_context->ceventcontext->root_handler(event); -} - -gint CRectContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPRectContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this; static bool dragging; @@ -529,7 +439,7 @@ gint CRectContext::root_handler(GdkEvent* event) { // if (((SPEventContextClass *) sp_rect_context_parent_class)->root_handler) { // ret = ((SPEventContextClass *) sp_rect_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/rect-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 382048a3d..b61446b34 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -47,7 +47,7 @@ using Inkscape::DocumentUndo; -#include "sp-factory.h" +#include "tool-factory.h" namespace { SPEventContext* createRectContext() { -- cgit v1.2.3 From dda3882d58e8cc05ce1d153ad09ee17819d2c0f1 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 01:28:31 +0200 Subject: Some refactoring in RectContext and StarContext. (bzr r11608.1.101) --- src/rect-context.cpp | 315 ++++++++++++++++++++++----------------------------- 1 file changed, 134 insertions(+), 181 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index b61446b34..3b1169017 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -61,157 +61,116 @@ const std::string& SPRectContext::getPrefsPath() { return SPRectContext::prefsPath; } -//static const double goldenratio = 1.61803398874989484820; // golden ratio - -static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state); -static void sp_rect_finish(SPRectContext *rc); -static void sp_rect_cancel(SPRectContext *rc); - - const std::string SPRectContext::prefsPath = "/tools/shapes/rect"; SPRectContext::SPRectContext() : SPEventContext() { - SPRectContext* rect_context = this; - - SPEventContext *event_context = SP_EVENT_CONTEXT(rect_context); - - rect_context->_message_context = 0; - - event_context->cursor_shape = cursor_rect_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/rect"; - - rect_context->item = NULL; - - rect_context->rx = 0.0; - rect_context->ry = 0.0; - - //new (&rect_context->sel_changed_connection) sigc::connection(); + this->_message_context = 0; + + this->cursor_shape = cursor_rect_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/rect"; + + this->rect = NULL; + + this->rx = 0.0; + this->ry = 0.0; } void SPRectContext::finish() { - SPEventContext* ec = this; - - SPRectContext *rc = SP_RECT_CONTEXT(ec); - SPDesktop *desktop = ec->desktop; + SPDesktop *desktop = this->desktop; sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); - sp_rect_finish(rc); - rc->sel_changed_connection.disconnect(); + + this->finishItem(); + this->sel_changed_connection.disconnect(); -// if (((SPEventContextClass *) sp_rect_context_parent_class)->finish) { -// ((SPEventContextClass *) sp_rect_context_parent_class)->finish(ec); -// } SPEventContext::finish(); } SPRectContext::~SPRectContext() { - SPRectContext *rc = SP_RECT_CONTEXT(this); - SPEventContext *ec = SP_EVENT_CONTEXT(this); - - ec->enableGrDrag(false); + this->enableGrDrag(false); - rc->sel_changed_connection.disconnect(); - //rc->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 (rc->item) { - sp_rect_finish(rc); + if (this->rect) { + this->finishItem(); } - if (rc->_message_context) { - delete rc->_message_context; + if (this->_message_context) { + delete this->_message_context; } - - //G_OBJECT_CLASS(sp_rect_context_parent_class)->dispose(object); } /** * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -static void sp_rect_context_selection_changed(Inkscape::Selection *selection, gpointer data) -{ - SPRectContext *rc = SP_RECT_CONTEXT(data); - SPEventContext *ec = SP_EVENT_CONTEXT(rc); - - ec->shape_editor->unset_item(SH_KNOTHOLDER); - SPItem *item = selection->singleItem(); - ec->shape_editor->set_item(item, SH_KNOTHOLDER); +void SPRectContext::selection_changed(Inkscape::Selection* selection) { + this->shape_editor->unset_item(SH_KNOTHOLDER); + this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); } void SPRectContext::setup() { - SPRectContext* ec = this; - - SPRectContext *rc = SP_RECT_CONTEXT(ec); - -// if (((SPEventContextClass *) sp_rect_context_parent_class)->setup) { -// ((SPEventContextClass *) sp_rect_context_parent_class)->setup(ec); -// } SPEventContext::setup(); - ec->shape_editor = new ShapeEditor(ec->desktop); + this->shape_editor = new ShapeEditor(this->desktop); - SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); + 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); } - rc->sel_changed_connection.disconnect(); - rc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged( - sigc::bind(sigc::ptr_fun(&sp_rect_context_selection_changed), (gpointer)rc) + this->sel_changed_connection.disconnect(); + this->sel_changed_connection = sp_desktop_selection(this->desktop)->connectChanged( + sigc::mem_fun(this, &SPRectContext::selection_changed) ); - sp_event_context_read(ec, "rx"); - sp_event_context_read(ec, "ry"); + sp_event_context_read(this, "rx"); + sp_event_context_read(this, "ry"); 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(); } - rc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); + this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } void SPRectContext::set(Inkscape::Preferences::Entry* val) { - SPEventContext* ec = this; - - SPRectContext *rc = SP_RECT_CONTEXT(ec); - /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ Glib::ustring name = val->getEntryName(); + if ( name == "rx" ) { - rc->rx = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up + this->rx = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up } else if ( name == "ry" ) { - rc->ry = val->getDoubleLimited(); + this->ry = val->getDoubleLimited(); } } gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { - SPEventContext* event_context = this; - - SPDesktop *desktop = event_context->desktop; + SPDesktop *desktop = this->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; @@ -230,45 +189,42 @@ gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { } gint SPRectContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this; - static bool dragging; - SPDesktop *desktop = event_context->desktop; + SPDesktop *desktop = this->desktop; Inkscape::Selection *selection = sp_desktop_selection (desktop); - SPRectContext *rc = SP_RECT_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) { - Geom::Point const button_w(event->button.x, - event->button.y); + if (event->button.button == 1 && !this->space_panning) { + Geom::Point const button_w(event->button.x, event->button.y); // save drag origin - event_context->xp = (gint) button_w[Geom::X]; - event_context->yp = (gint) button_w[Geom::Y]; - event_context->within_tolerance = true; + this->xp = (gint) button_w[Geom::X]; + this->yp = (gint) button_w[Geom::Y]; + this->within_tolerance = true; // remember clicked item, disregarding groups, honoring Alt - event_context->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, TRUE); + this->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, TRUE); dragging = true; /* Position center */ Geom::Point button_dt(desktop->w2d(button_w)); - rc->center = button_dt; + this->center = button_dt; /* Snap center */ SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop); m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE); m.unSetup(); - rc->center = button_dt; + this->center = button_dt; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), ( GDK_KEY_PRESS_MASK | @@ -283,25 +239,25 @@ gint SPRectContext::root_handler(GdkEvent* event) { break; case GDK_MOTION_NOTIFY: if ( dragging - && (event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning) + && (event->motion.state & GDK_BUTTON1_MASK) && !this->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 ( 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_rect_drag(*rc, motion_dt, event->motion.state); // this will also handle the snapping + this->drag(motion_dt, event->motion.state); // this will also handle the snapping gobble_motion_events(GDK_BUTTON1_MASK); ret = TRUE; - } else if (!sp_event_context_knot_mouseover(rc)) { + } else if (!sp_event_context_knot_mouseover(this)) { SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop); @@ -313,27 +269,27 @@ gint SPRectContext::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); + sp_event_context_discard_delayed_snap_event(this); - if (!event_context->within_tolerance) { + if (!this->within_tolerance) { // we've been dragging, finish the rect - sp_rect_finish(rc); - } 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->item_to_select = NULL; + this->item_to_select = NULL; ret = TRUE; sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); @@ -350,7 +306,7 @@ gint SPRectContext::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 square or integer-ratio rect, lock a rounded corner circular"), _("Shift: draw around the starting point"), NULL); @@ -384,9 +340,9 @@ gint SPRectContext::root_handler(GdkEvent* event) { 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_rect_cancel(rc); + this->cancel(); ret = TRUE; } break; @@ -396,10 +352,11 @@ gint SPRectContext::root_handler(GdkEvent* event) { 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 rect - sp_rect_finish(rc); + this->finishItem(); } // do not return true, so that space would work switching to selector } @@ -408,7 +365,7 @@ gint SPRectContext::root_handler(GdkEvent* event) { 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: @@ -425,7 +382,7 @@ gint SPRectContext::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; @@ -436,137 +393,133 @@ gint SPRectContext::root_handler(GdkEvent* event) { } if (!ret) { -// if (((SPEventContextClass *) sp_rect_context_parent_class)->root_handler) { -// ret = ((SPEventContextClass *) sp_rect_context_parent_class)->root_handler(event_context, event); -// } ret = SPEventContext::root_handler(event); } return ret; } -static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state) -{ - SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop; - - if (!rc.item) { +void SPRectContext::drag(Geom::Point const pt, guint state) { + SPDesktop *desktop = this->desktop; - if (Inkscape::have_viable_layer(desktop, rc._message_context) == false) { + if (!this->rect) { + if (Inkscape::have_viable_layer(desktop, this->_message_context) == false) { return; } // Create object - Inkscape::XML::Document *xml_doc = SP_EVENT_CONTEXT_DOCUMENT(&rc)->getReprDoc(); + Inkscape::XML::Document *xml_doc = this->desktop->doc()->getReprDoc(); Inkscape::XML::Node *repr = xml_doc->createElement("svg:rect"); // Set style sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/rect", false); - rc.item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr); + this->rect = SP_RECT(desktop->currentLayer()->appendChildRepr(repr)); Inkscape::GC::release(repr); - rc.item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); - rc.item->updateRepr(); + + this->rect->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); + this->rect->updateRepr(); desktop->canvas->forceFullRedrawAfterInterruptions(5); } - Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, rc.item, pt, rc.center, state); + Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, this->rect, pt, this->center, state); - SP_RECT(rc.item)->setPosition(r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); + this->rect->setPosition(r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); - if ( rc.rx != 0.0 ) { - SP_RECT(rc.item)->setRx(true, rc.rx); + if (this->rx != 0.0) { + this->rect->setRx(true, this->rx); } - if ( rc.ry != 0.0 ) { - if (rc.rx == 0.0) - SP_RECT(rc.item)->setRy(true, CLAMP(rc.ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); + if (this->ry != 0.0) { + if (this->rx == 0.0) + this->rect->setRy(true, CLAMP(this->ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); else - SP_RECT(rc.item)->setRy(true, CLAMP(rc.ry, 0, r.dimensions()[Geom::Y])); + this->rect->setRy(true, CLAMP(this->ry, 0, r.dimensions()[Geom::Y])); } // status text 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()); + if (state & GDK_CONTROL_MASK) { int ratio_x, ratio_y; bool is_golden_ratio = false; + if (fabs (rdimx) > fabs (rdimy)) { if (fabs(rdimx / rdimy - goldenratio) < 1e-6) { is_golden_ratio = true; } + ratio_x = (int) rint (rdimx / rdimy); ratio_y = 1; } else { if (fabs(rdimy / rdimx - goldenratio) < 1e-6) { is_golden_ratio = true; } + ratio_x = 1; ratio_y = (int) rint (rdimy / rdimx); } + if (!is_golden_ratio) { - rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %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, _("Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); } else { if (ratio_y == 1) { - rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point"), xs->str, ys->str); + this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point"), xs->str, ys->str); } else { - rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point"), xs->str, ys->str); + this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point"), xs->str, ys->str); } } } else { - rc._message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point"), xs->str, ys->str); + this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; 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_rect_finish(SPRectContext *rc) -{ - rc->_message_context->clear(); +void SPRectContext::finishItem() { + this->_message_context->clear(); - if ( rc->item != NULL ) { - SPRect *rect = SP_RECT(rc->item); - if (rect->width.computed == 0 || rect->height.computed == 0) { - sp_rect_cancel(rc); // Don't allow the creating of zero sized rectangle, for example when the start and and point snap to the snap grid point + if (this->rect != NULL) { + if (this->rect->width.computed == 0 || this->rect->height.computed == 0) { + this->cancel(); // Don't allow the creating of zero sized rectangle, for example when the start and and point snap to the snap grid point return; } - SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(rc); + this->rect->updateRepr(); - SP_OBJECT(rc->item)->updateRepr(); + this->desktop->canvas->endForcedFullRedraws(); - desktop->canvas->endForcedFullRedraws(); + sp_desktop_selection(this->desktop)->set(this->rect); - sp_desktop_selection(desktop)->set(rc->item); - DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_RECT, - _("Create rectangle")); + DocumentUndo::done(sp_desktop_document(this->desktop), SP_VERB_CONTEXT_RECT, _("Create rectangle")); - rc->item = NULL; + this->rect = NULL; } } -static void sp_rect_cancel(SPRectContext *rc) -{ - SPDesktop *desktop = SP_EVENT_CONTEXT(rc)->desktop; - - sp_desktop_selection(desktop)->clear(); - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0); +void SPRectContext::cancel(){ + sp_desktop_selection(this->desktop)->clear(); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), 0); - if (rc->item != NULL) { - SP_OBJECT(rc->item)->deleteObject(); - rc->item = NULL; + if (this->rect != NULL) { + this->rect->deleteObject(); + this->rect = NULL; } - rc->within_tolerance = false; - rc->xp = 0; - rc->yp = 0; - rc->item_to_select = NULL; + this->within_tolerance = false; + this->xp = 0; + this->yp = 0; + this->item_to_select = NULL; - desktop->canvas->endForcedFullRedraws(); + this->desktop->canvas->endForcedFullRedraws(); - DocumentUndo::cancel(sp_desktop_document(desktop)); + DocumentUndo::cancel(sp_desktop_document(this->desktop)); } -- 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/rect-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 3b1169017..e6c3cfdd9 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -74,7 +74,7 @@ SPRectContext::SPRectContext() : SPEventContext() { this->tolerance = 0; this->within_tolerance = false; this->item_to_select = NULL; - this->tool_url = "/tools/shapes/rect"; + //this->tool_url = "/tools/shapes/rect"; this->rect = 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/rect-context.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index e6c3cfdd9..42e6c4452 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -150,15 +150,15 @@ void SPRectContext::setup() { this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } -void SPRectContext::set(Inkscape::Preferences::Entry* val) { +void SPRectContext::set(const Inkscape::Preferences::Entry& val) { /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ - Glib::ustring name = val->getEntryName(); + Glib::ustring name = val.getEntryName(); if ( name == "rx" ) { - this->rx = val->getDoubleLimited(); // prevents NaN and +/-Inf from messing up + this->rx = val.getDoubleLimited(); // prevents NaN and +/-Inf from messing up } else if ( name == "ry" ) { - this->ry = val->getDoubleLimited(); + this->ry = val.getDoubleLimited(); } } -- cgit v1.2.3 From 9b2956fbaefb4e12bad3fc359c47e5923f33bb41 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 28 Apr 2013 00:05:16 +0200 Subject: various changes (bzr r11608.1.105) --- src/rect-context.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 42e6c4452..441b573f0 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -74,7 +74,6 @@ SPRectContext::SPRectContext() : SPEventContext() { this->tolerance = 0; this->within_tolerance = false; this->item_to_select = NULL; - //this->tool_url = "/tools/shapes/rect"; this->rect = NULL; @@ -83,9 +82,7 @@ SPRectContext::SPRectContext() : SPEventContext() { } void SPRectContext::finish() { - SPDesktop *desktop = this->desktop; - - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), GDK_CURRENT_TIME); this->finishItem(); this->sel_changed_connection.disconnect(); @@ -163,8 +160,6 @@ void SPRectContext::set(const Inkscape::Preferences::Entry& val) { } gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { - SPDesktop *desktop = this->desktop; - gint ret = FALSE; switch (event->type) { @@ -179,11 +174,9 @@ gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { break; } -// if (((SPEventContextClass *) sp_rect_context_parent_class)->item_handler) { -// ret = ((SPEventContextClass *) sp_rect_context_parent_class)->item_handler(event_context, item, event); -// } - // CPPIFY: ret is always overwritten... - ret = SPEventContext::item_handler(item, event); + if (!ret) { + ret = SPEventContext::item_handler(item, event); + } return ret; } -- 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/rect-context.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 040127ae3..06745564f 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -359,13 +359,13 @@ static gint sp_rect_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-rect"); ret = TRUE; } @@ -373,7 +373,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_KEY_g: case GDK_KEY_G: - if (MOD__SHIFT_ONLY) { + if (MOD__SHIFT_ONLY(event)) { sp_selection_to_guides(desktop); ret = true; } @@ -406,7 +406,7 @@ static gint sp_rect_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/rect-context.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 06745564f..17675745f 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -35,7 +35,6 @@ #include "message-context.h" #include "pixmaps/cursor-rect.xpm" #include "rect-context.h" -#include "sp-metrics.h" #include #include "xml/repr.h" #include "xml/node-event-vector.h" @@ -483,8 +482,10 @@ static void sp_rect_drag(SPRectContext &rc, Geom::Point const pt, guint state) // status text 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; bool is_golden_ratio = false; -- 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/rect-context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index f93ddf6c3..23c4794c1 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -159,7 +159,7 @@ void SPRectContext::set(const Inkscape::Preferences::Entry& val) { } } -gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { +bool SPRectContext::item_handler(SPItem* item, GdkEvent* event) { gint ret = FALSE; switch (event->type) { @@ -181,7 +181,7 @@ gint SPRectContext::item_handler(SPItem* item, GdkEvent* event) { return ret; } -gint SPRectContext::root_handler(GdkEvent* event) { +bool SPRectContext::root_handler(GdkEvent* event) { static bool dragging; SPDesktop *desktop = this->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/rect-context.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 23c4794c1..2a3c8dd2b 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -64,8 +64,6 @@ const std::string& SPRectContext::getPrefsPath() { const std::string SPRectContext::prefsPath = "/tools/shapes/rect"; SPRectContext::SPRectContext() : SPEventContext() { - this->_message_context = 0; - this->cursor_shape = cursor_rect_xpm; this->hot_x = 4; this->hot_y = 4; @@ -102,10 +100,6 @@ SPRectContext::~SPRectContext() { if (this->rect) { this->finishItem(); } - - if (this->_message_context) { - delete this->_message_context; - } } /** @@ -143,8 +137,6 @@ void SPRectContext::setup() { if (prefs->getBool("/tools/shapes/gradientdrag")) { this->enableGrDrag(); } - - this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } void SPRectContext::set(const Inkscape::Preferences::Entry& val) { @@ -396,7 +388,7 @@ void SPRectContext::drag(Geom::Point const pt, guint state) { SPDesktop *desktop = this->desktop; if (!this->rect) { - if (Inkscape::have_viable_layer(desktop, this->_message_context) == false) { + if (Inkscape::have_viable_layer(desktop, this->message_context) == false) { return; } @@ -459,16 +451,16 @@ void SPRectContext::drag(Geom::Point const pt, guint state) { } if (!is_golden_ratio) { - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %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, _("Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); } else { if (ratio_y == 1) { - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point"), xs->str, ys->str); + this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point"), xs->str, ys->str); } else { - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point"), xs->str, ys->str); + this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point"), xs->str, ys->str); } } } else { - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point"), xs->str, ys->str); + this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point"), xs->str, ys->str); } g_string_free(xs, FALSE); @@ -476,7 +468,7 @@ void SPRectContext::drag(Geom::Point const pt, guint state) { } void SPRectContext::finishItem() { - this->_message_context->clear(); + this->message_context->clear(); if (this->rect != NULL) { if (this->rect->width.computed == 0 || this->rect->height.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/rect-context.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 17675745f..a8bc69bff 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -532,6 +532,7 @@ static void sp_rect_finish(SPRectContext *rc) SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(rc); SP_OBJECT(rc->item)->updateRepr(); + rc->item->doWriteTransform(rc->item->getRepr(), rc->item->transform, NULL, true); desktop->canvas->endForcedFullRedraws(); -- cgit v1.2.3 From e953bdf2beb96e63af5f2cdb54d139f561596bb9 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 21 Sep 2013 11:39:09 +0200 Subject: Rectangles can be drawn inside other shapes again. Fixed bugs: - https://launchpad.net/bugs/1228393 (bzr r12561) --- src/rect-context.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 599680190..f60b3d465 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -165,9 +165,7 @@ bool SPRectContext::item_handler(SPItem* item, GdkEvent* event) { break; } - if (!ret) { - ret = SPEventContext::item_handler(item, event); - } + ret = SPEventContext::item_handler(item, event); return ret; } -- 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/rect-context.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index f60b3d465..a0e751359 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -426,8 +426,8 @@ void SPRectContext::drag(Geom::Point const 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/rect-context.cpp | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp index a0e751359..95a7f1f2d 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -48,21 +48,25 @@ using Inkscape::DocumentUndo; #include "tool-factory.h" +namespace Inkscape { +namespace UI { +namespace Tools { + namespace { - SPEventContext* createRectContext() { - return new SPRectContext(); + ToolBase* createRectContext() { + return new RectTool(); } bool rectContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/rect", createRectContext); } -const std::string& SPRectContext::getPrefsPath() { - return SPRectContext::prefsPath; +const std::string& RectTool::getPrefsPath() { + return RectTool::prefsPath; } -const std::string SPRectContext::prefsPath = "/tools/shapes/rect"; +const std::string RectTool::prefsPath = "/tools/shapes/rect"; -SPRectContext::SPRectContext() : SPEventContext() { +RectTool::RectTool() : ToolBase() { this->cursor_shape = cursor_rect_xpm; this->hot_x = 4; this->hot_y = 4; @@ -78,16 +82,16 @@ SPRectContext::SPRectContext() : SPEventContext() { this->ry = 0.0; } -void SPRectContext::finish() { +void RectTool::finish() { sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), GDK_CURRENT_TIME); this->finishItem(); this->sel_changed_connection.disconnect(); - SPEventContext::finish(); + ToolBase::finish(); } -SPRectContext::~SPRectContext() { +RectTool::~RectTool() { this->enableGrDrag(false); this->sel_changed_connection.disconnect(); @@ -105,13 +109,13 @@ SPRectContext::~SPRectContext() { * Callback that processes the "changed" signal on the selection; * destroys old and creates new knotholder. */ -void SPRectContext::selection_changed(Inkscape::Selection* selection) { +void RectTool::selection_changed(Inkscape::Selection* selection) { this->shape_editor->unset_item(SH_KNOTHOLDER); this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); } -void SPRectContext::setup() { - SPEventContext::setup(); +void RectTool::setup() { + ToolBase::setup(); this->shape_editor = new ShapeEditor(this->desktop); @@ -122,7 +126,7 @@ void SPRectContext::setup() { this->sel_changed_connection.disconnect(); this->sel_changed_connection = sp_desktop_selection(this->desktop)->connectChanged( - sigc::mem_fun(this, &SPRectContext::selection_changed) + sigc::mem_fun(this, &RectTool::selection_changed) ); sp_event_context_read(this, "rx"); @@ -138,7 +142,7 @@ void SPRectContext::setup() { } } -void SPRectContext::set(const Inkscape::Preferences::Entry& val) { +void RectTool::set(const Inkscape::Preferences::Entry& val) { /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ Glib::ustring name = val.getEntryName(); @@ -150,7 +154,7 @@ void SPRectContext::set(const Inkscape::Preferences::Entry& val) { } } -bool SPRectContext::item_handler(SPItem* item, GdkEvent* event) { +bool RectTool::item_handler(SPItem* item, GdkEvent* event) { gint ret = FALSE; switch (event->type) { @@ -165,12 +169,12 @@ bool SPRectContext::item_handler(SPItem* item, GdkEvent* event) { break; } - ret = SPEventContext::item_handler(item, event); + ret = ToolBase::item_handler(item, event); return ret; } -bool SPRectContext::root_handler(GdkEvent* event) { +bool RectTool::root_handler(GdkEvent* event) { static bool dragging; SPDesktop *desktop = this->desktop; @@ -375,13 +379,13 @@ bool SPRectContext::root_handler(GdkEvent* event) { } if (!ret) { - ret = SPEventContext::root_handler(event); + ret = ToolBase::root_handler(event); } return ret; } -void SPRectContext::drag(Geom::Point const pt, guint state) { +void RectTool::drag(Geom::Point const pt, guint state) { SPDesktop *desktop = this->desktop; if (!this->rect) { @@ -466,7 +470,7 @@ void SPRectContext::drag(Geom::Point const pt, guint state) { g_string_free(ys, FALSE); } -void SPRectContext::finishItem() { +void RectTool::finishItem() { this->message_context->clear(); if (this->rect != NULL) { @@ -488,7 +492,7 @@ void SPRectContext::finishItem() { } } -void SPRectContext::cancel(){ +void RectTool::cancel(){ sp_desktop_selection(this->desktop)->clear(); sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), 0); @@ -507,6 +511,9 @@ void SPRectContext::cancel(){ DocumentUndo::cancel(sp_desktop_document(this->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/rect-context.cpp | 527 --------------------------------------------------- 1 file changed, 527 deletions(-) delete mode 100644 src/rect-context.cpp (limited to 'src/rect-context.cpp') diff --git a/src/rect-context.cpp b/src/rect-context.cpp deleted file mode 100644 index 95a7f1f2d..000000000 --- a/src/rect-context.cpp +++ /dev/null @@ -1,527 +0,0 @@ -/* - * Rectangle drawing context - * - * Author: - * Lauris Kaplinski - * bulia byak - * Jon A. Cruz - * Abhishek Sharma - * - * Copyright (C) 2006 Johan Engelen - * Copyright (C) 2000-2005 authors - * Copyright (C) 2000-2001 Ximian, Inc. - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#include "config.h" - -#include -#include -#include - -#include "macros.h" -#include "display/sp-canvas.h" -#include "sp-rect.h" -#include "document.h" -#include "document-undo.h" -#include "sp-namedview.h" -#include "selection.h" -#include "selection-chemistry.h" -#include "desktop-handles.h" -#include "snap.h" -#include "desktop.h" -#include "desktop-style.h" -#include "message-context.h" -#include "pixmaps/cursor-rect.xpm" -#include "rect-context.h" -#include -#include "xml/repr.h" -#include "xml/node-event-vector.h" -#include "preferences.h" -#include "context-fns.h" -#include "shape-editor.h" -#include "verbs.h" -#include "display/sp-canvas-item.h" - -using Inkscape::DocumentUndo; - -#include "tool-factory.h" - -namespace Inkscape { -namespace UI { -namespace Tools { - -namespace { - ToolBase* createRectContext() { - return new RectTool(); - } - - bool rectContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/rect", createRectContext); -} - -const std::string& RectTool::getPrefsPath() { - return RectTool::prefsPath; -} - -const std::string RectTool::prefsPath = "/tools/shapes/rect"; - -RectTool::RectTool() : ToolBase() { - this->cursor_shape = cursor_rect_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->rect = NULL; - - this->rx = 0.0; - this->ry = 0.0; -} - -void RectTool::finish() { - sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), GDK_CURRENT_TIME); - - this->finishItem(); - this->sel_changed_connection.disconnect(); - - ToolBase::finish(); -} - -RectTool::~RectTool() { - 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->rect) { - this->finishItem(); - } -} - -/** - * Callback that processes the "changed" signal on the selection; - * destroys old and creates new knotholder. - */ -void RectTool::selection_changed(Inkscape::Selection* selection) { - this->shape_editor->unset_item(SH_KNOTHOLDER); - this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); -} - -void RectTool::setup() { - ToolBase::setup(); - - 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 = sp_desktop_selection(this->desktop)->connectChanged( - sigc::mem_fun(this, &RectTool::selection_changed) - ); - - sp_event_context_read(this, "rx"); - sp_event_context_read(this, "ry"); - - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - if (prefs->getBool("/tools/shapes/selcue")) { - this->enableSelectionCue(); - } - - if (prefs->getBool("/tools/shapes/gradientdrag")) { - this->enableGrDrag(); - } -} - -void RectTool::set(const Inkscape::Preferences::Entry& val) { - /* fixme: Proper error handling for non-numeric data. Use a locale-independent function like - * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */ - Glib::ustring name = val.getEntryName(); - - if ( name == "rx" ) { - this->rx = val.getDoubleLimited(); // prevents NaN and +/-Inf from messing up - } else if ( name == "ry" ) { - this->ry = val.getDoubleLimited(); - } -} - -bool RectTool::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; - } - - ret = ToolBase::item_handler(item, event); - - return ret; -} - -bool RectTool::root_handler(GdkEvent* event) { - static bool dragging; - - SPDesktop *desktop = this->desktop; - 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) { - Geom::Point const button_w(event->button.x, event->button.y); - - // save drag origin - this->xp = (gint) button_w[Geom::X]; - this->yp = (gint) button_w[Geom::Y]; - this->within_tolerance = true; - - // remember clicked item, disregarding groups, honoring Alt - this->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, TRUE); - - dragging = true; - - /* Position center */ - Geom::Point button_dt(desktop->w2d(button_w)); - this->center = button_dt; - - /* Snap center */ - SnapManager &m = desktop->namedview->snap_manager; - m.setup(desktop); - m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE); - m.unSetup(); - this->center = button_dt; - - 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; - } - 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); // this will also handle the snapping - 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 rect - 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->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 square or integer-ratio rect, lock a rounded corner circular"), - _("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-rect"); - ret = TRUE; - } - break; - - case GDK_KEY_g: - case GDK_KEY_G: - if (MOD__SHIFT_ONLY(event)) { - sp_selection_to_guides(desktop); - 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 rect - 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 (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 - case GDK_KEY_Meta_R: - this->defaultMessageContext()->clear(); - break; - default: - break; - } - break; - default: - break; - } - - if (!ret) { - ret = ToolBase::root_handler(event); - } - - return ret; -} - -void RectTool::drag(Geom::Point const pt, guint state) { - SPDesktop *desktop = this->desktop; - - if (!this->rect) { - if (Inkscape::have_viable_layer(desktop, this->message_context) == false) { - return; - } - - // Create object - Inkscape::XML::Document *xml_doc = this->desktop->doc()->getReprDoc(); - Inkscape::XML::Node *repr = xml_doc->createElement("svg:rect"); - - // Set style - sp_desktop_apply_style_tool (desktop, repr, "/tools/shapes/rect", false); - - this->rect = SP_RECT(desktop->currentLayer()->appendChildRepr(repr)); - Inkscape::GC::release(repr); - - this->rect->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); - this->rect->updateRepr(); - - desktop->canvas->forceFullRedrawAfterInterruptions(5); - } - - Geom::Rect const r = Inkscape::snap_rectangular_box(desktop, this->rect, pt, this->center, state); - - this->rect->setPosition(r.min()[Geom::X], r.min()[Geom::Y], r.dimensions()[Geom::X], r.dimensions()[Geom::Y]); - - if (this->rx != 0.0) { - this->rect->setRx(true, this->rx); - } - - if (this->ry != 0.0) { - if (this->rx == 0.0) - this->rect->setRy(true, CLAMP(this->ry, 0, MIN(r.dimensions()[Geom::X], r.dimensions()[Geom::Y])/2)); - else - this->rect->setRy(true, CLAMP(this->ry, 0, r.dimensions()[Geom::Y])); - } - - // status text - 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; - bool is_golden_ratio = false; - - if (fabs (rdimx) > fabs (rdimy)) { - if (fabs(rdimx / rdimy - goldenratio) < 1e-6) { - is_golden_ratio = true; - } - - ratio_x = (int) rint (rdimx / rdimy); - ratio_y = 1; - } else { - if (fabs(rdimy / rdimx - goldenratio) < 1e-6) { - is_golden_ratio = true; - } - - ratio_x = 1; - ratio_y = (int) rint (rdimy / rdimx); - } - - if (!is_golden_ratio) { - this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point"), xs->str, ys->str, ratio_x, ratio_y); - } else { - if (ratio_y == 1) { - this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point"), xs->str, ys->str); - } else { - this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point"), xs->str, ys->str); - } - } - } else { - this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point"), xs->str, ys->str); - } - - g_string_free(xs, FALSE); - g_string_free(ys, FALSE); -} - -void RectTool::finishItem() { - this->message_context->clear(); - - if (this->rect != NULL) { - if (this->rect->width.computed == 0 || this->rect->height.computed == 0) { - this->cancel(); // Don't allow the creating of zero sized rectangle, for example when the start and and point snap to the snap grid point - return; - } - - this->rect->updateRepr(); - this->rect->doWriteTransform(this->rect->getRepr(), this->rect->transform, NULL, true); - - this->desktop->canvas->endForcedFullRedraws(); - - sp_desktop_selection(this->desktop)->set(this->rect); - - DocumentUndo::done(sp_desktop_document(this->desktop), SP_VERB_CONTEXT_RECT, _("Create rectangle")); - - this->rect = NULL; - } -} - -void RectTool::cancel(){ - sp_desktop_selection(this->desktop)->clear(); - sp_canvas_item_ungrab(SP_CANVAS_ITEM(this->desktop->acetate), 0); - - if (this->rect != NULL) { - this->rect->deleteObject(); - this->rect = NULL; - } - - this->within_tolerance = false; - this->xp = 0; - this->yp = 0; - this->item_to_select = NULL; - - this->desktop->canvas->endForcedFullRedraws(); - - DocumentUndo::cancel(sp_desktop_document(this->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