X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-view-presentation.c;h=0a11ce1cb5f6a95495e851d74fdef4e338d4a009;hb=a90e38bd4aab8013c402e55753275f5b3408e103;hp=72af799cf3d857ff36441fb76e9964690d0c7dd4;hpb=e288b2cb68ac2645bfee992566bd8f1974388fb1;p=evince.git diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index 72af799c..0a11ce1c 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "config.h" @@ -30,17 +30,18 @@ #include "ev-transition-animation.h" #include "ev-view-cursor.h" #include "ev-page-cache.h" -#include "ev-mapping.h" enum { PROP_0, PROP_DOCUMENT, PROP_CURRENT_PAGE, - PROP_ROTATION + PROP_ROTATION, + PROP_INVERTED_COLORS }; enum { CHANGE_PAGE, + FINISHED, N_SIGNALS }; @@ -56,10 +57,14 @@ struct _EvViewPresentation GtkWidget base; guint current_page; + cairo_surface_t *current_surface; EvDocument *document; guint rotation; + gboolean inverted_colors; EvPresentationState state; gdouble scale; + gint monitor_width; + gint monitor_height; /* Cursors */ EvViewCursor cursor; @@ -91,6 +96,7 @@ struct _EvViewPresentationClass /* signals */ void (* change_page) (EvViewPresentation *pview, GtkScrollType scroll); + void (* finished) (EvViewPresentation *pview); }; static guint signals[N_SIGNALS] = { 0 }; @@ -109,12 +115,14 @@ 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; - gdk_window_set_background (widget->window, &widget->style->black); + style = gtk_widget_get_style (widget); + gdk_window_set_background (gtk_widget_get_window (widget), &style->black); gtk_widget_queue_draw (widget); } @@ -122,12 +130,14 @@ 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; - gdk_window_set_background (widget->window, &widget->style->black); + style = gtk_widget_get_style (widget); + gdk_window_set_background (gtk_widget_get_window (widget), &style->black); gtk_widget_queue_draw (widget); } @@ -135,12 +145,14 @@ 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; - gdk_window_set_background (widget->window, &widget->style->white); + style = gtk_widget_get_style (widget); + gdk_window_set_background (gtk_widget_get_window (widget), &style->white); gtk_widget_queue_draw (widget); } @@ -160,47 +172,50 @@ static gdouble ev_view_presentation_get_scale_for_page (EvViewPresentation *pview, guint page) { - gdouble width, height; + if (!ev_document_is_page_size_uniform (pview->document) || pview->scale == 0) { + gdouble width, height; - ev_document_get_page_size (pview->document, page, &width, &height); + ev_document_get_page_size (pview->document, page, &width, &height); + if (pview->rotation == 90 || pview->rotation == 270) { + gdouble tmp; - if (pview->rotation == 90 || pview->rotation == 270) - return GTK_WIDGET (pview)->allocation.height / width; - else - return GTK_WIDGET (pview)->allocation.height / height; -} - -static void -ev_view_presentation_update_scale (EvViewPresentation *pview) -{ - if (ev_document_is_page_size_uniform (pview->document) && pview->scale != 0) - return; + tmp = width; + width = height; + height = tmp; + } + pview->scale = MIN (pview->monitor_width / width, pview->monitor_height / height); + } - pview->scale = ev_view_presentation_get_scale_for_page (pview, pview->current_page); + return pview->scale; } static void ev_view_presentation_get_page_area (EvViewPresentation *pview, GdkRectangle *area) { - GtkWidget *widget = GTK_WIDGET (pview); - gdouble doc_width, doc_height; - gint view_width, view_height; + GtkWidget *widget = GTK_WIDGET (pview); + GtkAllocation allocation; + gdouble doc_width, doc_height; + gint view_width, view_height; + gdouble scale; ev_document_get_page_size (pview->document, pview->current_page, &doc_width, &doc_height); + scale = ev_view_presentation_get_scale_for_page (pview, pview->current_page); if (pview->rotation == 90 || pview->rotation == 270) { - view_width = (gint)((doc_height * pview->scale) + 0.5); - view_height = (gint)((doc_width * pview->scale) + 0.5); + view_width = (gint)((doc_height * scale) + 0.5); + view_height = (gint)((doc_width * scale) + 0.5); } else { - view_width = (gint)((doc_width * pview->scale) + 0.5); - view_height = (gint)((doc_height * pview->scale) + 0.5); + view_width = (gint)((doc_width * scale) + 0.5); + view_height = (gint)((doc_height * scale) + 0.5); } - area->x = (MAX (0, widget->allocation.width - view_width)) / 2; - area->y = (MAX (0, widget->allocation.height - view_height)) / 2; + gtk_widget_get_allocation (widget, &allocation); + + area->x = (MAX (0, allocation.width - view_width)) / 2; + area->y = (MAX (0, allocation.height - view_height)) / 2; area->width = view_width; area->height = view_height; } @@ -234,7 +249,7 @@ ev_view_presentation_transition_start (EvViewPresentation *pview) duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (pview->document), pview->current_page); - if (duration > 0) { + if (duration >= 0) { pview->trans_timeout_id = g_timeout_add_seconds (duration, (GSourceFunc) transition_next_page, @@ -288,14 +303,16 @@ ev_view_presentation_animation_start (EvViewPresentation *pview, pview->animation = ev_transition_animation_new (effect); - surface = EV_JOB_RENDER (pview->curr_job)->surface; - ev_transition_animation_set_origin_surface (pview->animation, 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) @@ -316,6 +333,9 @@ job_finished_cb (EvJob *job, { EvJobRender *job_render = EV_JOB_RENDER (job); + if (pview->inverted_colors) + ev_document_misc_invert_surface (job_render->surface); + if (job != pview->curr_job) return; @@ -339,11 +359,8 @@ ev_view_presentation_schedule_new_job (EvViewPresentation *pview, if (page < 0 || page >= ev_document_get_n_pages (pview->document)) return NULL; - if (ev_document_is_page_size_uniform (pview->document)) - scale = pview->scale; - else - scale = ev_view_presentation_get_scale_for_page (pview, page); - job = ev_job_render_new (pview->document, page, pview->rotation, pview->scale, 0, 0); + scale = ev_view_presentation_get_scale_for_page (pview, page); + job = ev_job_render_new (pview->document, page, pview->rotation, scale, 0, 0); g_signal_connect (job, "finished", G_CALLBACK (job_finished_cb), pview); @@ -453,7 +470,7 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview, } pview->current_page = page; - ev_view_presentation_update_scale (pview); + if (pview->page_cache) ev_page_cache_set_page_range (pview->page_cache, page, page); @@ -526,22 +543,14 @@ send_focus_change (GtkWidget *widget, { GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); - g_object_ref (widget); - - if (in) - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - else - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); - fevent->focus_change.type = GDK_FOCUS_CHANGE; - fevent->focus_change.window = g_object_ref (widget->window); + fevent->focus_change.window = gtk_widget_get_window (widget); fevent->focus_change.in = in; + if (fevent->focus_change.window) + g_object_ref (fevent->focus_change.window); - gtk_widget_event (widget, fevent); + gtk_widget_send_focus_change (widget, fevent); - g_object_notify (G_OBJECT (widget), "has-focus"); - - g_object_unref (widget); gdk_event_free (fevent); } @@ -617,29 +626,28 @@ ev_view_presentation_goto_entry_activate (GtkEntry *entry, static void ev_view_presentation_goto_window_create (EvViewPresentation *pview) { - GtkWidget *frame, *hbox, *toplevel, *label; + GtkWidget *frame, *hbox, *label; + GtkWindow *toplevel, *goto_window; - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (pview)); + toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pview))); + goto_window = GTK_WINDOW (pview->goto_window); if (pview->goto_window) { - if (GTK_WINDOW (toplevel)->group) - gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, - GTK_WINDOW (pview->goto_window)); - else if (GTK_WINDOW (pview->goto_window)->group) - gtk_window_group_remove_window (GTK_WINDOW (pview->goto_window)->group, - 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)) + gtk_window_group_remove_window (gtk_window_get_group (goto_window), goto_window); + return; } pview->goto_window = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_set_screen (GTK_WINDOW (pview->goto_window), - gtk_widget_get_screen (GTK_WIDGET (pview))); + gtk_window_set_screen (goto_window, gtk_widget_get_screen (GTK_WIDGET (pview))); - if (GTK_WINDOW (toplevel)->group) - gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, - GTK_WINDOW (pview->goto_window)); + if (gtk_window_has_group (toplevel)) + gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window); - gtk_window_set_modal (GTK_WINDOW (pview->goto_window), TRUE); + gtk_window_set_modal (goto_window, TRUE); g_signal_connect (pview->goto_window, "delete_event", G_CALLBACK (ev_view_presentation_goto_window_delete_event), @@ -702,7 +710,9 @@ ev_view_presentation_goto_window_send_key_event (EvViewPresentation *pview, new_event = (GdkEventKey *) gdk_event_copy (event); g_object_unref (new_event->window); - new_event->window = g_object_ref (pview->goto_window->window); + new_event->window = gtk_widget_get_window (pview->goto_window); + if (new_event->window) + g_object_ref (new_event->window); gtk_widget_realize (pview->goto_window); gtk_widget_event (pview->goto_window, (GdkEvent *)new_event); @@ -738,19 +748,21 @@ 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; + GdkRectangle page_area; + EvMappingList *link_mapping; + EvLink *link; + gdouble width, height; + gdouble new_x, new_y; + gdouble scale; if (!pview->page_cache) return NULL; ev_document_get_page_size (pview->document, pview->current_page, &width, &height); ev_view_presentation_get_page_area (pview, &page_area); - x = (x - page_area.x) / pview->scale; - y = (y - page_area.y) / pview->scale; + scale = ev_view_presentation_get_scale_for_page (pview, pview->current_page); + x = (x - page_area.x) / scale; + y = (y - page_area.y) / scale; switch (pview->rotation) { case 0: case 360: @@ -825,13 +837,13 @@ ev_view_presentation_set_cursor (EvViewPresentation *pview, return; widget = GTK_WIDGET (pview); - if (!GTK_WIDGET_REALIZED (widget)) + if (!gtk_widget_get_realized (widget)) gtk_widget_realize (widget); pview->cursor = view_cursor; cursor = ev_view_cursor_new (gtk_widget_get_display (widget), view_cursor); - gdk_window_set_cursor (widget->window, cursor); + gdk_window_set_cursor (gtk_widget_get_window (widget), cursor); gdk_flush (); if (cursor) gdk_cursor_unref (cursor); @@ -875,6 +887,19 @@ ev_view_presentation_hide_cursor_timeout_start (EvViewPresentation *pview) pview); } +static void +ev_view_presentation_update_current_surface (EvViewPresentation *pview, + cairo_surface_t *surface) +{ + if (!surface || pview->current_surface == surface) + return; + + cairo_surface_reference (surface); + if (pview->current_surface) + cairo_surface_destroy (pview->current_surface); + pview->current_surface = surface; +} + static void ev_view_presentation_destroy (GtkObject *object) { @@ -904,6 +929,11 @@ ev_view_presentation_destroy (GtkObject *object) pview->next_job = NULL; } + if (pview->current_surface) { + cairo_surface_destroy (pview->current_surface); + pview->current_surface = NULL; + } + if (pview->page_cache) { g_object_unref (pview->page_cache); pview->page_cache = NULL; @@ -926,25 +956,6 @@ ev_view_presentation_size_request (GtkWidget *widget, requisition->height = 0; } -static void -ev_view_presentation_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); - GdkScreen *screen = gtk_widget_get_screen (widget); - - allocation->x = 0; - allocation->y = 0; - allocation->width = gdk_screen_get_width (screen); - allocation->height = gdk_screen_get_height (screen); - - GTK_WIDGET_CLASS (ev_view_presentation_parent_class)->size_allocate (widget, allocation); - - ev_view_presentation_update_scale (pview); - - gtk_widget_queue_draw (widget); -} - static void ev_view_presentation_draw_end_page (EvViewPresentation *pview) { @@ -952,8 +963,9 @@ ev_view_presentation_draw_end_page (EvViewPresentation *pview) PangoLayout *layout; PangoFontDescription *font_desc; gchar *markup; + GtkAllocation allocation; GdkRectangle area = {0}; - const gchar *text = _("End of presentation. Press Escape to exit."); + const gchar *text = _("End of presentation. Click to exit."); if (pview->state != EV_PRESENTATION_END) return; @@ -967,12 +979,13 @@ ev_view_presentation_draw_end_page (EvViewPresentation *pview) pango_font_description_set_size (font_desc, 16 * PANGO_SCALE); pango_layout_set_font_description (layout, font_desc); - area.width = widget->allocation.width; - area.height = widget->allocation.height; + gtk_widget_get_allocation (widget, &allocation); + area.width = allocation.width; + area.height = allocation.height; - gtk_paint_layout (widget->style, - widget->window, - GTK_WIDGET_STATE (widget), + gtk_paint_layout (gtk_widget_get_style (widget), + gtk_widget_get_window (widget), + gtk_widget_get_state (widget), FALSE, &area, widget, @@ -1010,12 +1023,15 @@ 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 (widget->window); + cr = gdk_cairo_create (gtk_widget_get_window (widget)); /* normalize to x=0, y=0 */ cairo_translate (cr, page_area.x, page_area.y); page_area.x = page_area.y = 0; + /* Try to fix rounding errors */ + page_area.width--; + ev_transition_animation_paint (pview->animation, cr, page_area); cairo_destroy (cr); } @@ -1024,19 +1040,25 @@ ev_view_presentation_expose_event (GtkWidget *widget, } surface = pview->curr_job ? EV_JOB_RENDER (pview->curr_job)->surface : NULL; - if (!surface) + if (surface) { + ev_view_presentation_update_current_surface (pview, surface); + } else if (pview->current_surface) { + surface = pview->current_surface; + } else { return FALSE; + } ev_view_presentation_get_page_area (pview, &page_area); if (gdk_rectangle_intersect (&page_area, &(event->area), &overlap)) { - cr = gdk_cairo_create (widget->window); - - cairo_translate (cr, overlap.x, overlap.y); - cairo_surface_set_device_offset (surface, - overlap.x - page_area.x, - overlap.y - page_area.y); - cairo_set_source_surface (cr, surface, 0, 0); - cairo_paint (cr); + cr = gdk_cairo_create (gtk_widget_get_window (widget)); + + /* Try to fix rounding errors. See bug #438760 */ + if (overlap.width == page_area.width) + overlap.width--; + + 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); } @@ -1071,6 +1093,22 @@ ev_view_presentation_key_press_event (GtkWidget *widget, ev_view_presentation_set_white (pview); return TRUE; + case GDK_Home: + if (pview->state == EV_PRESENTATION_NORMAL) { + ev_view_presentation_update_current_page (pview, 0); + return TRUE; + } + break; + case GDK_End: + if (pview->state == EV_PRESENTATION_NORMAL) { + gint page; + + page = ev_document_get_n_pages (pview->document) - 1; + ev_view_presentation_update_current_page (pview, page); + + return TRUE; + } + break; default: break; } @@ -1103,6 +1141,12 @@ ev_view_presentation_button_release_event (GtkWidget *widget, case 1: { EvLink *link; + if (pview->state == EV_PRESENTATION_END) { + g_signal_emit (pview, signals[FINISHED], 0, NULL); + + return FALSE; + } + link = ev_view_presentation_get_link_at_location (pview, event->x, event->y); @@ -1146,22 +1190,45 @@ ev_view_presentation_motion_notify_event (GtkWidget *widget, return FALSE; } +static gboolean +init_presentation (GtkWidget *widget) +{ + EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); + GdkScreen *screen = gtk_widget_get_screen (widget); + GdkRectangle monitor; + gint monitor_num; + + monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + pview->monitor_width = monitor.width; + pview->monitor_height = monitor.height; + + ev_view_presentation_update_current_page (pview, pview->current_page); + ev_view_presentation_hide_cursor_timeout_start (pview); + + return FALSE; +} + static void ev_view_presentation_realize (GtkWidget *widget) { + GdkWindow *window; + GtkStyle *style; GdkWindowAttr attributes; + GtkAllocation allocation; - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); + 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); - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = widget->allocation.width; - attributes.height = widget->allocation.height; + gtk_widget_get_allocation (widget, &allocation); + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; attributes.event_mask = GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | @@ -1169,20 +1236,23 @@ ev_view_presentation_realize (GtkWidget *widget) GDK_KEY_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | - GDK_ENTER_NOTIFY_MASK | + GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK; - 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 (widget->window, widget); - widget->style = gtk_style_attach (widget->style, widget->window); + 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_background (widget->window, &widget->style->black); + gdk_window_set_user_data (window, widget); + gtk_widget_set_window (widget, window); - gtk_widget_queue_resize (widget); + gtk_widget_style_attach (widget); + style = gtk_widget_get_style (widget); + gdk_window_set_background (window, &style->black); + + g_idle_add ((GSourceFunc)init_presentation, widget); } static void @@ -1262,6 +1332,9 @@ ev_view_presentation_set_property (GObject *object, case PROP_ROTATION: pview->rotation = g_value_get_uint (value); break; + case PROP_INVERTED_COLORS: + pview->inverted_colors = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); } @@ -1274,7 +1347,6 @@ ev_view_presentation_constructor (GType type, { GObject *object; EvViewPresentation *pview; - GtkAllocation a; object = G_OBJECT_CLASS (ev_view_presentation_parent_class)->constructor (type, n_construct_properties, @@ -1286,11 +1358,6 @@ ev_view_presentation_constructor (GType type, ev_page_cache_set_flags (pview->page_cache, EV_PAGE_DATA_INCLUDE_LINKS); } - /* Call allocate asap to update page scale */ - ev_view_presentation_size_allocate (GTK_WIDGET (pview), &a); - ev_view_presentation_update_current_page (pview, pview->current_page); - ev_view_presentation_hide_cursor_timeout_start (pview); - return object; } @@ -1304,7 +1371,6 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) klass->change_page = ev_view_presentation_change_page; - widget_class->size_allocate = ev_view_presentation_size_allocate; widget_class->size_request = ev_view_presentation_size_request; widget_class->realize = ev_view_presentation_realize; widget_class->expose_event = ev_view_presentation_expose_event; @@ -1343,6 +1409,14 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) 0, 360, 0, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (gobject_class, + PROP_INVERTED_COLORS, + g_param_spec_boolean ("inverted_colors", + "Inverted Colors", + "Whether presentation is displayed with inverted colors", + FALSE, + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY)); signals[CHANGE_PAGE] = g_signal_new ("change_page", @@ -1353,6 +1427,15 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, GTK_TYPE_SCROLL_TYPE); + signals[FINISHED] = + g_signal_new ("finished", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvViewPresentationClass, finished), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0, + G_TYPE_NONE); binding_set = gtk_binding_set_by_class (klass); add_change_page_binding_keypad (binding_set, GDK_Left, 0, GTK_SCROLL_PAGE_BACKWARD); @@ -1388,13 +1471,14 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) static void ev_view_presentation_init (EvViewPresentation *pview) { - GTK_WIDGET_SET_FLAGS (pview, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE); } GtkWidget * ev_view_presentation_new (EvDocument *document, guint current_page, - guint rotation) + guint rotation, + gboolean inverted_colors) { g_return_val_if_fail (EV_IS_DOCUMENT (document), NULL); g_return_val_if_fail (current_page < ev_document_get_n_pages (document), NULL); @@ -1403,6 +1487,7 @@ ev_view_presentation_new (EvDocument *document, "document", document, "current_page", current_page, "rotation", rotation, + "inverted_colors", inverted_colors, NULL)); }