Fixes bug #542924. Makes enums static to fix Solaris build.

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 1a76442a910fb19c53c59407d084f80f6596d372..bc3cb980daf295efb03aad5d20d5f0fb6b504b65 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -320,6 +320,7 @@ static void       compute_selections                         (EvView
                                                              GdkPoint           *start,
                                                              GdkPoint           *stop);
 static void       clear_selection                            (EvView             *view);
                                                              GdkPoint           *start,
                                                              GdkPoint           *stop);
 static void       clear_selection                            (EvView             *view);

+static void       clear_link_selected                        (EvView             *view);

 static void       selection_free                             (EvViewSelection    *selection);
 static char*      get_selected_text                          (EvView             *ev_view);
 static void       ev_view_primary_get_cb                     (GtkClipboard       *clipboard,
 static void       selection_free                             (EvViewSelection    *selection);
 static char*      get_selected_text                          (EvView             *ev_view);
 static void       ev_view_primary_get_cb                     (GtkClipboard       *clipboard,


@@ -1658,9 +1659,9 @@ ev_view_form_field_get_region (EvView      *view,
        GList       *forms_mapping;
 
        forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
        GList       *forms_mapping;
 
        forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,

-                                                               field->page);
+                                                               field->page->index);

        ev_form_field_mapping_get_area (forms_mapping, field, &field_area);
        ev_form_field_mapping_get_area (forms_mapping, field, &field_area);

-       doc_rect_to_view_rect (view, field->page, &field_area, &view_area);
+       doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);

        view_area.x -= view->scroll_x;
        view_area.y -= view->scroll_y;
 
        view_area.x -= view->scroll_x;
        view_area.y -= view->scroll_y;
 


@@ -1711,7 +1712,7 @@ ev_view_form_field_button_create_widget (EvView      *view,
                         * we need to update also the region for the current selected item
                         */
                        forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
                         * we need to update also the region for the current selected item
                         */
                        forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,

-                                                                               field->page);
+                                                                               field->page->index);

                        for (l = forms_mapping; l; l = g_list_next (l)) {
                                EvFormField *button = ((EvFormFieldMapping *)(l->data))->field;
                                GdkRegion   *button_region;
                        for (l = forms_mapping; l; l = g_list_next (l)) {
                                EvFormField *button = ((EvFormFieldMapping *)(l->data))->field;
                                GdkRegion   *button_region;


@@ -1739,7 +1740,7 @@ ev_view_form_field_button_create_widget (EvView      *view,
 
        ev_pixbuf_cache_reload_page (view->pixbuf_cache,
                                     field_region,
 
        ev_pixbuf_cache_reload_page (view->pixbuf_cache,
                                     field_region,

-                                    field->page,
+                                    field->page->index,

                                     view->rotation,
                                     view->scale);
        gdk_region_destroy (field_region);
                                     view->rotation,
                                     view->scale);
        gdk_region_destroy (field_region);


@@ -1769,7 +1770,7 @@ ev_view_form_field_text_save (EvView    *view,
                field->changed = FALSE;
                ev_pixbuf_cache_reload_page (view->pixbuf_cache,
                                             field_region,
                field->changed = FALSE;
                ev_pixbuf_cache_reload_page (view->pixbuf_cache,
                                             field_region,

-                                            field->page,
+                                            field->page->index,

                                             view->rotation,
                                             view->scale);
                gdk_region_destroy (field_region);
                                             view->rotation,
                                             view->scale);
                gdk_region_destroy (field_region);


@@ -1890,7 +1891,7 @@ ev_view_form_field_choice_save (EvView    *view,
                field->changed = FALSE;
                ev_pixbuf_cache_reload_page (view->pixbuf_cache,
                                             field_region,
                field->changed = FALSE;
                ev_pixbuf_cache_reload_page (view->pixbuf_cache,
                                             field_region,

-                                            field->page,
+                                            field->page->index,

                                             view->rotation,
                                             view->scale);
                gdk_region_destroy (field_region);
                                             view->rotation,
                                             view->scale);
                gdk_region_destroy (field_region);


@@ -2107,10 +2108,10 @@ ev_view_handle_form_field (EvView      *view,
                                g_object_ref (field),
                                (GDestroyNotify)g_object_unref);
 
                                g_object_ref (field),
                                (GDestroyNotify)g_object_unref);
 

-       form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page);
+       form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page->index);

        ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
        
        ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
        

-       doc_rect_to_view_rect (view, field->page, &field_area, &view_area);
+       doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);

        view_area.x -= view->scroll_x;
        view_area.y -= view->scroll_y;
 
        view_area.x -= view->scroll_x;
        view_area.y -= view->scroll_y;
 


@@ -2310,10 +2311,10 @@ ev_view_size_allocate (GtkWidget      *widget,
                        continue;
 
                form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
                        continue;
 
                form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,

-                                                                            field->page);
+                                                                            field->page->index);

                ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
 
                ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
 

