![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 51355b3e516af91c7e1557ff34fe7837840d5926..4be82339140ad104cb165308dc87aebedd8f9f16 100644 (file)
#include "interface.h"
#include "toolbox.h"
#include "prefs-utils.h"
+#include "preferences.h"
#include "file.h"
#include "display/canvas-arena.h"
#include "display/nr-arena.h"
#include "conn-avoid-ref.h"
#include "ege-select-one-action.h"
#include "ege-color-prof-tracker.h"
+#include "color-profile-fns.h"
+#include "xml/node-observer.h"
+#include "box3d-context.h"
+#include "sp-image.h"
-#if defined (SOLARIS_2_8)
+#if defined (SOLARIS) && (SOLARIS == 8)
#include "round.h"
using Inkscape::round;
#endif
static gint sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw);
-static void sp_dtw_color_profile_event(GtkWidget *widget, SPDesktopWidget *dtw);
-
+static void sp_dtw_color_profile_event(EgeColorProfTracker *widget, SPDesktopWidget *dtw);
+static void cms_adjust_toggled( GtkWidget *button, gpointer data );
+static void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled );
static void sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw);
static void sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidget *dtw);
SPViewWidgetClass *dtw_parent_class;
+using Inkscape::XML::Node;
+
+class PrefWatcher : public Inkscape::XML::NodeObserver {
+public:
+ PrefWatcher();
+ virtual ~PrefWatcher();
+
+
+ virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
+ virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
+ virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/,
+ Node */*old_prev*/, Node */*new_prev*/ ) {}
+ virtual void notifyContentChanged( Node &/*node*/,
+ Inkscape::Util::ptr_shared<char> /*old_content*/,
+ Inkscape::Util::ptr_shared<char> /*new_content*/ ) {}
+ virtual void notifyAttributeChanged( Node &node, GQuark name,
+ Inkscape::Util::ptr_shared<char> old_value,
+ Inkscape::Util::ptr_shared<char> new_value );
+ void add( SPDesktopWidget* dtw );
+ void remove( SPDesktopWidget* dtw );
+
+private:
+ static void hook(EgeColorProfTracker *tracker, gint a, gint b, PrefWatcher *watcher);
+
+ std::list<SPDesktopWidget*> dtws;
+ EgeColorProfTracker *_tracker;
+};
+
+PrefWatcher::PrefWatcher() :
+ NodeObserver(),
+ dtws(),
+ _tracker(0)
+{
+ _tracker = ege_color_prof_tracker_new(0);
+ g_signal_connect( G_OBJECT(_tracker), "modified", G_CALLBACK(hook), this );
+}
+
+PrefWatcher::~PrefWatcher()
+{
+}
+
+void PrefWatcher::hook(EgeColorProfTracker */*tracker*/, gint screen, gint monitor, PrefWatcher */*watcher*/)
+{
+#if ENABLE_LCMS
+ unsigned char* buf = 0;
+ guint len = 0;
+
+ ege_color_prof_tracker_get_profile_for( screen, monitor, reinterpret_cast<gpointer*>(&buf), &len );
+ Glib::ustring id = Inkscape::colorprofile_set_display_per( buf, len, screen, monitor );
+#endif // ENABLE_LCMS
+}
+
+void PrefWatcher::add( SPDesktopWidget* dtw )
+{
+ dtws.push_back(dtw);
+}
+
+void PrefWatcher::remove( SPDesktopWidget* dtw )
+{
+ dtws.remove(dtw);
+}
+
+void PrefWatcher::notifyAttributeChanged( Node &node, GQuark name,
+ Inkscape::Util::ptr_shared<char> /*old_value*/,
+ Inkscape::Util::ptr_shared<char> /*new_value*/ )
+{
+#if ENABLE_LCMS
+ (void)name;
+ if ( strcmp("group", node.name()) == 0 ) {
+ gchar const* id = node.attribute("id");
+ bool refresh = false;
+ if ( !id ) {
+ // bad
+ } else if (strcmp("displayprofile", id) == 0) {
+ Glib::ustring current = prefs_get_string_attribute( "options.displayprofile", "uri" );
+ bool enabled = current.length() > 0;
+
+ for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
+ SPDesktopWidget* dtw = *it;
+ if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) != enabled ) {
+ cms_adjust_set_sensitive( dtw, enabled );
+ }
+ }
+ refresh = true;
+ } else if (strcmp("softproof", id) == 0) {
+ refresh = true;
+ }
+
+ if ( refresh ) {
+ for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
+ (*it)->requestCanvasUpdate();
+ }
+ }
+#else
+ {
+ (void)node;
+ (void)name;
+#endif // ENABLE_LCMS
+ }
+}
+
+static PrefWatcher* watcher = 0;
+
void
SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message)
{
@@ -121,35 +230,37 @@ SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message)
gdk_window_process_updates(GTK_WIDGET(sb)->window, TRUE);
}
- // FIXME: TODO: remove <b></b> before displaying as tooltip
- gtk_tooltips_set_tip (this->tt, this->select_status_eventbox, message ? message : "", NULL);
+ gtk_tooltips_set_tip (this->tt, this->select_status_eventbox, gtk_label_get_text (sb) , NULL);
}
-NR::Point
+Geom::Point
SPDesktopWidget::window_get_pointer()
{
gint x,y;
gdk_window_get_pointer (GTK_WIDGET (canvas)->window, &x, &y, NULL);
- return NR::Point(x,y);
+ return Geom::Point(x,y);
}
/**
* Registers SPDesktopWidget class and returns its type number.
*/
-GtkType
-sp_desktop_widget_get_type (void)
+GType sp_desktop_widget_get_type(void)
{
static GtkType type = 0;
if (!type) {
- static const GtkTypeInfo info = {
- "SPDesktopWidget",
- sizeof (SPDesktopWidget),
- sizeof (SPDesktopWidgetClass),
- (GtkClassInitFunc) sp_desktop_widget_class_init,
- (GtkObjectInitFunc) sp_desktop_widget_init,
- NULL, NULL, NULL
+ GTypeInfo info = {
+ sizeof(SPDesktopWidgetClass),
+ 0, // base_init
+ 0, // base_finalize
+ (GClassInitFunc)sp_desktop_widget_class_init,
+ 0, // class_finalize
+ 0, // class_data
+ sizeof(SPDesktopWidget),
+ 0, // n_preallocs
+ (GInstanceInitFunc)sp_desktop_widget_init,
+ 0 // value_table
};
- type = gtk_type_unique (SP_TYPE_VIEW_WIDGET, &info);
+ type = g_type_register_static(SP_TYPE_VIEW_WIDGET, "SPDesktopWidget", &info, static_cast<GTypeFlags>(0));
}
return type;
}
gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->vscrollbar, TRUE, TRUE, 0);
gtk_table_attach (GTK_TABLE (canvas_tbl), dtw->vscrollbar_box, 2, 3, 0, 2, (GtkAttachOptions)(GTK_SHRINK), (GtkAttachOptions)(GTK_FILL), 0, 0);
+
+ gchar const* tip = "";
+ Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE );
+ if ( verb ) {
+ SPAction *act = verb->get_action( dtw->viewwidget.view );
+ if ( act && act->tip ) {
+ tip = act->tip;
+ }
+ }
dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
- "swatches",
- _("Adjust the display"),
+ "color_management",
+ tip,
dtw->tt );
- gtk_widget_set_sensitive(dtw->cms_adjust, FALSE);
+#if ENABLE_LCMS
+ {
+ Glib::ustring current = prefs_get_string_attribute( "options.displayprofile", "uri" );
+ bool enabled = current.length() > 0;
+ cms_adjust_set_sensitive( dtw, enabled );
+ if ( enabled ) {
+ long long int active = prefs_get_int_attribute_limited( "options.displayprofile", "enable", 0, 0, 1 );
+ if ( active ) {
+ sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), TRUE );
+ }
+ }
+ }
+ g_signal_connect_after( G_OBJECT(dtw->cms_adjust), "clicked", G_CALLBACK(cms_adjust_toggled), dtw );
+#else
+ cms_adjust_set_sensitive(dtw, FALSE);
+#endif // ENABLE_LCMS
gtk_table_attach( GTK_TABLE(canvas_tbl), dtw->cms_adjust, 2, 3, 2, 3, (GtkAttachOptions)(GTK_SHRINK), (GtkAttachOptions)(GTK_SHRINK), 0, 0);
+ {
+ Inkscape::XML::Node* prefs = Inkscape::Preferences::get();
+ if ( prefs ) {
+ if (!watcher) {
+ watcher = new PrefWatcher();
+ prefs->addSubtreeObserver( *watcher );
+ }
+ watcher->add(dtw);
+ } else {
+ g_warning("NULL preferences instance encountered");
+ }
+ }
/* Canvas */
dtw->canvas = SP_CANVAS (sp_canvas_new_aa ());
+#if ENABLE_LCMS
+ dtw->canvas->enable_cms_display_adj = prefs_get_int_attribute_limited( "options.displayprofile", "enable", 0, 0, 1 ) != 0;
+#endif // ENABLE_LCMS
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (dtw->canvas), GTK_CAN_FOCUS);
style = gtk_style_copy (GTK_WIDGET (dtw->canvas)->style);
style->bg[GTK_STATE_NORMAL] = style->white;
gtk_widget_set_style (GTK_WIDGET (dtw->canvas), style);
- gtk_widget_set_extension_events(GTK_WIDGET (dtw->canvas) , GDK_EXTENSION_EVENTS_ALL);
+ if ( prefs_get_int_attribute ("options.useextinput", "value", 1) )
+ gtk_widget_set_extension_events(GTK_WIDGET (dtw->canvas) , GDK_EXTENSION_EVENTS_ALL); //set extension events for tablets, unless disabled in preferences
g_signal_connect (G_OBJECT (dtw->canvas), "event", G_CALLBACK (sp_desktop_widget_event), dtw);
gtk_table_attach (GTK_TABLE (canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
prefs_get_int_attribute_limited ("options.dialogtype", "value", Inkscape::UI::Dialog::FLOATING, 0, 1) ==
Inkscape::UI::Dialog::DOCK;
- if (create_dock)
- {
+ if (create_dock) {
dtw->dock = new Inkscape::UI::Widget::Dock();
Gtk::HPaned *paned = new Gtk::HPaned();
gtk_box_pack_start(GTK_BOX(dtw->statusbar), GTK_WIDGET(dtw->layer_selector->gobj()), FALSE, FALSE, 1);
dtw->_tracker = ege_color_prof_tracker_new(GTK_WIDGET(dtw->layer_selector->gobj()));
+#if ENABLE_LCMS
+ {
+ Glib::ustring id = Inkscape::colorprofile_get_display_id( 0, 0 );
+ bool enabled = false;
+ if ( dtw->canvas->cms_key ) {
+ *(dtw->canvas->cms_key) = id;
+ enabled = !dtw->canvas->cms_key->empty();
+ }
+ cms_adjust_set_sensitive( dtw, enabled );
+ }
+#endif // ENABLE_LCMS
g_signal_connect( G_OBJECT(dtw->_tracker), "changed", G_CALLBACK(sp_dtw_color_profile_event), dtw );
dtw->select_status_eventbox = gtk_event_box_new ();
SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (object);
if (dtw->desktop) {
+ if ( watcher ) {
+ watcher->remove(dtw);
+ }
g_signal_handlers_disconnect_by_func(G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK(sp_dtw_zoom_input), dtw);
g_signal_handlers_disconnect_by_func(G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK(sp_dtw_zoom_output), dtw);
gtk_signal_disconnect_by_data (GTK_OBJECT (dtw->zoom_status), dtw->zoom_status);
: g_basename(uri) );
GString *name = g_string_new ("");
if (this->desktop->number > 1) {
- if (this->desktop->getMode() == RENDERMODE_OUTLINE) {
+ if (this->desktop->getMode() == Inkscape::RENDERMODE_OUTLINE) {
g_string_printf (name, _("%s: %d (outline) - Inkscape"), fname, this->desktop->number);
} else {
g_string_printf (name, _("%s: %d - Inkscape"), fname, this->desktop->number);
}
} else {
- if (this->desktop->getMode() == RENDERMODE_OUTLINE) {
+ if (this->desktop->getMode() == Inkscape::RENDERMODE_OUTLINE) {
g_string_printf (name, _("%s (outline) - Inkscape"), fname);
} else {
g_string_printf (name, _("%s - Inkscape"), fname);
}
if (GTK_WIDGET_REALIZED (widget)) {
- NR::Rect const area = dtw->desktop->get_display_area();
+ Geom::Rect const area = to_2geom(dtw->desktop->get_display_area());
double zoom = dtw->desktop->current_zoom();
if (GTK_WIDGET_CLASS(dtw_parent_class)->size_allocate) {
@@ -502,14 +666,14 @@ sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
if (SP_BUTTON_IS_DOWN(dtw->sticky_zoom)) {
/* Calculate zoom per pixel */
- double const zpsp = zoom / hypot (area.dimensions()[NR::X], area.dimensions()[NR::Y]);
+ double const zpsp = zoom / hypot (area.dimensions()[Geom::X], area.dimensions()[Geom::Y]);
/* Find new visible area */
- NR::Rect newarea = dtw->desktop->get_display_area();
+ Geom::Rect newarea = to_2geom(dtw->desktop->get_display_area());
/* Calculate adjusted zoom */
- zoom = zpsp * hypot(newarea.dimensions()[NR::X], newarea.dimensions()[NR::Y]);
- dtw->desktop->zoom_absolute(newarea.midpoint()[NR::X], newarea.midpoint()[NR::Y], zoom);
+ zoom = zpsp * hypot(newarea.dimensions()[Geom::X], newarea.dimensions()[Geom::Y]);
+ dtw->desktop->zoom_absolute(newarea.midpoint()[Geom::X], newarea.midpoint()[Geom::Y], zoom);
} else {
- dtw->desktop->zoom_absolute(area.midpoint()[NR::X], area.midpoint()[NR::Y], zoom);
+ dtw->desktop->zoom_absolute(area.midpoint()[Geom::X], area.midpoint()[Geom::Y], zoom);
}
} else {
dtw->desktop->set_display_area (d.x0, d.y0, d.x1, d.y1, 10);
+ sp_desktop_widget_update_namedview(dtw);
+}
+
+/* This is just to provide access to common functionality from sp_desktop_widget_realize() above
+ as well as from SPDesktop::change_document() */
+void
+sp_desktop_widget_update_namedview (SPDesktopWidget *dtw) {
+ g_return_if_fail(dtw);
+
/* Listen on namedview modification */
// originally (prior to the sigc++ conversion) the signal was simply
// connected twice rather than disconnecting the first connection
@@ -587,19 +760,58 @@ sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dt
return FALSE;
}
-void sp_dtw_color_profile_event(GtkWidget */*widget*/, SPDesktopWidget */*dtw*/)
+void sp_dtw_color_profile_event(EgeColorProfTracker */*tracker*/, SPDesktopWidget *dtw)
{
+#if ENABLE_LCMS
// Handle profile changes
+ GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(dtw));
+ gint screenNum = gdk_screen_get_number(screen);
+ gint monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_toplevel(GTK_WIDGET(dtw))->window);
+ Glib::ustring id = Inkscape::colorprofile_get_display_id( screenNum, monitor );
+ bool enabled = false;
+ if ( dtw->canvas->cms_key ) {
+ *(dtw->canvas->cms_key) = id;
+ dtw->requestCanvasUpdate();
+ enabled = !dtw->canvas->cms_key->empty();
+ }
+ cms_adjust_set_sensitive( dtw, enabled );
+#endif // ENABLE_LCMS
+}
+
+void cms_adjust_toggled( GtkWidget */*button*/, gpointer data )
+{
+#if ENABLE_LCMS
+ SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(data);
+
+ bool down = SP_BUTTON_IS_DOWN(dtw->cms_adjust);
+ if ( down != dtw->canvas->enable_cms_display_adj ) {
+ dtw->canvas->enable_cms_display_adj = down;
+ dtw->requestCanvasUpdate();
+ prefs_set_int_attribute( "options.displayprofile", "enable", down ? 1 : 0 );
+ }
+#endif // ENABLE_LCMS
+}
+
+void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled )
+{
+ Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE );
+ if ( verb ) {
+ SPAction *act = verb->get_action( dtw->viewwidget.view );
+ if ( act ) {
+ sp_action_set_sensitive( act, enabled );
+ }
+ }
+ gtk_widget_set_sensitive( dtw->cms_adjust, enabled );
}
void
-sp_dtw_desktop_activate (SPDesktopWidget *dtw)
+sp_dtw_desktop_activate (SPDesktopWidget */*dtw*/)
{
/* update active desktop indicator */
}
void
-sp_dtw_desktop_deactivate (SPDesktopWidget *dtw)
+sp_dtw_desktop_deactivate (SPDesktopWidget */*dtw*/)
{
/* update inactive desktop indicator */
}
if (inkscape_is_sole_desktop_for_document(*desktop)) {
SPDocument *doc = desktop->doc();
- if (sp_document_repr_root(doc)->attribute("sodipodi:modified") != NULL) {
+ if (doc->isModifiedSinceSave()) {
GtkWidget *dialog;
/** \todo
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
_("<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a format (%s) that may cause data loss!</span>\n\n"
- "Do you want to save this file in another format?"),
+ "Do you want to save this file as an Inkscape SVG?"),
SP_DOCUMENT_NAME(doc),
Inkscape::Extension::db.get(sp_document_repr_root(doc)->attribute("inkscape:output_extension"))->get_name());
// fix for bug 1767940:
GtkWidget *close_button;
close_button = gtk_button_new_with_mnemonic(_("Close _without saving"));
gtk_widget_show(close_button);
+ GtkWidget *save_button;
+ save_button = gtk_button_new_with_mnemonic(_("_Save as SVG"));
+ gtk_widget_show(save_button);
gtk_dialog_add_action_widget(GTK_DIALOG(dialog), close_button, GTK_RESPONSE_NO);
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_SAVE, GTK_RESPONSE_YES);
+ gtk_dialog_add_action_widget(GTK_DIALOG(dialog), save_button, GTK_RESPONSE_YES);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
gint response;
}
void
-SPDesktopWidget::setCoordinateStatus(NR::Point p)
+SPDesktopWidget::setCoordinateStatus(Geom::Point p)
{
gchar *cstr;
- cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[NR::X]);
+ cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[Geom::X]);
gtk_label_set_markup( GTK_LABEL(this->coord_status_x), cstr );
g_free(cstr);
- cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[NR::Y]);
+ cstr = g_strdup_printf("<tt>%7.2f </tt>", dt2r * p[Geom::Y]);
gtk_label_set_markup( GTK_LABEL(this->coord_status_y), cstr );
g_free(cstr);
}
SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
{
gboolean vis = GTK_WIDGET_VISIBLE (this);
+ (void)vis; // TODO figure out why it is here but not used.
Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
}
void
-SPDesktopWidget::setWindowPosition (NR::Point p)
+SPDesktopWidget::setWindowPosition (Geom::Point p)
{
Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
if (window)
{
- window->move (gint(round(p[NR::X])), gint(round(p[NR::Y])));
+ window->move (gint(round(p[Geom::X])), gint(round(p[Geom::Y])));
}
}
dtw->dt2r = 1.0 / namedview->doc_units->unittobase;
- dtw->ruler_origin = NR::Point(0,0); //namedview->gridorigin; Why was the grid origin used here?
+ dtw->ruler_origin = Geom::Point(0,0); //namedview->gridorigin; Why was the grid origin used here?
dtw->desktop = new SPDesktop();
dtw->stub = new SPDesktopWidget::WidgetStub (dtw);
}
void
-SPDesktopWidget::viewSetPosition (NR::Point p)
+SPDesktopWidget::viewSetPosition (Geom::Point p)
{
- NR::Point const origin = ( p - ruler_origin );
+ Geom::Point const origin = ( p - ruler_origin );
/// \todo fixme:
- GTK_RULER(hruler)->position = origin[NR::X];
+ GTK_RULER(hruler)->position = origin[Geom::X];
gtk_ruler_draw_pos (GTK_RULER (hruler));
- GTK_RULER(vruler)->position = origin[NR::Y];
+ GTK_RULER(vruler)->position = origin[Geom::Y];
gtk_ruler_draw_pos (GTK_RULER (vruler));
}
void
sp_desktop_widget_update_rulers (SPDesktopWidget *dtw)
{
- NR::Rect const viewbox = dtw->canvas->getViewbox();
+ sp_desktop_widget_update_hruler(dtw);
+ sp_desktop_widget_update_vruler(dtw);
+}
+
+void
+sp_desktop_widget_update_hruler (SPDesktopWidget *dtw)
+{
+ /* The viewbox (in integers) must exactly match the size of SPCanvasbuf's pixel buffer.
+ * This is important because the former is being used for drawing the ruler, whereas
+ * the latter is used for drawing e.g. the grids and guides. Only when the viewbox
+ * coincides with the pixel buffer, everything will line up nicely.
+ */
+ NR::IRect viewbox = dtw->canvas->getViewboxIntegers();
+
double const scale = dtw->desktop->current_zoom();
- double s = viewbox.min()[NR::X] / scale - dtw->ruler_origin[NR::X];
- double e = viewbox.max()[NR::X] / scale - dtw->ruler_origin[NR::X];
+ double s = viewbox.min()[Geom::X] / scale - dtw->ruler_origin[Geom::X];
+ double e = viewbox.max()[Geom::X] / scale - dtw->ruler_origin[Geom::X];
gtk_ruler_set_range(GTK_RULER(dtw->hruler), s, e, GTK_RULER(dtw->hruler)->position, (e - s));
- s = viewbox.min()[NR::Y] / -scale - dtw->ruler_origin[NR::Y];
- e = viewbox.max()[NR::Y] / -scale - dtw->ruler_origin[NR::Y];
+}
+
+void
+sp_desktop_widget_update_vruler (SPDesktopWidget *dtw)
+{
+ /* The viewbox (in integers) must exactly match the size of SPCanvasbuf's pixel buffer.
+ * This is important because the former is being used for drawing the ruler, whereas
+ * the latter is used for drawing e.g. the grids and guides. Only when the viewbox
+ * coincides with the pixel buffer, everything will line up nicely.
+ */
+ NR::IRect viewbox = dtw->canvas->getViewboxIntegers();
+
+ double const scale = dtw->desktop->current_zoom();
+ double s = viewbox.min()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y];
+ double e = viewbox.max()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y];
gtk_ruler_set_range(GTK_RULER(dtw->vruler), s, e, GTK_RULER(dtw->vruler)->position, (e - s));
}
@@ -1165,7 +1407,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
SPNamedView *nv=SP_NAMEDVIEW(obj);
if (flags & SP_OBJECT_MODIFIED_FLAG) {
dtw->dt2r = 1.0 / nv->doc_units->unittobase;
- dtw->ruler_origin = NR::Point(0,0); //nv->gridorigin; Why was the grid origin used here?
+ dtw->ruler_origin = Geom::Point(0,0); //nv->gridorigin; Why was the grid origin used here?
sp_ruler_set_metric (GTK_RULER (dtw->vruler), nv->getDefaultMetric());
sp_ruler_set_metric (GTK_RULER (dtw->hruler), nv->getDefaultMetric());
@@ -1178,7 +1420,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
}
static void
-sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw)
+sp_desktop_widget_adjustment_value_changed (GtkAdjustment */*adj*/, SPDesktopWidget *dtw)
{
if (dtw->update)
return;
@@ -1188,14 +1430,26 @@ sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget
sp_canvas_scroll_to (dtw->canvas, dtw->hadj->value, dtw->vadj->value, FALSE);
sp_desktop_widget_update_rulers (dtw);
+ /* update perspective lines if we are in the 3D box tool (so that infinite ones are shown correctly) */
+ sp_box3d_context_update_lines(dtw->desktop->event_context);
+
dtw->update = 0;
}
/* we make the desktop window with focus active, signal is connected in interface.c */
bool SPDesktopWidget::onFocusInEvent(GdkEventFocus*)
{
+
+ if (prefs_get_int_attribute_limited("options.bitmapautoreload", "value", 1, 0, 1)) {
+ GSList const *imageList = sp_document_get_resource_list(desktop->doc(), "image");
+ for (GSList const *p = imageList; p; p = p->next) {
+ SPImage* image = SP_IMAGE(p->data);
+ sp_image_refresh_if_outdated( image );
+ }
+ }
+
inkscape_activate_desktop (desktop);
-
+
return false;
}
}
static gint
-sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer data)
+sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer /*data*/)
{
gdouble new_scrolled = gtk_spin_button_get_value (spin);
const gchar *b = gtk_entry_get_text (GTK_ENTRY (spin));
}
static bool
-sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data)
+sp_dtw_zoom_output (GtkSpinButton *spin, gpointer /*data*/)
{
gchar b[64];
double val = sp_dtw_zoom_value_to_display (gtk_spin_button_get_value (spin));
SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (data);
SPDesktop *desktop = dtw->desktop;
- NR::Rect const d = desktop->get_display_area();
+ Geom::Rect const d = to_2geom(desktop->get_display_area());
g_signal_handler_block (spin, dtw->zoom_update);
- desktop->zoom_absolute (d.midpoint()[NR::X], d.midpoint()[NR::Y], zoom_factor);
+ desktop->zoom_absolute (d.midpoint()[Geom::X], d.midpoint()[Geom::Y], zoom_factor);
g_signal_handler_unblock (spin, dtw->zoom_update);
spinbutton_defocus (GTK_OBJECT (spin));
}
static void
-sp_dtw_zoom_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data)
+sp_dtw_zoom_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
{
GList *children, *iter;
GtkWidget *item;
static void
sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor)
{
- NR::Rect const d = dt->get_display_area();
- dt->zoom_absolute(d.midpoint()[NR::X], d.midpoint()[NR::Y], factor);
+ Geom::Rect const d = to_2geom(dt->get_display_area());
+ dt->zoom_absolute(d.midpoint()[Geom::X], d.midpoint()[Geom::Y], factor);
}
static void
-sp_dtw_zoom_50 (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_50 (GtkMenuItem */*item*/, gpointer data)
{
sp_dtw_zoom_menu_handler (static_cast<SPDesktop*>(data), 0.5);
}
static void
-sp_dtw_zoom_100 (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_100 (GtkMenuItem */*item*/, gpointer data)
{
sp_dtw_zoom_menu_handler (static_cast<SPDesktop*>(data), 1.0);
}
static void
-sp_dtw_zoom_200 (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_200 (GtkMenuItem */*item*/, gpointer data)
{
sp_dtw_zoom_menu_handler (static_cast<SPDesktop*>(data), 2.0);
}
static void
-sp_dtw_zoom_page (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_page (GtkMenuItem */*item*/, gpointer data)
{
static_cast<SPDesktop*>(data)->zoom_page();
}
static void
-sp_dtw_zoom_drawing (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_drawing (GtkMenuItem */*item*/, gpointer data)
{
static_cast<SPDesktop*>(data)->zoom_drawing();
}
static void
-sp_dtw_zoom_selection (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_selection (GtkMenuItem */*item*/, gpointer data)
{
static_cast<SPDesktop*>(data)->zoom_selection();
}
}
}
+void sp_desktop_widget_toggle_color_prof_adj( SPDesktopWidget *dtw )
+{
+
+ if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) ) {
+ if ( SP_BUTTON_IS_DOWN(dtw->cms_adjust) ) {
+ sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), FALSE );
+ } else {
+ sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), TRUE );
+ }
+ }
+}
+
/* Unused
void
sp_spw_toggle_menubar (SPDesktopWidget *dtw, bool is_fullscreen)
/* The desktop region we always show unconditionally */
SPDocument *doc = dtw->desktop->doc();
- NR::Rect darea(NR::Point(-sp_document_width(doc), -sp_document_height(doc)),
- NR::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc)));
+ NR::Rect darea(Geom::Point(-sp_document_width(doc), -sp_document_height(doc)),
+ Geom::Point(2 * sp_document_width(doc), 2 * sp_document_height(doc)));
darea = NR::union_bounds(darea, sp_item_bbox_desktop(SP_ITEM(SP_DOCUMENT_ROOT(doc))));
/* Canvas region we always show unconditionally */
- NR::Rect carea(NR::Point(darea.min()[NR::X] * scale - 64,
- darea.max()[NR::Y] * -scale - 64),
- NR::Point(darea.max()[NR::X] * scale + 64,
- darea.min()[NR::Y] * -scale + 64));
+ NR::Rect carea(Geom::Point(darea.min()[Geom::X] * scale - 64,
+ darea.max()[Geom::Y] * -scale - 64),
+ Geom::Point(darea.max()[Geom::X] * scale + 64,
+ darea.min()[Geom::Y] * -scale + 64));
NR::Rect viewbox = dtw->canvas->getViewbox();
/* Viewbox is always included into scrollable region */
carea = NR::union_bounds(carea, viewbox);
- set_adjustment(dtw->hadj, carea.min()[NR::X], carea.max()[NR::X],
- viewbox.dimensions()[NR::X],
- 0.1 * viewbox.dimensions()[NR::X],
- viewbox.dimensions()[NR::X]);
- gtk_adjustment_set_value(dtw->hadj, viewbox.min()[NR::X]);
-
- set_adjustment(dtw->vadj, carea.min()[NR::Y], carea.max()[NR::Y],
- viewbox.dimensions()[NR::Y],
- 0.1 * viewbox.dimensions()[NR::Y],
- viewbox.dimensions()[NR::Y]);
- gtk_adjustment_set_value(dtw->vadj, viewbox.min()[NR::Y]);
+ set_adjustment(dtw->hadj, carea.min()[Geom::X], carea.max()[Geom::X],
+ viewbox.dimensions()[Geom::X],
+ 0.1 * viewbox.dimensions()[Geom::X],
+ viewbox.dimensions()[Geom::X]);
+ gtk_adjustment_set_value(dtw->hadj, viewbox.min()[Geom::X]);
+
+ set_adjustment(dtw->vadj, carea.min()[Geom::Y], carea.max()[Geom::Y],
+ viewbox.dimensions()[Geom::Y],
+ 0.1 * viewbox.dimensions()[Geom::Y],
+ viewbox.dimensions()[Geom::Y]);
+ gtk_adjustment_set_value(dtw->vadj, viewbox.min()[Geom::Y]);
dtw->update = 0;
}