X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=bdf738f86b5e8cbc986ca0f5fa671a6d0d130d58;hb=e769474337c9a6ffdaed2327056e8de2f7ca9ee4;hp=0607771d476f689f75b741ee46c5c13f2a7fddd3;hpb=2d603e6e91cf2b8095cc94c26441bbfc15b4e59d;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 0607771d..bdf738f8 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 { @@ -80,13 +88,7 @@ typedef enum { #define SCROLL_TIME 150 /*** Scrolling ***/ -static void ev_view_set_scroll_adjustments (GtkLayout *layout, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); 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, @@ -154,11 +156,10 @@ 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_expose_event (GtkWidget *widget, - GdkEventExpose *event); +static gboolean ev_view_draw (GtkWidget *widget, + cairo_t *cr); static gboolean ev_view_popup_menu (GtkWidget *widget); static gboolean ev_view_button_press_event (GtkWidget *widget, GdkEventButton *event); @@ -178,10 +179,13 @@ static AtkObject *ev_view_get_accessible (GtkWidget *widget) /*** Drawing ***/ static void highlight_find_results (EvView *view, + cairo_t *cr, int page); static void highlight_forward_search_results (EvView *view, + cairo_t *cr, int page); static void focus_annotation (EvView *view, + cairo_t *cr, int page, GdkRectangle *clip); static void draw_one_page (EvView *view, @@ -213,7 +217,7 @@ static void on_adjustment_value_changed (GtkAdjustment /*** GObject ***/ static void ev_view_finalize (GObject *object); -static void ev_view_destroy (GtkObject *object); +static void ev_view_dispose (GObject *object); static void ev_view_class_init (EvViewClass *class); static void ev_view_init (EvView *view); @@ -279,7 +283,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" @@ -550,8 +555,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,47 +746,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 -ev_view_set_scroll_adjustments (GtkLayout *layout, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment) -{ - EvView *view = EV_VIEW (layout); - - set_scroll_adjustment (view, GTK_ORIENTATION_HORIZONTAL, hadjustment); - set_scroll_adjustment (view, GTK_ORIENTATION_VERTICAL, vadjustment); - - 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); + + g_object_notify (G_OBJECT (view), prop_name); } static void @@ -2218,14 +2216,14 @@ ev_view_form_field_choice_changed (GtkWidget *widget, field->changed = TRUE; } - if (GTK_IS_COMBO_BOX_ENTRY (widget)) { - gchar *text; - - text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget)); + if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (widget))) { + const gchar *text; + + text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget)))); if (!field_choice->text || (field_choice->text && g_ascii_strcasecmp (field_choice->text, text) != 0)) { g_free (field_choice->text); - field_choice->text = text; + field_choice->text = g_strdup (text); field->changed = TRUE; } } @@ -2332,8 +2330,10 @@ ev_view_form_field_choice_create_widget (EvView *view, view); } else if (field_choice->is_editable) { /* ComboBoxEntry */ gchar *text; - - choice = gtk_combo_box_entry_new_with_model (model, 0); + + /* FIXME once gtk bug 633050 is fixed */ + choice = g_object_new (GTK_TYPE_COMBO_BOX, "has-entry", TRUE, "model", model, NULL); + text = ev_document_forms_form_field_choice_get_text (EV_DOCUMENT_FORMS (view->document), field); if (text) { gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (choice))), text); @@ -2415,7 +2415,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); } @@ -3134,6 +3134,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) @@ -3159,8 +3183,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); @@ -3189,7 +3213,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); @@ -3201,7 +3225,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); @@ -3234,35 +3258,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) { @@ -3341,13 +3336,12 @@ find_selection_for_page (EvView *view, } static gboolean -ev_view_expose_event (GtkWidget *widget, - GdkEventExpose *event) +ev_view_draw (GtkWidget *widget, + cairo_t *cr) { - EvView *view = EV_VIEW (widget); - GdkWindow *bin_window; - cairo_t *cr; - gint i; + EvView *view = EV_VIEW (widget); + gint i; + GdkRectangle clip_rect; if (view->loading) { show_loading_window (view); @@ -3359,8 +3353,8 @@ ev_view_expose_event (GtkWidget *widget, if (view->document == NULL) return FALSE; - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); - cr = gdk_cairo_create (bin_window); + if (!gdk_cairo_get_clip_rectangle (cr, &clip_rect)) + return FALSE; for (i = view->start_page; i >= 0 && i <= view->end_page; i++) { GdkRectangle page_area; @@ -3373,22 +3367,20 @@ ev_view_expose_event (GtkWidget *widget, page_area.x -= view->scroll_x; page_area.y -= view->scroll_y; - draw_one_page (view, i, cr, &page_area, &border, &(event->area), &page_ready); + draw_one_page (view, i, cr, &page_area, &border, &clip_rect, &page_ready); if (page_ready && view->find_pages && view->highlight_find_results) - highlight_find_results (view, i); + highlight_find_results (view, cr, i); if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document)) show_annotation_windows (view, i); if (page_ready && view->focus_annotation) - focus_annotation (view, i, &event->area); + focus_annotation (view, cr, i, &clip_rect); if (page_ready && view->synctex_result) - highlight_forward_search_results (view, i); + highlight_forward_search_results (view, cr, i); } - cairo_destroy (cr); - - if (GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) - (* GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) (widget, event); + if (GTK_WIDGET_CLASS (ev_view_parent_class)->draw) + GTK_WIDGET_CLASS (ev_view_parent_class)->draw (widget, cr); return FALSE; } @@ -3866,15 +3858,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; @@ -4143,7 +4135,7 @@ ev_view_key_press_event (GtkWidget *widget, return FALSE; } - return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + return gtk_bindings_activate_event (G_OBJECT (widget), event); } static gint @@ -4203,22 +4195,21 @@ ev_view_style_set (GtkWidget *widget, static void draw_rubberband (EvView *view, - GdkWindow *window, + cairo_t *cr, const GdkRectangle *rect, gdouble alpha) { GtkStyle *style; - GdkColor *fill_color_gdk; + const GdkColor *fill_color_gdk; gdouble r, g, b; - cairo_t *cr; style = gtk_widget_get_style (GTK_WIDGET (view)); - fill_color_gdk = gdk_color_copy (&style->base[GTK_STATE_SELECTED]); + 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.; - cr = gdk_cairo_create (window); + cairo_save (cr); cairo_set_source_rgba (cr, r, g, b, alpha); cairo_rectangle (cr, @@ -4231,20 +4222,16 @@ draw_rubberband (EvView *view, cairo_set_source_rgb (cr, r, g, b); cairo_stroke (cr); - cairo_destroy (cr); - - gdk_color_free (fill_color_gdk); + cairo_restore (cr); } static void -highlight_find_results (EvView *view, int page) +highlight_find_results (EvView *view, + cairo_t *cr, + int page) { gint i, n_results = 0; - GdkWindow *bin_window; - - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); - n_results = ev_view_find_get_n_results (view, page); for (i = 0; i < n_results; i++) { @@ -4260,36 +4247,36 @@ highlight_find_results (EvView *view, int page) rectangle = ev_view_find_get_result (view, page, i); doc_rect_to_view_rect (view, page, rectangle, &view_rectangle); - draw_rubberband (view, bin_window, &view_rectangle, alpha); + draw_rubberband (view, cr, &view_rectangle, alpha); } } static void -highlight_forward_search_results (EvView *view, int page) +highlight_forward_search_results (EvView *view, + cairo_t *cr, + int page) { - GdkWindow *bin_window; GdkRectangle rect; - cairo_t *cr; EvMapping *mapping = view->synctex_result; if (GPOINTER_TO_INT (mapping->data) != page) return; - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); doc_rect_to_view_rect (view, page, &mapping->area, &rect); - cr = gdk_cairo_create (bin_window); + cairo_save (cr); cairo_set_source_rgb (cr, 1., 0., 0.); cairo_rectangle (cr, rect.x - view->scroll_x, rect.y - view->scroll_y, rect.width, rect.height); cairo_stroke (cr); - cairo_destroy (cr); + cairo_restore (cr); } static void focus_annotation (EvView *view, + cairo_t *cr, gint page, GdkRectangle *clip) { @@ -4302,13 +4289,14 @@ focus_annotation (EvView *view, return; doc_rect_to_view_rect (view, page, &mapping->area, &rect); - gtk_paint_focus (gtk_widget_get_style (widget), - gtk_layout_get_bin_window (GTK_LAYOUT (view)), - gtk_widget_get_state (widget), - NULL, widget, NULL, - rect.x - view->scroll_x, - rect.y - view->scroll_y, - rect.width + 1, rect.height + 1); + + 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); } static void @@ -4527,7 +4515,7 @@ ev_view_finalize (GObject *object) } static void -ev_view_destroy (GtkObject *object) +ev_view_dispose (GObject *object) { EvView *view = EV_VIEW (object); @@ -4583,9 +4571,68 @@ ev_view_destroy (GtkObject *object) view->loading_timeout = 0; } - ev_view_set_scroll_adjustments (GTK_LAYOUT (view), NULL, NULL); + gtk_scrollable_set_hadjustment (GTK_SCROLLABLE (view), NULL); + gtk_scrollable_set_vadjustment (GTK_SCROLLABLE (view), NULL); - GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object); + G_OBJECT_CLASS (ev_view_parent_class)->dispose (object); +} + +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; + } } static AtkObject * @@ -4625,14 +4672,15 @@ static void ev_view_class_init (EvViewClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); - GtkLayoutClass *layout_class = GTK_LAYOUT_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; - widget_class->expose_event = ev_view_expose_event; + widget_class->draw = ev_view_draw; widget_class->button_press_event = ev_view_button_press_event; widget_class->motion_notify_event = ev_view_motion_notify_event; widget_class->button_release_event = ev_view_button_release_event; @@ -4640,9 +4688,9 @@ 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; @@ -4652,12 +4700,14 @@ ev_view_class_init (EvViewClass *class) widget_class->popup_menu = ev_view_popup_menu; widget_class->query_tooltip = ev_view_query_tooltip; - gtk_object_class->destroy = ev_view_destroy; - - layout_class->set_scroll_adjustments = ev_view_set_scroll_adjustments; - 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, @@ -4748,7 +4798,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; @@ -4770,9 +4834,6 @@ ev_view_init (EvView *view) view->pending_scroll = SCROLL_TO_KEEP_POSITION; view->jump_to_find_result = TRUE; view->highlight_find_results = FALSE; - - gtk_layout_set_hadjustment (GTK_LAYOUT (view), NULL); - gtk_layout_set_vadjustment (GTK_LAYOUT (view), NULL); } /*** Callbacks ***/ @@ -4800,27 +4861,7 @@ job_finished_cb (EvPixbufCache *pixbuf_cache, EvView *view) { if (region) { - GdkWindow *bin_window; - - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); -#if GTK_CHECK_VERSION(2, 90, 5) - gdk_window_invalidate_region (bin_window, region, TRUE); -#else - { - GdkRegion *gdk_region = gdk_region_new (); - guint n_recs = cairo_region_num_rectangles (region); - guint i; - - for (i = 0; i < n_recs; i++) { - cairo_rectangle_int_t rect; - - cairo_region_get_rectangle (region, i, &rect); - gdk_region_union_with_rect (gdk_region, (GdkRectangle *)&rect); - } - gdk_window_invalidate_region (bin_window, gdk_region, TRUE); - gdk_region_destroy (gdk_region); - } -#endif + gdk_window_invalidate_region (gtk_widget_get_window (GTK_WIDGET (view)), region, TRUE); } else { gtk_widget_queue_draw (GTK_WIDGET (view)); } @@ -4882,7 +4923,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); @@ -4897,10 +4938,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); @@ -5965,33 +6003,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); -#if GTK_CHECK_VERSION(2, 90, 5) - gdk_window_invalidate_region (bin_window, region, TRUE); -#else - { - GdkRegion *gdk_region = gdk_region_new (); - guint n_recs = cairo_region_num_rectangles (region); - guint i; - - for (i = 0; i < n_recs; i++) { - cairo_rectangle_int_t rect; - - cairo_region_get_rectangle (region, i, &rect); - gdk_region_union_with_rect (gdk_region, (GdkRectangle *)&rect); - } - gdk_window_invalidate_region (bin_window, gdk_region, TRUE); - gdk_region_destroy (gdk_region); - } -#endif + gdk_window_invalidate_region (gtk_widget_get_window (GTK_WIDGET (view)), region, TRUE); cairo_region_destroy (region); } } @@ -6229,7 +6248,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; @@ -6237,10 +6256,10 @@ 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);