]> www.fi.muni.cz Git - evince.git/blobdiff - libview/ev-view-presentation.c
working with signals
[evince.git] / libview / ev-view-presentation.c
index 311695e51916ff1fe9a8e4f1a2b75c42b5c0687f..6ee168beff4fd6679e24ccf7e65e5eb00fea8926 100644 (file)
@@ -30,7 +30,6 @@
 #include "ev-transition-animation.h"
 #include "ev-view-cursor.h"
 #include "ev-page-cache.h"
-#include "ev-mapping.h"
 
 enum {
        PROP_0,
@@ -41,8 +40,10 @@ enum {
 };
 
 enum {
+       PAGE_CHANGED,
        CHANGE_PAGE,
        FINISHED,
+        SIGNAL_EXTERNAL_LINK,
        N_SIGNALS
 };
 
@@ -57,6 +58,8 @@ struct _EvViewPresentation
 {
        GtkWidget base;
 
+        guint                  is_constructing : 1;
+
        guint                  current_page;
        cairo_surface_t       *current_surface;
        EvDocument            *document;
@@ -95,15 +98,17 @@ struct _EvViewPresentationClass
        GtkWidgetClass base_class;
 
        /* signals */
-       void (* change_page) (EvViewPresentation *pview,
-                             GtkScrollType       scroll);
-       void (* finished)    (EvViewPresentation *pview);
+       void (* page_changed)  (EvViewPresentation *pview,
+                               gint                page);
+       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);
@@ -112,18 +117,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);
 }
 
@@ -131,14 +137,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);
 }
 
@@ -146,14 +150,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);
 }
 
@@ -304,16 +306,16 @@ ev_view_presentation_animation_start (EvViewPresentation *pview,
 
        pview->animation = ev_transition_animation_new (effect);
 
-       surface = EV_JOB_RENDER (pview->curr_job)->surface;
+       surface = pview->curr_job ? EV_JOB_RENDER (pview->curr_job)->surface : NULL;
        ev_transition_animation_set_origin_surface (pview->animation,
                                                    surface != NULL ?
                                                    surface : pview->current_surface);
 
        jump = new_page - pview->current_page;
        if (jump == -1)
-               surface = EV_JOB_RENDER (pview->prev_job)->surface;
+               surface = pview->prev_job ? EV_JOB_RENDER (pview->prev_job)->surface : NULL;
        else if (jump == 1)
-               surface = EV_JOB_RENDER (pview->next_job)->surface;
+               surface = pview->next_job ? EV_JOB_RENDER (pview->next_job)->surface : NULL;
        else
                surface = NULL;
        if (surface)
@@ -382,6 +384,25 @@ ev_view_presentation_delete_job (EvViewPresentation *pview,
        g_object_unref (job);
 }
 
+static void
+ev_view_presentation_reset_jobs (EvViewPresentation *pview)
+{
+        if (pview->curr_job) {
+                ev_view_presentation_delete_job (pview, pview->curr_job);
+                pview->curr_job = NULL;
+        }
+
+        if (pview->prev_job) {
+                ev_view_presentation_delete_job (pview, pview->prev_job);
+                pview->prev_job = NULL;
+        }
+
+        if (pview->next_job) {
+                ev_view_presentation_delete_job (pview, pview->next_job);
+                pview->next_job = NULL;
+        }
+}
+
 static void
 ev_view_presentation_update_current_page (EvViewPresentation *pview,
                                          guint               page)
@@ -470,6 +491,8 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview,
                }
        }
 
+       g_signal_emit (pview, signals[PAGE_CHANGED], 0, page);
+       g_printf("pages: %d %d\n",page,pview->current_page;
        pview->current_page = page;
 
        if (pview->page_cache)
@@ -486,7 +509,20 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview,
                gtk_widget_queue_draw (GTK_WIDGET (pview));
 }
 
