]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-view.c
Blank screen in presentation mode when pressing 'b' (filling with black)
[evince.git] / shell / ev-view.c
index 3eed46a803bfe54a2ab76bfe2052c0387c25f9a9..9a37136cee60860dc66c3e89f9dba4d086b380df 100644 (file)
@@ -1051,6 +1051,47 @@ location_in_selected_text (EvView  *view,
        return FALSE;
 }
 
+static gboolean
+get_doc_point_from_offset (EvView *view, 
+                          gint    page, 
+                          gint    x_offset, 
+                          gint    y_offset, 
+                          gint   *x_new, 
+                          gint   *y_new)
+{
+        int width, height;
+       double x, y;
+
+        ev_page_cache_get_size (view->page_cache, page,
+                                view->rotation,
+                                1.0,
+                                &width, &height);
+
+       x_offset = x_offset / view->scale;
+       y_offset = y_offset / view->scale;
+
+        if (view->rotation == 0) {
+                x = x_offset;
+                y = y_offset;
+        } else if (view->rotation == 90) {
+                x = y_offset;
+                y = width - x_offset;
+        } else if (view->rotation == 180) {
+                x = width - x_offset;
+                y = height - y_offset;
+        } else if (view->rotation == 270) {
+                x = height - y_offset; 
+                y = x_offset;
+        } else {
+                g_assert_not_reached ();
+        }
+
+       *x_new = x;
+       *y_new = y;
+       
+       return TRUE;
+}
+
 /*** Hyperref ***/
 static EvLink *
 ev_view_get_link_at_location (EvView  *view,
@@ -1059,6 +1100,7 @@ ev_view_get_link_at_location (EvView  *view,
 {
        gint page = -1;
        gint x_offset = 0, y_offset = 0;
+       gint x_new = 0, y_new = 0;
        GList *link_mapping;
        
        x += view->scroll_x;
@@ -1069,10 +1111,15 @@ ev_view_get_link_at_location (EvView  *view,
        if (page == -1)
                return NULL;
 
+       
+       if (get_doc_point_from_offset (view, page, x_offset, 
+                                      y_offset, &x_new, &y_new) == FALSE)
+               return NULL;
+
        link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page);
 
        if (link_mapping)
-               return ev_link_mapping_find (link_mapping, x_offset / view->scale, y_offset / view->scale);
+               return ev_link_mapping_find (link_mapping, x_new, y_new);
        else
                return NULL;
 }
@@ -1739,6 +1786,42 @@ find_selection_for_page (EvView *view,
        return NULL;
 }
 
+static void
+draw_end_presentation_page (EvView       *view,
+                           GdkRectangle *page_area)
+{
+       PangoLayout *layout;
+       PangoFontDescription *font_desc;
+       gchar *markup;
+       const gchar *text = _("End of presentation, press Escape to exit.");
+
+       if (view->presentation_state != EV_PRESENTATION_END)
+               return;
+
+       layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL);
+       markup = g_strdup_printf ("<span foreground=\"white\">%s</span>", text);
+       pango_layout_set_markup (layout, markup, -1);
+       g_free (markup);
+
+       font_desc = pango_font_description_new ();
+       pango_font_description_set_size (font_desc, 16 * PANGO_SCALE);
+       pango_layout_set_font_description (layout, font_desc);
+
+       gtk_paint_layout (GTK_WIDGET (view)->style,
+                         GTK_WIDGET (view)->window,
+                         GTK_WIDGET_STATE (view),
+                         FALSE,
+                         page_area,
+                         GTK_WIDGET (view),
+                         NULL,
+                         page_area->x + 15,
+                         page_area->y + 15,
+                         layout);
+
+       pango_font_description_free (font_desc);
+       g_object_unref (layout);
+}
+
 static gboolean
 ev_view_expose_event (GtkWidget      *widget,
                      GdkEventExpose *event)
@@ -1746,6 +1829,26 @@ ev_view_expose_event (GtkWidget      *widget,
        EvView *view = EV_VIEW (widget);
        int i;
 
+       if (view->presentation) {
+               switch (view->presentation_state) {
+                       case EV_PRESENTATION_END: {
+                               GdkRectangle area = {0};
+
+                               area.width = widget->allocation.width;
+                               area.height = widget->allocation.height;
+                               
+                               draw_end_presentation_page (view, &area);
+                       }
+                               return FALSE;
+                       case EV_PRESENTATION_BLACK:
+                       case EV_PRESENTATION_WHITE:
+                               return FALSE;
+                       case EV_PRESENTATION_NORMAL:
+                       default:
+                               break;
+               }
+       }
+       
        if (view->loading) {
                GdkRectangle area = {0};
                
@@ -2011,11 +2114,7 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 
                        return TRUE;
                }
-       /* For the Evince 0.4.x release, we limit links to un-rotated documents
-        * only.
-        */
-       } else if (view->pressed_button <= 0 &&
-                  view->rotation == 0) {
+       } else if (view->pressed_button <= 0) {
                handle_link_over_xy (view, x, y);
                return TRUE;
        }
@@ -2077,6 +2176,60 @@ ev_view_button_release_event (GtkWidget      *widget,
        return FALSE;
 }
 
+static gboolean
+ev_view_key_press_event (GtkWidget   *widget,
+                        GdkEventKey *event)
+{
+       EvView *view = EV_VIEW (widget);
+       EvPresentationState current;
+
+       if (!view->presentation ||
+           view->presentation_state == EV_PRESENTATION_END)
+               return FALSE;
+
+       current = view->presentation_state;
+
+       switch (event->keyval) {
+               case GDK_b:
+               case GDK_B:
+                       view->presentation_state =
+                               (view->presentation_state == EV_PRESENTATION_BLACK) ?
+                               EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK;
+                       break;
+               case GDK_w:
+               case GDK_W:
+                       view->presentation_state =
+                               (view->presentation_state == EV_PRESENTATION_WHITE) ?
+                               EV_PRESENTATION_NORMAL : EV_PRESENTATION_WHITE;
+                       break;
+               default:
+                       if (view->presentation_state == EV_PRESENTATION_BLACK ||
+                           view->presentation_state == EV_PRESENTATION_WHITE) {
+                               view->presentation_state = EV_PRESENTATION_NORMAL;
+                       }
+       }
+
+       if (current == view->presentation_state)
+               return FALSE;
+
+       switch (view->presentation_state) {
+               case EV_PRESENTATION_NORMAL:
+               case EV_PRESENTATION_BLACK:
+                       gdk_window_set_background (widget->window,
+                                                  &widget->style->black);
+                       break;
+               case EV_PRESENTATION_WHITE:
+                       gdk_window_set_background (widget->window,
+                                                  &widget->style->white);
+                       break;
+               default:
+                       return FALSE;
+       }
+
+       gtk_widget_queue_draw (widget);
+       return TRUE;
+}
+
 static gint
 ev_view_focus_in (GtkWidget     *widget,
                  GdkEventFocus *event)
@@ -2558,6 +2711,7 @@ ev_view_class_init (EvViewClass *class)
        widget_class->button_press_event = ev_view_button_press_event;
        widget_class->motion_notify_event = ev_view_motion_notify_event;
        widget_class->button_release_event = ev_view_button_release_event;
+       widget_class->key_press_event = ev_view_key_press_event;
        widget_class->focus_in_event = ev_view_focus_in;
        widget_class->focus_out_event = ev_view_focus_out;
        widget_class->get_accessible = ev_view_get_accessible;
@@ -2731,6 +2885,7 @@ ev_view_init (EvView *view)
        view->continuous = TRUE;
        view->dual_page = FALSE;
        view->presentation = FALSE;
+       view->presentation_state = EV_PRESENTATION_NORMAL;
        view->fullscreen = FALSE;
        view->sizing_mode = EV_SIZING_FIT_WIDTH;
        view->pending_scroll = SCROLL_TO_KEEP_POSITION;
@@ -3020,6 +3175,9 @@ ev_view_set_presentation (EvView   *view,
        if (view->presentation == presentation)
                return;
 
+       if (!presentation)
+               view->presentation_state = EV_PRESENTATION_NORMAL;
+       
        view->presentation = presentation;
        view->pending_scroll = SCROLL_TO_PAGE_POSITION;
        gtk_widget_queue_resize (GTK_WIDGET (view));
@@ -3033,7 +3191,6 @@ ev_view_set_presentation (EvView   *view,
                                                   &GTK_WIDGET (view)->style->mid [GTK_STATE_NORMAL]);
        }
 
-
        g_object_notify (G_OBJECT (view), "presentation");
 }
 
