X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view.c;h=cbc6b4ac1286bace33bdc6d7218833bffe5ae680;hb=4de037ccccb4d836db43bf97fdaacf7c02ffb1f1;hp=71470fbe43c20b511a8a489436f40afca67579ff;hpb=70a15c80d722d7974328550498bd2cfc3cc03302;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index 71470fbe..cbc6b4ac 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -28,10 +28,11 @@ #include #include -#include "ev-mapping.h" +#include "ev-mapping-list.h" #include "ev-document-forms.h" #include "ev-document-images.h" #include "ev-document-links.h" +#include "ev-document-layers.h" #include "ev-document-misc.h" #include "ev-pixbuf-cache.h" #include "ev-page-cache.h" @@ -55,6 +56,8 @@ enum { SIGNAL_POPUP_MENU, SIGNAL_SELECTION_CHANGED, SIGNAL_SYNC_SOURCE, + SIGNAL_ANNOT_ADDED, + SIGNAL_LAYERS_CHANGED, N_SIGNALS }; @@ -64,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 { @@ -71,19 +82,25 @@ typedef enum { EV_VIEW_FIND_PREV } EvViewFindDirection; +typedef struct { + GtkWidget *widget; + + /* View coords */ + gint x; + gint y; + + /* Document */ + guint page; + EvRectangle doc_rect; +} EvViewChild; + #define ZOOM_IN_FACTOR 1.2 #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR) #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, @@ -151,11 +168,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); @@ -167,17 +183,22 @@ 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); /*** 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, gint page, cairo_t *cr, @@ -207,7 +228,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); @@ -273,7 +294,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_CONTAINER, + G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)) /* HeightToPage cache */ #define EV_HEIGHT_TO_PAGE_CACHE_KEY "ev-height-to-page-cache" @@ -473,7 +495,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; } @@ -544,8 +566,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; @@ -735,47 +757,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 @@ -785,7 +800,7 @@ add_scroll_binding_keypad (GtkBindingSet *binding_set, GtkScrollType scroll, gboolean horizontal) { - guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left; + guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left; gtk_binding_entry_add_signal (binding_set, keyval, modifiers, "binding_activated", 2, @@ -1462,11 +1477,11 @@ get_doc_point_from_location (EvView *view, } static void -ev_view_get_area_from_mapping (EvView *view, - guint page, - GList *mapping_list, - gconstpointer data, - GdkRectangle *area) +ev_view_get_area_from_mapping (EvView *view, + guint page, + EvMappingList *mapping_list, + gconstpointer data, + GdkRectangle *area) { EvMapping *mapping; @@ -1476,6 +1491,41 @@ ev_view_get_area_from_mapping (EvView *view, area->y -= view->scroll_y; } +static void +ev_view_put (EvView *view, + GtkWidget *child_widget, + gint x, + gint y, + guint page, + EvRectangle *doc_rect) +{ + EvViewChild *child; + + child = g_slice_new (EvViewChild); + + child->widget = child_widget; + child->x = x; + child->y = y; + child->page = page; + child->doc_rect = *doc_rect; + + gtk_widget_set_parent (child_widget, GTK_WIDGET (view)); + view->children = g_list_append (view->children, child); +} + +static void +ev_view_put_to_doc_rect (EvView *view, + GtkWidget *child_widget, + guint page, + EvRectangle *doc_rect) +{ + GdkRectangle area; + + doc_rect_to_view_rect (view, page, doc_rect, &area); + area.x -= view->scroll_x; + area.y -= view->scroll_y; + ev_view_put (view, child_widget, area.x, area.y, page, doc_rect); +} /*** Hyperref ***/ static EvLink * @@ -1485,7 +1535,7 @@ ev_view_get_link_at_location (EvView *view, { gint page = -1; gint x_new = 0, y_new = 0; - GList *link_mapping; + EvMappingList *link_mapping; if (!EV_IS_DOCUMENT_LINKS (view->document)) return NULL; @@ -1734,6 +1784,38 @@ ev_view_handle_link (EvView *view, EvLink *link) ev_view_goto_dest (view, dest); } break; + case EV_LINK_ACTION_TYPE_LAYERS_STATE: { + GList *show, *hide, *toggle; + GList *l; + EvDocumentLayers *document_layers; + + document_layers = EV_DOCUMENT_LAYERS (view->document); + + show = ev_link_action_get_show_list (action); + for (l = show; l; l = g_list_next (l)) { + ev_document_layers_show_layer (document_layers, EV_LAYER (l->data)); + } + + hide = ev_link_action_get_hide_list (action); + for (l = hide; l; l = g_list_next (l)) { + ev_document_layers_hide_layer (document_layers, EV_LAYER (l->data)); + } + + toggle = ev_link_action_get_toggle_list (action); + for (l = toggle; l; l = g_list_next (l)) { + EvLayer *layer = EV_LAYER (l->data); + + if (ev_document_layers_layer_is_visible (document_layers, layer)) { + ev_document_layers_hide_layer (document_layers, layer); + } else { + ev_document_layers_show_layer (document_layers, layer); + } + } + + g_signal_emit (view, signals[SIGNAL_LAYERS_CHANGED], 0); + ev_view_reload_page (view, view->current_page, NULL); + } + break; case EV_LINK_ACTION_TYPE_GOTO_REMOTE: case EV_LINK_ACTION_TYPE_EXTERNAL_URI: case EV_LINK_ACTION_TYPE_LAUNCH: @@ -1829,6 +1911,12 @@ ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) if (view->cursor == EV_VIEW_CURSOR_HIDDEN) return; + if (view->adding_annot) { + if (view->cursor != EV_VIEW_CURSOR_ADD) + ev_view_set_cursor (view, EV_VIEW_CURSOR_ADD); + return; + } + if (view->drag_info.in_drag) { if (view->cursor != EV_VIEW_CURSOR_DRAG) ev_view_set_cursor (view, EV_VIEW_CURSOR_DRAG); @@ -1863,7 +1951,8 @@ ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y) if (view->cursor == EV_VIEW_CURSOR_LINK || view->cursor == EV_VIEW_CURSOR_IBEAM || view->cursor == EV_VIEW_CURSOR_DRAG || - view->cursor == EV_VIEW_CURSOR_AUTOSCROLL) + view->cursor == EV_VIEW_CURSOR_AUTOSCROLL || + view->cursor == EV_VIEW_CURSOR_ADD) ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL); } @@ -1879,7 +1968,7 @@ ev_view_get_image_at_location (EvView *view, { gint page = -1; gint x_new = 0, y_new = 0; - GList *image_mapping; + EvMappingList *image_mapping; if (!EV_IS_DOCUMENT_IMAGES (view->document)) return NULL; @@ -1903,7 +1992,7 @@ ev_view_get_form_field_at_location (EvView *view, { gint page = -1; gint x_new = 0, y_new = 0; - GList *forms_mapping; + EvMappingList *forms_mapping; if (!EV_IS_DOCUMENT_FORMS (view->document)) return NULL; @@ -1923,8 +2012,8 @@ static cairo_region_t * ev_view_form_field_get_region (EvView *view, EvFormField *field) { - GdkRectangle view_area; - GList *forms_mapping; + GdkRectangle view_area; + EvMappingList *forms_mapping; forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, field->page->index); @@ -1962,8 +2051,9 @@ ev_view_form_field_button_create_widget (EvView *view, return NULL; case EV_FORM_FIELD_BUTTON_CHECK: case EV_FORM_FIELD_BUTTON_RADIO: { - gboolean state; - GList *forms_mapping, *l; + gboolean state; + EvMappingList *forms_mapping; + GList *l; state = ev_document_forms_form_field_button_get_state (EV_DOCUMENT_FORMS (view->document), field); @@ -1980,7 +2070,7 @@ ev_view_form_field_button_create_widget (EvView *view, */ forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, field->page->index); - for (l = forms_mapping; l; l = g_list_next (l)) { + for (l = ev_mapping_list_get_list (forms_mapping); l; l = g_list_next (l)) { EvFormField *button = ((EvMapping *)(l->data))->data; cairo_region_t *button_region; @@ -2061,6 +2151,16 @@ ev_view_form_field_text_changed (GtkWidget *widget, } } +static gboolean +ev_view_form_field_text_focus_out (GtkWidget *widget, + GdkEventFocus *event, + EvView *view) +{ + ev_view_form_field_text_save (view, widget); + + return FALSE; +} + static GtkWidget * ev_view_form_field_text_create_widget (EvView *view, EvFormField *field) @@ -2086,6 +2186,9 @@ ev_view_form_field_text_create_widget (EvView *view, g_free (txt); } + g_signal_connect (text, "focus-out-event", + G_CALLBACK (ev_view_form_field_text_focus_out), + view); g_signal_connect (text, "changed", G_CALLBACK (ev_view_form_field_text_changed), field); @@ -2103,7 +2206,10 @@ ev_view_form_field_text_create_widget (EvView *view, gtk_text_buffer_set_text (buffer, txt, -1); g_free (txt); } - + + g_signal_connect( buffer, "focus-out-event", + G_CALLBACK (ev_view_form_field_text_focus_out), + view); g_signal_connect (buffer, "changed", G_CALLBACK (ev_view_form_field_text_changed), field); @@ -2172,14 +2278,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; } } @@ -2286,8 +2392,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); @@ -2338,9 +2446,9 @@ ev_view_handle_form_field (EvView *view, gdouble x, gdouble y) { - GtkWidget *field_widget = NULL; - GList *form_field_mapping; - GdkRectangle view_area; + GtkWidget *field_widget = NULL; + EvMappingList *form_field_mapping; + EvMapping *mapping; if (field->is_read_only) return; @@ -2365,11 +2473,8 @@ ev_view_handle_form_field (EvView *view, form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, field->page->index); - ev_view_get_area_from_mapping (view, field->page->index, - form_field_mapping, - field, &view_area); - - gtk_layout_put (GTK_LAYOUT (view), field_widget, view_area.x, view_area.y); + mapping = ev_mapping_list_find (form_field_mapping, field); + ev_view_put_to_doc_rect (view, field_widget, field->page->index, &mapping->area); gtk_widget_show (field_widget); gtk_widget_grab_focus (field_widget); } @@ -2490,7 +2595,7 @@ ev_view_find_window_child_for_annot (EvView *view, continue; wannot = ev_annotation_window_get_annotation (EV_ANNOTATION_WINDOW (child->window)); - if (wannot == annot || strcmp (wannot->name, annot->name) == 0) + if (ev_annotation_equal (wannot, annot)) return child; } @@ -2573,37 +2678,73 @@ annotation_window_moved (EvAnnotationWindow *window, } static void -ev_view_annotation_save (EvView *view, - EvAnnotation *annot) +ev_view_annotation_save_contents (EvView *view, + GParamSpec *pspec, + EvAnnotation *annot) { if (!view->document) return; - if (!annot->changed) - return; + ev_document_doc_mutex_lock (); + ev_document_annotations_save_annotation (EV_DOCUMENT_ANNOTATIONS (view->document), + annot, EV_ANNOTATIONS_SAVE_CONTENTS); + ev_document_doc_mutex_unlock (); +} - ev_document_annotations_annotation_set_contents (EV_DOCUMENT_ANNOTATIONS (view->document), - annot, annot->contents); - annot->changed = FALSE; +static GtkWidget * +ev_view_create_annotation_window (EvView *view, + EvAnnotation *annot, + GtkWindow *parent) +{ + GtkWidget *window; + EvRectangle doc_rect; + GdkRectangle view_rect; + guint page; + + window = ev_annotation_window_new (annot, parent); + g_signal_connect (window, "grab_focus", + G_CALLBACK (annotation_window_grab_focus), + view); + g_signal_connect (window, "closed", + G_CALLBACK (annotation_window_closed), + view); + g_signal_connect (window, "moved", + G_CALLBACK (annotation_window_moved), + view); + g_signal_connect_swapped (annot, "notify::contents", + G_CALLBACK (ev_view_annotation_save_contents), + view); + g_object_set_data (G_OBJECT (annot), "popup", window); + + page = ev_annotation_get_page_index (annot); + ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (window), &doc_rect); + doc_rect_to_view_rect (view, page, &doc_rect, &view_rect); + view_rect.x -= view->scroll_x; + view_rect.y -= view->scroll_y; + + ev_view_window_child_put (view, window, page, + view_rect.x, view_rect.y, + doc_rect.x1, doc_rect.y1); + + return window; } static void show_annotation_windows (EvView *view, gint page) { - GList *annots, *l; - GtkWindow *parent; + EvMappingList *annots; + GList *l; + GtkWindow *parent; parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); annots = ev_page_cache_get_annot_mapping (view->page_cache, page); - for (l = annots; l && l->data; l = g_list_next (l)) { + for (l = ev_mapping_list_get_list (annots); l && l->data; l = g_list_next (l)) { EvAnnotation *annot; EvViewWindowChild *child; GtkWidget *window; - EvRectangle *doc_rect; - GdkRectangle view_rect; annot = ((EvMapping *)(l->data))->data; @@ -2627,30 +2768,7 @@ show_annotation_windows (EvView *view, g_object_set_data (G_OBJECT (annot), "popup", window); ev_view_window_child_move_with_parent (view, window); } else { - window = ev_annotation_window_new (annot, parent); - g_signal_connect (window, "grab_focus", - G_CALLBACK (annotation_window_grab_focus), - view); - g_signal_connect (window, "closed", - G_CALLBACK (annotation_window_closed), - view); - g_signal_connect (window, "moved", - G_CALLBACK (annotation_window_moved), - view); - g_object_set_data (G_OBJECT (annot), "popup", window); - - doc_rect = (EvRectangle *)ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (window)); - doc_rect_to_view_rect (view, page, doc_rect, &view_rect); - view_rect.x -= view->scroll_x; - view_rect.y -= view->scroll_y; - - ev_view_window_child_put (view, window, page, - view_rect.x, view_rect.y, - doc_rect->x1, doc_rect->y1); - - g_object_weak_ref (G_OBJECT (annot), - (GWeakNotify)ev_view_annotation_save, - view); + ev_view_create_annotation_window (view, annot, parent); } } } @@ -2659,11 +2777,12 @@ static void hide_annotation_windows (EvView *view, gint page) { - GList *annots, *l; + EvMappingList *annots; + GList *l; annots = ev_page_cache_get_annot_mapping (view->page_cache, page); - for (l = annots; l && l->data; l = g_list_next (l)) { + for (l = ev_mapping_list_get_list (annots); l && l->data; l = g_list_next (l)) { EvAnnotation *annot; GtkWidget *window; @@ -2685,7 +2804,7 @@ ev_view_get_annotation_at_location (EvView *view, { gint page = -1; gint x_new = 0, y_new = 0; - GList *annotations_mapping; + EvMappingList *annotations_mapping; if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document)) return NULL; @@ -2701,6 +2820,23 @@ ev_view_get_annotation_at_location (EvView *view, return NULL; } +static void +ev_view_annotation_show_popup_window (EvView *view, + GtkWidget *window) +{ + EvViewWindowChild *child; + + if (!window) + return; + + child = ev_view_get_window_child (view, window); + if (!child->visible) { + child->visible = TRUE; + ev_view_window_child_move (view, child, child->x, child->y); + gtk_widget_show (window); + } +} + static void ev_view_handle_annotation (EvView *view, EvAnnotation *annot, @@ -2712,21 +2848,13 @@ ev_view_handle_annotation (EvView *view, GtkWidget *window; window = g_object_get_data (G_OBJECT (annot), "popup"); - if (window) { - EvViewWindowChild *child; - - child = ev_view_get_window_child (view, window); - if (!child->visible) { - child->visible = TRUE; - ev_view_window_child_move (view, child, child->x, child->y); - gtk_widget_show (window); - } - } + ev_view_annotation_show_popup_window (view, window); } if (EV_IS_ANNOTATION_ATTACHMENT (annot)) { - EvAttachment *attachment = EV_ANNOTATION_ATTACHMENT (annot)->attachment; + EvAttachment *attachment; + attachment = ev_annotation_attachment_get_attachment (EV_ANNOTATION_ATTACHMENT (annot)); if (attachment) { GError *error = NULL; @@ -2743,6 +2871,144 @@ ev_view_handle_annotation (EvView *view, } } +static void +ev_view_create_annotation (EvView *view, + EvAnnotationType annot_type, + gint x, + gint y) +{ + EvAnnotation *annot; + GdkPoint point; + GdkRectangle page_area; + GtkBorder border; + EvRectangle doc_rect, popup_rect; + EvPage *page; + GdkColor color = { 0, 65535, 65535, 0 }; + GdkRectangle view_rect; + cairo_region_t *region; + + point.x = x; + point.y = y; + ev_view_get_page_extents (view, view->current_page, &page_area, &border); + view_point_to_doc_point (view, &point, &page_area, + &doc_rect.x1, &doc_rect.y1); + doc_rect.x2 = doc_rect.x1 + 24; + doc_rect.y2 = doc_rect.y1 + 24; + + ev_document_doc_mutex_lock (); + page = ev_document_get_page (view->document, view->current_page); + switch (annot_type) { + case EV_ANNOTATION_TYPE_TEXT: + annot = ev_annotation_text_new (page); + break; + case EV_ANNOTATION_TYPE_ATTACHMENT: + /* TODO */ + g_object_unref (page); + ev_document_doc_mutex_unlock (); + return; + default: + g_assert_not_reached (); + } + g_object_unref (page); + + ev_annotation_set_color (annot, &color); + + if (EV_IS_ANNOTATION_MARKUP (annot)) { + popup_rect.x1 = doc_rect.x2; + popup_rect.x2 = popup_rect.x1 + 200; + popup_rect.y1 = doc_rect.y2; + popup_rect.y2 = popup_rect.y1 + 150; + g_object_set (annot, + "rectangle", &popup_rect, + "has_popup", TRUE, + "popup_is_open", FALSE, + "label", g_get_real_name (), + "opacity", 1.0, + NULL); + } + ev_document_annotations_add_annotation (EV_DOCUMENT_ANNOTATIONS (view->document), + annot, &doc_rect); + ev_document_doc_mutex_unlock (); + + /* If the page didn't have annots, mark the cache as dirty */ + if (!ev_page_cache_get_annot_mapping (view->page_cache, view->current_page)) + ev_page_cache_mark_dirty (view->page_cache, view->current_page); + + if (EV_IS_ANNOTATION_MARKUP (annot)) { + GtkWindow *parent; + GtkWidget *window; + + parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))); + window = ev_view_create_annotation_window (view, annot, parent); + + /* Show the annot window the first time */ + ev_view_annotation_show_popup_window (view, window); + } + + doc_rect_to_view_rect (view, view->current_page, &doc_rect, &view_rect); + view_rect.x -= view->scroll_x; + view_rect.y -= view->scroll_y; + region = cairo_region_create_rectangle (&view_rect); + ev_view_reload_page (view, view->current_page, region); + cairo_region_destroy (region); + + g_signal_emit (view, signals[SIGNAL_ANNOT_ADDED], 0, annot); +} + +void +ev_view_focus_annotation (EvView *view, + EvMapping *annot_mapping) +{ + GdkRectangle view_rect; + EvAnnotation *annot; + guint page; + + if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document)) + return; + + if (view->focus_annotation == annot_mapping) + return; + + view->focus_annotation = annot_mapping; + annot = (EvAnnotation *)annot_mapping->data; + + page = ev_annotation_get_page_index (annot); + ev_document_model_set_page (view->model, page); + + doc_rect_to_view_rect (view, page, + &annot_mapping->area, &view_rect); + ensure_rectangle_is_visible (view, &view_rect); + gtk_widget_queue_draw (GTK_WIDGET (view)); +} + +void +ev_view_begin_add_annotation (EvView *view, + EvAnnotationType annot_type) +{ + if (annot_type == EV_ANNOTATION_TYPE_UNKNOWN) + return; + + if (view->adding_annot) + return; + + view->adding_annot = TRUE; + view->adding_annot_type = annot_type; + ev_view_set_cursor (view, EV_VIEW_CURSOR_ADD); +} + +void +ev_view_cancel_add_annotation (EvView *view) +{ + gint x, y; + + if (!view->adding_annot) + return; + + view->adding_annot = FALSE; + gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); + ev_view_handle_cursor_over_xy (view, x, y); +} + static gboolean ev_view_synctex_backward_search (EvView *view, gdouble x, @@ -2927,15 +3193,46 @@ 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) { EvView *view = EV_VIEW (widget); - GList *children, *l; + GList *l; gint root_x, root_y; - GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation); + gtk_widget_set_allocation (widget, allocation); + + if (gtk_widget_get_realized (widget)) + gdk_window_move_resize (gtk_widget_get_window (widget), + allocation->x, + allocation->y, + allocation->width, + allocation->height); if (!view->document) return; @@ -2951,9 +3248,9 @@ ev_view_size_allocate (GtkWidget *widget, ev_view_size_request (widget, &req); 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); @@ -2963,41 +3260,20 @@ ev_view_size_allocate (GtkWidget *widget, view->pending_point.x = 0; view->pending_point.y = 0; - children = gtk_container_get_children (GTK_CONTAINER (widget)); - for (l = children; l && l->data; l = g_list_next (l)) { - EvFormField *field; - GdkRectangle view_area; - GList *form_field_mapping; - GtkAllocation child_allocation; - GtkRequisition child_requisition; - GtkWidget *child = (GtkWidget *)l->data; - - field = g_object_get_data (G_OBJECT (child), "form-field"); - if (!field) + for (l = view->children; l && l->data; l = g_list_next (l)) { + GdkRectangle view_area; + EvViewChild *child = (EvViewChild *)l->data; + + if (!gtk_widget_get_visible (child->widget)) continue; - form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, - field->page->index); - ev_view_get_area_from_mapping (view, field->page->index, - form_field_mapping, - field, &view_area); - - gtk_widget_size_request (child, &child_requisition); - 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); - - gtk_container_child_get (GTK_CONTAINER (widget), - child, - "x", &child_allocation.x, - "y", &child_allocation.y, - 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); - } + doc_rect_to_view_rect (view, child->page, &child->doc_rect, &view_area); + view_area.x -= view->scroll_x; + view_area.y -= view->scroll_y; + + gtk_widget_set_size_request (child->widget, view_area.width, view_area.height); + gtk_widget_size_allocate (child->widget, &view_area); } - g_list_free (children); if (view->window_children) gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)), @@ -3010,7 +3286,7 @@ ev_view_size_allocate (GtkWidget *widget, child = (EvViewWindowChild *)l->data; - doc_rect = *ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (child->window)); + ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (child->window), &doc_rect); if (child->moved) { doc_rect.x1 = child->orig_x; doc_rect.y1 = child->orig_y; @@ -3027,35 +3303,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) { @@ -3133,14 +3380,45 @@ find_selection_for_page (EvView *view, return NULL; } +static void +ev_view_realize (GtkWidget *widget) +{ + GtkAllocation allocation; + GdkWindow *window; + GdkWindowAttr attributes; + gint attributes_mask; + + gtk_widget_set_realized (widget, TRUE); + + gtk_widget_get_allocation (widget, &allocation); + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.event_mask = gtk_widget_get_events (widget); + + attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; + + window = gdk_window_new (gtk_widget_get_parent_window (widget), + &attributes, attributes_mask); + gtk_widget_set_window (widget, window); + gdk_window_set_user_data (window, widget); + + gtk_style_context_set_background (gtk_widget_get_style_context (widget), + window); +} + 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); @@ -3152,8 +3430,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; @@ -3166,20 +3444,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, 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; } @@ -3229,9 +3507,9 @@ get_link_area (EvView *view, EvLink *link, GdkRectangle *area) { - GList *link_mapping; - gint page; - gint x_offset = 0, y_offset = 0; + EvMappingList *link_mapping; + gint page; + gint x_offset = 0, y_offset = 0; x += view->scroll_x; y += view->scroll_y; @@ -3251,9 +3529,9 @@ get_annot_area (EvView *view, EvAnnotation *annot, GdkRectangle *area) { - GList *annot_mapping; - gint page; - gint x_offset = 0, y_offset = 0; + EvMappingList *annot_mapping; + gint page; + gint x_offset = 0, y_offset = 0; x += view->scroll_x; y += view->scroll_y; @@ -3279,14 +3557,18 @@ ev_view_query_tooltip (GtkWidget *widget, gchar *text; annot = ev_view_get_annotation_at_location (view, x, y); - if (annot && annot->contents) { - GdkRectangle annot_area; + if (annot) { + const gchar *contents; - get_annot_area (view, x, y, annot, &annot_area); - gtk_tooltip_set_text (tooltip, annot->contents); - gtk_tooltip_set_tip_area (tooltip, &annot_area); + if ((contents = ev_annotation_get_contents (annot))) { + GdkRectangle annot_area; - return TRUE; + get_annot_area (view, x, y, annot, &annot_area); + gtk_tooltip_set_text (tooltip, contents); + gtk_tooltip_set_tip_area (tooltip, &annot_area); + + return TRUE; + } } link = ev_view_get_link_at_location (view, x, y); @@ -3300,10 +3582,13 @@ ev_view_query_tooltip (GtkWidget *widget, get_link_area (view, x, y, link, &link_area); gtk_tooltip_set_text (tooltip, text); gtk_tooltip_set_tip_area (tooltip, &link_area); + g_free (text); + + return TRUE; } g_free (text); - return TRUE; + return FALSE; } static void @@ -3354,13 +3639,15 @@ ev_view_button_press_event (GtkWidget *widget, window = EV_ANNOTATION_WINDOW (view->window_child_focus->window); annot = ev_annotation_window_get_annotation (window); ev_annotation_window_ungrab_focus (window); - ev_view_annotation_save (view, annot); view->window_child_focus = NULL; } view->pressed_button = event->button; view->selection_info.in_drag = FALSE; + if (view->adding_annot) + return FALSE; + if (view->scroll_info.autoscrolling) return TRUE; @@ -3408,6 +3695,9 @@ ev_view_button_press_event (GtkWidget *widget, gtk_widget_queue_draw (widget); } + if (view->focus_annotation) + view->focus_annotation = NULL; + if (EV_IS_SELECTION (view->document)) start_selection_for_event (view, event); } @@ -3435,14 +3725,7 @@ ev_view_button_press_event (GtkWidget *widget, static void ev_view_remove_all (EvView *view) { - GList *children, *child; - - children = gtk_container_get_children (GTK_CONTAINER (view)); - for (child = children; child && child->data; child = g_list_next (child)) { - gtk_container_remove (GTK_CONTAINER (view), - GTK_WIDGET (child->data)); - } - g_list_free (children); + gtk_container_foreach (GTK_CONTAINER (view), (GtkCallback) gtk_widget_destroy, NULL); } /*** Drag and Drop ***/ @@ -3645,15 +3928,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; @@ -3812,7 +4095,12 @@ ev_view_button_release_event (GtkWidget *widget, view->pressed_button = -1; return TRUE; - } + } + + if (view->pressed_button == 1 && event->state & GDK_CONTROL_MASK) { + view->pressed_button = -1; + return TRUE; + } if (view->drag_info.in_drag) { view->drag_info.release_timeout_id = @@ -3826,6 +4114,19 @@ ev_view_button_release_event (GtkWidget *widget, view->drag_info.in_drag = FALSE; + if (view->adding_annot && view->pressed_button == 1) { + view->adding_annot = FALSE; + ev_view_handle_cursor_over_xy (view, event->x, event->y); + view->pressed_button = -1; + + ev_view_create_annotation (view, + view->adding_annot_type, + event->x + view->scroll_x, + event->y + view->scroll_y); + + return FALSE; + } + if (view->pressed_button == 2) { ev_view_handle_cursor_over_xy (view, event->x, event->y); } @@ -3904,7 +4205,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 @@ -3951,37 +4252,30 @@ 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 ***/ static void draw_rubberband (EvView *view, - GdkWindow *window, + cairo_t *cr, const GdkRectangle *rect, gdouble alpha) { - GtkStyle *style; - 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]); - r = fill_color_gdk->red / 65535.; - g = fill_color_gdk->green / 65535.; - b = fill_color_gdk->blue / 65535.; + GtkStyleContext *context; + GdkRGBA color; - cr = gdk_cairo_create (window); + 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, @@ -3989,23 +4283,19 @@ 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_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++) { @@ -4021,32 +4311,54 @@ 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) +{ + GtkWidget *widget = GTK_WIDGET (view); + GdkRectangle rect; + EvMapping *mapping = view->focus_annotation; + EvAnnotation *annot = (EvAnnotation *)mapping->data; + + if (ev_annotation_get_page_index (annot) != page) + return; + + doc_rect_to_view_rect (view, page, &mapping->area, &rect); + + 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 @@ -4133,7 +4445,6 @@ draw_one_page (EvView *view, GdkRectangle *expose_area, gboolean *page_ready) { - GdkWindow *bin_window; GdkRectangle overlap; GdkRectangle real_page_area; gint current_page; @@ -4153,10 +4464,9 @@ draw_one_page (EvView *view, real_page_area.height -= (border->top + border->bottom); *page_ready = TRUE; - bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view)); current_page = ev_document_model_get_page (view->model); inverted_colors = ev_document_model_get_inverted_colors (view->model); - ev_document_misc_paint_one_page (bin_window, + ev_document_misc_paint_one_page (cr, GTK_WIDGET (view), page_area, border, page == current_page, @@ -4267,7 +4577,7 @@ ev_view_finalize (GObject *object) } static void -ev_view_destroy (GtkObject *object) +ev_view_dispose (GObject *object) { EvView *view = EV_VIEW (object); @@ -4323,21 +4633,81 @@ 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 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 @@ -4350,27 +4720,89 @@ ev_view_get_accessible (GtkWidget *widget) factory = atk_registry_get_factory (registry, derived_type); derived_atk_type = atk_object_factory_get_accessible_type (factory); - if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) - atk_registry_set_factory_type (registry, + if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) { + atk_registry_set_factory_type (registry, EV_TYPE_VIEW, ev_view_accessible_factory_get_type ()); + 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; +} + +/* GtkContainer */ +static void +ev_view_remove (GtkContainer *container, + GtkWidget *widget) +{ + EvView *view = EV_VIEW (container); + GList *tmp_list = view->children; + EvViewChild *child; + + while (tmp_list) { + child = tmp_list->data; + + if (child->widget == widget) { + gtk_widget_unparent (widget); + + view->children = g_list_remove_link (view->children, tmp_list); + g_list_free_1 (tmp_list); + g_slice_free (EvViewChild, child); + + return; + } + + tmp_list = tmp_list->next; + } +} + +static void +ev_view_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + EvView *view = EV_VIEW (container); + GList *tmp_list = view->children; + EvViewChild *child; + + while (tmp_list) { + child = tmp_list->data; + tmp_list = tmp_list->next; + + (* callback) (child->widget, callback_data); + } +} + 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); + GtkContainerClass *container_class = GTK_CONTAINER_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->realize = ev_view_realize; + 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; @@ -4378,24 +4810,29 @@ 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; widget_class->query_tooltip = ev_view_query_tooltip; - gtk_object_class->destroy = ev_view_destroy; + container_class->remove = ev_view_remove; + container_class->forall = ev_view_forall; - 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, @@ -4445,24 +4882,40 @@ ev_view_class_init (EvViewClass *class) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + signals[SIGNAL_ANNOT_ADDED] = g_signal_new ("annot-added", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvViewClass, annot_added), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + EV_TYPE_ANNOTATION); + signals[SIGNAL_LAYERS_CHANGED] = g_signal_new ("layers-changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvViewClass, layers_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, + G_TYPE_NONE); binding_set = gtk_binding_set_by_class (class); - add_scroll_binding_keypad (binding_set, GDK_Left, 0, GTK_SCROLL_STEP_BACKWARD, TRUE); - add_scroll_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_FORWARD, TRUE); - add_scroll_binding_keypad (binding_set, GDK_Left, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE); - add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, TRUE); - add_scroll_binding_keypad (binding_set, GDK_Up, 0, GTK_SCROLL_STEP_BACKWARD, FALSE); - add_scroll_binding_keypad (binding_set, GDK_Down, 0, GTK_SCROLL_STEP_FORWARD, FALSE); - add_scroll_binding_keypad (binding_set, GDK_Up, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE); - add_scroll_binding_keypad (binding_set, GDK_Down, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, FALSE); - gtk_binding_entry_add_signal (binding_set, GDK_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, + add_scroll_binding_keypad (binding_set, GDK_KEY_Left, 0, GTK_SCROLL_STEP_BACKWARD, TRUE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_STEP_FORWARD, TRUE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Left, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, TRUE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Up, 0, GTK_SCROLL_STEP_BACKWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Down, 0, GTK_SCROLL_STEP_FORWARD, FALSE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Up, GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE); + add_scroll_binding_keypad (binding_set, GDK_KEY_Down, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP, FALSE); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE); - gtk_binding_entry_add_signal (binding_set, GDK_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE); - gtk_binding_entry_add_signal (binding_set, GDK_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE); - gtk_binding_entry_add_signal (binding_set, GDK_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE); } @@ -4470,7 +4923,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; @@ -4492,9 +4959,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 ***/ @@ -4522,10 +4986,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)); } @@ -4553,12 +5014,13 @@ static void on_adjustment_value_changed (GtkAdjustment *adjustment, EvView *view) { + GtkWidget *widget = GTK_WIDGET (view); int dx = 0, dy = 0; gint x, y; gint value; - GList *children, *l; + GList *l; - if (!gtk_widget_get_realized (GTK_WIDGET (view))) + if (!gtk_widget_get_realized (widget)) return; if (view->hadjustment) { @@ -4577,19 +5039,14 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, view->scroll_y = 0; } - children = gtk_container_get_children (GTK_CONTAINER (view)); - for (l = children; l && l->data; l = g_list_next (l)) { - gint child_x, child_y; - GtkWidget *child = (GtkWidget *)l->data; - - gtk_container_child_get (GTK_CONTAINER (view), - child, - "x", &child_x, - "y", &child_y, - NULL); - gtk_layout_move (GTK_LAYOUT (view), child, child_x + dx, child_y + dy); + for (l = view->children; l && l->data; l = g_list_next (l)) { + EvViewChild *child = (EvViewChild *)l->data; + + child->x += dx; + child->y += dy; + if (gtk_widget_get_visible (child->widget) && gtk_widget_get_visible (widget)) + gtk_widget_queue_resize (widget); } - g_list_free (children); for (l = view->window_children; l && l->data; l = g_list_next (l)) { EvViewWindowChild *child; @@ -4598,17 +5055,14 @@ on_adjustment_value_changed (GtkAdjustment *adjustment, ev_view_window_child_move (view, child, child->x + dx, child->y + dy); } - + if (view->pending_resize) { - gtk_widget_queue_draw (GTK_WIDGET (view)); + gtk_widget_queue_draw (widget); } 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 (widget), dx, dy); } - gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y); + gtk_widget_get_pointer (widget, &x, &y); ev_view_handle_cursor_over_xy (view, x, y); if (view->document) @@ -4633,6 +5087,14 @@ 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 (ev_view_is_a11y_enabled (view)) { + EvJobPageDataFlags flags = ev_page_cache_get_flags (view->page_cache); + + ev_page_cache_set_flags (view->page_cache, + flags | + EV_PAGE_DATA_INCLUDE_TEXT_LAYOUT | + EV_PAGE_DATA_INCLUDE_TEXT); + } inverted_colors = ev_document_model_get_inverted_colors (view->model); ev_pixbuf_cache_set_inverted_colors (view->pixbuf_cache, inverted_colors); g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view); @@ -4772,6 +5234,7 @@ ev_view_document_changed_cb (EvDocumentModel *model, if (document != view->document) { gint current_page; + ev_view_remove_all (view); clear_caches (view); if (view->document) { @@ -5606,12 +6069,14 @@ merge_selection_region (EvView *view, /* Now we figure out what needs redrawing */ if (old_sel && new_sel) { if (old_sel->covered_region && new_sel->covered_region) { - cairo_region_t *tbr; - /* We only want to redraw the areas that have * changed, so we xor the old and new regions * and redraw if it's different */ region = cairo_region_copy (old_sel->covered_region); +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 12) + cairo_region_xor (region, new_sel->covered_region); +#else + cairo_region_t *tbr; tbr = cairo_region_copy (new_sel->covered_region); /* xor old_sel, new_sel*/ @@ -5619,6 +6084,7 @@ merge_selection_region (EvView *view, cairo_region_subtract (region, new_sel->covered_region); cairo_region_union (region, tbr); cairo_region_destroy (tbr); +#endif if (cairo_region_is_empty (region)) { cairo_region_destroy (region); @@ -5659,16 +6125,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); } } @@ -5906,7 +6370,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; @@ -5914,13 +6378,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