Merge from trunk.

(bzr r12475.1.29)

1 files changed, 91 insertions, 132 deletions

diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 57ddc1656..7dfe203ba 100644
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -48,74 +48,49 @@
 
 using Inkscape::DocumentUndo;
 
-typedef struct
-{
-    double        R;
-    double        G;
-    double        B;
-    double        alpha;
-
-    unsigned int  dragging : 1;
-    
-    SPCanvasItem *grabbed;
-    SPCanvasItem *area;
-    Geom::Point   centre;
-} SPDropperContextPrivate;
-
-#define SP_DROPPER_CONTEXT_GET_PRIVATE(dc) \
-    G_TYPE_INSTANCE_GET_PRIVATE(dc, SP_TYPE_DROPPER_CONTEXT, SPDropperContextPrivate)
-
-static void sp_dropper_context_class_init(SPDropperContextClass *klass);
-static void sp_dropper_context_init(SPDropperContext *dc);
-
-static void sp_dropper_context_setup(SPEventContext *ec);
-static void sp_dropper_context_finish(SPEventContext *ec);
-
-static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent * event);
-
-static SPEventContextClass *parent_class;
-
 static GdkCursor *cursor_dropper_fill = NULL;
 static GdkCursor *cursor_dropper_stroke = NULL;
 
-G_DEFINE_TYPE(SPDropperContext, sp_dropper_context, SP_TYPE_EVENT_CONTEXT);
+#include "tool-factory.h"
 
-static void
-sp_dropper_context_class_init(SPDropperContextClass *klass)
-{
-    GObjectClass        *object_class = G_OBJECT_CLASS (klass);
-    SPEventContextClass *ec_class     = SP_EVENT_CONTEXT_CLASS(klass);
+namespace {
+	SPEventContext* createDropperContext() {
+		return new SPDropperContext();
+	}
 
-    parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass));
+	bool dropperContextRegistered = ToolFactory::instance().registerObject("/tools/dropper", createDropperContext);
+}
 
-    ec_class->setup = sp_dropper_context_setup;
-    ec_class->finish = sp_dropper_context_finish;
-    ec_class->root_handler = sp_dropper_context_root_handler;
-    
-    g_type_class_add_private(object_class, sizeof(SPDropperContext));
+const std::string& SPDropperContext::getPrefsPath() {
+	return SPDropperContext::prefsPath;
 }
 
-static void sp_dropper_context_init(SPDropperContext *dc)
-{
-    SPEventContext *event_context = SP_EVENT_CONTEXT(dc);
-    event_context->cursor_shape = cursor_dropper_f_xpm;
-    event_context->hot_x = 7;
-    event_context->hot_y = 7;
+const std::string SPDropperContext::prefsPath = "/tools/dropper";
+
+SPDropperContext::SPDropperContext() : SPEventContext() {
+	this->R = 0;
+	this->G = 0;
+	this->B = 0;
+	this->alpha = 0;
+	this->dragging = false;
+
+	this->grabbed = 0;
+	this->area = 0;
+	this->centre = Geom::Point(0, 0);
+
+    this->cursor_shape = cursor_dropper_f_xpm;
+    this->hot_x = 7;
+    this->hot_y = 7;
 
     cursor_dropper_fill = sp_cursor_new_from_xpm(cursor_dropper_f_xpm , 7, 7);
     cursor_dropper_stroke = sp_cursor_new_from_xpm(cursor_dropper_s_xpm , 7, 7);
-
 }
 
-static void
-sp_dropper_context_setup(SPEventContext *ec)
-{
-    SPDropperContext        *dc   = SP_DROPPER_CONTEXT(ec);
-    SPDropperContextPrivate *priv = SP_DROPPER_CONTEXT_GET_PRIVATE(dc);
+SPDropperContext::~SPDropperContext() {
+}
 
-    if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) {
-        (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec);
-    }
+void SPDropperContext::setup() {
+    SPEventContext::setup();
 
     /* TODO: have a look at sp_dyna_draw_context_setup where the same is done.. generalize? at least make it an arcto! */
     SPCurve *c = new SPCurve();
@@ -126,38 +101,35 @@ sp_dropper_context_setup(SPEventContext *ec)
     c->curveto(1, -C1, C1, -1, 0, -1 );
     c->curveto(-C1, -1, -1, -C1, -1, 0 );
     c->closepath();
-    priv->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c);
+    this->area = sp_canvas_bpath_new(sp_desktop_controls(this->desktop), c);
     c->unref();
-    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(priv->area), 0x00000000,(SPWindRule)0);
-    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(priv->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-    sp_canvas_item_hide(priv->area);
+    
+    sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(this->area), 0x00000000,(SPWindRule)0);
+    sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(this->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+    sp_canvas_item_hide(this->area);
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    
     if (prefs->getBool("/tools/dropper/selcue")) {
-        ec->enableSelectionCue();
+        this->enableSelectionCue();
     }
 
     if (prefs->getBool("/tools/dropper/gradientdrag")) {
-        ec->enableGrDrag();
+        this->enableGrDrag();
     }
 }
 
