#include "ev-transition-animation.h"
#include "ev-view-cursor.h"
#include "ev-page-cache.h"
-#include "ev-mapping.h"
enum {
PROP_0,
pview->animation = ev_transition_animation_new (effect);
- surface = EV_JOB_RENDER (pview->curr_job)->surface;
+ surface = pview->curr_job ? EV_JOB_RENDER (pview->curr_job)->surface : NULL;
ev_transition_animation_set_origin_surface (pview->animation,
surface != NULL ?
surface : pview->current_surface);
jump = new_page - pview->current_page;
if (jump == -1)
- surface = EV_JOB_RENDER (pview->prev_job)->surface;
+ surface = pview->prev_job ? EV_JOB_RENDER (pview->prev_job)->surface : NULL;
else if (jump == 1)
- surface = EV_JOB_RENDER (pview->next_job)->surface;
+ surface = pview->next_job ? EV_JOB_RENDER (pview->next_job)->surface : NULL;
else
surface = NULL;
if (surface)
/* 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
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))
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),
gdouble x,
gdouble y)
{
- GdkRectangle page_area;
- GList *link_mapping;
- EvLink *link;
- gdouble width, height;
- gdouble new_x, new_y;
- gdouble scale;
+ GdkRectangle page_area;
+ EvMappingList *link_mapping;
+ EvLink *link;
+ gdouble width, height;
+ gdouble new_x, new_y;
+ gdouble scale;
if (!pview->page_cache)
return NULL;
return gtk_bindings_activate_event (GTK_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;
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,
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);
- 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);
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff