[dvi] Use ANSI C rand() instead of random()

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

diff --git a/shell/ev-window.c b/shell/ev-window.c
index a07bea71a38276916682373e4ea3f78bc3e0a0bf..37148318272a51244faacdac5737b2835550edf0 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
 /* this file is part of evince, a gnome document viewer
  *
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
 /* this file is part of evince, a gnome document viewer
  *

+ *  Copyright (C) 2009 Juanjo Marín <juanj.marin@juntadeandalucia.es>

  *  Copyright (C) 2008 Carlos Garcia Campos
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.
  *  Copyright (C) 2008 Carlos Garcia Campos
  *  Copyright (C) 2004 Martin Kretzschmar
  *  Copyright (C) 2004 Red Hat, Inc.


@@ -85,6 +86,7 @@
 #include "ev-utils.h"
 #include "ev-keyring.h"
 #include "ev-view.h"
 #include "ev-utils.h"
 #include "ev-keyring.h"
 #include "ev-view.h"

+#include "ev-view-presentation.h"

 #include "ev-view-type-builtins.h"
 #include "ev-window.h"
 #include "ev-window-title.h"
 #include "ev-view-type-builtins.h"
 #include "ev-window.h"
 #include "ev-window-title.h"


@@ -133,6 +135,7 @@ struct _EvWindowPrivate {
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;
        GtkWidget *find_bar;
        GtkWidget *scrolled_window;
        GtkWidget *view;

+       GtkWidget *presentation_view;

        GtkWidget *message_area;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;
        GtkWidget *message_area;
        GtkWidget *password_view;
        GtkWidget *sidebar_thumbs;


@@ -164,9 +167,6 @@ struct _EvWindowPrivate {
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
 
        /* Fullscreen mode */
        GtkWidget *fullscreen_toolbar;
 

-       /* Presentation mode */
-       guint      presentation_timeout_id;
-

        /* Popup view */
        GtkWidget *view_popup;
        EvLink    *link;
        /* Popup view */
        GtkWidget *view_popup;
        EvLink    *link;


@@ -215,6 +215,8 @@ struct _EvWindowPrivate {
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 
 #define EV_WINDOW_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_WINDOW, EvWindowPrivate))
 

+#define EV_WINDOW_IS_PRESENTATION(w) (w->priv->presentation_view != NULL)
+

 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 #define NAVIGATION_ACTION      "Navigation"
 #define PAGE_SELECTOR_ACTION   "PageSelector"
 #define ZOOM_CONTROL_ACTION    "ViewZoom"
 #define NAVIGATION_ACTION      "Navigation"


@@ -225,8 +227,6 @@ struct _EvWindowPrivate {
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 
 #define GCONF_LOCKDOWN_PRINT        "/desktop/gnome/lockdown/disable_printing"
 #define GCONF_LOCKDOWN_PRINT_SETUP  "/desktop/gnome/lockdown/disable_print_setup"
 

-#define PRESENTATION_TIMEOUT 5
-

 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"
 #define SIDEBAR_DEFAULT_SIZE    132
 #define LINKS_SIDEBAR_ID "links"
 #define THUMBNAILS_SIDEBAR_ID "thumbnails"


@@ -423,12 +423,18 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
        ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewAutoscroll", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewPageWidth", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewReload", has_pages);
        ev_window_set_action_sensitive (ev_window, "ViewAutoscroll", has_pages);

+       ev_window_set_action_sensitive (ev_window, "ViewInvertedColors", has_pages);

 
        /* Toolbar-specific actions: */
        ev_window_set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
        ev_window_set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
        ev_window_set_action_sensitive (ev_window, NAVIGATION_ACTION,  FALSE);
 
 
        /* Toolbar-specific actions: */
        ev_window_set_action_sensitive (ev_window, PAGE_SELECTOR_ACTION, has_pages);
        ev_window_set_action_sensitive (ev_window, ZOOM_CONTROL_ACTION,  has_pages);
        ev_window_set_action_sensitive (ev_window, NAVIGATION_ACTION,  FALSE);
 

+        /* Help menu */
+#ifdef G_OS_WIN32
+       ev_window_set_action_sensitive (ev_window, "HelpContents", FALSE);
+#endif
+

         ev_window_update_actions (ev_window);
 }
 
         ev_window_update_actions (ev_window);
 }
 


