Moved and renamed some tool-related files.

(bzr r12785)

1 files changed, 0 insertions, 1017 deletions

diff --git a/src/mesh-context.cpp b/src/mesh-context.cpp
deleted file mode 100644
index 6b5542e3f..000000000
--- a/src/mesh-context.cpp
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
- * Mesh drawing and editing tool
- *
- * Authors:
- *   bulia byak <buliabyak@users.sf.net>
- *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
- *   Abhishek Sharma
- *   Tavmjong Bah <tavmjong@free.fr>
- *
- * Copyright (C) 2012 Tavmjong Bah
- * Copyright (C) 2007 Johan Engelen
- * Copyright (C) 2005 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-//#define DEBUG_MESH
-
-
-// Libraries
-#include <gdk/gdkkeysyms.h>
-#include <glibmm/i18n.h>
-
-// General
-#include "desktop.h"
-#include "desktop-handles.h"
-#include "document.h"
-#include "document-undo.h"
-#include "macros.h"
-#include "message-context.h"
-#include "message-stack.h"
-#include "preferences.h"
-#include "rubberband.h"
-#include "selection.h"
-#include "snap.h"
-#include "sp-namedview.h"
-#include "verbs.h"
-
-// Gradient specific
-#include "gradient-drag.h"
-#include "gradient-chemistry.h"
-#include "pixmaps/cursor-gradient.xpm"
-#include "pixmaps/cursor-gradient-add.xpm"
-
-// Mesh specific
-#include "mesh-context.h"
-#include "sp-mesh-gradient.h"
-#include "display/sp-ctrlcurve.h"
-
-using Inkscape::DocumentUndo;
-
-#include "tool-factory.h"
-
-namespace Inkscape {
-namespace UI {
-namespace Tools {
-
-static void sp_mesh_drag(MeshTool &rc, Geom::Point const pt, guint state, guint32 etime);
-
-namespace {
-	ToolBase* createMeshContext() {
-		return new MeshTool();
-	}
-
-	bool meshContextRegistered = ToolFactory::instance().registerObject("/tools/mesh", createMeshContext);
-}
-
-const std::string& MeshTool::getPrefsPath() {
-	return MeshTool::prefsPath;
-}
-
-const std::string MeshTool::prefsPath = "/tools/mesh";
-
-MeshTool::MeshTool() : ToolBase() {
-	this->selcon = 0;
-	this->node_added = false;
-	this->subselcon = 0;
-
-    this->cursor_addnode = false;
-    this->cursor_shape = cursor_gradient_xpm;
-    this->hot_x = 4;
-    this->hot_y = 4;
-    this->xp = 0;
-    this->yp = 0;
-    this->tolerance = 6;
-    this->within_tolerance = false;
-    this->item_to_select = NULL;
-}
-
-MeshTool::~MeshTool() {
-    this->enableGrDrag(false);
-
-    this->selcon->disconnect();
-    delete this->selcon;
-    
-    this->subselcon->disconnect();
-    delete this->subselcon;
-}
-
-const gchar *ms_handle_descr [] = {
-    N_("Mesh gradient <b>corner</b>"),
-    N_("Mesh gradient <b>handle</b>"),
-    N_("Mesh gradient <b>tensor</b>")
-};
-
-void MeshTool::selection_changed(Inkscape::Selection* /*sel*/) {
-    GrDrag *drag = this->_grdrag;
-    Inkscape::Selection *selection = sp_desktop_selection(this->desktop);
-
-    if (selection == NULL) {
-        return;
-    }
-
-    guint n_obj = g_slist_length((GSList *) selection->itemList());
-
-    if (!drag->isNonEmpty() || selection->isEmpty()) {
-        return;
-    }
-
-    guint n_tot = drag->numDraggers();
-    guint n_sel = drag->numSelected();
-
-    //The use of ngettext in the following code is intentional even if the English singular form would never be used
-    if (n_sel == 1) {
-        if (drag->singleSelectedDraggerNumDraggables() == 1) {
-            gchar * message = g_strconcat(
-                //TRANSLATORS: %s will be substituted with the point name (see previous messages); This is part of a compound message
-                _("%s selected"),
-                //TRANSLATORS: Mind the space in front. This is part of a compound message
-                ngettext(" out of %d mesh handle"," out of %d mesh handles",n_tot),
-                ngettext(" on %d selected object"," on %d selected objects",n_obj),NULL);
-            this->message_context->setF(Inkscape::NORMAL_MESSAGE,
-                                       message,_(ms_handle_descr[drag->singleSelectedDraggerSingleDraggableType()]), n_tot, n_obj);
-        } else {
-            gchar * message =
-                g_strconcat(
-                    //TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count)
-                    ngettext("One handle merging %d stop (drag with <b>Shift</b> to separate) selected",
-                             "One handle merging %d stops (drag with <b>Shift</b> to separate) selected",
-                             drag->singleSelectedDraggerNumDraggables()),
-                    ngettext(" out of %d mesh handle"," out of %d mesh handles",n_tot),
-                    ngettext(" on %d selected object"," on %d selected objects",n_obj),NULL);
-            this->message_context->setF(Inkscape::NORMAL_MESSAGE,message,drag->singleSelectedDraggerNumDraggables(), n_tot, n_obj);
-        }
-    } else if (n_sel > 1) {
-        //TRANSLATORS: The plural refers to number of selected mesh handles. This is part of a compound message (part two indicates selected object count)
-        gchar * message =
-            g_strconcat(ngettext("<b>%d</b> mesh handle selected out of %d","<b>%d</b> mesh handles selected out of %d",n_sel),
-                        //TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message
-                        ngettext(" on %d selected object"," on %d selected objects",n_obj),NULL);
-        this->message_context->setF(Inkscape::NORMAL_MESSAGE,message, n_sel, n_tot, n_obj);
-    } else if (n_sel == 0) {
-        this->message_context->setF(Inkscape::NORMAL_MESSAGE,
-                                   //TRANSLATORS: The plural refers to number of selected objects
-                                   ngettext("<b>No</b> mesh handles selected out of %d on %d selected object",
-                                            "<b>No</b> mesh handles selected out of %d on %d selected objects",n_obj), n_tot, n_obj);
-    }
-
-    // FIXME
-    // We need to update mesh gradient handles.
-    // Get gradient this drag belongs too..
-    // std::cout << "mesh_selection_changed: selection: objects: " << n_obj << std::endl;
-    // GSList *itemList = (GSList *) selection->itemList();
-    // while( itemList ) {
-
-    //     SPItem *item = SP_ITEM( itemList->data );
-    //     // std::cout << "  item: " << SP_OBJECT(item)->getId() << std::endl;
-
-    //     SPStyle *style = item->style;
-    //     if (style && (style->fill.isPaintserver())) {
-
-    //         SPPaintServer *server = item->style->getFillPaintServer();
-    //         if ( SP_IS_MESHGRADIENT(server) ) {
-
-    //             SPMeshGradient *mg = SP_MESHGRADIENT(server);
-
-    //             guint rows    = 0;//mg->array.patches.size();
-    //             for ( guint i = 0; i < rows; ++i ) {
-    //                 guint columns = 0;//mg->array.patches[0].size();
-    //                 for ( guint j = 0; j < columns; ++j ) {
-    //                 }
-    //             }
-    //         }
-    //     }
-    //     itemList = itemList->next;
-    // }
-
-    // GList* dragger_ptr = drag->draggers;  // Points to GrDragger class (group of GrDraggable)
-    // guint count = 0;
-    // while( dragger_ptr ) {
-
-    //     std::cout << "mesh_selection_changed: dragger: " << ++count << std::endl;
-    //     GSList* draggable_ptr = ((GrDragger *) dragger_ptr->data)->draggables;
-
-    //     while( draggable_ptr ) {
-
-    //         std::cout << "mesh_selection_changed:  draggable: " << draggable_ptr << std::endl;
-    //         GrDraggable *draggable = (GrDraggable *) draggable_ptr->data;
-
-    //         gint point_type     = draggable->point_type;
-    //         gint point_i        = draggable->point_i;
-    //         bool fill_or_stroke = draggable->fill_or_stroke;
-
-    //         if( point_type == POINT_MG_CORNER ) {
-
-    //             //std::cout << "mesh_selection_changed:   POINT_MG_CORNER: " << point_i << std::endl;
-    //             // Now we must create or destroy corresponding handles.
-
-    //             if( g_list_find( drag->selected, dragger_ptr->data ) ) {
-    //                 //std::cout << "gradient_selection_changed:    Selected: " << point_i << std::endl;
-    //                 // Which meshes does this point belong to?
-
-    //             } else {
-    //                 //std::cout << "mesh_selection_changed:    Not Selected: " << point_i << std::endl;
-    //             }
-    //         }
-
-    //         draggable_ptr = draggable_ptr->next;
-
-    //     }
-
-    //     dragger_ptr = dragger_ptr->next;
-    // }
-}
-
-void MeshTool::setup() {
-    ToolBase::setup();
-
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/tools/mesh/selcue", true)) {
-        this->enableSelectionCue();
-    }
-
-    this->enableGrDrag();
-    Inkscape::Selection *selection = sp_desktop_selection(this->desktop);
-
-    this->selcon = new sigc::connection(selection->connectChanged(
-    	sigc::mem_fun(this, &MeshTool::selection_changed)
-    ));
-
-    this->subselcon = new sigc::connection(this->desktop->connectToolSubselectionChanged(
-    	sigc::hide(sigc::bind(
-    		sigc::mem_fun(*this, &MeshTool::selection_changed),
-    		(Inkscape::Selection*)NULL)
-    	)
-    ));
-
-    this->selection_changed(selection);
-}
-
-void
-sp_mesh_context_select_next (ToolBase *event_context)
-{
-    GrDrag *drag = event_context->_grdrag;
-    g_assert (drag);
-
-    GrDragger *d = drag->select_next();
-
-    event_context->desktop->scroll_to_point(d->point, 1.0);
-}
-
-void
-sp_mesh_context_select_prev (ToolBase *event_context)
-{
-    GrDrag *drag = event_context->_grdrag;
-    g_assert (drag);
-
-    GrDragger *d = drag->select_prev();
-
-    event_context->desktop->scroll_to_point(d->point, 1.0);
-}
-
-/**
-Returns true if mouse cursor over mesh edge.
-*/
-static bool
-sp_mesh_context_is_over_line (MeshTool *rc, SPItem *item, Geom::Point event_p)
-{
-    SPDesktop *desktop = SP_EVENT_CONTEXT (rc)->desktop;
-
-    //Translate mouse point into proper coord system
-    rc->mousepoint_doc = desktop->w2d(event_p);
-
-    SPCtrlCurve *curve = SP_CTRLCURVE(item);
-    Geom::BezierCurveN<3> b( curve->p0, curve->p1, curve->p2, curve->p3 );
-    Geom::Coord coord = b.nearestPoint( rc->mousepoint_doc ); // Coord == double
-    Geom::Point nearest = b( coord );
-
-    double dist_screen = Geom::L2 (rc->mousepoint_doc - nearest) * desktop->current_zoom();
-
-    double tolerance = (double) SP_EVENT_CONTEXT(rc)->tolerance;
-
-    bool close = (dist_screen < tolerance);
-
-    return close;
-}
-
-
-/**
-Split row/column near the mouse point.
-*/
-static void sp_mesh_context_split_near_point(MeshTool *rc, SPItem *item,  Geom::Point mouse_p, guint32 /*etime*/)
-{
-
-#ifdef DEBUG_MESH
-    std::cout << "sp_mesh_context_split_near_point: entrance: " << mouse_p << std::endl;
-#endif
-
-    // item is the selected item. mouse_p the location in doc coordinates of where to add the stop
-
-    ToolBase *ec = SP_EVENT_CONTEXT(rc);
-    SPDesktop *desktop = SP_EVENT_CONTEXT (rc)->desktop;
-
-    double tolerance = (double) ec->tolerance;
-
-    ec->get_drag()->addStopNearPoint (item, mouse_p, tolerance/desktop->current_zoom());
-
-    DocumentUndo::done(sp_desktop_document (desktop), SP_VERB_CONTEXT_MESH,
-                       _("Split mesh row/column"));
-
-    ec->get_drag()->updateDraggers();
-}
-
-/**
-Wrapper for various mesh operations that require a list of selected corner nodes.
- */
-static void
-sp_mesh_context_corner_operation (MeshTool *rc, MeshCornerOperation operation )
-{
-
-#ifdef DEBUG_MESH
-    std::cout << "sp_mesh_corner_operation: entrance: " << operation << std::endl;
-#endif
-
-    SPDocument *doc = NULL;
-    GrDrag *drag = rc->_grdrag;
-
-    std::map<SPMeshGradient*, std::vector<guint> > points;
-    std::map<SPMeshGradient*, SPItem*> items;
- 
-    // Get list of selected draggers for each mesh.
-    // For all selected draggers
-    for (GList *i = drag->selected; i != NULL; i = i->next) {
-        GrDragger *dragger = (GrDragger *) i->data;
-        // For all draggables of dragger
-        for (GSList const* j = dragger->draggables; j != NULL; j = j->next) {
-            GrDraggable *d = (GrDraggable *) j->data;
-
-            // Only mesh corners
-            if( d->point_type != POINT_MG_CORNER ) continue;
-
-            // Find the gradient
-            SPMeshGradient *gradient = SP_MESHGRADIENT( getGradient (d->item, d->fill_or_stroke) );
-
-            // Collect points together for same gradient
-            points[gradient].push_back( d->point_i );
-            items[gradient] = d->item;
-        }
-    }
-
-    // Loop over meshes.
-    for( std::map<SPMeshGradient*, std::vector<guint> >::const_iterator iter = points.begin(); iter != points.end(); ++iter) {
-        SPMeshGradient *mg = SP_MESHGRADIENT( iter->first );
-        if( iter->second.size() > 0 ) {
-            guint noperation = 0;
-            switch (operation) {
-
-                case MG_CORNER_SIDE_TOGGLE:
-                    // std::cout << "SIDE_TOGGLE" << std::endl;
-                    noperation += mg->array.side_toggle( iter->second );
-                    break;
-
-                case MG_CORNER_SIDE_ARC:
-                    // std::cout << "SIDE_ARC" << std::endl;
-                    noperation += mg->array.side_arc( iter->second );
-                    break;
-
-                case MG_CORNER_TENSOR_TOGGLE:
-                    // std::cout << "TENSOR_TOGGLE" << std::endl;
-                    noperation += mg->array.tensor_toggle( iter->second );
-                    break;
-
-                case MG_CORNER_COLOR_SMOOTH:
-                    // std::cout << "COLOR_SMOOTH" << std::endl;
-                    noperation += mg->array.color_smooth( iter->second );
-                    break;
-
-                case MG_CORNER_COLOR_PICK:
-                    // std::cout << "COLOR_PICK" << std::endl;
-                    noperation += mg->array.color_pick( iter->second, items[iter->first] );
-                    break;
-
-                default:
-                    std::cout << "sp_mesh_corner_operation: unknown operation" << std::endl;
-            }                    
-
-            if( noperation > 0 ) {
-                mg->array.write( mg );
-                mg->requestModified(SP_OBJECT_MODIFIED_FLAG);
-                doc = mg->document;
-
-                switch (operation) {
-
-                    case MG_CORNER_SIDE_TOGGLE:
-                        DocumentUndo::done(doc, SP_VERB_CONTEXT_MESH, _("Toggled mesh path type."));
-                        break;
-
-                    case MG_CORNER_SIDE_ARC:
-                        DocumentUndo::done(doc, SP_VERB_CONTEXT_MESH, _("Approximated arc for mesh side."));
-                        break;
-
-                    case MG_CORNER_TENSOR_TOGGLE:
-                        DocumentUndo::done(doc, SP_VERB_CONTEXT_MESH, _("Toggled mesh tensors."));
-                        break;
-
-                    case MG_CORNER_COLOR_SMOOTH:
-                        DocumentUndo::done(doc, SP_VERB_CONTEXT_MESH, _("Smoothed mesh corner color."));
-                        break;
-
-                    case MG_CORNER_COLOR_PICK:
-                        DocumentUndo::done(doc, SP_VERB_CONTEXT_MESH, _("Picked mesh corner color."));
-                        break;
-
-                    default:
-                        std::cout << "sp_mesh_corner_operation: unknown operation" << std::endl;
-                }
-            }
-        }
-    }
-    drag->updateDraggers();
-
-}
-
-
-/**
-Handles all keyboard and mouse input for meshs.
-*/
-bool MeshTool::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);
-    double const nudge = prefs->getDoubleLimited("/options/nudgedistance/value", 2, 0, 1000, "px"); // in px
-
-    GrDrag *drag = this->_grdrag;
-    g_assert (drag);
-
-    gint ret = FALSE;
-
-    switch (event->type) {
-    case GDK_2BUTTON_PRESS:
-
-#ifdef DEBUG_MESH
-        std::cout << "sp_mesh_context_root_handler: GDK_2BUTTON_PRESS" << std::endl;
-#endif
-
-        // Double click:
-        //  If over a mesh line, divide mesh row/column
-        //  If not over a line, create new gradients for selected objects.
-
-        if ( event->button.button == 1 ) {
-            // Are we over a mesh line?
-            bool over_line = false;
-            SPCtrlCurve *line = NULL;
-
-            if (drag->lines) {
-                for (GSList *l = drag->lines; (l != NULL) && (!over_line); l = l->next) {
-                    line = (SPCtrlCurve*) l->data;
-                    over_line |= sp_mesh_context_is_over_line (this, (SPItem*) line, Geom::Point(event->motion.x, event->motion.y));
-                }
-            }
-
-            if (over_line) {
-                // We take the first item in selection, because with doubleclick, the first click
-                // always resets selection to the single object under cursor
-                sp_mesh_context_split_near_point(this, SP_ITEM(selection->itemList()->data), this->mousepoint_doc, event->button.time);
-            } else {
-                // Create a new gradient with default coordinates.
-                for (GSList const* i = selection->itemList(); i != NULL; i = i->next) {
-                    SPItem *item = SP_ITEM(i->data);
-                    SPGradientType new_type = SP_GRADIENT_TYPE_MESH;
-                    Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
-
-#ifdef DEBUG_MESH
-                    std::cout << "sp_mesh_context_root_handler: creating new mesh on: " << (fsmode == Inkscape::FOR_FILL ? "Fill" : "Stroke") << std::endl;
-#endif
-                    SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop, item, fsmode);
-
-                    SPGradient *priv = sp_item_set_gradient(item, vector, new_type, fsmode);
-                    sp_gradient_reset_to_userspace(priv, item);
-                }
-
-                DocumentUndo::done(sp_desktop_document (desktop), SP_VERB_CONTEXT_MESH,
-                                   _("Create default mesh"));
-            }
-
-            ret = TRUE;
-        }
-        break;
-
-    case GDK_BUTTON_PRESS:
-
-#ifdef DEBUG_MESH
-        std::cout << "sp_mesh_context_root_handler: GDK_BUTTON_PRESS" << std::endl;
-#endif
-        // Button down
-        //  If Shift key down: do rubber band selection
-        //  Else set origin for drag. A drag creates a new gradient if one does not exist
-         if ( event->button.button == 1 && !this->space_panning ) {
-            Geom::Point 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;
-
-            dragging = true;
-
-            Geom::Point button_dt = desktop->w2d(button_w);
-            if (event->button.state & GDK_SHIFT_MASK) {
-                Inkscape::Rubberband::get(desktop)->start(desktop, button_dt);
-            } else {
-                // remember clicked item, disregarding groups, honoring Alt; do nothing with Crtl to
-                // enable Ctrl+doubleclick of exactly the selected item(s)
-                if (!(event->button.state & GDK_CONTROL_MASK)) {
-                    this->item_to_select = sp_event_context_find_item (desktop, button_w, event->button.state & GDK_MOD1_MASK, TRUE);
-                }
-
-                if (!selection->isEmpty()) {
-                    SnapManager &m = desktop->namedview->snap_manager;
-                    m.setup(desktop);
-                    m.freeSnapReturnByRef(button_dt, Inkscape::SNAPSOURCE_NODE_HANDLE);
-                    m.unSetup();
-                }
-
-                this->origin = button_dt;
-            }
-
-            ret = TRUE;
-        }
-        break;
-
-    case GDK_MOTION_NOTIFY:
-        // Mouse move
-        if ( dragging && ( event->motion.state & GDK_BUTTON1_MASK ) && !this->space_panning ) {
- 
-#ifdef DEBUG_MESH
-            std::cout << "sp_mesh_context_root_handler: GDK_MOTION_NOTIFY: Dragging" << std::endl;
-#endif
-            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 const motion_dt = this->desktop->w2d(motion_w);
-
-            if (Inkscape::Rubberband::get(desktop)->is_started()) {
-                Inkscape::Rubberband::get(desktop)->move(motion_dt);
-                this->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Draw around</b> handles to select them"));
-            } else {
-                // Create new gradient with coordinates determined by drag.
-                sp_mesh_drag(*this, motion_dt, event->motion.state, event->motion.time);
-            }
-
-            gobble_motion_events(GDK_BUTTON1_MASK);
-
-            ret = TRUE;
-        } else {
-            // Not dragging
-
-            // Do snapping
-            if (!drag->mouseOver() && !selection->isEmpty()) {
-                SnapManager &m = desktop->namedview->snap_manager;
-                m.setup(desktop);
-
-                Geom::Point const motion_w(event->motion.x, event->motion.y);
-                Geom::Point const motion_dt = this->desktop->w2d(motion_w);
-
-                m.preSnap(Inkscape::SnapCandidatePoint(motion_dt, Inkscape::SNAPSOURCE_OTHER_HANDLE));
-                m.unSetup();
-            }
-
-            // Highlight corner node corresponding to side or tensor node
-            if( drag->mouseOver() ) {
-                // MESH FIXME: Light up corresponding corner node corresponding to node we are over.
-                // See "pathflash" in ui/tools/node-tool.cpp for ideas.
-                // Use desktop->add_temporary_canvasitem( SPCanvasItem, milliseconds );
-            }
-
-            // Change cursor shape if over line
-            bool over_line = false;
-
-            if (drag->lines) {
-                for (GSList *l = drag->lines; l != NULL; l = l->next) {
-                    over_line |= sp_mesh_context_is_over_line (this, (SPItem*) l->data, Geom::Point(event->motion.x, event->motion.y));
-                }
-            }
-
-            if (this->cursor_addnode && !over_line) {
-                this->cursor_shape = cursor_gradient_xpm;
-                this->sp_event_context_update_cursor();
-                this->cursor_addnode = false;
-            } else if (!this->cursor_addnode && over_line) {
-                this->cursor_shape = cursor_gradient_add_xpm;
-                this->sp_event_context_update_cursor();
-                this->cursor_addnode = true;
-            }
-        }
-        break;
-
-    case GDK_BUTTON_RELEASE:
-
-#ifdef DEBUG_MESH
-        std::cout << "sp_mesh_context_root_handler: GDK_BUTTON_RELEASE" << std::endl;
-#endif
-
-        this->xp = this->yp = 0;
-
-        if ( event->button.button == 1 && !this->space_panning ) {
-            // Check if over line
-            bool over_line = false;
-            SPCtrlLine *line = NULL;
-
-            if (drag->lines) {
-                for (GSList *l = drag->lines; (l != NULL) && (!over_line); l = l->next) {
-                    line = (SPCtrlLine*) l->data;
-                    over_line = sp_mesh_context_is_over_line (this, (SPItem*) line, Geom::Point(event->motion.x, event->motion.y));
-
-                    if (over_line) {
-                        break;
-                    }
-                }
-            }
-
-            if ( (event->button.state & GDK_CONTROL_MASK) && (event->button.state & GDK_MOD1_MASK ) ) {
-                if (over_line && line) {
-                    sp_mesh_context_split_near_point(this, line->item, this->mousepoint_doc, 0);
-                    ret = TRUE;
-                }
-            } else {
-                dragging = false;
-
-                // unless clicked with Ctrl (to enable Ctrl+doubleclick).
-                if (event->button.state & GDK_CONTROL_MASK) {
-                    ret = TRUE;
-                    break;
-                }
-
-                if (!this->within_tolerance) {
-                    // we've been dragging, either do nothing (grdrag handles that),
-                    // or rubberband-select if we have rubberband
-                    Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop);
-
-                    if (r->is_started() && !this->within_tolerance) {
-                        // this was a rubberband drag
-                        if (r->getMode() == RUBBERBAND_MODE_RECT) {
-                            Geom::OptRect const b = r->getRectangle();
-                            drag->selectRect(*b);
-                        }
-                    }
-                } else if (this->item_to_select) {
-                    if (over_line && line) {
-                        // Clicked on an existing mesh line, don't change selection. This stops
-                        // possible change in selection during a double click with overlapping objects
-                    } else {
-                        // 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; do the same as Esc
-                    if (drag->selected) {
-                        drag->deselectAll();
-                    } else {
-                        selection->clear();
-                    }
-                }
-
-                this->item_to_select = NULL;
-                ret = TRUE;
-            }
-
-            Inkscape::Rubberband::get(desktop)->stop();
-        }
-        break;
-
-    case GDK_KEY_PRESS:
-
-#ifdef DEBUG_MESH
-        std::cout << "sp_mesh_context_root_handler: GDK_KEY_PRESS" << std::endl;
-#endif
-
-        // FIXME: tip
-        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:
-            sp_event_show_modifier_tip (this->defaultMessageContext(), event,
-                                        _("FIXME<b>Ctrl</b>: snap mesh angle"),
-                                        _("FIXME<b>Shift</b>: draw mesh around the starting point"),
-                                        NULL);
-            break;
-
-        case GDK_KEY_A:
-        case GDK_KEY_a:
-            if (MOD__CTRL_ONLY(event) && drag->isNonEmpty()) {
-                drag->selectAll();
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_Escape:
-            if (drag->selected) {
-                drag->deselectAll();
-            } else {
-                selection->clear();
-            }
-
-            ret = TRUE;
-            //TODO: make dragging escapable by Esc
-            break;
-
-        case GDK_KEY_Left: // move handle left
-        case GDK_KEY_KP_Left:
-        case GDK_KEY_KP_4:
-            if (!MOD__CTRL(event)) { // not ctrl
-                gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-
-                if (MOD__ALT(event)) { // alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move_screen(mul*-10, 0); // shift
-                    } else {
-                    	drag->selected_move_screen(mul*-1, 0); // no shift
-                    }
-                } else { // no alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move(mul*-10*nudge, 0); // shift
-                    } else {
-                    	drag->selected_move(mul*-nudge, 0); // no shift
-                    }
-                }
-
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_Up: // move handle up
-        case GDK_KEY_KP_Up:
-        case GDK_KEY_KP_8:
-            if (!MOD__CTRL(event)) { // not ctrl
-                gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-
-                if (MOD__ALT(event)) { // alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move_screen(0, mul*10); // shift
-                    } else {
-                    	drag->selected_move_screen(0, mul*1); // no shift
-                    }
-                } else { // no alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move(0, mul*10*nudge); // shift
-                    } else {
-                    	drag->selected_move(0, mul*nudge); // no shift
-                    }
-                }
-
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_Right: // move handle right
-        case GDK_KEY_KP_Right:
-        case GDK_KEY_KP_6:
-            if (!MOD__CTRL(event)) { // not ctrl
-                gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-
-                if (MOD__ALT(event)) { // alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move_screen(mul*10, 0); // shift
-                    } else {
-                    	drag->selected_move_screen(mul*1, 0); // no shift
-                    }
-                } else { // no alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move(mul*10*nudge, 0); // shift
-                    } else {
-                    	drag->selected_move(mul*nudge, 0); // no shift
-                    }
-                }
-
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_Down: // move handle down
-        case GDK_KEY_KP_Down:
-        case GDK_KEY_KP_2:
-            if (!MOD__CTRL(event)) { // not ctrl
-                gint mul = 1 + gobble_key_events(get_group0_keyval(&event->key), 0); // with any mask
-
-                if (MOD__ALT(event)) { // alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move_screen(0, mul*-10); // shift
-                    } else {
-                    	drag->selected_move_screen(0, mul*-1); // no shift
-                    }
-                } else { // no alt
-                    if (MOD__SHIFT(event)) {
-                    	drag->selected_move(0, mul*-10*nudge); // shift
-                    } else {
-                    	drag->selected_move(0, mul*-nudge); // no shift
-                    }
-                }
-
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_Insert:
-        case GDK_KEY_KP_Insert:
-            // with any modifiers:
-            //sp_gradient_context_add_stops_between_selected_stops (rc);
-            std::cout << "Inserting stops between selected stops not implemented yet" << std::endl;
-            ret = TRUE;
-            break;
-
-        case GDK_KEY_Delete:
-        case GDK_KEY_KP_Delete:
-        case GDK_KEY_BackSpace:
-            if ( drag->selected ) {
-                std::cout << "Deleting mesh stops not implemented yet" << std::endl;
-                ret = TRUE;
-            }
-            break;
-
-        // Mesh Operations --------------------------------------------
-
-        case GDK_KEY_b:  // Toggle mesh side between lineto and curveto.
-        case GDK_KEY_B: 
-            if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
-                sp_mesh_context_corner_operation ( this, MG_CORNER_SIDE_TOGGLE );
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_c:  // Convert mesh side from generic Bezier to Bezier approximating arc,
-        case GDK_KEY_C:  // preserving handle direction.
-            if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
-                sp_mesh_context_corner_operation ( this, MG_CORNER_SIDE_ARC );
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_g:  // Toggle mesh tensor points on/off
-        case GDK_KEY_G: 
-            if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
-                sp_mesh_context_corner_operation ( this, MG_CORNER_TENSOR_TOGGLE );
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_j:  // Smooth corner color
-        case GDK_KEY_J:
-            if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
-                sp_mesh_context_corner_operation ( this, MG_CORNER_COLOR_SMOOTH );
-                ret = TRUE;
-            }
-            break;
-
-        case GDK_KEY_k:  // Pick corner color
-        case GDK_KEY_K:
-            if (MOD__ALT(event) && drag->isNonEmpty() && drag->hasSelection()) {
-                sp_mesh_context_corner_operation ( this, MG_CORNER_COLOR_PICK );
-                ret = TRUE;
-            }
-            break;
-
-        default:
-            break;
-        }
-
-        break;
-
-    case GDK_KEY_RELEASE:
-
-#ifdef DEBUG_MESH
-        std::cout << "sp_mesh_context_root_handler: GDK_KEY_RELEASE" << std::endl;
-#endif
-        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;
-}
-
-static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/, guint32 /*etime*/) {
-    SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
-    Inkscape::Selection *selection = sp_desktop_selection(desktop);
-    SPDocument *document = sp_desktop_document(desktop);
-    ToolBase *ec = SP_EVENT_CONTEXT(&rc);
-
-    if (!selection->isEmpty()) {
-
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        int type = SP_GRADIENT_TYPE_MESH;
-        Inkscape::PaintTarget fill_or_stroke = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
-
-        SPGradient *vector;
-        if (ec->item_to_select) {
-            // pick color from the object where drag started
-            vector = sp_gradient_vector_for_object(document, desktop, ec->item_to_select, fill_or_stroke);
-        } else {
-            // Starting from empty space:
-            // Sort items so that the topmost comes last
-            GSList *items = g_slist_copy ((GSList *) selection->itemList());
-            items = g_slist_sort(items, (GCompareFunc) sp_item_repr_compare_position);
-            // take topmost
-            vector = sp_gradient_vector_for_object(document, desktop, SP_ITEM(g_slist_last(items)->data), fill_or_stroke);
-            g_slist_free (items);
-        }
-
-        // HACK: reset fill-opacity - that 0.75 is annoying; BUT remove this when we have an opacity slider for all tabs
-        SPCSSAttr *css = sp_repr_css_attr_new();
-        sp_repr_css_set_property(css, "fill-opacity", "1.0");
-
-        for (GSList const *i = selection->itemList(); i != NULL; i = i->next) {
-
-            //FIXME: see above
-            sp_repr_css_change_recursive(SP_OBJECT(i->data)->getRepr(), css, "style");
-
-            sp_item_set_gradient(SP_ITEM(i->data), vector, (SPGradientType) type, fill_or_stroke);
-
-            // We don't need to do anything. Mesh is already sized appropriately.
- 
-            SP_OBJECT(i->data)->requestModified(SP_OBJECT_MODIFIED_FLAG);
-        }
-        // if (ec->_grdrag) {
-        //     ec->_grdrag->updateDraggers();
-        //     // prevent regenerating draggers by selection modified signal, which sometimes
-        //     // comes too late and thus destroys the knot which we will now grab:
-        //     ec->_grdrag->local_change = true;
-        //     // give the grab out-of-bounds values of xp/yp because we're already dragging
-        //     // and therefore are already out of tolerance
-        //     ec->_grdrag->grabKnot (SP_ITEM(selection->itemList()->data),
-        //                            type == SP_GRADIENT_TYPE_LINEAR? POINT_LG_END : POINT_RG_R1,
-        //                            -1, // ignore number (though it is always 1)
-        //                            fill_or_stroke, 99999, 99999, etime);
-        // }
-        // We did an undoable action, but SPDocumentUndo::done will be called by the knot when released
-
-        // status text; we do not track coords because this branch is run once, not all the time
-        // during drag
-        int n_objects = g_slist_length((GSList *) selection->itemList());
-        rc.message_context->setF(Inkscape::NORMAL_MESSAGE,
-                                  ngettext("<b>Gradient</b> for %d object; with <b>Ctrl</b> to snap angle",
-                                           "<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle", n_objects),
-                                  n_objects);
-    } else {
-        sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select <b>objects</b> on which to create gradient."));
-    }
-
-}
-
-}
-}
-}
-
-/*
-  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 :