-static void
-sp_dropper_context_finish(SPEventContext *ec)
-{
-    SPDropperContext        *dc   = SP_DROPPER_CONTEXT(ec);
-    SPDropperContextPrivate *priv = SP_DROPPER_CONTEXT_GET_PRIVATE(dc);
-
-    ec->enableGrDrag(false);
+void SPDropperContext::finish() {
+    this->enableGrDrag(false);
 	
-    if (priv->grabbed) {
-        sp_canvas_item_ungrab(priv->grabbed, GDK_CURRENT_TIME);
-        priv->grabbed = NULL;
+    if (this->grabbed) {
+        sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
+        this->grabbed = NULL;
     }
 
-    if (priv->area) {
-        sp_canvas_item_destroy(priv->area);
-        priv->area = NULL;
+    if (this->area) {
+        sp_canvas_item_destroy(this->area);
+        this->area = NULL;
     }
 
     if (cursor_dropper_fill) {
@@ -168,6 +140,7 @@ sp_dropper_context_finish(SPEventContext *ec)
 #endif
         cursor_dropper_fill = NULL;
     }
+    
     if (cursor_dropper_stroke) {
 #if GTK_CHECK_VERSION(3,0,0)
         g_object_unref(cursor_dropper_stroke);
@@ -176,42 +149,25 @@ sp_dropper_context_finish(SPEventContext *ec)
 #endif
         cursor_dropper_fill = NULL;
     }
-
-    //Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    //prefs->setBool("/tools/dropper/onetimepick", false);
-
 }
 
 /**
  * Returns the current dropper context color.
  */
-guint32
-sp_dropper_context_get_color(SPEventContext *ec)
-{
-    SPDropperContext        *dc    = SP_DROPPER_CONTEXT(ec);
-    SPDropperContextPrivate *priv  = SP_DROPPER_CONTEXT_GET_PRIVATE(dc);
+guint32 SPDropperContext::get_color() {
     Inkscape::Preferences   *prefs = Inkscape::Preferences::get();
 
-    int pick = prefs->getInt("/tools/dropper/pick",
-                             SP_DROPPER_PICK_VISIBLE);
-
+    int pick = prefs->getInt("/tools/dropper/pick", SP_DROPPER_PICK_VISIBLE);
     bool setalpha = prefs->getBool("/tools/dropper/setalpha", true);
 
-    return SP_RGBA32_F_COMPOSE(priv->R,
-                               priv->G,
-                               priv->B,
-                               (pick == SP_DROPPER_PICK_ACTUAL && setalpha) ? priv->alpha 
-                                                                              : 1.0);
+    return SP_RGBA32_F_COMPOSE(this->R,
+                               this->G,
+                               this->B,
+                               (pick == SP_DROPPER_PICK_ACTUAL && setalpha) ? this->alpha : 1.0);
 }
 
-static gint
-sp_dropper_context_root_handler(SPEventContext *event_context,
-                                GdkEvent       *event)
-{
-    SPDropperContext        *dc      = SP_DROPPER_CONTEXT(event_context);
-    SPDropperContextPrivate *priv    = SP_DROPPER_CONTEXT_GET_PRIVATE(dc);
-    SPDesktop               *desktop = event_context->desktop;
-    Inkscape::Preferences   *prefs   = Inkscape::Preferences::get();
+bool SPDropperContext::root_handler(GdkEvent* event) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     int ret = FALSE;
 
@@ -220,16 +176,16 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
 
     switch (event->type) {
 	case GDK_BUTTON_PRESS:
-            if (event->button.button == 1 && !event_context->space_panning) {
-                priv->centre = Geom::Point(event->button.x, event->button.y);
-                priv->dragging = TRUE;
+            if (event->button.button == 1 && !this->space_panning) {
+                this->centre = Geom::Point(event->button.x, event->button.y);
+                this->dragging = true;
                 ret = TRUE;
             }
 			
 			sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
 								GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK,
 								NULL, event->button.time);
-			priv->grabbed = SP_CANVAS_ITEM(desktop->acetate);
+			this->grabbed = SP_CANVAS_ITEM(desktop->acetate);
 
             break;
 	case GDK_MOTION_NOTIFY:
@@ -237,7 +193,7 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 // pass on middle and right drag
                 ret = FALSE;
                 break;
-            } else if (!event_context->space_panning) {
+            } else if (!this->space_panning) {
                 // otherwise, constantly calculate color no matter is any button pressed or not
 
                 // If one time pick with stroke set the pixmap
@@ -250,25 +206,25 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 double rw = 0.0;
                 double R(0), G(0), B(0), A(0);
 
-                if (priv->dragging) {
+                if (this->dragging) {
                     // calculate average
 
                     // radius
-                    rw = std::min(Geom::L2(Geom::Point(event->button.x, event->button.y) - priv->centre), 400.0);
+                    rw = std::min(Geom::L2(Geom::Point(event->button.x, event->button.y) - this->centre), 400.0);
 
                     if (rw == 0) { // happens sometimes, little idea why...
                         break;
                     }
 
-                    Geom::Point const cd = desktop->w2d(priv->centre);
+                    Geom::Point const cd = desktop->w2d(this->centre);
                     Geom::Affine const w2dt = desktop->w2d();
                     const double scale = rw * w2dt.descrim();
                     Geom::Affine const sm( Geom::Scale(scale, scale) * Geom::Translate(cd) );
-                    sp_canvas_item_affine_absolute(priv->area, sm);
-                    sp_canvas_item_show(priv->area);
+                    sp_canvas_item_affine_absolute(this->area, sm);
+                    sp_canvas_item_show(this->area);
 
                     /* Get buffer */
-                    Geom::Rect r(priv->centre, priv->centre);
+                    Geom::Rect r(this->centre, this->centre);
                     r.expandBy(rw);
                     if (!r.hasZeroArea()) {
                         Geom::IntRect area = r.roundOutwards();
@@ -307,13 +263,13 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 }
 
                 // remember color
-                priv->R = R;
-                priv->G = G;
-                priv->B = B;
-                priv->alpha = A;
+                this->R = R;
+                this->G = G;
+                this->B = B;
+                this->alpha = A;
 
                 // status message
-                double alpha_to_set = setalpha? priv->alpha : 1.0;
+                double alpha_to_set = setalpha? this->alpha : 1.0;
                 guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, alpha_to_set);
 
                 gchar c[64];
@@ -323,15 +279,14 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 // locale-sensitive printf is OK, since this goes to the UI, not into SVG
                 gchar *alpha = g_strdup_printf(_(" alpha %.3g"), alpha_to_set);
                 // where the color is picked, to show in the statusbar
-                gchar *where = priv->dragging ? g_strdup_printf(_(", averaged with radius %d"), (int) rw) : g_strdup_printf(_(" under cursor"));
+                gchar *where = this->dragging ? g_strdup_printf(_(", averaged with radius %d"), (int) rw) : g_strdup_printf(_(" under cursor"));
                 // message, to show in the statusbar
-                const gchar *message = priv->dragging ? _("<b>Release mouse</b> to set color.") : _("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard");
-                event_context->defaultMessageContext()->setF(
+                const gchar *message = this->dragging ? _("<b>Release mouse</b> to set color.") : _("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard");
+
+                this->defaultMessageContext()->setF(
                     Inkscape::NORMAL_MESSAGE,
                     "<b>%s%s</b>%s. %s", c,
-                    (pick == SP_DROPPER_PICK_VISIBLE)? "" : alpha,
-                    where, message
-                    );
+                    (pick == SP_DROPPER_PICK_VISIBLE) ? "" : alpha, where, message);
 
                 g_free(where);
                 g_free(alpha);
@@ -339,20 +294,21 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
+
 	case GDK_BUTTON_RELEASE:
-            if (event->button.button == 1 && !event_context->space_panning)
-            {
-                sp_canvas_item_hide(priv->area);
-                priv->dragging = FALSE;
+            if (event->button.button == 1 && !this->space_panning) {
+                sp_canvas_item_hide(this->area);
+                this->dragging = false;
 				
-				if (priv->grabbed) {
-					sp_canvas_item_ungrab(priv->grabbed, event->button.time);
-					priv->grabbed = NULL;
+				if (this->grabbed) {
+					sp_canvas_item_ungrab(this->grabbed, event->button.time);
+					this->grabbed = NULL;
 				}
 
-                double alpha_to_set = setalpha? priv->alpha : 1.0;
+                double alpha_to_set = setalpha? this->alpha : 1.0;
 
                 bool fill = !(event->button.state & GDK_SHIFT_MASK); // Stroke if Shift key held
+
                 if (prefs->getBool("/tools/dropper/onetimepick", false)) {
                     // "One time" pick from Fill/Stroke dialog stroke page, always apply fill or stroke (ignore <Shift> key)
                     fill = (prefs->getInt("/dialogs/fillstroke/page", 0) == 0)  ? true : false;
@@ -361,7 +317,7 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 // do the actual color setting
                 sp_desktop_set_color(desktop,
                                      (event->button.state & GDK_MOD1_MASK)?
-                                     ColorRGBA(1 - priv->R, 1 - priv->G, 1 - priv->B, alpha_to_set) : ColorRGBA(priv->R, priv->G, priv->B, alpha_to_set),
+                                     ColorRGBA(1 - this->R, 1 - this->G, 1 - this->B, alpha_to_set) : ColorRGBA(this->R, this->G, this->B, alpha_to_set),
                                      false,  fill);
 
                 // REJON: set aux. toolbar input to hex color!
@@ -384,6 +340,7 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
+
     case GDK_KEY_PRESS:
         switch (get_group0_keyval(&event->key)) {
         case GDK_KEY_Up:
@@ -395,6 +352,7 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             }
             break;
+
         case GDK_KEY_Escape:
             sp_desktop_selection(desktop)->clear();
         case GDK_KEY_Shift_L:
@@ -409,6 +367,7 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
             break;
         }
         break;
+
     case GDK_KEY_RELEASE:
         switch (get_group0_keyval(&event->key)) {
         case GDK_KEY_Shift_L:
@@ -418,18 +377,18 @@ sp_dropper_context_root_handler(SPEventContext *event_context,
                 gdk_window_set_cursor(window, cursor_dropper_fill);
             }
             break;
+
         default:
             break;
         }
         break;
+
     default:
         break;
     }
 
     if (!ret) {
-        if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) {
-            ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event);
-        }
+    	ret = SPEventContext::root_handler(event);
     }
 
     return ret;