@@ -461,7 +467,7 @@ ev_window_update_actions (EvWindow *ev_window)
         ev_window_set_action_sensitive (ev_window, "F3",
                                         has_pages && can_find_in_page);
 
         ev_window_set_action_sensitive (ev_window, "F3",
                                         has_pages && can_find_in_page);
 

-       presentation_mode = ev_view_get_presentation (view);
+       presentation_mode = EV_WINDOW_IS_PRESENTATION (ev_window);

        
        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                                        has_pages &&
        
        ev_window_set_action_sensitive (ev_window, "ViewZoomIn",
                                        has_pages &&


@@ -549,7 +555,7 @@ update_chrome_visibility (EvWindow *window)
        gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
 
        gboolean menubar, toolbar, findbar, fullscreen_toolbar, sidebar;
        gboolean fullscreen_mode, presentation, fullscreen;
 

-       presentation = ev_view_get_presentation (EV_VIEW (priv->view));
+       presentation = EV_WINDOW_IS_PRESENTATION (window);

        fullscreen = ev_document_model_get_fullscreen (priv->model);
        fullscreen_mode = fullscreen || presentation;
 
        fullscreen = ev_document_model_get_fullscreen (priv->model);
        fullscreen_mode = fullscreen || presentation;
 


@@ -796,8 +802,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
        if (link) {
                action = g_object_ref (ev_link_get_action (link));
                dest = ev_link_action_get_dest (action);
        if (link) {
                action = g_object_ref (ev_link_get_action (link));
                dest = ev_link_action_get_dest (action);

-               page = ev_link_dest_get_page (dest);
-               page_label = ev_view_page_label_from_dest (EV_VIEW (window->priv->view), dest);
+               page_label = ev_document_links_get_dest_page_label (EV_DOCUMENT_LINKS (window->priv->document), dest);

        } else {
                dest = ev_link_dest_new_page (page);
                action = ev_link_action_new_dest (dest);
        } else {
                dest = ev_link_dest_new_page (page);
                action = ev_link_action_new_dest (dest);


@@ -848,6 +853,14 @@ view_handle_link_cb (EvView *view, EvLink *link, EvWindow *window)
        ev_window_add_history (window, current_page, NULL);
 }
 
        ev_window_add_history (window, current_page, NULL);
 }
 

+static void
+view_selection_changed_cb (EvView   *view,
+                          EvWindow *window)
+{
+       ev_window_set_action_sensitive (window, "EditCopy",
+                                       ev_view_get_has_selection (view));
+}
+

 static void
 ev_window_page_changed_cb (EvWindow        *ev_window,
                           gint             old_page,
 static void
 ev_window_page_changed_cb (EvWindow        *ev_window,
                           gint             old_page,


@@ -947,9 +960,10 @@ setup_model_from_metadata (EvWindow *window)
        gchar   *sizing_mode;
        gdouble  zoom;
        gint     rotation;
        gchar   *sizing_mode;
        gdouble  zoom;
        gint     rotation;

-       gboolean continuous = { 0, };
-       gboolean dual_page = { 0, };
-       gboolean fullscreen = { 0, };
+       gboolean inverted_colors = FALSE;
+       gboolean continuous = FALSE;
+       gboolean dual_page = FALSE;
+       gboolean fullscreen = FALSE;

 
        if (!window->priv->metadata)
                return;
 
        if (!window->priv->metadata)
                return;


@@ -995,6 +1009,10 @@ setup_model_from_metadata (EvWindow *window)
                ev_document_model_set_rotation (window->priv->model, rotation);
        }
 
                ev_document_model_set_rotation (window->priv->model, rotation);
        }
 

+       /* Inverted Colors */
+       if (ev_metadata_get_boolean (window->priv->metadata, "inverted-colors", &inverted_colors))
+               ev_document_model_set_inverted_colors (window->priv->model, inverted_colors);
+

        /* Continuous */
        if (ev_metadata_get_boolean (window->priv->metadata, "continuous", &continuous)) {
                ev_document_model_set_continuous (window->priv->model, continuous);
        /* Continuous */
        if (ev_metadata_get_boolean (window->priv->metadata, "continuous", &continuous)) {
                ev_document_model_set_continuous (window->priv->model, continuous);


@@ -1146,10 +1164,11 @@ ev_window_set_icon_from_thumbnail (EvJobThumbnail *job,
 }
 
 static void
 }
 
 static void

-ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
+ev_window_refresh_window_thumbnail (EvWindow *ev_window)

 {
        gdouble page_width;
        gdouble scale;
 {
        gdouble page_width;
        gdouble scale;

+       gint rotation;

        EvDocument *document = ev_window->priv->document;
 
        if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||
        EvDocument *document = ev_window->priv->document;
 
        if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||


@@ -1162,6 +1181,7 @@ ev_window_refresh_window_thumbnail (EvWindow *ev_window, int rotation)
 
        ev_document_get_page_size (document, 0, &page_width, NULL);
        scale = 128. / page_width;
 
        ev_document_get_page_size (document, 0, &page_width, NULL);
        scale = 128. / page_width;

+       rotation = ev_document_model_get_rotation (ev_window->priv->model);

 
        ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, 0, rotation, scale);
        g_signal_connect (ev_window->priv->thumbnail_job, "finished",
 
        ev_window->priv->thumbnail_job = ev_job_thumbnail_new (document, 0, rotation, scale);
        g_signal_connect (ev_window->priv->thumbnail_job, "finished",


@@ -1190,7 +1210,7 @@ ev_window_setup_document (EvWindow *ev_window)
 
        ev_window->priv->setup_document_idle = 0;
        
 
        ev_window->priv->setup_document_idle = 0;
        

-       ev_window_refresh_window_thumbnail (ev_window, 0);
+       ev_window_refresh_window_thumbnail (ev_window);

 
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
        ev_window_title_set_document (ev_window->priv->title, document);
 
        ev_window_set_page_mode (ev_window, PAGE_MODE_DOCUMENT);
        ev_window_title_set_document (ev_window->priv->title, document);


@@ -1234,7 +1254,10 @@ ev_window_setup_document (EvWindow *ev_window)
        info = ev_document_get_info (document);
        update_document_mode (ev_window, info->mode);
 
        info = ev_document_get_info (document);
        update_document_mode (ev_window, info->mode);
 

-       gtk_widget_grab_focus (ev_window->priv->view);
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))
+               gtk_widget_grab_focus (ev_window->priv->presentation_view);
+       else
+               gtk_widget_grab_focus (ev_window->priv->view);

 
        return FALSE;
 }
 
        return FALSE;
 }


@@ -3464,7 +3487,6 @@ fullscreen_toolbar_remove_shadow (GtkWidget *toolbar)
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {
 static void
 ev_window_run_fullscreen (EvWindow *window)
 {

-       EvView  *view = EV_VIEW (window->priv->view);

        gboolean fullscreen_window = TRUE;
 
        if (ev_document_model_get_fullscreen (window->priv->model))
        gboolean fullscreen_window = TRUE;
 
        if (ev_document_model_get_fullscreen (window->priv->model))


@@ -3487,7 +3509,7 @@ ev_window_run_fullscreen (EvWindow *window)
                                       window->priv->fullscreen_toolbar, 1);
        }
 
                                       window->priv->fullscreen_toolbar, 1);
        }
 

