![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e37f1660bca922ea18e0c7e59818c83a7ccd3932..81814fc01cd1e154e3219768da72c1562699aade 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
#include "display/canvas-bpath.h"
#include "display/canvas-arena.h"
#include "display/curve.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
#include "color.h"
#include "color-rgba.h"
#include "desktop-style.h"
SPEventContextClass *ec_class = (SPEventContextClass *) klass;
parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass);
-
+
ec_class->setup = sp_dropper_context_setup;
ec_class->finish = sp_dropper_context_finish;
ec_class->root_handler = sp_dropper_context_root_handler;
((SPEventContextClass *) parent_class)->setup(ec);
}
- SPCurve *c = sp_curve_new_from_static_bpath(spdc_circle);
- dc->area = sp_canvas_bpath_new(SP_DT_CONTROLS(ec->desktop), c);
- sp_curve_unref(c);
+ SPCurve *c = SPCurve::new_from_foreign_bpath(spdc_circle);
+ dc->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c);
+ c->unref();
sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(dc->area), 0x00000000,(SPWindRule)0);
sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
sp_canvas_item_hide(dc->area);
-
+
if (prefs_get_int_attribute("tools.dropper", "selcue", 0) != 0) {
ec->enableSelectionCue();
}
-
+
if (prefs_get_int_attribute("tools.dropper", "gradientdrag", 0) != 0) {
ec->enableGrDrag();
}
static void sp_dropper_context_finish(SPEventContext *ec)
{
SPDropperContext *dc = SP_DROPPER_CONTEXT(ec);
-
+
ec->enableGrDrag(false);
-
+
if (dc->area) {
gtk_object_destroy(GTK_OBJECT(dc->area));
dc->area = NULL;
/**
- * Copies the current context color to the clipboard.
+ * Returns the current dropper context color.
*/
-void sp_dropper_context_copy(SPEventContext *ec)
+guint32 sp_dropper_context_get_color(SPEventContext *ec)
{
SPDropperContext *dc = SP_DROPPER_CONTEXT(ec);
-
- guint32 const c32 = SP_RGBA32_F_COMPOSE(dc->R, dc->G, dc->B, dc->alpha);
-
+
int pick = prefs_get_int_attribute("tools.dropper", "pick",
SP_DROPPER_PICK_VISIBLE);
-
- gchar c[64];
- g_snprintf(c, 64, "%06x%02x", c32 >> 8,
- pick == SP_DROPPER_PICK_ACTUAL? SP_COLOR_F_TO_U(dc->alpha) : 255);
-
- Glib::ustring text;
- text += c;
- if (!text.empty())
- {
- Glib::RefPtr<Gtk::Clipboard> refClipboard =
- Gtk::Clipboard::get();
- refClipboard->set_text(text);
- }
-}
-
-/**
- * Makes a copy of the current desktop color to the clipboard.
- */
-void sp_dropper_c32_color_copy(guint32 c32)
-{
- int const pick = prefs_get_int_attribute("tools.dropper", "pick",
- SP_DROPPER_PICK_VISIBLE);
-
- gchar c[64];
- g_snprintf(c, 64, "%06x%02x", c32 >> 8,
- pick == SP_DROPPER_PICK_ACTUAL? SP_RGBA32_A_U(c32) : 255);
-
- Glib::ustring text;
- text += c;
- if (!text.empty()) {
- Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
- refClipboard->set_text(text);
- }
-}
-
-
-/**
- * Makes a copy of the current color as a hex value. This should always compute
- * the current color without alpha, but the on-screen representation.
- */
-void sp_dropper_c32_color_copy_hex(guint32 c32)
-{
- /*
- int pick = prefs_get_int_attribute ("tools.dropper", "pick",
- SP_DROPPER_PICK_VISIBLE);
-
- if ( pick == SP_DROPPER_PICK_ACTUAL )
- ; // process c32 so that it computes against page
- // else just can cut off that last 2 hex digits....
+ int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1);
- */
-
- gchar c[48];
- g_snprintf(c, 48, "%06x", c32 >> 8);
-
- Glib::ustring text;
- text += c;
- if (!text.empty()) {
- Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
- refClipboard->set_text(text);
- }
+ return SP_RGBA32_F_COMPOSE(dc->R, dc->G, dc->B,
+ (pick == SP_DROPPER_PICK_ACTUAL && setalpha) ? dc->alpha : 1.0);
}
-static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
+static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEvent *event)
{
- SPDropperContext *dc = (SPDropperContext *) ec;
+ SPDropperContext *dc = (SPDropperContext *) event_context;
int ret = FALSE;
+ SPDesktop *desktop = event_context->desktop;
int pick = prefs_get_int_attribute("tools.dropper", "pick", SP_DROPPER_PICK_VISIBLE);
+ int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1);
switch (event->type) {
case GDK_BUTTON_PRESS:
- if (event->button.button == 1) {
+ if (event->button.button == 1 && !event_context->space_panning) {
dc->centre = NR::Point(event->button.x, event->button.y);
dc->dragging = TRUE;
ret = TRUE;
@@ -235,40 +178,40 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
// pass on middle-drag
ret = FALSE;
break;
- } else {
+ } else if (!event_context->space_panning) {
// otherwise, constantly calculate color no matter is any button pressed or not
-
+
double rw = 0.0;
double W(0), R(0), G(0), B(0), A(0);
-
- if (dc->dragging) {
+
+ if (dc->dragging) {
// calculate average
-
+
// radius
rw = std::min(NR::L2(NR::Point(event->button.x, event->button.y) - dc->centre), 400.0);
-
+
if (rw == 0) { // happens sometimes, little idea why...
break;
}
-
- NR::Point const cd = ec->desktop->w2d(dc->centre);
- NR::Matrix const w2dt = ec->desktop->w2d();
- const double scale = rw * NR_MATRIX_DF_EXPANSION(&w2dt);
+
+ NR::Point const cd = desktop->w2d(dc->centre);
+ NR::Matrix const w2dt = desktop->w2d();
+ const double scale = rw * NR::expansion(w2dt);
NR::Matrix const sm( NR::scale(scale, scale) * NR::translate(cd) );
sp_canvas_item_affine_absolute(dc->area, sm);
sp_canvas_item_show(dc->area);
-
+
/* Get buffer */
const int x0 = (int) floor(dc->centre[NR::X] - rw);
const int y0 = (int) floor(dc->centre[NR::Y] - rw);
const int x1 = (int) ceil(dc->centre[NR::X] + rw);
const int y1 = (int) ceil(dc->centre[NR::Y] + rw);
-
+
if ((x1 > x0) && (y1 > y0)) {
NRPixBlock pb;
nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x0, y0, x1, y1, TRUE);
/* fixme: (Lauris) */
- sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb);
+ sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(desktop)), &pb);
for (int y = y0; y < y1; y++) {
const unsigned char *s = NR_PIXBLOCK_PX(&pb) + (y - y0) * pb.rs;
for (int x = x0; x < x1; x++) {
@@ -284,7 +227,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
}
}
nr_pixblock_release(&pb);
-
+
R = (R + 0.001) / (255.0 * W);
G = (G + 0.001) / (255.0 * W);
B = (B + 0.001) / (255.0 * W);
@@ -302,18 +245,18 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
int x = (int) floor(event->button.x);
int y = (int) floor(event->button.y);
nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x, y, x+1, y+1, TRUE);
- sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb);
+ sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(desktop)), &pb);
const unsigned char *s = NR_PIXBLOCK_PX(&pb);
-
+
R = s[0] / 255.0;
G = s[1] / 255.0;
B = s[2] / 255.0;
A = s[3] / 255.0;
}
-
+
if (pick == SP_DROPPER_PICK_VISIBLE) {
// compose with page color
- guint32 bg = SP_DT_NAMEDVIEW(ec->desktop)->pagecolor;
+ guint32 bg = sp_desktop_namedview(desktop)->pagecolor;
R = R + (SP_RGBA32_R_F(bg)) * (1 - A);
G = G + (SP_RGBA32_G_F(bg)) * (1 - A);
B = B + (SP_RGBA32_B_F(bg)) * (1 - A);
@@ -326,7 +269,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
B /= A;
}
}
-
+
if (fabs(A) < 1e-4) {
A = 0; // suppress exponentials, CSS does not allow that
}
@@ -336,50 +279,54 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
dc->G = G;
dc->B = B;
dc->alpha = A;
-
+
// status message
- guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, A);
-
+ double alpha_to_set = setalpha? dc->alpha : 1.0;
+ guint32 c32 = SP_RGBA32_F_COMPOSE(R, G, B, alpha_to_set);
+
gchar c[64];
- sp_svg_write_color(c, 64, c32);
+ sp_svg_write_color(c, sizeof(c), c32);
// alpha of color under cursor, to show in the statusbar
// locale-sensitive printf is OK, since this goes to the UI, not into SVG
- gchar *alpha = g_strdup_printf(_(" alpha %.3g"), A);
+ gchar *alpha = g_strdup_printf(_(" alpha %.3g"), alpha_to_set);
// where the color is picked, to show in the statusbar
gchar *where = dc->dragging ? g_strdup_printf(_(", averaged with radius %d"), (int) rw) : g_strdup_printf(_(" under cursor"));
// message, to show in the statusbar
const gchar *message = dc->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");
- ec->defaultMessageContext()->setF(
+ event_context->defaultMessageContext()->setF(
Inkscape::NORMAL_MESSAGE,
"<b>%s%s</b>%s. %s", c,
(pick == SP_DROPPER_PICK_VISIBLE)? "" : alpha,
where, message
);
-
+
g_free(where);
g_free(alpha);
-
+
ret = TRUE;
}
break;
case GDK_BUTTON_RELEASE:
- if (event->button.button == 1)
+ if (event->button.button == 1 && !event_context->space_panning)
{
sp_canvas_item_hide(dc->area);
dc->dragging = FALSE;
-
+
+ double alpha_to_set = setalpha? dc->alpha : 1.0;
+
// do the actual color setting
- sp_desktop_set_color(ec->desktop,
+ sp_desktop_set_color(desktop,
(event->button.state & GDK_MOD1_MASK)?
- ColorRGBA(1 - dc->R, 1 - dc->G, 1 - dc->B, dc->alpha) : ColorRGBA(dc->R, dc->G, dc->B, dc->alpha),
+ ColorRGBA(1 - dc->R, 1 - dc->G, 1 - dc->B, alpha_to_set) : ColorRGBA(dc->R, dc->G, dc->B, alpha_to_set),
false, !(event->button.state & GDK_SHIFT_MASK));
-
+
// REJON: set aux. toolbar input to hex color!
-
-
- if (!(SP_DT_SELECTION(ec->desktop)->isEmpty())) {
- sp_document_done(SP_DT_DOCUMENT(ec->desktop));
+
+
+ if (!(sp_desktop_selection(desktop)->isEmpty())) {
+ sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER,
+ _("Set picked color"));
}
ret = TRUE;
@@ -387,17 +334,17 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
break;
case GDK_KEY_PRESS:
switch (get_group0_keyval(&event->key)) {
- case GDK_Up:
- case GDK_Down:
- case GDK_KP_Up:
- case GDK_KP_Down:
+ case GDK_Up:
+ case GDK_Down:
+ case GDK_KP_Up:
+ case GDK_KP_Down:
// prevent the zoom field from activation
if (!MOD__CTRL_ONLY) {
ret = TRUE;
}
break;
case GDK_Escape:
- SP_DT_SELECTION(ec->desktop)->clear();
+ sp_desktop_selection(desktop)->clear();
default:
break;
}
@@ -405,13 +352,13 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event)
default:
break;
}
-
+
if (!ret) {
if (((SPEventContextClass *) parent_class)->root_handler) {
- ret = ((SPEventContextClass *) parent_class)->root_handler(ec, event);
+ ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event);
}
}
-
+
return ret;
}