-static void
+void
+ev_view_presentation_set_page (EvViewPresentation *pview, gint new_page)
+{
+       guint n_pages;
+
+       n_pages = ev_document_get_n_pages (pview->document);
+
+       if (new_page >= n_pages)
+               ev_view_presentation_set_end (pview);
+       else
+               ev_view_presentation_update_current_page (pview, new_page);
+}
+
+void
 ev_view_presentation_next_page (EvViewPresentation *pview)
 {
        guint n_pages;
@@ -511,7 +547,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;
@@ -535,7 +571,7 @@ ev_view_presentation_previous_page (EvViewPresentation *pview)
 
 /* Goto Window */
 #define KEY_IS_NUMERIC(keyval) \
-       ((keyval >= GDK_0 && keyval <= GDK_9) || (keyval >= GDK_KP_0 && keyval <= GDK_KP_9))
+       ((keyval >= GDK_KEY_0 && keyval <= GDK_KEY_9) || (keyval >= GDK_KEY_KP_0 && keyval <= GDK_KEY_KP_9))
 
 /* Cut and paste from gtkwindow.c */
 static void
@@ -580,17 +616,17 @@ ev_view_presentation_goto_window_key_press_event (GtkWidget          *widget,
                                                  EvViewPresentation *pview)
 {
        switch (event->keyval) {
-       case GDK_Escape:
-       case GDK_Tab:
-       case GDK_KP_Tab:
-       case GDK_ISO_Left_Tab:
+       case GDK_KEY_Escape:
+       case GDK_KEY_Tab:
+       case GDK_KEY_KP_Tab:
+       case GDK_KEY_ISO_Left_Tab:
                ev_view_presentation_goto_window_hide (pview);
                return TRUE;
-       case GDK_Return:
-       case GDK_KP_Enter:
-       case GDK_ISO_Enter:
-       case GDK_BackSpace:
-       case GDK_Delete:
+       case GDK_KEY_Return:
+       case GDK_KEY_KP_Enter:
+       case GDK_KEY_ISO_Enter:
+       case GDK_KEY_BackSpace:
+       case GDK_KEY_Delete:
                return FALSE;
        default:
                if (!KEY_IS_NUMERIC (event->keyval))
@@ -631,9 +667,9 @@ ev_view_presentation_goto_window_create (EvViewPresentation *pview)
        GtkWindow *toplevel, *goto_window;
 
        toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pview)));
-       goto_window = GTK_WINDOW (pview->goto_window);
 
        if (pview->goto_window) {
+                goto_window = GTK_WINDOW (pview->goto_window);
                if (gtk_window_has_group (toplevel))
                        gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window);
                else if (gtk_window_has_group (goto_window))
@@ -643,6 +679,7 @@ ev_view_presentation_goto_window_create (EvViewPresentation *pview)
        }
 
        pview->goto_window = gtk_window_new (GTK_WINDOW_POPUP);
+        goto_window = GTK_WINDOW (pview->goto_window);
        gtk_window_set_screen (goto_window, gtk_widget_get_screen (GTK_WIDGET (pview)));
 
        if (gtk_window_has_group (toplevel))
@@ -736,6 +773,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;
@@ -749,12 +789,12 @@ ev_view_presentation_get_link_at_location (EvViewPresentation *pview,
                                           gdouble             x,
                                           gdouble             y)
 {
-       GdkRectangle page_area;
-       GList       *link_mapping;
-       EvLink      *link;
-       gdouble      width, height;
-       gdouble      new_x, new_y;
-       gdouble      scale;
+       GdkRectangle   page_area;
+       EvMappingList *link_mapping;
+       EvLink        *link;
+       gdouble        width, height;
+       gdouble        new_x, new_y;
+       gdouble        scale;
 
        if (!pview->page_cache)
                return NULL;
@@ -794,14 +834,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) {
@@ -816,13 +857,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;
        }
 }
 
@@ -847,7 +900,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
@@ -902,7 +955,7 @@ ev_view_presentation_update_current_surface (EvViewPresentation *pview,
 }
 
 static void
-ev_view_presentation_destroy (GtkObject *object)
+ev_view_presentation_dispose (GObject *object)
 {
        EvViewPresentation *pview = EV_VIEW_PRESENTATION (object);
 
@@ -914,21 +967,7 @@ ev_view_presentation_destroy (GtkObject *object)
        ev_view_presentation_animation_cancel (pview);
        ev_view_presentation_transition_stop (pview);
        ev_view_presentation_hide_cursor_timeout_stop (pview);
-
-       if (pview->curr_job) {
-               ev_view_presentation_delete_job (pview, pview->curr_job);
-               pview->curr_job = NULL;
-       }
-
-       if (pview->prev_job) {
-               ev_view_presentation_delete_job (pview, pview->prev_job);
-               pview->prev_job = NULL;
-       }
-
-       if (pview->next_job) {
-               ev_view_presentation_delete_job (pview, pview->next_job);
-               pview->next_job = NULL;
-       }
+        ev_view_presentation_reset_jobs (pview);
 
        if (pview->current_surface) {
                cairo_surface_destroy (pview->current_surface);
@@ -946,19 +985,28 @@ ev_view_presentation_destroy (GtkObject *object)
                pview->goto_entry = NULL;
        }
 
-       GTK_OBJECT_CLASS (ev_view_presentation_parent_class)->destroy (object);
+       G_OBJECT_CLASS (ev_view_presentation_parent_class)->dispose (object);
 }
 
 static void
