Format string is corrected, fixes bug #397129.

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

diff --git a/shell/ev-view.c b/shell/ev-view.c
index d83f5724b32d1c51892b843ba70a6b471c71ac52..98be15fd92d90f85b4a66e6bc7be82099bf10b7c 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -35,14 +35,15 @@
 #include "ev-utils.h"
 #include "ev-selection.h"
 #include "ev-document-links.h"
 #include "ev-utils.h"
 #include "ev-selection.h"
 #include "ev-document-links.h"

+#include "ev-document-images.h"

 #include "ev-document-find.h"
 #include "ev-document-transition.h"
 #include "ev-document-misc.h"
 #include "ev-document-find.h"
 #include "ev-document-transition.h"
 #include "ev-document-misc.h"

-#include "ev-debug.h"

 #include "ev-job-queue.h"
 #include "ev-page-cache.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-tooltip.h"
 #include "ev-job-queue.h"
 #include "ev-page-cache.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-tooltip.h"

+#include "ev-application.h"

 
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
 
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))


@@ -71,6 +72,12 @@ enum {
        N_SIGNALS,
 };
 
        N_SIGNALS,
 };
 

+enum {
+       TARGET_DND_URI,
+       TARGET_DND_TEXT,
+       TARGET_DND_IMAGE
+};
+

 enum {
        TARGET_STRING,
        TARGET_TEXT,
 enum {
        TARGET_STRING,
        TARGET_TEXT,


@@ -79,13 +86,17 @@ enum {
        TARGET_TEXT_BUFFER_CONTENTS
 };
 
        TARGET_TEXT_BUFFER_CONTENTS
 };
 

-static const GtkTargetEntry targets[] = {
+static const GtkTargetEntry clipboard_targets[] = {

        { "STRING", 0, TARGET_STRING },
        { "TEXT",   0, TARGET_TEXT },
        { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
        { "UTF8_STRING", 0, TARGET_UTF8_STRING },
 };
 
        { "STRING", 0, TARGET_STRING },
        { "TEXT",   0, TARGET_TEXT },
        { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
        { "UTF8_STRING", 0, TARGET_UTF8_STRING },
 };
 

+static const GtkTargetEntry view_drop_targets[] = {
+       { "text/uri-list", 0, 0 }
+};
+

 static guint signals[N_SIGNALS];
 
 typedef enum {
 static guint signals[N_SIGNALS];
 
 typedef enum {


@@ -111,9 +122,6 @@ static void       view_update_range_and_current_page         (EvView
 static void       set_scroll_adjustment                      (EvView             *view,
                                                              GtkOrientation      orientation,
                                                              GtkAdjustment      *adjustment);
 static void       set_scroll_adjustment                      (EvView             *view,
                                                              GtkOrientation      orientation,
                                                              GtkAdjustment      *adjustment);

-static void       ev_view_set_scroll_adjustments             (EvView             *view,
-                                                             GtkAdjustment      *hadjustment,
-                                                             GtkAdjustment      *vadjustment);

 static void       add_scroll_binding_keypad                  (GtkBindingSet      *binding_set,
                                                              guint               keyval,
                                                              GdkModifierType modifiers,
 static void       add_scroll_binding_keypad                  (GtkBindingSet      *binding_set,
                                                              guint               keyval,
                                                              GdkModifierType modifiers,


@@ -1108,6 +1116,9 @@ ev_view_get_link_at_location (EvView  *view,
        gint x_offset = 0, y_offset = 0;
        gint x_new = 0, y_new = 0;
        GList *link_mapping;
        gint x_offset = 0, y_offset = 0;
        gint x_new = 0, y_new = 0;
        GList *link_mapping;

+
+       if (!EV_IS_DOCUMENT_LINKS (view->document))
+               return NULL;

        
        x += view->scroll_x;
        y += view->scroll_y;
        
        x += view->scroll_x;
        y += view->scroll_y;


@@ -1503,6 +1514,40 @@ handle_link_over_xy (EvView *view, gint x, gint y)
        return;
 }
 
        return;
 }
 

+/*** Images ***/
+static EvImage *
+ev_view_get_image_at_location (EvView  *view,
+                              gdouble  x,
+                              gdouble  y)
+{
+       gint page = -1;
+       gint x_offset = 0, y_offset = 0;
+       gint x_new = 0, y_new = 0;
+       GList *image_mapping;
+
+       if (!EV_IS_DOCUMENT_IMAGES (view->document))
+               return NULL;
+
+       x += view->scroll_x;
+       y += view->scroll_y;
+
+       find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
+
+       if (page == -1)
+               return NULL;
+
+       if (get_doc_point_from_offset (view, page, x_offset,
+                                      y_offset, &x_new, &y_new) == FALSE)
+               return NULL;
+
+       image_mapping = ev_pixbuf_cache_get_image_mapping (view->pixbuf_cache, page);
+
+       if (image_mapping)
+               return ev_image_mapping_find (image_mapping, x_new, y_new);
+       else
+               return NULL;
+}
+

 /*** GtkWidget implementation ***/
 
 static void
 /*** GtkWidget implementation ***/
 
 static void


@@ -1659,6 +1704,8 @@ ev_view_size_allocate (GtkWidget      *widget,
 {
        EvView *view = EV_VIEW (widget);
 
 {
        EvView *view = EV_VIEW (widget);
 

+       GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation);
+       

        if (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
            view->sizing_mode == EV_SIZING_BEST_FIT) {
 
        if (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
            view->sizing_mode == EV_SIZING_BEST_FIT) {
 


@@ -1675,8 +1722,6 @@ ev_view_size_allocate (GtkWidget      *widget,
 
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
        view->pending_resize = FALSE;
 
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
        view->pending_resize = FALSE;

-
-       GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation);

 }
 
 static void
 }
 
 static void


@@ -1687,7 +1732,6 @@ ev_view_realize (GtkWidget *widget)
 
        GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
 
        GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 

-

        attributes.window_type = GDK_WINDOW_CHILD;
        attributes.wclass = GDK_INPUT_OUTPUT;
        attributes.visual = gtk_widget_get_visual (widget);
        attributes.window_type = GDK_WINDOW_CHILD;
        attributes.wclass = GDK_INPUT_OUTPUT;
        attributes.visual = gtk_widget_get_visual (widget);


@@ -1895,17 +1939,38 @@ ev_view_expose_event (GtkWidget      *widget,
        return FALSE;
 }
 
        return FALSE;
 }
 

+static gboolean
+ev_view_do_popup_menu (EvView *view,
+                      gdouble x,
+                      gdouble y)
+{
+       EvLink  *link;
+       EvImage *image;
+
+       image = ev_view_get_image_at_location (view, x, y);
+       if (image) {
+               g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, image);
+               return TRUE;
+       }
+
+       link = ev_view_get_link_at_location (view, x, y);
+       if (link) {
+               g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link);
+               return TRUE;
+       }
+
+       g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL);
+
+       return TRUE;
+}
+

 static gboolean
 ev_view_popup_menu (GtkWidget *widget)
 {
 static gboolean
 ev_view_popup_menu (GtkWidget *widget)
 {

-    gint x, y;
-    EvLink *link;
-    EvView *view = EV_VIEW (widget);
-    
-    gtk_widget_get_pointer (widget, &x, &y);
-    link = ev_view_get_link_at_location (view, x, y);
-    g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link);
-    return TRUE;
+       gint x, y;
+       
+       gtk_widget_get_pointer (widget, &x, &y);
+       return ev_view_do_popup_menu (EV_VIEW (widget), x, y);

 }
 
 static gboolean
 }
 
 static gboolean


@@ -1913,7 +1978,6 @@ ev_view_button_press_event (GtkWidget      *widget,
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);

-       EvLink *link;

        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);
        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);


@@ -1923,7 +1987,9 @@ ev_view_button_press_event (GtkWidget      *widget,
        view->selection_info.in_drag = FALSE;
        
        switch (event->button) {
        view->selection_info.in_drag = FALSE;
        
        switch (event->button) {

-               case 1:
+               case 1: {
+                       EvImage *image;
+

                        if (view->selection_info.selections) {
                                if (location_in_selected_text (view,
                                                               event->x + view->scroll_x,
                        if (view->selection_info.selections) {
                                if (location_in_selected_text (view,
                                                               event->x + view->scroll_x,


@@ -1934,11 +2000,19 @@ ev_view_button_press_event (GtkWidget      *widget,
                                }
                                
                                gtk_widget_queue_draw (widget);
                                }
                                
                                gtk_widget_queue_draw (widget);

+                       } else if ((image = ev_view_get_image_at_location (view, event->x, event->y))) {
+                               if (view->image_dnd_info.image)
+                                       g_object_unref (view->image_dnd_info.image);
+                               view->image_dnd_info.image = g_object_ref (image);
+                               view->image_dnd_info.in_drag = TRUE;
+
+                               view->image_dnd_info.start.x = event->x + view->scroll_x;
+                               view->image_dnd_info.start.y = event->y + view->scroll_y;

                        }
 
                        view->selection_info.start.x = event->x + view->scroll_x;
                        view->selection_info.start.y = event->y + view->scroll_y;
                        }
 
                        view->selection_info.start.x = event->x + view->scroll_x;
                        view->selection_info.start.y = event->y + view->scroll_y;

-                       
+               }                       

                        return TRUE;
                case 2:
                        /* use root coordinates as reference point because
                        return TRUE;
                case 2:
                        /* use root coordinates as reference point because


@@ -1952,14 +2026,13 @@ ev_view_button_press_event (GtkWidget      *widget,
 
                        return TRUE;
                case 3:
 
                        return TRUE;
                case 3:

-                       link = ev_view_get_link_at_location (view, event->x, event->y);
-                       g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link);
-                       return TRUE;
+                       return ev_view_do_popup_menu (view, event->x, event->y);

        }
        
        return FALSE;
 }
 
        }
        
        return FALSE;
 }
 

+/*** Drag and Drop ***/

 static void
 ev_view_drag_data_get (GtkWidget        *widget,
                       GdkDragContext   *context,
 static void
 ev_view_drag_data_get (GtkWidget        *widget,
                       GdkDragContext   *context,


@@ -1969,18 +2042,95 @@ ev_view_drag_data_get (GtkWidget        *widget,
 {
        EvView *view = EV_VIEW (widget);
 
 {
        EvView *view = EV_VIEW (widget);
 

-       if (view->selection_info.selections &&
-           ev_document_can_get_text (view->document)) {
-               gchar *text;
+       switch (info) {
+               case TARGET_DND_TEXT:
+                       if (view->selection_info.selections &&
+                           ev_document_can_get_text (view->document)) {
+                               gchar *text;
+
+                               text = get_selected_text (view);
+                               
+                               gtk_selection_data_set_text (selection_data,
+                                                            text,
+                                                            strlen (text));
+                               
+                               g_free (text);
+                       }
+                       break;
+               case TARGET_DND_IMAGE:
+                       if (view->image_dnd_info.image) {
+                               GdkPixbuf *pixbuf;
+
+                               pixbuf = ev_image_get_pixbuf (view->image_dnd_info.image);
+                               gtk_selection_data_set_pixbuf (selection_data, pixbuf);
+                       }
+                       break;
+               case TARGET_DND_URI:
+                       if (view->image_dnd_info.image) {
+                               const gchar *tmp_uri;
+                               gchar      **uris;

 
 

-               text = get_selected_text (view);
+                               tmp_uri = ev_image_save_tmp (view->image_dnd_info.image);

 
 

-               gtk_selection_data_set_text (selection_data, text, strlen (text));
+                               uris = g_new0 (gchar *, 2);
+                               uris[0] = (gchar *)tmp_uri;
+                               
+                               gtk_selection_data_set_uris (selection_data, uris);

 
 

-               g_free (text);
+                               /* g_free instead of g_strfreev since tmp_uri is const */ 
+                               g_free (uris);
+                       }

        }
 }
 
        }
 }
 

+static gboolean
+ev_view_drag_motion (GtkWidget      *widget,
+                    GdkDragContext *context,
+                    gint            x,
+                    gint            y,
+                    guint           time)
+{
+       if (gtk_drag_get_source_widget (context) == widget)
+               gdk_drag_status (context, 0, time);
+       else
+               gdk_drag_status (context, context->suggested_action, time);
+       
+       return TRUE;
+}
+                    
+static void
+ev_view_drag_data_received (GtkWidget          *widget,
+                           GdkDragContext     *context,
+                           gint                x,
+                           gint                y,
+                           GtkSelectionData   *selection_data,
+                           guint               info,
+                           guint               time)
+{
+       gchar  **uris;
+       gint     i = 0;
+       GSList  *uri_list = NULL;
+
+       uris = gtk_selection_data_get_uris (selection_data);
+       if (!uris) {
+               gtk_drag_finish (context, FALSE, FALSE, time);
+               return;
+       }
+
+       for (i = 0; uris[i]; i++) {
+               uri_list = g_slist_prepend (uri_list, (gpointer) uris[i]);
+       }
+       
+       ev_application_open_uri_list (EV_APP, uri_list,
+                                     gtk_widget_get_screen (widget),
+                                     0);
+       gtk_drag_finish (context, TRUE, FALSE, time);
+       
+       g_strfreev (uris);
+       g_slist_free (uri_list);
+}
+
+

 static gboolean
 selection_update_idle_cb (EvView *view)
 {
 static gboolean
 selection_update_idle_cb (EvView *view)
 {


@@ -2048,19 +2198,38 @@ ev_view_motion_notify_event (GtkWidget      *widget,
                                              view->selection_info.start.x,
                                              view->selection_info.start.y,
                                              x, y)) {
                                              view->selection_info.start.x,
                                              view->selection_info.start.y,
                                              x, y)) {

-                       GdkDragContext *context;

                        GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
 
                        GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
 

-                       gtk_target_list_add_text_targets (target_list, 0);
+                       gtk_target_list_add_text_targets (target_list, TARGET_DND_TEXT);

 
 

-                       context = gtk_drag_begin (widget, target_list,
-                                                 GDK_ACTION_COPY,
-                                                 1, (GdkEvent *)event);
+                       gtk_drag_begin (widget, target_list,
+                                       GDK_ACTION_COPY,
+                                       1, (GdkEvent *)event);

 
                        view->selection_info.in_drag = FALSE;
 
                        gtk_target_list_unref (target_list);
 
 
                        view->selection_info.in_drag = FALSE;
 
                        gtk_target_list_unref (target_list);
 

+                       return TRUE;
+               }
+       } else if (view->image_dnd_info.in_drag) {
+               if (gtk_drag_check_threshold (widget,
+                                             view->selection_info.start.x,
+                                             view->selection_info.start.y,
+                                             x, y)) {
+                       GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
+
+                       gtk_target_list_add_uri_targets (target_list, TARGET_DND_URI);
+                       gtk_target_list_add_image_targets (target_list, TARGET_DND_IMAGE, TRUE);
+
+                       gtk_drag_begin (widget, target_list,
+                                       GDK_ACTION_COPY,
+                                       1, (GdkEvent *)event);
+
+                       view->image_dnd_info.in_drag = FALSE;
+
+                       gtk_target_list_unref (target_list);
+

                        return TRUE;
                }
        }
                        return TRUE;
                }
        }


@@ -2153,6 +2322,7 @@ ev_view_button_release_event (GtkWidget      *widget,
 
        view->pressed_button = -1;
        view->drag_info.in_drag = FALSE;
 
        view->pressed_button = -1;
        view->drag_info.in_drag = FALSE;

+       view->image_dnd_info.in_drag = FALSE;

 
        if (view->selection_scroll_id) {
            g_source_remove (view->selection_scroll_id);
 
        if (view->selection_scroll_id) {
            g_source_remove (view->selection_scroll_id);


@@ -2773,13 +2943,15 @@ ev_view_finalize (GObject *object)
 {
        EvView *view = EV_VIEW (object);
 
 {
        EvView *view = EV_VIEW (object);
 

-       LOG ("Finalize");
-

        g_free (view->status);
        g_free (view->find_status);
 
        clear_selection (view);
 
        g_free (view->status);
        g_free (view->find_status);
 
        clear_selection (view);
 

+       if (view->image_dnd_info.image)
+               g_object_unref (view->image_dnd_info.image);
+       view->image_dnd_info.image = NULL;
+

        G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
 
        G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
 }
 


@@ -2965,6 +3137,8 @@ ev_view_class_init (EvViewClass *class)
        widget_class->leave_notify_event = ev_view_leave_notify_event;
        widget_class->style_set = ev_view_style_set;
        widget_class->drag_data_get = ev_view_drag_data_get;
        widget_class->leave_notify_event = ev_view_leave_notify_event;
        widget_class->style_set = ev_view_style_set;
        widget_class->drag_data_get = ev_view_drag_data_get;

+       widget_class->drag_motion = ev_view_drag_motion;
+       widget_class->drag_data_received = ev_view_drag_data_received;

        widget_class->popup_menu = ev_view_popup_menu;
        gtk_object_class->destroy = ev_view_destroy;
 
        widget_class->popup_menu = ev_view_popup_menu;
        gtk_object_class->destroy = ev_view_destroy;
 


@@ -3075,20 +3249,20 @@ ev_view_class_init (EvViewClass *class)
                                         PROP_ZOOM,
                                         g_param_spec_double ("zoom",
                                                              "Zoom factor",
                                         PROP_ZOOM,
                                         g_param_spec_double ("zoom",
                                                              "Zoom factor",

-                                                              "Zoom factor",
-                                                              MIN_SCALE,
-                                                              MAX_SCALE,
-                                                              1.0,
-                                                              G_PARAM_READWRITE));
+                                                             "Zoom factor",
+                                                             0,
+                                                             G_MAXDOUBLE,
+                                                             1.0,
+                                                             G_PARAM_READWRITE));

        g_object_class_install_property (object_class,
                                         PROP_ROTATION,
                                         g_param_spec_double ("rotation",
                                                              "Rotation",
        g_object_class_install_property (object_class,
                                         PROP_ROTATION,
                                         g_param_spec_double ("rotation",
                                                              "Rotation",

-                                                              "Rotation",
-                                                              0,
-                                                              360,
-                                                              0,
-                                                              G_PARAM_READWRITE));
+                                                             "Rotation",
+                                                             0,
+                                                             360,
+                                                             0,
+                                                             G_PARAM_READWRITE));

        g_object_class_install_property (object_class,
                                         PROP_HAS_SELECTION,
                                         g_param_spec_boolean ("has-selection",
        g_object_class_install_property (object_class,
                                         PROP_HAS_SELECTION,
                                         g_param_spec_boolean ("has-selection",


@@ -3132,6 +3306,12 @@ ev_view_init (EvView *view)
        view->sizing_mode = EV_SIZING_FIT_WIDTH;
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
        view->jump_to_find_result = TRUE;
        view->sizing_mode = EV_SIZING_FIT_WIDTH;
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
        view->jump_to_find_result = TRUE;

+
+       gtk_drag_dest_set (GTK_WIDGET (view),
+                          GTK_DEST_DEFAULT_ALL,
+                          view_drop_targets,
+                          G_N_ELEMENTS (view_drop_targets),
+                          GDK_ACTION_COPY);

 }
 
 /*** Callbacks ***/
 }
 
 /*** Callbacks ***/


@@ -3310,7 +3490,7 @@ ev_view_set_zoom (EvView   *view,
        else
                scale = factor;
 
        else
                scale = factor;
 

-       scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
+       scale = CLAMP (scale, view->min_scale, view->max_scale);

 
        if (ABS (view->scale - scale) < EPSILON)
                return;
 
        if (ABS (view->scale - scale) < EPSILON)
                return;


@@ -3329,6 +3509,18 @@ ev_view_get_zoom (EvView *view)
        return view->scale;
 }
 
        return view->scale;
 }
 

+void
+ev_view_set_screen_dpi (EvView  *view,
+                       gdouble  dpi)
+{
+       g_return_if_fail (EV_IS_VIEW (view));
+       g_return_if_fail (dpi > 0);
+
+       view->dpi = dpi;
+       view->min_scale = MIN_SCALE * dpi / 72.0;
+       view->max_scale = MAX_SCALE * dpi / 72.0;
+}
+

 gboolean
 ev_view_get_continuous (EvView *view)
 {
 gboolean
 ev_view_get_continuous (EvView *view)
 {


@@ -3521,13 +3713,13 @@ ev_view_get_sizing_mode (EvView *view)
 gboolean
 ev_view_can_zoom_in (EvView *view)
 {
 gboolean
 ev_view_can_zoom_in (EvView *view)
 {

-       return view->scale * ZOOM_IN_FACTOR <= MAX_SCALE;
+       return view->scale * ZOOM_IN_FACTOR <= view->max_scale;

 }
 
 gboolean
 ev_view_can_zoom_out (EvView *view)
 {
 }
 
 gboolean
 ev_view_can_zoom_out (EvView *view)
 {

-       return view->scale * ZOOM_OUT_FACTOR >= MIN_SCALE;
+       return view->scale * ZOOM_OUT_FACTOR >= view->min_scale;

 }
 
 void
 }
 
 void


@@ -4502,8 +4694,8 @@ ev_view_update_primary_selection (EvView *ev_view)
 
        if (ev_view->selection_info.selections) {
                if (!gtk_clipboard_set_with_owner (clipboard,
 
        if (ev_view->selection_info.selections) {
                if (!gtk_clipboard_set_with_owner (clipboard,

-                                                  targets,
-                                                  G_N_ELEMENTS (targets),
+                                                  clipboard_targets,
+                                                  G_N_ELEMENTS (clipboard_targets),

                                                   ev_view_primary_get_cb,
                                                   ev_view_primary_clear_cb,
                                                   G_OBJECT (ev_view)))
                                                   ev_view_primary_get_cb,
                                                   ev_view_primary_clear_cb,
                                                   G_OBJECT (ev_view)))