-       if (ev_view_get_presentation (view)) {
+       if (EV_WINDOW_IS_PRESENTATION (window)) {

                ev_window_stop_presentation (window, FALSE);
                fullscreen_window = FALSE;
        }
                ev_window_stop_presentation (window, FALSE);
                fullscreen_window = FALSE;
        }


@@ -3549,70 +3571,6 @@ ev_window_cmd_view_fullscreen (GtkAction *action, EvWindow *window)
        }
 }
 
        }
 }
 

-static gboolean
-presentation_timeout_cb (EvWindow *window)
-{
-       EvView *view = EV_VIEW (window->priv->view);
-
-       if (!view || !ev_view_get_presentation (EV_VIEW (view)))
-               return FALSE;
-
-       ev_view_hide_cursor (EV_VIEW (window->priv->view));
-       window->priv->presentation_timeout_id = 0;
-
-       return FALSE;
-}
-
-static void
-presentation_set_timeout (EvWindow *window)
-{
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-
-       window->priv->presentation_timeout_id =
-               g_timeout_add_seconds (PRESENTATION_TIMEOUT,
-                                      (GSourceFunc)presentation_timeout_cb, window);
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-static void
-presentation_clear_timeout (EvWindow *window)
-{
-       if (window->priv->presentation_timeout_id > 0) {
-               g_source_remove (window->priv->presentation_timeout_id);
-       }
-       
-       window->priv->presentation_timeout_id = 0;
-
-       ev_view_show_cursor (EV_VIEW (window->priv->view));
-}
-
-static gboolean
-presentation_motion_notify_cb (GtkWidget *widget,
-                              GdkEventMotion *event,
-                              gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_set_timeout (window);
-
-       return FALSE;
-}
-
-static gboolean
-presentation_leave_notify_cb (GtkWidget *widget,
-                             GdkEventCrossing *event,
-                             gpointer user_data)
-{
-       EvWindow *window = EV_WINDOW (user_data);
-
-       presentation_clear_timeout (window);
-
-       return FALSE;
-}
-

 static void
 ev_window_update_presentation_action (EvWindow *window)
 {
 static void
 ev_window_update_presentation_action (EvWindow *window)
 {


@@ -3622,50 +3580,54 @@ ev_window_update_presentation_action (EvWindow *window)
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
        g_signal_handlers_block_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
        gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),

-                                     ev_view_get_presentation (EV_VIEW (window->priv->view)));
+                                     EV_WINDOW_IS_PRESENTATION (window));

        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
 }
 
        g_signal_handlers_unblock_by_func
                (action, G_CALLBACK (ev_window_cmd_view_presentation), window);
 }
 