-ev_view_presentation_size_request (GtkWidget      *widget,
-                                  GtkRequisition *requisition)
+ev_view_presentation_get_preferred_width (GtkWidget *widget,
+                                          gint      *minimum,
+                                          gint      *natural)
 {
-       requisition->width = 0;
-       requisition->height = 0;
+        *minimum = *natural = 0;
 }
 
 static void
-ev_view_presentation_draw_end_page (EvViewPresentation *pview)
+ev_view_presentation_get_preferred_height (GtkWidget *widget,
+                                           gint      *minimum,
+                                           gint      *natural)
+{
+        *minimum = *natural = 0;
+}
+
+static void
+ev_view_presentation_draw_end_page (EvViewPresentation *pview,
+                                    cairo_t *cr)
 {
        GtkWidget *widget = GTK_WIDGET (pview);
        PangoLayout *layout;
@@ -984,34 +1032,29 @@ ev_view_presentation_draw_end_page (EvViewPresentation *pview)
        area.width = allocation.width;
        area.height = allocation.height;
 
-       gtk_paint_layout (gtk_widget_get_style (widget),
-                         gtk_widget_get_window (widget),
-                         gtk_widget_get_state (widget),
-                         FALSE,
-                         &area,
-                         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);
 }
 
 static gboolean
-ev_view_presentation_expose_event (GtkWidget      *widget,
-                                  GdkEventExpose *event)
+ev_view_presentation_draw (GtkWidget *widget,
+                           cairo_t   *cr)
 {
        EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget);
        GdkRectangle        page_area;
        GdkRectangle        overlap;
        cairo_surface_t    *surface;
-       cairo_t            *cr;
+        GdkRectangle        clip_rect;
+
+        if (!gdk_cairo_get_clip_rectangle (cr, &clip_rect))
+                return FALSE;
 
        switch (pview->state) {
        case EV_PRESENTATION_END:
-               ev_view_presentation_draw_end_page (pview);
+               ev_view_presentation_draw_end_page (pview, cr);
                return FALSE;
        case EV_PRESENTATION_BLACK:
        case EV_PRESENTATION_WHITE:
@@ -1024,7 +1067,7 @@ ev_view_presentation_expose_event (GtkWidget      *widget,
                if (ev_transition_animation_ready (pview->animation)) {
                        ev_view_presentation_get_page_area (pview, &page_area);
 
-                       cr = gdk_cairo_create (gtk_widget_get_window (widget));
+                        cairo_save (cr);
 
                        /* normalize to x=0, y=0 */
                        cairo_translate (cr, page_area.x, page_area.y);
@@ -1034,7 +1077,8 @@ ev_view_presentation_expose_event (GtkWidget      *widget,
                        page_area.width--;
 
                        ev_transition_animation_paint (pview->animation, cr, page_area);
-                       cairo_destroy (cr);
+
+                        cairo_restore (cr);
                }
 
                return TRUE;
@@ -1050,8 +1094,8 @@ ev_view_presentation_expose_event (GtkWidget      *widget,
        }
 
        ev_view_presentation_get_page_area (pview, &page_area);
-       if (gdk_rectangle_intersect (&page_area, &(event->area), &overlap)) {
-               cr = gdk_cairo_create (gtk_widget_get_window (widget));
+       if (gdk_rectangle_intersect (&page_area, &clip_rect, &overlap)) {
+                cairo_save (cr);
 
                /* Try to fix rounding errors. See bug #438760 */
                if (overlap.width == page_area.width)
@@ -1060,7 +1104,8 @@ ev_view_presentation_expose_event (GtkWidget      *widget,
                cairo_rectangle (cr, overlap.x, overlap.y, overlap.width, overlap.height);
                cairo_set_source_surface (cr, surface, page_area.x, page_area.y);
                cairo_fill (cr);
-               cairo_destroy (cr);
+
+                cairo_restore (cr);
        }
 
        return FALSE;
@@ -1073,34 +1118,34 @@ ev_view_presentation_key_press_event (GtkWidget   *widget,
        EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget);
 
        if (pview->state == EV_PRESENTATION_END)
-               return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
+                return gtk_bindings_activate_event (G_OBJECT (widget), event);
 
        switch (event->keyval) {
-       case GDK_b:
-       case GDK_B:
-       case GDK_period:
-       case GDK_KP_Decimal:
+       case GDK_KEY_b:
+       case GDK_KEY_B:
+       case GDK_KEY_period:
+       case GDK_KEY_KP_Decimal:
                if (pview->state == EV_PRESENTATION_BLACK)
                        ev_view_presentation_set_normal (pview);
                else
                        ev_view_presentation_set_black (pview);
 
                return TRUE;
-       case GDK_w:
-       case GDK_W:
+       case GDK_KEY_w:
+       case GDK_KEY_W:
                if (pview->state == EV_PRESENTATION_WHITE)
                        ev_view_presentation_set_normal (pview);
                else
                        ev_view_presentation_set_white (pview);
 
                return TRUE;
-       case GDK_Home:
+       case GDK_KEY_Home:
                if (pview->state == EV_PRESENTATION_NORMAL) {
                        ev_view_presentation_update_current_page (pview, 0);
                        return TRUE;
                }
                break;
-       case GDK_End:
+       case GDK_KEY_End:
                if (pview->state == EV_PRESENTATION_NORMAL) {
                        gint page;
 
@@ -1129,7 +1174,7 @@ ev_view_presentation_key_press_event (GtkWidget   *widget,
                return TRUE;
        }
 
-       return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
+       return gtk_bindings_activate_event (G_OBJECT (widget), event);
 }
 
 static gboolean
@@ -1152,7 +1197,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);
        }
@@ -1213,17 +1258,15 @@ 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);
 
        attributes.window_type = GDK_WINDOW_CHILD;
        attributes.wclass = GDK_INPUT_OUTPUT;
        attributes.visual = gtk_widget_get_visual (widget);
-       attributes.colormap = gtk_widget_get_colormap (widget);
 
        gtk_widget_get_allocation (widget, &allocation);
        attributes.x = allocation.x;
@@ -1243,15 +1286,12 @@ ev_view_presentation_realize (GtkWidget *widget)
        window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                 &attributes,
                                 GDK_WA_X | GDK_WA_Y |
-                                GDK_WA_COLORMAP |
                                 GDK_WA_VISUAL);
 
        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);
 }
