presentation: Make next/previous methods public

[evince.git] / libview / ev-view-presentation.c

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 96977184c5e0f01ab55fa4b043f146ff9b27cbff..3454d778fc4a51d163f3d0476a37a08f2dff081e 100644 (file)
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -42,6 +42,7 @@ enum {
 enum {
        CHANGE_PAGE,
        FINISHED,
+        SIGNAL_EXTERNAL_LINK,
        N_SIGNALS
 };
 
@@ -94,15 +95,15 @@ struct _EvViewPresentationClass
        GtkWidgetClass base_class;
 
        /* signals */
-       void (* change_page) (EvViewPresentation *pview,
-                             GtkScrollType       scroll);
-       void (* finished)    (EvViewPresentation *pview);
+       void (* change_page)   (EvViewPresentation *pview,
+                                GtkScrollType       scroll);
+       void (* finished)      (EvViewPresentation *pview);
+        void (* external_link) (EvViewPresentation *pview,
+                                EvLinkAction       *action);
 };
 
 static guint signals[N_SIGNALS] = { 0 };
 
-static void ev_view_presentation_next_page               (EvViewPresentation *pview);
-static void ev_view_presentation_previous_page           (EvViewPresentation *pview);
 static void ev_view_presentation_set_cursor_for_location (EvViewPresentation *pview,
                                                          gdouble             x,
                                                          gdouble             y);
@@ -111,18 +112,19 @@ static void ev_view_presentation_set_cursor_for_location (EvViewPresentation *pv
 
 G_DEFINE_TYPE (EvViewPresentation, ev_view_presentation, GTK_TYPE_WIDGET)
 
+static GdkRGBA black = { 0., 0., 0., 1. };
+static GdkRGBA white = { 1., 1., 1., 1. };
+
 static void
 ev_view_presentation_set_normal (EvViewPresentation *pview)
 {
        GtkWidget *widget = GTK_WIDGET (pview);
-       GtkStyle  *style;
 
        if (pview->state == EV_PRESENTATION_NORMAL)
                return;
 
        pview->state = EV_PRESENTATION_NORMAL;
-       style = gtk_widget_get_style (widget);
-       gdk_window_set_background (gtk_widget_get_window (widget), &style->black);
+       gdk_window_set_background_rgba (gtk_widget_get_window (widget), &black);
        gtk_widget_queue_draw (widget);
 }
 
@@ -130,14 +132,12 @@ static void
 ev_view_presentation_set_black (EvViewPresentation *pview)
 {
        GtkWidget *widget = GTK_WIDGET (pview);
-       GtkStyle  *style;
 
        if (pview->state == EV_PRESENTATION_BLACK)
                return;
 
        pview->state = EV_PRESENTATION_BLACK;
-       style = gtk_widget_get_style (widget);
-       gdk_window_set_background (gtk_widget_get_window (widget), &style->black);
+       gdk_window_set_background_rgba (gtk_widget_get_window (widget), &black);
        gtk_widget_queue_draw (widget);
 }
 
@@ -145,14 +145,12 @@ static void
 ev_view_presentation_set_white (EvViewPresentation *pview)
 {
        GtkWidget *widget = GTK_WIDGET (pview);
-       GtkStyle  *style;
 
        if (pview->state == EV_PRESENTATION_WHITE)
                return;
 
        pview->state = EV_PRESENTATION_WHITE;
-       style = gtk_widget_get_style (widget);
-       gdk_window_set_background (gtk_widget_get_window (widget), &style->white);
+       gdk_window_set_background_rgba (gtk_widget_get_window (widget), &white);
        gtk_widget_queue_draw (widget);
 }
 
@@ -485,7 +483,7 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview,
                gtk_widget_queue_draw (GTK_WIDGET (pview));
 }
 
-static void
+void
 ev_view_presentation_next_page (EvViewPresentation *pview)
 {
        guint n_pages;
@@ -510,7 +508,7 @@ ev_view_presentation_next_page (EvViewPresentation *pview)
                ev_view_presentation_update_current_page (pview, new_page);
 }
 
