X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdropper-context.cpp;h=5415fdc80fb050af4193d3c11cab77911811b5b9;hb=91c307b04acb17109e2811ed9f525217e03cea02;hp=65cc56964139fcb615b854cae3760d579abd18e2;hpb=469c9ea92e7d1cc3fec6a26cc79ac54c6ff5b3df;p=inkscape.git diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 65cc56964..5415fdc80 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -22,7 +22,6 @@ #include #include -#include "libnr/n-art-bpath.h" #include "macros.h" #include "display/canvas-bpath.h" #include "display/canvas-arena.h" @@ -31,7 +30,7 @@ #include "color.h" #include "color-rgba.h" #include "desktop-style.h" -#include "prefs-utils.h" +#include "preferences.h" #include "sp-namedview.h" #include "desktop.h" #include "desktop-handles.h" @@ -39,22 +38,10 @@ #include "document.h" #include "pixmaps/cursor-dropper.xpm" -#include "pixmaps/cursor-dropper.pixbuf" #include "dropper-context.h" #include "message-context.h" -#include "libnr/nr-scale-translate-ops.h" - -#define C1 0.552 -static NArtBpath const spdc_circle[] = { - { NR_MOVETO, 0, 0, 0, 0, -1, 0 }, - { NR_CURVETO, -1, C1, -C1, 1, 0, 1 }, - { NR_CURVETO, C1, 1, 1, C1, 1, 0 }, - { NR_CURVETO, 1, -C1, C1, -1, 0, -1 }, - { NR_CURVETO, -C1, -1, -1, -C1, -1, 0 }, - { NR_END, 0, 0, 0, 0, 0, 0 } -}; -#undef C1 +//#include "libnr/nr-scale-translate-ops.h" static void sp_dropper_context_class_init(SPDropperContextClass *klass); static void sp_dropper_context_init(SPDropperContext *dc); @@ -100,11 +87,6 @@ static void sp_dropper_context_init(SPDropperContext *dc) { SPEventContext *event_context = SP_EVENT_CONTEXT(dc); event_context->cursor_shape = cursor_dropper_xpm; - event_context->cursor_pixbuf = gdk_pixbuf_new_from_inline( - -1, - cursor_dropper_pixbuf, - FALSE, - NULL); event_context->hot_x = 7; event_context->hot_y = 7; } @@ -117,18 +99,27 @@ static void sp_dropper_context_setup(SPEventContext *ec) ((SPEventContextClass *) parent_class)->setup(ec); } - SPCurve *c = sp_curve_new_from_foreign_bpath(spdc_circle); + /* 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(); + const double C1 = 0.552; + c->moveto(-1,0); + c->curveto(-1, C1, -C1, 1, 0, 1 ); + c->curveto(C1, 1, 1, C1, 1, 0 ); + c->curveto(1, -C1, C1, -1, 0, -1 ); + c->curveto(-C1, -1, -1, -C1, -1, 0 ); + c->closepath(); dc->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); - sp_curve_unref(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) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (prefs->getBool("/tools/dropper/selcue")) { ec->enableSelectionCue(); } - if (prefs_get_int_attribute("tools.dropper", "gradientdrag", 0) != 0) { + if (prefs->getBool("/tools/dropper/gradientdrag")) { ec->enableGrDrag(); } } @@ -138,6 +129,11 @@ static void sp_dropper_context_finish(SPEventContext *ec) SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); ec->enableGrDrag(false); + + if (dc->grabbed) { + sp_canvas_item_ungrab(dc->grabbed, GDK_CURRENT_TIME); + dc->grabbed = NULL; + } if (dc->area) { gtk_object_destroy(GTK_OBJECT(dc->area)); @@ -147,104 +143,62 @@ static void sp_dropper_context_finish(SPEventContext *ec) /** - * Copies the current context color to the clipboard. + * Returns the current dropper context icc-color. */ -void sp_dropper_context_copy(SPEventContext *ec) +SPColor* sp_dropper_context_get_icc_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); - - int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1); - - gchar c[64]; - g_snprintf(c, 64, "%06x%02x", c32 >> 8, - (pick == SP_DROPPER_PICK_ACTUAL && setalpha)? SP_COLOR_F_TO_U(dc->alpha) : 255); - - Glib::ustring text; - text += c; - if (!text.empty()) - { - Glib::RefPtr refClipboard = - Gtk::Clipboard::get(); - refClipboard->set_text(text); - } -} + //TODO: implement-me! -/** - * 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 refClipboard = Gtk::Clipboard::get(); - refClipboard->set_text(text); - } + return 0; // At least we will cause a clean crash, instead of random corruption. } - /** - * 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. + * Returns the current dropper context color. */ -void sp_dropper_c32_color_copy_hex(guint32 c32) +guint32 sp_dropper_context_get_color(SPEventContext *ec) { - /* - 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.... - - */ + SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - gchar c[48]; - g_snprintf(c, 48, "%06x", c32 >> 8); + int pick = prefs->getInt("/tools/dropper/pick", + SP_DROPPER_PICK_VISIBLE); + bool setalpha = prefs->getBool("/tools/dropper/setalpha", true); - Glib::ustring text; - text += c; - if (!text.empty()) { - Glib::RefPtr 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; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - int pick = prefs_get_int_attribute("tools.dropper", "pick", SP_DROPPER_PICK_VISIBLE); - int setalpha = prefs_get_int_attribute("tools.dropper", "setalpha", 1); + int pick = prefs->getInt("/tools/dropper/pick", SP_DROPPER_PICK_VISIBLE); + bool setalpha = prefs->getBool("/tools/dropper/setalpha", true); switch (event->type) { case GDK_BUTTON_PRESS: - if (event->button.button == 1) { - dc->centre = NR::Point(event->button.x, event->button.y); + if (event->button.button == 1 && !event_context->space_panning) { + dc->centre = Geom::Point(event->button.x, event->button.y); dc->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); + dc->grabbed = SP_CANVAS_ITEM(desktop->acetate); + break; case GDK_MOTION_NOTIFY: if (event->motion.state & GDK_BUTTON2_MASK) { // 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; @@ -254,35 +208,35 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) // calculate average // radius - rw = std::min(NR::L2(NR::Point(event->button.x, event->button.y) - dc->centre), 400.0); + rw = std::min(Geom::L2(Geom::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::Matrix const sm( NR::scale(scale, scale) * NR::translate(cd) ); + Geom::Point const cd = desktop->w2d(dc->centre); + Geom::Matrix const w2dt = desktop->w2d(); + const double scale = rw * w2dt.descrim(); + Geom::Matrix const sm( Geom::Scale(scale, scale) * Geom::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); + const int x0 = (int) floor(dc->centre[Geom::X] - rw); + const int y0 = (int) floor(dc->centre[Geom::Y] - rw); + const int x1 = (int) ceil(dc->centre[Geom::X] + rw); + const int y1 = (int) ceil(dc->centre[Geom::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_desktop_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++) { - const double dx = x - dc->centre[NR::X]; - const double dy = y - dc->centre[NR::Y]; + const double dx = x - dc->centre[Geom::X]; + const double dy = y - dc->centre[Geom::Y]; const double w = exp(-((dx * dx) + (dy * dy)) / (rw * rw)); W += w; R += w * s[0]; @@ -311,7 +265,7 @@ 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_desktop_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; @@ -322,7 +276,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) if (pick == SP_DROPPER_PICK_VISIBLE) { // compose with page color - guint32 bg = sp_desktop_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); @@ -351,7 +305,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) 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 @@ -360,7 +314,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) 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 ? _("Release mouse to set color.") : _("Click to set fill, Shift+click to set stroke; drag to average color in area; with Alt to pick inverse color; Ctrl+C to copy the color under mouse to clipboard"); - ec->defaultMessageContext()->setF( + event_context->defaultMessageContext()->setF( Inkscape::NORMAL_MESSAGE, "%s%s%s. %s", c, (pick == SP_DROPPER_PICK_VISIBLE)? "" : alpha, @@ -374,15 +328,20 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) } 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; + + if (dc->grabbed) { + sp_canvas_item_ungrab(dc->grabbed, event->button.time); + dc->grabbed = NULL; + } 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, alpha_to_set) : ColorRGBA(dc->R, dc->G, dc->B, alpha_to_set), false, !(event->button.state & GDK_SHIFT_MASK)); @@ -390,8 +349,8 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) // REJON: set aux. toolbar input to hex color! - if (!(sp_desktop_selection(ec->desktop)->isEmpty())) { - sp_document_done(sp_desktop_document(ec->desktop), SP_VERB_CONTEXT_DROPPER, + if (!(sp_desktop_selection(desktop)->isEmpty())) { + sp_document_done(sp_desktop_document(desktop), SP_VERB_CONTEXT_DROPPER, _("Set picked color")); } @@ -410,7 +369,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) } break; case GDK_Escape: - sp_desktop_selection(ec->desktop)->clear(); + sp_desktop_selection(desktop)->clear(); default: break; } @@ -421,7 +380,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) 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); } }