@@ -1304,7 +1344,7 @@ add_change_page_binding_keypad (GtkBindingSet  *binding_set,
                                GdkModifierType modifiers,
                                GtkScrollType   scroll)
 {
-       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,
                                      "change_page", 1,
@@ -1331,7 +1371,7 @@ ev_view_presentation_set_property (GObject      *object,
                pview->current_page = g_value_get_uint (value);
                break;
        case PROP_ROTATION:
-               pview->rotation = g_value_get_uint (value);
+                ev_view_presentation_set_rotation (pview, g_value_get_uint (value));
                break;
        case PROP_INVERTED_COLORS:
                pview->inverted_colors = g_value_get_boolean (value);
@@ -1341,10 +1381,27 @@ ev_view_presentation_set_property (GObject      *object,
        }
 }
 
+static void
+ev_view_presentation_get_property (GObject    *object,
+                                   guint       prop_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+        EvViewPresentation *pview = EV_VIEW_PRESENTATION (object);
+
+        switch (prop_id) {
+        case PROP_ROTATION:
+                g_value_set_uint (value, ev_view_presentation_get_rotation (pview));
+                break;
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        }
+}
+
 static GObject *
 ev_view_presentation_constructor (GType                  type,
-                                 guint                  n_construct_properties,
-                                 GObjectConstructParam *construct_params)
+                                                                 guint                  n_construct_properties,
+                                                                 GObjectConstructParam *construct_params)
 {
        GObject            *object;
        EvViewPresentation *pview;
@@ -1353,6 +1410,7 @@ ev_view_presentation_constructor (GType                  type,
                                                                                  n_construct_properties,
                                                                                  construct_params);
        pview = EV_VIEW_PRESENTATION (object);
+        pview->is_constructing = FALSE;
 
        if (EV_IS_DOCUMENT_LINKS (pview->document)) {
                pview->page_cache = ev_page_cache_new (pview->document);
@@ -1367,24 +1425,26 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
 {
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
        GObjectClass   *gobject_class = G_OBJECT_CLASS (klass);
-       GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
        GtkBindingSet  *binding_set;
+        GtkCssProvider *provider;
 
        klass->change_page = ev_view_presentation_change_page;
 
-       widget_class->size_request = ev_view_presentation_size_request;
+        gobject_class->dispose = ev_view_presentation_dispose;
+
+       widget_class->get_preferred_width = ev_view_presentation_get_preferred_width;
+       widget_class->get_preferred_height = ev_view_presentation_get_preferred_height;
        widget_class->realize = ev_view_presentation_realize;
-       widget_class->expose_event = ev_view_presentation_expose_event;
+        widget_class->draw = ev_view_presentation_draw;
        widget_class->key_press_event = ev_view_presentation_key_press_event;
        widget_class->button_release_event = ev_view_presentation_button_release_event;
        widget_class->focus_out_event = ev_view_presentation_focus_out;
        widget_class->motion_notify_event = ev_view_presentation_motion_notify_event;
        widget_class->scroll_event = ev_view_presentation_scroll_event;
 
-       gtk_object_class->destroy = ev_view_presentation_destroy;
-
        gobject_class->constructor = ev_view_presentation_constructor;
        gobject_class->set_property = ev_view_presentation_set_property;
+        gobject_class->get_property = ev_view_presentation_get_property;
 
        g_object_class_install_property (gobject_class,
                                         PROP_DOCUMENT,
@@ -1408,8 +1468,8 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
                                                            "Rotation",
                                                            "Current rotation angle",
                                                            0, 360, 0,
-                                                           G_PARAM_WRITABLE |
-                                                           G_PARAM_CONSTRUCT_ONLY));
+                                                           G_PARAM_READWRITE |
+                                                           G_PARAM_CONSTRUCT));
        g_object_class_install_property (gobject_class,
                                         PROP_INVERTED_COLORS,
                                         g_param_spec_boolean ("inverted_colors",
@@ -1428,6 +1488,15 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
                              g_cclosure_marshal_VOID__ENUM,
                              G_TYPE_NONE, 1,
                              GTK_TYPE_SCROLL_TYPE);
+       signals [PAGE_CHANGED] =
+               g_signal_new ("page-changed",
+                             EV_TYPE_VIEW_PRESENTATION,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvViewPresentationClass, page_changed),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__INT,
+                             G_TYPE_NONE, 2,
+                             G_TYPE_INT, G_TYPE_INT);
        signals[FINISHED] =
                g_signal_new ("finished",
                              G_OBJECT_CLASS_TYPE (gobject_class),
@@ -1437,42 +1506,62 @@ 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_Left,  0, GTK_SCROLL_PAGE_BACKWARD);
-       add_change_page_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_PAGE_FORWARD);
-       add_change_page_binding_keypad (binding_set, GDK_Up,    0, GTK_SCROLL_PAGE_BACKWARD);
-       add_change_page_binding_keypad (binding_set, GDK_Down,  0, GTK_SCROLL_PAGE_FORWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_space, 0,
+       add_change_page_binding_keypad (binding_set, GDK_KEY_Left,  0, GTK_SCROLL_PAGE_BACKWARD);
+       add_change_page_binding_keypad (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_PAGE_FORWARD);
+       add_change_page_binding_keypad (binding_set, GDK_KEY_Up,    0, GTK_SCROLL_PAGE_BACKWARD);
+       add_change_page_binding_keypad (binding_set, GDK_KEY_Down,  0, GTK_SCROLL_PAGE_FORWARD);
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_BackSpace, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_J, 0,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_J, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_H, 0,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_L, 0,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_L, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD);
-       gtk_binding_entry_add_signal (binding_set, GDK_K, 0,
+       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
 ev_view_presentation_init (EvViewPresentation *pview)
 {
        gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE);
+        pview->is_constructing = TRUE;
 }
 
 GtkWidget *
@@ -1497,3 +1586,31 @@ ev_view_presentation_get_current_page (EvViewPresentation *pview)
 {
        return pview->current_page;
 }
+
+void
+ev_view_presentation_set_rotation (EvViewPresentation *pview,
+                                   gint                rotation)
+{
+        if (rotation >= 360)
+                rotation -= 360;
+        else if (rotation < 0)
+                rotation += 360;
+
+        if (pview->rotation == rotation)
+                return;
+
+        pview->rotation = rotation;
+        g_object_notify (G_OBJECT (pview), "rotation");
+        if (pview->is_constructing)
+                return;
+
+        pview->scale = 0;
+        ev_view_presentation_reset_jobs (pview);
+        ev_view_presentation_update_current_page (pview, pview->current_page);
+}
+
+guint
+ev_view_presentation_get_rotation (EvViewPresentation *pview)
+{
+        return pview->rotation;
+}