+static void
+ev_window_view_presentation_finished (EvWindow *window)
+{
+       ev_window_stop_presentation (window, TRUE);
+}
+

 static void
 ev_window_run_presentation (EvWindow *window)
 {
 static void
 ev_window_run_presentation (EvWindow *window)
 {

-       EvView  *view = EV_VIEW (window->priv->view);

        gboolean fullscreen_window = TRUE;
        gboolean fullscreen_window = TRUE;

+       guint    current_page;
+       guint    rotation;

 
 

-       if (ev_view_get_presentation (view))
+       if (EV_WINDOW_IS_PRESENTATION (window))

                return;
 
        if (ev_document_model_get_fullscreen (window->priv->model)) {
                ev_window_stop_fullscreen (window, FALSE);
                fullscreen_window = FALSE;
        }
                return;
 
        if (ev_document_model_get_fullscreen (window->priv->model)) {
                ev_window_stop_fullscreen (window, FALSE);
                fullscreen_window = FALSE;
        }

-       
-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_NONE,
-                     NULL);

 
 

-       ev_view_set_presentation (view, TRUE);
-       ev_window_update_presentation_action (window);
+       current_page = ev_document_model_get_page (window->priv->model);
+       rotation = ev_document_model_get_rotation (window->priv->model);
+       window->priv->presentation_view =
+               ev_view_presentation_new (window->priv->document, current_page, rotation);
+       g_signal_connect_swapped (window->priv->presentation_view, "finished",
+                                 G_CALLBACK (ev_window_view_presentation_finished),
+                                 window);
+
+       gtk_box_pack_start (GTK_BOX (window->priv->main_box),
+                           window->priv->presentation_view,
+                           FALSE, FALSE, 0);
+       gtk_widget_show (window->priv->presentation_view);

 
 

+       ev_window_update_presentation_action (window);

        update_chrome_visibility (window);
        update_chrome_visibility (window);

-       
-       gtk_widget_grab_focus (window->priv->view);
+
+       gtk_widget_grab_focus (window->priv->presentation_view);

        if (fullscreen_window)
                gtk_window_fullscreen (GTK_WINDOW (window));
 
        if (fullscreen_window)
                gtk_window_fullscreen (GTK_WINDOW (window));
 

-       g_signal_connect (window->priv->view,
-                         "motion-notify-event",
-                         G_CALLBACK (presentation_motion_notify_cb),
-                         window);
-       g_signal_connect (window->priv->view,
-                         "leave-notify-event",
-                         G_CALLBACK (presentation_leave_notify_cb),
-                         window);
-       presentation_set_timeout (window);
-

        ev_application_screensaver_disable (EV_APP);
        ev_application_screensaver_disable (EV_APP);

-       
+

        if (window->priv->metadata && !ev_window_is_empty (window))
                ev_metadata_set_boolean (window->priv->metadata, "presentation", TRUE);
 }
        if (window->priv->metadata && !ev_window_is_empty (window))
                ev_metadata_set_boolean (window->priv->metadata, "presentation", TRUE);
 }