@@ -4131,27 +4288,47 @@ ev_view_show_cursor (EvView *view)
        ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
 }
 
+static void
+ev_view_reset_presentation_state (EvView *view)
+{
+       if (!view->presentation ||
+           view->presentation_state == EV_PRESENTATION_NORMAL)
+               return;
+
+       view->presentation_state = EV_PRESENTATION_NORMAL;
+       gdk_window_set_background (GTK_WIDGET (view)->window,
+                                  &GTK_WIDGET (view)->style->black);
+       gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
 gboolean
 ev_view_next_page (EvView *view)
 {
-       int page;
+       int page, n_pages;
 
        g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
        
        if (!view->page_cache)
                return FALSE;
 
+       ev_view_reset_presentation_state (view);
+       
        page = ev_page_cache_get_current_page (view->page_cache);
+       n_pages = ev_page_cache_get_n_pages (view->page_cache);
 
        if (view->dual_page && !view->presentation)
                page = page + 2; 
        else 
                page = page + 1;
 
-       if (page < ev_page_cache_get_n_pages (view->page_cache)) {
+       if (page < n_pages) {
                ev_page_cache_set_current_page (view->page_cache, page);
                return TRUE;
-       } else if (ev_view_get_dual_page (view) && page == ev_page_cache_get_n_pages (view->page_cache)) {
+       } else if (view->presentation && page == n_pages) {
+               view->presentation_state = EV_PRESENTATION_END;
+               gtk_widget_queue_draw (GTK_WIDGET (view));
+               return TRUE;
+       } else if (view->dual_page && page == n_pages) {
                ev_page_cache_set_current_page (view->page_cache, page - 1);
                return TRUE;
        } else {
@@ -4169,6 +4346,14 @@ ev_view_previous_page (EvView *view)
        if (!view->page_cache)
                return FALSE;
 
+       if (view->presentation &&
+           view->presentation_state == EV_PRESENTATION_END) {
+               ev_view_reset_presentation_state (view);
+               return TRUE;
+       }
+
+       ev_view_reset_presentation_state (view);
+
        page = ev_page_cache_get_current_page (view->page_cache);
 
        if (view->dual_page && !view->presentation)