-               doc_rect_to_view_rect (view, field->page, &field_area, &view_area);
+               doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);

                view_area.x -= view->scroll_x;
                view_area.y -= view->scroll_y;
 
                view_area.x -= view->scroll_x;
                view_area.y -= view->scroll_y;
 


@@ -3178,6 +3179,7 @@ ev_view_button_release_event (GtkWidget      *widget,
        }
 
        if (view->selection_info.selections) {
        }
 
        if (view->selection_info.selections) {

+               clear_link_selected (view);

                ev_view_update_primary_selection (view);
                
                if (view->selection_info.in_drag) {
                ev_view_update_primary_selection (view);
                
                if (view->selection_info.in_drag) {


@@ -3438,6 +3440,8 @@ ev_view_key_press_event (GtkWidget   *widget,
        switch (event->keyval) {
                case GDK_b:
                case GDK_B:
        switch (event->keyval) {
                case GDK_b:
                case GDK_B:

+               case GDK_period:
+               case GDK_KP_Decimal:

                        view->presentation_state =
                                (view->presentation_state == EV_PRESENTATION_BLACK) ?
                                EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK;
                        view->presentation_state =
                                (view->presentation_state == EV_PRESENTATION_BLACK) ?
                                EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK;


@@ -3823,6 +3827,7 @@ ev_view_finalize (GObject *object)
        g_free (view->find_status);
 
        clear_selection (view);
        g_free (view->find_status);
 
        clear_selection (view);

+       clear_link_selected (view);

 
        if (view->image_dnd_info.image)
                g_object_unref (view->image_dnd_info.image);
 
        if (view->image_dnd_info.image)
                g_object_unref (view->image_dnd_info.image);


@@ -5716,15 +5721,19 @@ get_selected_text (EvView *view)
        EvRenderContext *rc;
 
        text = g_string_new (NULL);
        EvRenderContext *rc;
 
        text = g_string_new (NULL);

-       rc = ev_render_context_new (view->rotation, 1, view->scale);
+       rc = ev_render_context_new (NULL, view->rotation, view->scale);

 
        ev_document_doc_mutex_lock ();
 
        for (l = view->selection_info.selections; l != NULL; l = l->next) {
                EvViewSelection *selection = (EvViewSelection *)l->data;
 
        ev_document_doc_mutex_lock ();
 
        for (l = view->selection_info.selections; l != NULL; l = l->next) {
                EvViewSelection *selection = (EvViewSelection *)l->data;

+               EvPage *page;

                gchar *tmp;
 
                gchar *tmp;
 

-               ev_render_context_set_page (rc, selection->page);
+               page = ev_document_get_page (view->document, selection->page);
+               ev_render_context_set_page (rc, page);
+               g_object_unref (page);
+               

                tmp = ev_selection_get_selected_text (EV_SELECTION (view->document),
                                                      rc, selection->style,
                                                      &(selection->rect));
                tmp = ev_selection_get_selected_text (EV_SELECTION (view->document),
                                                      rc, selection->style,
                                                      &(selection->rect));


@@ -5733,28 +5742,36 @@ get_selected_text (EvView *view)
                g_free (tmp);
        }
 
                g_free (tmp);
        }
 

-       ev_document_doc_mutex_unlock ();
-

        g_object_unref (rc);
        
        g_object_unref (rc);
        

+       ev_document_doc_mutex_unlock ();
+       

        normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
        g_string_free (text, TRUE);
        return normalized_text;
 }
 
        normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
        g_string_free (text, TRUE);
        return normalized_text;
 }
 

+static void
+ev_view_clipboard_copy (EvView      *view,
+                       const gchar *text)
+{
+       GtkClipboard *clipboard;
+
+       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (view),
+                                             GDK_SELECTION_CLIPBOARD);
+       gtk_clipboard_set_text (clipboard, text, -1);
+}
+

 void
 ev_view_copy (EvView *ev_view)
 {
 void
 ev_view_copy (EvView *ev_view)
 {

-       GtkClipboard *clipboard;

        char *text;
 
        if (!EV_IS_SELECTION (ev_view->document))
                return;
 
        text = get_selected_text (ev_view);
        char *text;
 
        if (!EV_IS_SELECTION (ev_view->document))
                return;
 
        text = get_selected_text (ev_view);

-       clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
-                                             GDK_SELECTION_CLIPBOARD);
-       gtk_clipboard_set_text (clipboard, text, -1);
+       ev_view_clipboard_copy (ev_view, text);

        g_free (text);
 }
 
        g_free (text);
 }
 


@@ -5765,15 +5782,20 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
                        gpointer          data)
 {
        EvView *ev_view = EV_VIEW (data);
                        gpointer          data)
 {
        EvView *ev_view = EV_VIEW (data);

-       char *text;
-
-       if (!EV_IS_SELECTION (ev_view->document))
-               return;

 
 

-       text = get_selected_text (ev_view);
-       if (text) {
-               gtk_selection_data_set_text (selection_data, text, -1);
-               g_free (text);
+       if (ev_view->link_selected) {
+               gtk_selection_data_set_text (selection_data,
+                                            ev_link_action_get_uri (ev_view->link_selected),
+                                            -1);
+       } else if (EV_IS_SELECTION (ev_view->document) &&
+                  ev_view->selection_info.selections) {
+               gchar *text;
+               
+               text = get_selected_text (ev_view);
+               if (text) {
+                       gtk_selection_data_set_text (selection_data, text, -1);
+                       g_free (text);
+               }

        }
 }
 
        }
 }
 


