X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=libview%2Fev-view.c;h=544a1fee85e5bc9224a90b1df28778decb7764da;hb=ab0edaffd2f1790ec8ac7ac17f90e0a8007b92cd;hp=024153cfb294e02a6b1b19364e53f282fca367d6;hpb=1d220fd5b90e5caf9defc73b594143f19a47378b;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 024153cf..544a1fee 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -67,6 +67,14 @@ enum { TARGET_DND_IMAGE }; +enum { + PROP_0, + PROP_HADJUSTMENT, + PROP_VADJUSTMENT, + PROP_HSCROLL_POLICY, + PROP_VSCROLL_POLICY +}; + static guint signals[N_SIGNALS]; typedef enum { @@ -81,9 +89,6 @@ typedef enum { /*** Scrolling ***/ static void view_update_range_and_current_page (EvView *view); -static void set_scroll_adjustment (EvView *view, - GtkOrientation orientation, - GtkAdjustment *adjustment); static void add_scroll_binding_keypad (GtkBindingSet *binding_set, guint keyval, GdkModifierType modifiers, @@ -151,7 +156,6 @@ static void ev_view_size_request (GtkWidget GtkRequisition *requisition); static void ev_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static void ev_view_realize (GtkWidget *widget); static gboolean ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event); static gboolean ev_view_draw (GtkWidget *widget, @@ -167,8 +171,7 @@ static gboolean ev_view_enter_notify_event (GtkWidget GdkEventCrossing *event); static gboolean ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event); -static void ev_view_style_set (GtkWidget *widget, - GtkStyle *old_style); +static void ev_view_style_updated (GtkWidget *widget); static void ev_view_remove_all (EvView *view); static AtkObject *ev_view_get_accessible (GtkWidget *widget); @@ -279,7 +282,8 @@ static void ev_view_primary_clear_cb (GtkClipboard gpointer data); static void ev_view_update_primary_selection (EvView *ev_view); -G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_LAYOUT) +G_DEFINE_TYPE_WITH_CODE (EvView, ev_view, GTK_TYPE_FIXED, + G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)) /* HeightToPage cache */ #define EV_HEIGHT_TO_PAGE_CACHE_KEY "ev-height-to-page-cache" @@ -479,7 +483,7 @@ ev_view_get_scrollbar_size (EvView *view, } gtk_widget_style_get (swindow, "scrollbar_spacing", &spacing, NULL); - gtk_widget_size_request (sb, &req); + gtk_widget_get_preferred_size (sb, &req, NULL); return (orientation == GTK_ORIENTATION_VERTICAL ? req.width : req.height) + spacing; } @@ -550,8 +554,8 @@ ev_view_scroll_to_page_position (EvView *view, GtkOrientation orientation) } static void -view_set_adjustment_values (EvView *view, - GtkOrientation orientation) +ev_view_set_adjustment_values (EvView *view, + GtkOrientation orientation) { GtkWidget *widget = GTK_WIDGET (view); GtkAdjustment *adjustment; @@ -741,53 +745,40 @@ view_update_range_and_current_page (EvView *view) } static void -set_scroll_adjustment (EvView *view, - GtkOrientation orientation, - GtkAdjustment *adjustment) +ev_view_set_scroll_adjustment (EvView *view, + GtkOrientation orientation, + GtkAdjustment *adjustment) { GtkAdjustment **to_set; + const gchar *prop_name; - if (orientation == GTK_ORIENTATION_HORIZONTAL) + if (orientation == GTK_ORIENTATION_HORIZONTAL) { to_set = &view->hadjustment; - else + prop_name = "hadjustment"; + } else { to_set = &view->vadjustment; + prop_name = "vadjustment"; + } - if (*to_set != adjustment) { - if (*to_set) { - g_signal_handlers_disconnect_by_func (*to_set, - (gpointer) on_adjustment_value_changed, - view); - g_object_unref (*to_set); - } - - *to_set = adjustment; - view_set_adjustment_values (view, orientation); + if (adjustment && adjustment == *to_set) + return; - if (*to_set) { - g_object_ref (*to_set); - g_signal_connect (*to_set, "value_changed", - G_CALLBACK (on_adjustment_value_changed), view); - } + if (*to_set) { + g_signal_handlers_disconnect_by_func (*to_set, + (gpointer) on_adjustment_value_changed, + view); + g_object_unref (*to_set); } -} - -static void -on_hadjustment_notify (EvView *view, - GParamSpec *pspec, - gpointer user_data) -{ - set_scroll_adjustment (view, GTK_ORIENTATION_HORIZONTAL, gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (view))); - on_adjustment_value_changed (NULL, view); -} + if (!adjustment) + adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + g_signal_connect (adjustment, "value_changed", + G_CALLBACK (on_adjustment_value_changed), + view); + *to_set = g_object_ref_sink (adjustment); + ev_view_set_adjustment_values (view, orientation); -static void -on_vadjustment_notify (EvView *view, - GParamSpec *pspec, - gpointer user_data) -{ - set_scroll_adjustment (view, GTK_ORIENTATION_VERTICAL, gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (view))); - on_adjustment_value_changed (NULL, view); + g_object_notify (G_OBJECT (view), prop_name); } static void @@ -2423,7 +2414,7 @@ ev_view_handle_form_field (EvView *view, form_field_mapping, field, &view_area); - gtk_layout_put (GTK_LAYOUT (view), field_widget, view_area.x, view_area.y); + gtk_fixed_put (GTK_FIXED (view), field_widget, view_area.x, view_area.y); gtk_widget_show (field_widget); gtk_widget_grab_focus (field_widget); } @@ -3142,6 +3133,30 @@ ev_view_size_request (GtkWidget *widget, *requisition = view->requisition; } +static void +ev_view_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + ev_view_size_request (widget, &requisition); + + *minimum = *natural = requisition.width; +} + +static void +ev_view_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + ev_view_size_request (widget, &requisition); + + *minimum = *natural = requisition.height; +} + static void ev_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation) @@ -3167,8 +3182,8 @@ ev_view_size_allocate (GtkWidget *widget, view->internal_size_request = FALSE; } - view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL); - view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL); + ev_view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL); + ev_view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL); if (view->document) view_update_range_and_current_page (view); @@ -3197,7 +3212,7 @@ ev_view_size_allocate (GtkWidget *widget, form_field_mapping, field, &view_area); - gtk_widget_size_request (child, &child_requisition); + gtk_widget_get_preferred_size (child, &child_requisition, NULL); if (child_requisition.width != view_area.width || child_requisition.height != view_area.height) gtk_widget_set_size_request (child, view_area.width, view_area.height); @@ -3209,7 +3224,7 @@ ev_view_size_allocate (GtkWidget *widget, NULL); if (child_allocation.x != view_area.x || child_allocation.y != view_area.y) { - gtk_layout_move (GTK_LAYOUT (widget), child, view_area.x, view_area.y); + gtk_fixed_move (GTK_FIXED (widget), child, view_area.x, view_area.y); } } g_list_free (children); @@ -3242,35 +3257,6 @@ ev_view_size_allocate (GtkWidget *widget, } } -static void -ev_view_realize (GtkWidget *widget) -{ - EvView *view = EV_VIEW (widget); - GdkWindow *bin_window; - GtkStyle *style; - - if (GTK_WIDGET_CLASS (ev_view_parent_class)->realize) - (* GTK_WIDGET_CLASS (ev_view_parent_class)->realize) (widget); - - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); - gdk_window_set_events (bin_window, - (gdk_window_get_events (bin_window) | - GDK_EXPOSURE_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_SCROLL_MASK | - GDK_KEY_PRESS_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK)); - - style = gtk_widget_get_style (widget); - gdk_window_set_background (bin_window, &style->mid[GTK_STATE_NORMAL]); - - on_adjustment_value_changed (NULL, view); -} - static gboolean ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event) { @@ -3871,15 +3857,15 @@ ev_view_motion_notify_event (GtkWidget *widget, GdkEventMotion *event) { EvView *view = EV_VIEW (widget); - GdkWindow *bin_window; + GdkWindow *window; gint x, y; if (!view->document) return FALSE; - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + window = gtk_widget_get_window (widget); - if (event->is_hint || event->window != bin_window) { + if (event->is_hint || event->window != window) { gtk_widget_get_pointer (widget, &x, &y); } else { x = event->x; @@ -4195,13 +4181,12 @@ ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) } static void -ev_view_style_set (GtkWidget *widget, - GtkStyle *old_style) +ev_view_style_updated (GtkWidget *widget) { if (EV_VIEW (widget)->pixbuf_cache) ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); - GTK_WIDGET_CLASS (ev_view_parent_class)->style_set (widget, old_style); + GTK_WIDGET_CLASS (ev_view_parent_class)->style_updated (widget); } /*** Drawing ***/ @@ -4212,19 +4197,14 @@ draw_rubberband (EvView *view, const GdkRectangle *rect, gdouble alpha) { - GtkStyle *style; - const GdkColor *fill_color_gdk; - gdouble r, g, b; - - style = gtk_widget_get_style (GTK_WIDGET (view)); - fill_color_gdk = &style->base[GTK_STATE_SELECTED]; - r = fill_color_gdk->red / 65535.; - g = fill_color_gdk->green / 65535.; - b = fill_color_gdk->blue / 65535.; + GtkStyleContext *context; + GdkRGBA color; + context = gtk_widget_get_style_context (GTK_WIDGET (view)); + gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &color); cairo_save (cr); - cairo_set_source_rgba (cr, r, g, b, alpha); + cairo_set_source_rgba (cr, color.red, color.green, color.blue, alpha); cairo_rectangle (cr, rect->x - view->scroll_x, rect->y - view->scroll_y, @@ -4232,7 +4212,7 @@ draw_rubberband (EvView *view, cairo_fill_preserve (cr); cairo_set_line_width (cr, 0.5); - cairo_set_source_rgb (cr, r, g, b); + cairo_set_source_rgb (cr, color.red, color.green, color.blue); cairo_stroke (cr); cairo_restore (cr); @@ -4303,13 +4283,11 @@ focus_annotation (EvView *view, doc_rect_to_view_rect (view, page, &mapping->area, &rect); - gtk_paint_focus (gtk_widget_get_style (widget), - cr, - gtk_widget_get_state (widget), - widget, NULL, - rect.x - view->scroll_x, - rect.y - view->scroll_y, - rect.width + 1, rect.height + 1); + gtk_render_focus (gtk_widget_get_style_context (widget), + cr, + rect.x - view->scroll_x, + rect.y - view->scroll_y, + rect.width + 1, rect.height + 1); } static void @@ -4590,16 +4568,75 @@ ev_view_dispose (GObject *object) G_OBJECT_CLASS (ev_view_parent_class)->dispose (object); } -static AtkObject * -ev_view_get_accessible (GtkWidget *widget) +static void +ev_view_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EvView *view = EV_VIEW (object); + + switch (prop_id) { + case PROP_HADJUSTMENT: + g_value_set_object (value, view->hadjustment); + break; + case PROP_VADJUSTMENT: + g_value_set_object (value, view->vadjustment); + break; + case PROP_HSCROLL_POLICY: + g_value_set_enum (value, view->hscroll_policy); + break; + case PROP_VSCROLL_POLICY: + g_value_set_enum (value, view->vscroll_policy); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +ev_view_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + EvView *view = EV_VIEW (object); + + switch (prop_id) { + case PROP_HADJUSTMENT: + ev_view_set_scroll_adjustment (view, GTK_ORIENTATION_HORIZONTAL, + (GtkAdjustment *) g_value_get_object (value)); + break; + case PROP_VADJUSTMENT: + ev_view_set_scroll_adjustment (view, GTK_ORIENTATION_VERTICAL, + (GtkAdjustment *) g_value_get_object (value)); + break; + case PROP_HSCROLL_POLICY: + view->hscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (view)); + break; + case PROP_VSCROLL_POLICY: + view->vscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (view)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/* Accessibility */ +static void +ev_view_init_accessibility (EvView *view) { static gboolean first_time = TRUE; if (first_time) { AtkObjectFactory *factory; AtkRegistry *registry; - GType derived_type; - GType derived_atk_type; + GType derived_type; + GType derived_atk_type; /* * Figure out whether accessibility is enabled by looking at the @@ -4616,13 +4653,26 @@ ev_view_get_accessible (GtkWidget *widget) atk_registry_set_factory_type (registry, EV_TYPE_VIEW, ev_view_accessible_factory_get_type ()); - EV_VIEW (widget)->a11y_enabled = TRUE; + view->a11y_enabled = TRUE; } first_time = FALSE; - } + } +} + +static AtkObject * +ev_view_get_accessible (GtkWidget *widget) +{ + ev_view_init_accessibility (EV_VIEW (widget)); return GTK_WIDGET_CLASS (ev_view_parent_class)->get_accessible (widget); } +static gboolean +ev_view_is_a11y_enabled (EvView *view) +{ + ev_view_init_accessibility (view); + return view->a11y_enabled; +} + static void ev_view_class_init (EvViewClass *class) { @@ -4630,6 +4680,8 @@ ev_view_class_init (EvViewClass *class) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); GtkBindingSet *binding_set; + object_class->get_property = ev_view_get_property; + object_class->set_property = ev_view_set_property; object_class->dispose = ev_view_dispose; object_class->finalize = ev_view_finalize; @@ -4641,13 +4693,13 @@ ev_view_class_init (EvViewClass *class) widget_class->focus_in_event = ev_view_focus_in; widget_class->focus_out_event = ev_view_focus_out; widget_class->get_accessible = ev_view_get_accessible; - widget_class->size_request = ev_view_size_request; + widget_class->get_preferred_width = ev_view_get_preferred_width; + widget_class->get_preferred_height = ev_view_get_preferred_height; widget_class->size_allocate = ev_view_size_allocate; - widget_class->realize = ev_view_realize; widget_class->scroll_event = ev_view_scroll_event; widget_class->enter_notify_event = ev_view_enter_notify_event; widget_class->leave_notify_event = ev_view_leave_notify_event; - widget_class->style_set = ev_view_style_set; + widget_class->style_updated = ev_view_style_updated; widget_class->drag_data_get = ev_view_drag_data_get; widget_class->drag_motion = ev_view_drag_motion; widget_class->popup_menu = ev_view_popup_menu; @@ -4655,6 +4707,12 @@ ev_view_class_init (EvViewClass *class) class->binding_activated = ev_view_scroll; + /* Scrollable interface */ + g_object_class_override_property (object_class, PROP_HADJUSTMENT, "hadjustment"); + g_object_class_override_property (object_class, PROP_VADJUSTMENT, "vadjustment"); + g_object_class_override_property (object_class, PROP_HSCROLL_POLICY, "hscroll-policy"); + g_object_class_override_property (object_class, PROP_VSCROLL_POLICY, "vscroll-policy"); + signals[SIGNAL_BINDING_ACTIVATED] = g_signal_new ("binding_activated", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, @@ -4745,7 +4803,21 @@ ev_view_class_init (EvViewClass *class) static void ev_view_init (EvView *view) { + gtk_widget_set_has_window (GTK_WIDGET (view), TRUE); gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE); + gtk_widget_set_redraw_on_allocate (GTK_WIDGET (view), FALSE); + gtk_container_set_resize_mode (GTK_CONTAINER (view), GTK_RESIZE_QUEUE); + + gtk_widget_set_events (GTK_WIDGET (view), + GDK_EXPOSURE_MASK | + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_SCROLL_MASK | + GDK_KEY_PRESS_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_ENTER_NOTIFY_MASK | + GDK_LEAVE_NOTIFY_MASK); view->start_page = -1; view->end_page = -1; @@ -4767,12 +4839,6 @@ ev_view_init (EvView *view) view->pending_scroll = SCROLL_TO_KEEP_POSITION; view->jump_to_find_result = TRUE; view->highlight_find_results = FALSE; - - g_signal_connect (view, "notify::hadjustment", G_CALLBACK (on_hadjustment_notify), NULL); - g_signal_connect (view, "notify::vadjustment", G_CALLBACK (on_vadjustment_notify), NULL); - - gtk_scrollable_set_hadjustment (GTK_SCROLLABLE (view), NULL); - gtk_scrollable_set_vadjustment (GTK_SCROLLABLE (view), NULL); } /*** Callbacks ***/ @@ -4800,10 +4866,7 @@ job_finished_cb (EvPixbufCache *pixbuf_cache, EvView *view) { if (region) { - GdkWindow *bin_window; - - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); - gdk_window_invalidate_region (bin_window, region, TRUE); + gdk_window_invalidate_region (gtk_widget_get_window (GTK_WIDGET (view)), region, TRUE); } else { gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -4865,7 +4928,7 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, "x", &child_x, "y", &child_y, NULL); - gtk_layout_move (GTK_LAYOUT (view), child, child_x + dx, child_y + dy); + gtk_fixed_move (GTK_FIXED (view), child, child_x + dx, child_y + dy); } g_list_free (children); @@ -4880,10 +4943,7 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, if (view->pending_resize) { gtk_widget_queue_draw (GTK_WIDGET (view)); } else { - GdkWindow *bin_window; - - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); - gdk_window_scroll (bin_window, dx, dy); + gdk_window_scroll (gtk_widget_get_window (GTK_WIDGET (view)), dx, dy); } gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); @@ -4911,7 +4971,7 @@ setup_caches (EvView *view) view->height_to_page_cache = ev_view_get_height_to_page_cache (view); view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->model, view->pixbuf_cache_size); view->page_cache = ev_page_cache_new (view->document); - if (view->a11y_enabled) { + if (ev_view_is_a11y_enabled (view)) { EvJobPageDataFlags flags = ev_page_cache_get_flags (view->page_cache); ev_page_cache_set_flags (view->page_cache, @@ -5948,16 +6008,14 @@ merge_selection_region (EvView *view, /* Redraw the damaged region! */ if (region) { - GdkWindow *bin_window; GdkRectangle page_area; GtkBorder border; - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); ev_view_get_page_extents (view, cur_page, &page_area, &border); cairo_region_translate (region, page_area.x + border.left - view->scroll_x, page_area.y + border.top - view->scroll_y); - gdk_window_invalidate_region (bin_window, region, TRUE); + gdk_window_invalidate_region (gtk_widget_get_window (GTK_WIDGET (view)), region, TRUE); cairo_region_destroy (region); } } @@ -6195,7 +6253,7 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) { GdkCursor *cursor = NULL; GtkWidget *widget; - GdkWindow *bin_window; + GdkWindow *window; if (view->cursor == new_cursor) { return; @@ -6203,13 +6261,13 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) view->cursor = new_cursor; - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); + window = gtk_widget_get_window (GTK_WIDGET (view)); widget = gtk_widget_get_toplevel (GTK_WIDGET (view)); cursor = ev_view_cursor_new (gtk_widget_get_display (widget), new_cursor); - gdk_window_set_cursor (bin_window, cursor); + gdk_window_set_cursor (window, cursor); gdk_flush (); if (cursor) - gdk_cursor_unref (cursor); + g_object_unref (cursor); } void