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=c3e40bf5787c557535f623470f65c010a0a70a6d;hb=b43ae08397c06479da37a5bf094a0a071cb4d394;hp=0a11ce1cb5f6a95495e851d74fdef4e338d4a009;hpb=356536f6b8b44bfcf13c644a26ecdd583465bc0f;p=evince.git diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index 0a11ce1c..c3e40bf5 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -31,10 +31,13 @@ #include "ev-view-cursor.h" #include "ev-page-cache.h" + + enum { PROP_0, PROP_DOCUMENT, PROP_CURRENT_PAGE, + PROP_PAGE, PROP_ROTATION, PROP_INVERTED_COLORS }; @@ -42,6 +45,7 @@ enum { enum { CHANGE_PAGE, FINISHED, + SIGNAL_EXTERNAL_LINK, N_SIGNALS }; @@ -56,6 +60,8 @@ struct _EvViewPresentation { GtkWidget base; + guint is_constructing : 1; + guint current_page; cairo_surface_t *current_surface; EvDocument *document; @@ -94,15 +100,15 @@ struct _EvViewPresentationClass GtkWidgetClass base_class; /* signals */ - void (* change_page) (EvViewPresentation *pview, - GtkScrollType scroll); - void (* finished) (EvViewPresentation *pview); + void (* change_page) (EvViewPresentation *pview, + GtkScrollType scroll); + void (* finished) (EvViewPresentation *pview); + void (* external_link) (EvViewPresentation *pview, + EvLinkAction *action); }; static guint signals[N_SIGNALS] = { 0 }; -static void ev_view_presentation_next_page (EvViewPresentation *pview); -static void ev_view_presentation_previous_page (EvViewPresentation *pview); static void ev_view_presentation_set_cursor_for_location (EvViewPresentation *pview, gdouble x, gdouble y); @@ -111,18 +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); } @@ -130,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); } @@ -145,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); } @@ -381,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 +492,7 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview, } pview->current_page = page; + g_object_notify (G_OBJECT(pview), "page"); if (pview->page_cache) ev_page_cache_set_page_range (pview->page_cache, page, page); @@ -485,7 +508,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; @@ -510,7 +546,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; @@ -534,7 +570,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 @@ -579,17 +615,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)) @@ -630,9 +666,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)) @@ -642,6 +678,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)) @@ -735,6 +772,9 @@ ev_view_presentation_link_is_supported (EvViewPresentation *pview, case EV_LINK_ACTION_TYPE_GOTO_DEST: return ev_link_action_get_dest (action) != NULL; case EV_LINK_ACTION_TYPE_NAMED: + case EV_LINK_ACTION_TYPE_GOTO_REMOTE: + case EV_LINK_ACTION_TYPE_EXTERNAL_URI: + case EV_LINK_ACTION_TYPE_LAUNCH: return TRUE; default: return FALSE; @@ -793,14 +833,15 @@ ev_view_presentation_get_link_at_location (EvViewPresentation *pview, } static void -ev_vew_presentation_goto_link_dest (EvViewPresentation *pview, - EvLink *link) +ev_vew_presentation_handle_link (EvViewPresentation *pview, + EvLink *link) { EvLinkAction *action; action = ev_link_get_action (link); - if (ev_link_action_get_action_type (action) == EV_LINK_ACTION_TYPE_NAMED) { + switch (ev_link_action_get_action_type (action)) { + case EV_LINK_ACTION_TYPE_NAMED: { const gchar *name = ev_link_action_get_name (action); if (g_ascii_strcasecmp (name, "FirstPage") == 0) { @@ -815,13 +856,25 @@ ev_vew_presentation_goto_link_dest (EvViewPresentation *pview, n_pages = ev_document_get_n_pages (pview->document); ev_view_presentation_update_current_page (pview, n_pages - 1); } - } else { + } + break; + + case EV_LINK_ACTION_TYPE_GOTO_DEST: { EvLinkDest *dest; gint page; dest = ev_link_action_get_dest (action); page = ev_document_links_get_dest_page (EV_DOCUMENT_LINKS (pview->document), dest); ev_view_presentation_update_current_page (pview, page); + } + break; + case EV_LINK_ACTION_TYPE_GOTO_REMOTE: + case EV_LINK_ACTION_TYPE_EXTERNAL_URI: + case EV_LINK_ACTION_TYPE_LAUNCH: + g_signal_emit (pview, signals[SIGNAL_EXTERNAL_LINK], 0, action); + break; + default: + break; } } @@ -846,7 +899,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 @@ -901,7 +954,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); @@ -913,21 +966,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); @@ -945,19 +984,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; @@ -983,34 +1031,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: @@ -1023,7 +1066,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); @@ -1033,7 +1076,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; @@ -1049,8 +1093,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) @@ -1059,7 +1103,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; @@ -1072,34 +1117,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; @@ -1128,7 +1173,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 @@ -1151,7 +1196,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); } @@ -1190,19 +1235,60 @@ ev_view_presentation_motion_notify_event (GtkWidget *widget, return FALSE; } -static gboolean -init_presentation (GtkWidget *widget) +static GdkRectangle +ev_view_presentation_get_monitor_geometry (EvViewPresentation *pview) { - EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); - GdkScreen *screen = gtk_widget_get_screen (widget); + GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET(pview)); GdkRectangle monitor; gint monitor_num; - monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget)); + monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (GTK_WIDGET(pview))); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + + return monitor; +} + +static void +ev_view_presentation_update_scale (EvViewPresentation *pview) +{ + GdkRectangle monitor = ev_view_presentation_get_monitor_geometry (pview); + + if((pview->monitor_width != monitor.width)||(pview->monitor_height != monitor.height)) { + pview->monitor_width = monitor.width; + pview->monitor_height = monitor.height; + + pview->scale = 0; + ev_view_presentation_reset_jobs (pview); + ev_view_presentation_update_current_page (pview, pview->current_page); + } +} + +static void +ev_view_presentation_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + gtk_widget_set_allocation (widget, allocation); + if (gtk_widget_get_realized (widget)) + gdk_window_move_resize (gtk_widget_get_window (widget), + allocation->x, + allocation->y, + allocation->width, + allocation->height); + ev_view_presentation_update_scale (EV_VIEW_PRESENTATION (widget)); +} + +static gboolean +init_presentation (GtkWidget *widget) +{ + EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); + GdkRectangle monitor = ev_view_presentation_get_monitor_geometry (pview); + pview->monitor_width = monitor.width; pview->monitor_height = monitor.height; + g_signal_connect_swapped (G_OBJECT (widget), "screen-changed", + G_CALLBACK (ev_view_presentation_update_scale), pview); + ev_view_presentation_update_current_page (pview, pview->current_page); ev_view_presentation_hide_cursor_timeout_start (pview); @@ -1212,17 +1298,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; @@ -1242,15 +1326,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); } @@ -1303,7 +1384,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, @@ -1329,8 +1410,11 @@ ev_view_presentation_set_property (GObject *object, case PROP_CURRENT_PAGE: pview->current_page = g_value_get_uint (value); break; + case PROP_PAGE: + 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); @@ -1340,10 +1424,30 @@ 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_PAGE: + g_value_set_uint (value, ev_view_presentation_get_current_page (pview)); + break; + 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; @@ -1352,6 +1456,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); @@ -1366,24 +1471,27 @@ 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->size_allocate = ev_view_presentation_size_allocate; + 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, @@ -1393,13 +1501,20 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) EV_TYPE_DOCUMENT, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + g_object_class_install_property (gobject_class, + PROP_PAGE, + g_param_spec_uint ("page", + "Current Page", + "The current page", + 0, G_MAXUINT, 0, + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_CURRENT_PAGE, g_param_spec_uint ("current_page", "Current Page", "The current page", 0, G_MAXUINT, 0, - G_PARAM_WRITABLE | + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (gobject_class, PROP_ROTATION, @@ -1407,8 +1522,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", @@ -1427,6 +1542,7 @@ 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), @@ -1436,42 +1552,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 * @@ -1496,3 +1632,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; +}