@@ -5784,6 +5806,7 @@ ev_view_primary_clear_cb (GtkClipboard *clipboard,
        EvView *view = EV_VIEW (data);
 
        clear_selection (view);
        EvView *view = EV_VIEW (data);
 
        clear_selection (view);

+       clear_link_selected (view);

 }
 
 static void
 }
 
 static void


@@ -5794,7 +5817,7 @@ ev_view_update_primary_selection (EvView *ev_view)
        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
                                               GDK_SELECTION_PRIMARY);
 
        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
                                               GDK_SELECTION_PRIMARY);
 

-       if (ev_view->selection_info.selections) {
+       if (ev_view->selection_info.selections || ev_view->link_selected) {

                if (!gtk_clipboard_set_with_owner (clipboard,
                                                   clipboard_targets,
                                                   G_N_ELEMENTS (clipboard_targets),
                if (!gtk_clipboard_set_with_owner (clipboard,
                                                   clipboard_targets,
                                                   G_N_ELEMENTS (clipboard_targets),


@@ -5808,6 +5831,27 @@ ev_view_update_primary_selection (EvView *ev_view)
        }
 }
 
        }
 }
 

+static void
+clear_link_selected (EvView *view)
+{
+       if (view->link_selected) {
+               g_object_unref (view->link_selected);
+               view->link_selected = NULL;
+       }
+}
+
+void
+ev_view_copy_link_address (EvView       *view,
+                          EvLinkAction *action)
+{
+       clear_link_selected (view);
+       
+       ev_view_clipboard_copy (view, ev_link_action_get_uri (action));
+       
+       view->link_selected = g_object_ref (action);
+       ev_view_update_primary_selection (view);
+}
+

 /*** Cursor operations ***/
 
 static GdkCursor *
 /*** Cursor operations ***/
 
 static GdkCursor *