@@ -3674,28 +3636,24 @@ static void
 ev_window_stop_presentation (EvWindow *window,
                             gboolean  unfullscreen_window)
 {
 ev_window_stop_presentation (EvWindow *window,
                             gboolean  unfullscreen_window)
 {

-       EvView *view = EV_VIEW (window->priv->view);
-       
-       if (!ev_view_get_presentation (view))
+       guint current_page;
+
+       if (!EV_WINDOW_IS_PRESENTATION (window))

                return;
 
                return;
 

-       g_object_set (G_OBJECT (window->priv->scrolled_window),
-                     "shadow-type", GTK_SHADOW_IN,
-                     NULL);
+       current_page = ev_view_presentation_get_current_page (EV_VIEW_PRESENTATION (window->priv->presentation_view));
+       ev_document_model_set_page (window->priv->model, current_page);
+
+       gtk_container_remove (GTK_CONTAINER (window->priv->main_box),
+                             window->priv->presentation_view);
+       window->priv->presentation_view = NULL;

 
 

-       ev_view_set_presentation (EV_VIEW (window->priv->view), FALSE);

        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        if (unfullscreen_window)
                gtk_window_unfullscreen (GTK_WINDOW (window));
 
        ev_window_update_presentation_action (window);
        update_chrome_visibility (window);
        if (unfullscreen_window)
                gtk_window_unfullscreen (GTK_WINDOW (window));
 

-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_motion_notify_cb,
-                                             window);
-       g_signal_handlers_disconnect_by_func (window->priv->view,
-                                             (gpointer) presentation_leave_notify_cb,
-                                             window);
-       presentation_clear_timeout (window);
+       gtk_widget_grab_focus (window->priv->view);

 
        ev_application_screensaver_enable (EV_APP);
 
 
        ev_application_screensaver_enable (EV_APP);
 


@@ -3771,7 +3729,6 @@ ev_window_state_event (GtkWidget           *widget,
                       GdkEventWindowState *event)
 {
        EvWindow *window = EV_WINDOW (widget);
                       GdkEventWindowState *event)
 {
        EvWindow *window = EV_WINDOW (widget);

-       EvView   *view = EV_VIEW (window->priv->view);

 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event (widget, event);
 
        if (GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event) {
                GTK_WIDGET_CLASS (ev_window_parent_class)->window_state_event (widget, event);


@@ -3781,14 +3738,14 @@ ev_window_state_event (GtkWidget           *widget,
                return FALSE;
 
        if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {
                return FALSE;
 
        if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) {

-               if (ev_document_model_get_fullscreen (window->priv->model) || ev_view_get_presentation (view))
+               if (ev_document_model_get_fullscreen (window->priv->model) || EV_WINDOW_IS_PRESENTATION (window))

                        return FALSE;
                
                ev_window_run_fullscreen (window);
        } else {
                if (ev_document_model_get_fullscreen (window->priv->model))
                        ev_window_stop_fullscreen (window, FALSE);
                        return FALSE;
                
                ev_window_run_fullscreen (window);
        } else {
                if (ev_document_model_get_fullscreen (window->priv->model))
                        ev_window_stop_fullscreen (window, FALSE);

-               else if (ev_view_get_presentation (view))
+               else if (EV_WINDOW_IS_PRESENTATION (window))

                        ev_window_stop_presentation (window, FALSE);
        }
 
                        ev_window_stop_presentation (window, FALSE);
        }
 


@@ -3845,6 +3802,14 @@ ev_window_cmd_edit_rotate_right (GtkAction *action, EvWindow *ev_window)
        ev_document_model_set_rotation (ev_window->priv->model, rotation + 90);
 }
 
        ev_document_model_set_rotation (ev_window->priv->model, rotation + 90);
 }
 

+static void
+ev_window_cmd_view_inverted_colors (GtkAction *action, EvWindow *ev_window)
+{
+       gboolean inverted_colors = ev_document_model_get_inverted_colors (ev_window->priv->model);
+
+       ev_document_model_set_inverted_colors (ev_window->priv->model, !inverted_colors);
+}
+

 static void
 ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog,
                               gint       response,
 static void
 ev_window_cmd_edit_toolbar_cb (GtkDialog *dialog,
                               gint       response,


@@ -4035,23 +4000,19 @@ ev_window_cmd_escape (GtkAction *action, EvWindow *window)
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;
                gtk_widget_grab_focus (window->priv->view);
        } else {
                gboolean fullscreen;

-               gboolean presentation;

 
                fullscreen = ev_document_model_get_fullscreen (window->priv->model);
 
                fullscreen = ev_document_model_get_fullscreen (window->priv->model);

-               g_object_get (window->priv->view,
-                             "presentation", &presentation,
-                             NULL);

 
                if (fullscreen) {
                        ev_window_stop_fullscreen (window, TRUE);
 
                if (fullscreen) {
                        ev_window_stop_fullscreen (window, TRUE);

-               } else if (presentation) {
+               } else if (EV_WINDOW_IS_PRESENTATION (window)) {

                        ev_window_stop_presentation (window, TRUE);
                        gtk_widget_grab_focus (window->priv->view);
                } else {
                        gtk_widget_grab_focus (window->priv->view);
                }
 
                        ev_window_stop_presentation (window, TRUE);
                        gtk_widget_grab_focus (window->priv->view);
                } else {
                        gtk_widget_grab_focus (window->priv->view);
                }
 

-               if (fullscreen && presentation)
+               if (fullscreen && EV_WINDOW_IS_PRESENTATION (window))

                        g_warning ("Both fullscreen and presentation set somehow");
        }
 }
                        g_warning ("Both fullscreen and presentation set somehow");
        }
 }