-static void
+void
 ev_view_presentation_previous_page (EvViewPresentation *pview)
 {
        gint new_page = 0;
@@ -735,6 +733,9 @@ ev_view_presentation_link_is_supported (EvViewPresentation *pview,
        case EV_LINK_ACTION_TYPE_GOTO_DEST:
                return ev_link_action_get_dest (action) != NULL;
        case EV_LINK_ACTION_TYPE_NAMED:
+        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
+        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
+        case EV_LINK_ACTION_TYPE_LAUNCH:
                return TRUE;
        default:
                return FALSE;
@@ -793,14 +794,15 @@ ev_view_presentation_get_link_at_location (EvViewPresentation *pview,
 }
 
 static void
-ev_vew_presentation_goto_link_dest (EvViewPresentation *pview,
-                                   EvLink             *link)
+ev_vew_presentation_handle_link (EvViewPresentation *pview,
+                                 EvLink             *link)
 {
        EvLinkAction *action;
 
        action = ev_link_get_action (link);
 
-       if (ev_link_action_get_action_type (action) == EV_LINK_ACTION_TYPE_NAMED) {
+        switch (ev_link_action_get_action_type (action)) {
+       case EV_LINK_ACTION_TYPE_NAMED: {
                const gchar *name = ev_link_action_get_name (action);
 
                if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
@@ -815,13 +817,25 @@ ev_vew_presentation_goto_link_dest (EvViewPresentation *pview,
                        n_pages = ev_document_get_n_pages (pview->document);
                        ev_view_presentation_update_current_page (pview, n_pages - 1);
                }
-       } else {
+        }
+                break;
+
+       case EV_LINK_ACTION_TYPE_GOTO_DEST: {
                EvLinkDest *dest;
                gint        page;
 
                dest = ev_link_action_get_dest (action);
                page = ev_document_links_get_dest_page (EV_DOCUMENT_LINKS (pview->document), dest);
                ev_view_presentation_update_current_page (pview, page);
+        }
+                break;
+        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
+        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
+        case EV_LINK_ACTION_TYPE_LAUNCH:
+                g_signal_emit (pview, signals[SIGNAL_EXTERNAL_LINK], 0, action);
+                break;
+        default:
+                break;
        }
 }
 
@@ -846,7 +860,7 @@ ev_view_presentation_set_cursor (EvViewPresentation *pview,
        gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
        gdk_flush ();
        if (cursor)
-               gdk_cursor_unref (cursor);
+               g_object_unref (cursor);
 }
 
 static void
@@ -992,15 +1006,8 @@ ev_view_presentation_draw_end_page (EvViewPresentation *pview,
        area.width = allocation.width;
        area.height = allocation.height;
 
-        gtk_paint_layout (gtk_widget_get_style (widget),
-                          cr,
-                          gtk_widget_get_state (widget),
-                          FALSE,
-                          widget,
-                          NULL,
-                          15,
-                          15,
-                          layout);
+        gtk_render_layout (gtk_widget_get_style_context (widget),
+                           cr, 15, 15, layout);
 
        pango_font_description_free (font_desc);
        g_object_unref (layout);
@@ -1164,7 +1171,7 @@ ev_view_presentation_button_release_event (GtkWidget      *widget,
                                                                  event->x,
                                                                  event->y);
                if (link)
-                       ev_vew_presentation_goto_link_dest (pview, link);
+                       ev_vew_presentation_handle_link (pview, link);
                else
                        ev_view_presentation_next_page (pview);
        }
@@ -1225,10 +1232,9 @@ init_presentation (GtkWidget *widget)
 static void
 ev_view_presentation_realize (GtkWidget *widget)
 {
-       GdkWindow    *window;
-       GtkStyle     *style;
-       GdkWindowAttr attributes;
-       GtkAllocation allocation;
+       GdkWindow     *window;
+       GdkWindowAttr  attributes;
+       GtkAllocation  allocation;
 
        gtk_widget_set_realized (widget, TRUE);
 
@@ -1258,10 +1264,8 @@ ev_view_presentation_realize (GtkWidget *widget)
 
        gdk_window_set_user_data (window, widget);
        gtk_widget_set_window (widget, window);
-
-       gtk_widget_style_attach (widget);
-       style = gtk_widget_get_style (widget);
-       gdk_window_set_background (window, &style->black);
+        gtk_style_context_set_background (gtk_widget_get_style_context (widget),
+                                          window);
 
        g_idle_add ((GSourceFunc)init_presentation, widget);
 }
@@ -1378,6 +1382,7 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
        GObjectClass   *gobject_class = G_OBJECT_CLASS (klass);
        GtkBindingSet  *binding_set;
+        GtkCssProvider *provider;
 
        klass->change_page = ev_view_presentation_change_page;
 
@@ -1447,6 +1452,15 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
                              g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0,
                              G_TYPE_NONE);
+        signals[SIGNAL_EXTERNAL_LINK] =
+                g_signal_new ("external-link",
+                              G_TYPE_FROM_CLASS (gobject_class),
+                              G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                              G_STRUCT_OFFSET (EvViewPresentationClass, external_link),
+                              NULL, NULL,
+                              g_cclosure_marshal_VOID__OBJECT,
+                              G_TYPE_NONE, 1,
+                              G_TYPE_OBJECT);
 
        binding_set = gtk_binding_set_by_class (klass);
        add_change_page_binding_keypad (binding_set, GDK_KEY_Left,  0, GTK_SCROLL_PAGE_BACKWARD);
@@ -1477,6 +1491,16 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
        gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
+
+        provider = gtk_css_provider_new ();
+        gtk_css_provider_load_from_data (provider,
+                                         "EvViewPresentation {\n"
+                                         " background-color: black; }",
+                                         -1, NULL);
+        gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                                   GTK_STYLE_PROVIDER (provider),
+                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        g_object_unref (provider);
 }
 
 static void