@@ -4166,7 +4127,21 @@ ev_window_rotation_changed_cb (EvDocumentModel *model,
                ev_metadata_set_int (window->priv->metadata, "rotation",
                                     rotation);
 
                ev_metadata_set_int (window->priv->metadata, "rotation",
                                     rotation);
 

-       ev_window_refresh_window_thumbnail (window, rotation);
+       ev_window_refresh_window_thumbnail (window);
+}
+
+static void
+ev_window_update_inverted_colors_action (EvWindow *window)
+{
+       GtkAction *action;
+
+       action = gtk_action_group_get_action (window->priv->action_group, "ViewInvertedColors");
+       g_signal_handlers_block_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_inverted_colors), window);
+       gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
+                                     ev_document_model_get_inverted_colors (window->priv->model));
+       g_signal_handlers_unblock_by_func
+               (action, G_CALLBACK (ev_window_cmd_view_inverted_colors), window);

 }
 
 static void
 }
 
 static void


@@ -4175,19 +4150,14 @@ ev_window_inverted_colors_changed_cb (EvDocumentModel *model,
                                      EvWindow        *window)
 {
        gboolean inverted_colors = ev_document_model_get_inverted_colors (model);
                                      EvWindow        *window)
 {
        gboolean inverted_colors = ev_document_model_get_inverted_colors (model);

-       gint rotation = ev_document_model_get_rotation (model);
+
+       ev_window_update_inverted_colors_action (window);

 
        if (window->priv->metadata && !ev_window_is_empty (window))
                ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
                                         inverted_colors);
 
 
        if (window->priv->metadata && !ev_window_is_empty (window))
                ev_metadata_set_boolean (window->priv->metadata, "inverted-colors",
                                         inverted_colors);
 

-       ev_window_refresh_window_thumbnail (window, rotation);
-}
-
-static void
-ev_window_has_selection_changed_cb (EvView *view, GParamSpec *pspec, EvWindow *window)
-{
-        ev_window_update_actions (window);
+       ev_window_refresh_window_thumbnail (window);

 }
 
 static void
 }
 
 static void


@@ -4318,7 +4288,7 @@ ev_window_view_toolbar_cb (GtkAction *action, EvWindow *ev_window)
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {
 static void
 ev_window_view_sidebar_cb (GtkAction *action, EvWindow *ev_window)
 {

-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
+       if (EV_WINDOW_IS_PRESENTATION (ev_window))

                return;
            
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,
                return;
            
        update_chrome_flag (ev_window, EV_CHROME_SIDEBAR,


@@ -4359,12 +4329,11 @@ ev_window_sidebar_visibility_changed_cb (EvSidebar  *ev_sidebar,
                                         GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {
                                         GParamSpec *pspec,
                                         EvWindow   *ev_window)
 {

-       EvView *view = EV_VIEW (ev_window->priv->view);

        GtkAction *action;
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
 
        GtkAction *action;
 
        action = gtk_action_group_get_action (ev_window->priv->action_group, "ViewSidebar");
 

-       if (!ev_view_get_presentation (view)) {
+       if (!EV_WINDOW_IS_PRESENTATION (ev_window)) {

                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
                                              GTK_WIDGET_VISIBLE (ev_sidebar));
 
                gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
                                              GTK_WIDGET_VISIBLE (ev_sidebar));
 


@@ -4491,9 +4460,6 @@ view_menu_popup_cb (EvView   *view,
                    GObject  *object,
                    EvWindow *ev_window)
 {
                    GObject  *object,
                    EvWindow *ev_window)
 {

-       if (ev_view_get_presentation (EV_VIEW (ev_window->priv->view)))
-               return FALSE;
-

        view_menu_link_popup (ev_window,
                              EV_IS_LINK (object) ? EV_LINK (object) : NULL);
        view_menu_image_popup (ev_window,
        view_menu_link_popup (ev_window,
                              EV_IS_LINK (object) ? EV_LINK (object) : NULL);
        view_menu_image_popup (ev_window,


@@ -4949,11 +4915,6 @@ ev_window_dispose (GObject *object)
                priv->history = NULL;
        }
 
                priv->history = NULL;
        }
 

-       if (priv->presentation_timeout_id > 0) {
-               g_source_remove (priv->presentation_timeout_id);
-               priv->presentation_timeout_id = 0;
-       }
-

        if (priv->print_queue) {
                g_queue_free (priv->print_queue);
                priv->print_queue = NULL;
        if (priv->print_queue) {
                g_queue_free (priv->print_queue);
                priv->print_queue = NULL;


@@ -4994,7 +4955,7 @@ ev_window_key_press_event (GtkWidget   *widget,
                g_object_unref (priv->view);
        }
 
                g_object_unref (priv->view);
        }
 

-       if (!handled && !ev_view_get_presentation (EV_VIEW (priv->view))) {
+       if (!handled && !EV_WINDOW_IS_PRESENTATION (ev_window)) {

                guint modifier = event->state & gtk_accelerator_get_default_mod_mask ();
 
                if (priv->menubar_accel_keyval != 0 &&
                guint modifier = event->state & gtk_accelerator_get_default_mod_mask ();
 
                if (priv->menubar_accel_keyval != 0 &&


@@ -5085,6 +5046,7 @@ static const GtkActionEntry entries[] = {
        { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>Right", NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 
        { "EditRotateRight", EV_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>Right", NULL,
          G_CALLBACK (ev_window_cmd_edit_rotate_right) },
 

+

         /* View menu */
         { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
           N_("Enlarge the document"),
         /* View menu */
         { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus",
           N_("Enlarge the document"),


@@ -5208,6 +5170,10 @@ static const GtkToggleActionEntry toggle_entries[] = {
         { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
           N_("Make the current document fill the window width"),
           G_CALLBACK (ev_window_cmd_view_page_width) },
         { "ViewPageWidth", EV_STOCK_ZOOM_WIDTH, N_("Fit Page _Width"), NULL,
           N_("Make the current document fill the window width"),
           G_CALLBACK (ev_window_cmd_view_page_width) },

+       { "ViewInvertedColors", EV_STOCK_INVERTED_COLORS, N_("_Inverted Colors"), "<control>I",
+         N_("Show page contents with the colors inverted"),
+         G_CALLBACK (ev_window_cmd_view_inverted_colors) },
+

 };
 
 /* Popups specific items */
 };
 
 /* Popups specific items */


@@ -5557,18 +5523,35 @@ launch_external_uri (EvWindow *window, EvLinkAction *action)
 
        if (!g_strstr_len (uri, strlen (uri), "://") &&
            !g_str_has_prefix (uri, "mailto:")) {
 
        if (!g_strstr_len (uri, strlen (uri), "://") &&
            !g_str_has_prefix (uri, "mailto:")) {

-               gchar *http;
-               
-               /* Not a valid uri, assuming it's http */
-               http = g_strdup_printf ("http://%s", uri);
-               ret = g_app_info_launch_default_for_uri (http, context, &error);
-               g_free (http);
+               gchar *new_uri;
+
+               /* Not a valid uri, assume http if it starts with www */
+               if (g_str_has_prefix (uri, "www.")) {
+                       new_uri = g_strdup_printf ("http://%s", uri);
+               } else {
+                       GFile *file, *parent;
+
+                       file = g_file_new_for_uri (window->priv->uri);
+                       parent = g_file_get_parent (file);
+                       g_object_unref (file);
+                       if (parent) {
+                               gchar *parent_uri = g_file_get_uri (parent);
+
+                               new_uri = g_build_filename (parent_uri, uri, NULL);
+                               g_free (parent_uri);
+                               g_object_unref (parent);
+                       } else {
+                               new_uri = g_strdup_printf ("file:///%s", uri);
+                       }
+               }
+               ret = g_app_info_launch_default_for_uri (new_uri, context, &error);
+               g_free (new_uri);

        } else {
                ret = g_app_info_launch_default_for_uri (uri, context, &error);
        }
        } else {
                ret = g_app_info_launch_default_for_uri (uri, context, &error);
        }

-       
+

        if (ret == FALSE) {
        if (ret == FALSE) {

-               ev_window_error_message (window, error, 
+               ev_window_error_message (window, error,

                                         "%s", _("Unable to open external link"));
                g_error_free (error);
        }
                                         "%s", _("Unable to open external link"));
                g_error_free (error);
        }


@@ -6085,6 +6068,7 @@ ev_window_init (EvWindow *ev_window)
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget;
        GtkAccelGroup *accel_group;
        GError *error = NULL;
        GtkWidget *sidebar_widget;

+       GtkWidget *menuitem;

        EggToolbarsModel *toolbars_model;
        GObject *mpkeys;
        gchar *ui_path;
        EggToolbarsModel *toolbars_model;
        GObject *mpkeys;
        gchar *ui_path;


@@ -6179,6 +6163,12 @@ ev_window_init (EvWindow *ev_window)
        gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);
        gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
                            ev_window->priv->menubar,
                            FALSE, FALSE, 0);

+       menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/MainMenu/EditMenu/EditRotateLeftMenu");
+       gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+       menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
+                                             "/MainMenu/EditMenu/EditRotateRightMenu");
+       gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);

 
        toolbars_model = get_toolbars_model ();
        ev_window->priv->toolbar = GTK_WIDGET
 
        toolbars_model = get_toolbars_model ();
        ev_window->priv->toolbar = GTK_WIDGET


@@ -6299,10 +6289,12 @@ ev_window_init (EvWindow *ev_window)
        g_signal_connect_object (ev_window->priv->view, "handle-link",
                                 G_CALLBACK (view_handle_link_cb),
                                 ev_window, 0);
        g_signal_connect_object (ev_window->priv->view, "handle-link",
                                 G_CALLBACK (view_handle_link_cb),
                                 ev_window, 0);

-       g_signal_connect_object (ev_window->priv->view,
-                                "popup",
+       g_signal_connect_object (ev_window->priv->view, "popup",

                                 G_CALLBACK (view_menu_popup_cb),
                                 ev_window, 0);
                                 G_CALLBACK (view_menu_popup_cb),
                                 ev_window, 0);

+       g_signal_connect_object (ev_window->priv->view, "selection-changed",
+                                G_CALLBACK (view_selection_changed_cb),
+                                ev_window, 0);

        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 
        gtk_widget_show (ev_window->priv->view);
        gtk_widget_show (ev_window->priv->password_view);
 


@@ -6348,16 +6340,10 @@ ev_window_init (EvWindow *ev_window)
                          "notify::dual-page",
                          G_CALLBACK (ev_window_dual_mode_changed_cb),
                          ev_window);
                          "notify::dual-page",
                          G_CALLBACK (ev_window_dual_mode_changed_cb),
                          ev_window);

-
-       /* Connect to view signals */

        g_signal_connect (ev_window->priv->model,
                          "notify::inverted-colors",
                          G_CALLBACK (ev_window_inverted_colors_changed_cb),
                          ev_window);
        g_signal_connect (ev_window->priv->model,
                          "notify::inverted-colors",
                          G_CALLBACK (ev_window_inverted_colors_changed_cb),
                          ev_window);

-       g_signal_connect (ev_window->priv->view,
-                         "notify::has-selection",
-                         G_CALLBACK (ev_window_has_selection_changed_cb),
-                         ev_window);

 
        /* Connect sidebar signals */
        g_signal_connect (ev_window->priv->sidebar,
 
        /* Connect sidebar signals */
        g_signal_connect (ev_window->priv->sidebar,