Merge lp:~ochosi/evince/show_titlebar into lp:ubuntu/vivid/evince

[Simon Steinbeiß]

This commit adds a patch to resolve https://bugs.launchpad.net/ubuntu/+source/evince/+bug/1422354.
At the moment when maximizing Evince, its titlebar isn't shown anymore. This is not a problem for DEs that use CSD, but for those with traditional WM borders (like Xfce) it's not desirable.

[lp:~ochosi/evince/show_titlebar]

208. By Simon Steinbeiß on 2015-02-20

Remove .pc dir

[Sebastien Bacher (seb128)]

looks like that got uploaded to vivid by Laney already, but thanks for the work!

Unmerged revisions

208. By Simon Steinbeiß on 2015-02-20

Remove .pc dir

207. By Simon Steinbeiß on 2015-02-20

Show the titlebar when the window is maximized

=== removed directory '.pc/11_grip_gestures.patch'
=== removed file '.pc/11_grip_gestures.patch/configure.ac'
--- .pc/11_grip_gestures.patch/configure.ac	2014-09-15 12:46:26 +0000
+++ .pc/11_grip_gestures.patch/configure.ac	1970-01-01 00:00:00 +0000
@@ -1,948 +0,0 @@
-# *****************************************************************************
-# Versioning
-# *****************************************************************************
-
-m4_define([ev_major_version],[3])
-m4_define([ev_minor_version],[13])
-m4_define([ev_micro_version],[91])
-m4_define([ev_extra_version],[])
-m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
-
-# The evince API version
-m4_define([ev_api_version], [3.0])
-
-# Libtool versioning. The backend and view libraries have separate versions.
-# Before making a release, the libtool version should be modified.
-# The string is of the form C:R:A.
-# - If interfaces have been changed or added, but binary compatibility has
-#   been preserved, change to C+1:0:A+1
-# - If binary compatibility has been broken (eg removed or changed interfaces)
-#   change to C+1:0:0
-# - If the interface is the same as the previous version, change to C:R+1:A
-
-# Libtool version of the backend library
-m4_define([ev_document_lt_current],[4])
-m4_define([ev_document_lt_revision],[0])
-m4_define([ev_document_lt_age],[0])
-m4_define([ev_document_lt_version_info],[ev_document_lt_current:ev_document_lt_revision:ev_document_lt_age])
-m4_define([ev_document_lt_current_minus_age],[m4_eval(ev_document_lt_current - ev_document_lt_age)])
-
-# Libtool version of the view library
-m4_define([ev_view_lt_current],[3])
-m4_define([ev_view_lt_revision],[0])
-m4_define([ev_view_lt_age],[0])
-m4_define([ev_view_lt_version_info],[ev_view_lt_current:ev_view_lt_revision:ev_view_lt_age])
-m4_define([ev_view_lt_current_minus_age],[m4_eval(ev_view_lt_current - ev_view_lt_age)])
-
-# Binary version for the document backends
-m4_define([ev_binary_version],[ev_document_lt_current])
-
-# *****************************************************************************
-
-AC_PREREQ([2.57])
-AC_INIT([Evince],[ev_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=evince],[evince])
-AM_INIT_AUTOMAKE([1.10 foreign dist-xz no-dist-gzip tar-ustar])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-
-if test -z "$enable_maintainer_mode"; then
-  enable_maintainer_mode=yes
-fi
-AM_MAINTAINER_MODE([enable])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-
-AC_PROG_SED
-
-# Initialize libtool
-LT_PREREQ([2.2])
-LT_INIT
-LT_LIB_M
-
-GNOME_CXX_WARNINGS
-
-IT_PROG_INTLTOOL([0.35.0])
-
-GETTEXT_PACKAGE=evince
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-AM_GLIB_GNU_GETTEXT
-
-m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
-EV_INTLTOOL_EVINCE_BACKEND_RULE='%.evince-backend:   %.evince-backend.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST([EV_INTLTOOL_EVINCE_BACKEND_RULE])
-
-GLIB_GSETTINGS
-
-# Check which platform to use
-
-AC_MSG_CHECKING([for which platform to build])
-AC_ARG_WITH([platform],
-  [AS_HELP_STRING([--with-platform=gnome|win32],
-                  [Setting platform (default: gnome)])],
-  [case "$withval" in
-    gnome|win32) ;;
-    *) AC_MSG_ERROR([invalid argument "$withval" for --with-platform]) ;;
-   esac],
-  [case "$host" in
-     *-*-mingw*|*-*-cygwin*) with_platform="win32" ;;
-     *) with_platform=gnome ;;
-   esac])
-
-AC_MSG_RESULT([$with_platform])
-
-if test "$with_platform" = "win32"; then
-  AC_CHECK_TOOL([WINDRES],[windres])
-  AC_MSG_CHECKING([for native Win32])
-  case "$host" in
-    *-*-mingw*)
-      os_win32=yes
-      ;;
-    *)
-      os_win32=no
-      ;;
-  esac
-  AC_MSG_RESULT([$os_win32])
-
-  AM_CFLAGS="$AM_CFLAGS -D_WIN32_WINNT=0x0500"
-fi
-
-AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
-
-dnl Specify required versions of dependencies
-CAIRO_REQUIRED=1.10.0
-GLIB_REQUIRED=2.36.0
-LIBSECRET_REQUIRED=0.5
-GTK_REQUIRED=3.12.0
-NAUTILUS_REQUIRED=2.91.4
-
-AC_SUBST([GLIB_REQUIRED])
-AC_SUBST([GTK_REQUIRED])
-
-AC_DEFINE([GDK_VERSION_MIN_REQUIRED], [GDK_VERSION_3_8], [Minimum GTK/GDK version required])
-
-ADWAITA_ICON_THEME_REQUIRED=2.17.1
-LIBXML_REQUIRED=2.5.0
-
-dnl Check dependencies
-
-# LIB_CFLAGS       for helpers and generic widgets. (libdocument, cut-and-paste)
-# BACKEND_CFLAGS   for backend implementations.
-# FRONTEND_CFLAGS  for frontend implementations. (properties, thumbnailer)
-# FRONTEND_LIBS
-# SHELL_CFLAGS     for shell implementation.
-# SHELL_LIBS
-
-have_zlib=yes
-AC_CHECK_HEADERS([zlib.h],
-	[AC_CHECK_LIB([z], [inflate],
-		[AC_CHECK_LIB([z], [crc32], [have_zlib=yes], [have_zlib=no])],
-		[have_zlib=no])],
-	[have_zlib=no])
-
-if test x$have_zlib = xno; then
-	AC_MSG_ERROR([No sufficient zlib library found on your system.])
-fi
-
-ZLIB_LIBS=-lz
-AC_SUBST(ZLIB_LIBS)
-
-PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gmodule-2.0)
-PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
-PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
-
-# Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
-# cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
-# so we need check for that explicity.
-
-evince_save_LIBS=$LIBS
-LIBS="$LIBS $LIBVIEW_LIBS"
-AC_CHECK_FUNCS(cairo_surface_set_device_scale)
-LIBS=$evince_save_LIBS
-
-AC_MSG_CHECKING([for hi-dpi support])
-if test "$ac_cv_func_cairo_surface_set_device_scale" = yes ; then
-   AC_DEFINE([HAVE_HIDPI_SUPPORT], [1], [Define if cairo and GTK+ have necessary functions for hi-dpi])
-   AC_MSG_RESULT([yes])
-else
-   AC_MSG_RESULT([no])
-fi
-
-SHELL_PLATFORM_PKGS=
-case "$with_platform" in
-  gnome)
-        # Evince has a rather soft run-time dependency on hicolor-icon-theme.
-        # If the hicolor theme is not available, Evince fails to display some
-        # icons. Because we cannot check for it at run-time, we instead
-        # would like to require the icon theme at compile-time. But, because
-        # the hicolor-icon-theme does not have a pkgconfig file, on gnome we
-        # require the gnome icon theme instead.
-        SHELL_PLATFORM_PKGS="adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED"
-        ;;
-  *)
-        # On all other platforms we issue a warning about the runtime
-        # dependency.
-        AC_MSG_WARN([Evince has a soft run-time dependency on hicolor-icon-theme. You are advised to have this theme installed when running Evince.]);
-        SHELL_PLATFORM_PKGS=""
-        ;;
-esac
-
-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
-
-# ***************
-# Build utilities
-# ***************
-
-AC_ARG_VAR([GLIB_GENMARSHAL],[the glib-genmarschal programme])
-AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal],[])
-if test -z "$GLIB_GENMARSHAL"; then
-  AC_MSG_ERROR([glib-genmarshal not found])
-fi
-
-AC_ARG_VAR([GLIB_MKENUMS],[the glib-mkenums programme])
-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums],[])
-if test -z "$GLIB_MKENUMS"; then
-  AC_MSG_ERROR([glib-mkenums not found])
-fi
-
-AC_ARG_VAR([GLIB_COMPILE_RESOURCES],[the glib-compile-resources programme])
-AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources],[])
-if test -z "$GLIB_COMPILE_RESOURCES"; then
-  AC_MSG_ERROR([glib-compile-resources not found])
-fi
-
-AC_ARG_VAR([XMLLINT],[the xmllint programme])
-AC_PATH_PROG([XMLLINT],[xmllint],[])
-if test -z "$XMLLINT"; then
-  AC_MSG_ERROR([xmllint not found])
-fi
-
-AC_ARG_VAR([GDBUS_CODEGEN],[the gdbus-codegen programme])
-AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen],[])
-if test -z "$GDBUS_CODEGEN"; then
-  AC_MSG_ERROR([gdbus-codegen not found])
-fi
-
-# ***
-
-BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols"
-AC_SUBST(BACKEND_LIBTOOL_FLAGS)
-
-dnl ===== Check special functions
-evince_save_LIBS=$LIBS
-LIBS="$LIBS $BACKEND_LIBS"
-AC_CHECK_FUNCS(cairo_format_stride_for_width)
-LIBS=$evince_save_LIBS
-
-# ******************
-# GKT+ Unix Printing
-# ******************
-
-AC_MSG_CHECKING([whether gtk+-unix-print support is requested])
-AC_ARG_WITH([gtk-unix-print],
-  [AS_HELP_STRING([--without-gtk-unix-print],
-		  [Disable the use of gtk-unix-print])],
-  [],[case "$os_win32" in
-        yes) with_gtk_unix_print=no ;;
-        *) with_gtk_unix_print=yes ;;
-      esac])
-      
-AC_MSG_RESULT([$with_gtk_unix_print])
-
-if test "$with_gtk_unix_print" = "yes"; then
-   PKG_CHECK_MODULES(GTKUNIXPRINT, [gtk+-unix-print-3.0 >= $GTK_REQUIRED])
-   AC_DEFINE([GTKUNIXPRINT_ENABLED], [1], [Define if gtk+-unix-print is enabled.])
-fi
-
-# *********************
-# GNOME Keyring support
-# *********************
-
-AC_ARG_WITH(keyring,
-        [AS_HELP_STRING([--without-keyring],
-			[Disable the use of gnome-keyring])],
-        [],
-        [case "$with_platform" in
-           gnome) with_keyring=yes ;;
-           win32) with_keyring=no ;;
-         esac])
-
-AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
-
-if test "$with_keyring" = "yes"; then
-        PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= $LIBSECRET_REQUIRED)
-        AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
-fi
-
-# ****
-# DBUS
-# ****
-
-AC_ARG_ENABLE([dbus],
-  [AS_HELP_STRING([--disable-dbus], [Disable support for dbus])],
-  [],
-  [case "$with_platform" in
-      gnome) enable_dbus=yes ;;
-    esac])
-
-if test "$enable_dbus" = "yes"; then
-  AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
-
-   PKG_CHECK_MODULES([EV_DAEMON], [gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0])
-fi
-
-AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
-
-# *******************************
-# GNOME Desktop (Thumbnail cache)
-# *******************************
-
-AC_ARG_ENABLE([libgnome-desktop],
-        [AS_HELP_STRING([--disable-libgnome-desktop], [Disable GNOME Desktop (Thumbnail cache)])],
-        [enable_gnome_desktop=$enableval],
-        [enable_gnome_desktop=auto])
-
-if test "$enable_gnome_desktop" != "no"; then
-   if test "$enable_gnome_desktop" = "auto"; then
-      PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0], has_libgnome_desktop=yes, has_libgnome_desktop=no)
-   else
-      PKG_CHECK_MODULES([LIBGNOME_DESKTOP], [gnome-desktop-3.0])
-      has_libgnome_desktop = yes
-   fi
-
-   if test x$has_libgnome_desktop = xyes; then
-      AC_DEFINE([HAVE_LIBGNOME_DESKTOP], [1], [Whether GNOME Desktop (Thumbnail cache) is available])
-      enable_gnome_desktop=yes
-   else
-      enable_gnome_desktop=no
-   fi
-fi
-
-dnl ========= Check for Desktop Schemas
-PKG_CHECK_MODULES([DESKTOP_SCHEMAS], [gsettings-desktop-schemas],
-                  has_desktop_schemas=yes, has_desktop_schemas=no)
-if test x$has_desktop_schemas = xyes; then
-   AC_DEFINE([HAVE_DESKTOP_SCHEMAS], [1], [Whether GSettings Desktop Schemas are available])
-fi
-
-dnl Debug mode
-
-AC_ARG_ENABLE([debug],
-	AS_HELP_STRING([--enable-debug],
-		       [Turn on evince debug mode]),
-	[enable_debug=$enableval],
-	[enable_debug=no])
-
-if test "x$enable_debug" = "xyes"; then
-   DEBUG_FLAGS="-DEV_ENABLE_DEBUG"
-fi
-
-LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS"
-LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS"
-AC_SUBST(LIBDOCUMENT_CFLAGS)
-AC_SUBST(LIBDOCUMENT_LIBS)
-
-LIBVIEW_CFLAGS="$LIBVIEW_CFLAGS $GTKUNIXPRINT_CFLAGS $DEBUG_FLAGS"
-LIBVIEW_LIBS="$LIBVIEW_LIBS $GTKUNIXPRINT_LIBS -lm"
-AC_SUBST(LIBVIEW_CFLAGS)
-AC_SUBST(LIBVIEW_LIBS)
-
-BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
-BACKEND_LIBS="$BACKEND_LIBS -lm"
-AC_SUBST(BACKEND_CFLAGS)
-AC_SUBST(BACKEND_LIBS)
-
-SHELL_CFLAGS="$SHELL_CORE_CFLAGS $LIBSECRET_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS $LIBGNOME_DESKTOP_CFLAGS"
-SHELL_LIBS="$SHELL_CORE_LIBS $LIBSECRET_LIBS $LIBGNOME_DESKTOP_LIBS -lz -lm"
-AC_SUBST(SHELL_CFLAGS)
-AC_SUBST(SHELL_LIBS)
-
-FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS $DEBUG_FLAGS"
-FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz"
-AC_SUBST(FRONTEND_CFLAGS)
-AC_SUBST(FRONTEND_LIBS)
-
-EV_DAEMON_CFLAGS="$EV_DAEMON_CFLAGS $DEBUG_FLAGS"
-AC_SUBST([EV_DAEMON_CFLAGS])
-AC_SUBST([EV_DAEMON_LIBS])
-
-# Check for Nautilus property page build
-AC_ARG_ENABLE([nautilus],
-  [AS_HELP_STRING([--disable-nautilus],
-		  [Disable build of nautilus extensions])],
-  [],
-  [case "$with_platform" in
-     gnome) enable_nautilus=yes ;;
-     *) enable_nautilus=no ;;
-    esac])
-
-if test "$enable_nautilus" = "yes" ; then
-  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-3.0 $MM gthread-2.0 libnautilus-extension >= $NAUTILUS_REQUIRED],
-                    [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
-  NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libnautilus-extension`}
-  NAUTILUS_EXTENSION_DIR=${NAUTILUS_EXTENSION_DIR#/}
-  AC_SUBST(NAUTILUS_EXTENSION_DIR)
-  AC_SUBST(NAUTILUS_CFLAGS)
-  AC_SUBST(NAUTILUS_LIBS)
-
-  AC_DEFINE([HAVE_NAUTILUS],[1], [defined if you build the nautilus plugin])
-fi
-
-AM_CONDITIONAL([ENABLE_NAUTILUS],[test "$enable_nautilus" = "yes"])
-
-# ***************
-# Document Viewer
-# ***************
-
-AC_ARG_ENABLE(
-  [viewer],
-  [AS_HELP_STRING([--disable-viewer], [Disable GNOME Document viewer])],
-  [],
-  [enable_viewer=yes]
-)
-AM_CONDITIONAL([ENABLE_VIEWER],[test "$enable_viewer" = "yes"])
-
-# ***************
-# Thumbnailer
-# ***************
-
-AC_ARG_ENABLE([thumbnailer],
-  [AS_HELP_STRING([--disable-thumbnailer],
-		  [Disable GNOME thumbnailer])],
-  [],
-  [enable_thumbnailer=yes])
-
-AM_CONDITIONAL([ENABLE_THUMBNAILER],[test "$enable_thumbnailer" = "yes"])
-
-# ***************
-# Print Previewer
-# ***************
-
-AC_ARG_ENABLE([previewer],
-  [AS_HELP_STRING([--disable-previewer],
-		  [Disable the GNOME Document Previewer])],
-  [],
-  [enable_previewer=yes])
-
-if test x$enable_previewer = "xyes" ; then
-  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED])
-fi
-
-AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"])
-PREVIEWER_CFLAGS="$PREVIEWER_CFLAGS $GTKUNIXPRINT_CFLAGS $DEBUG_FLAGS"
-PREVIEWER_LIBS="$PREVIEWER_LIBS $GTKUNIXPRINT_LIBS -lz"
-AC_SUBST(PREVIEWER_CFLAGS)
-AC_SUBST(PREVIEWER_LIBS)
-
-
-# **************
-# Browser Plugin
-# **************
-
-AC_ARG_ENABLE([browser-plugin],
-  [AS_HELP_STRING([--disable-browser-plugin],
-                  [Disable the Browser Plugin])],
-  [],
-  [enable_browser_plugin=yes])
-
-if test x$enable_browser_plugin = "xyes" ; then
-  PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
-
-  BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-  AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
-fi
-
-AM_CONDITIONAL([ENABLE_BROWSER_PLUGIN],[test "$enable_browser_plugin" = "yes"])
-BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS $DEBUG_FLAGS"
-AC_SUBST(BROWSER_PLUGIN_CFLAGS)
-AC_SUBST(BROWSER_PLUGIN_LIBS)
-
-# ***
-# GIR
-# ***
-
-# No automagic please!
-if test -z "$enable_introspection"; then
-  enable_introspection=no
-fi
-
-GOBJECT_INTROSPECTION_CHECK([1.0])
-
-dnl ================== portability checks ===========================================
-
-dnl for backtrace()
-AC_CHECK_HEADERS([execinfo.h])
-
-AC_CHECK_DECL([_NL_MEASUREMENT_MEASUREMENT],[
-  AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT],[1],[Define if _NL_MEASUREMENT_MEASUREMENT is available])
-  ],[],[#include <langinfo.h>])
-
-dnl ================== pdf checks ===================================================
-AC_ARG_ENABLE([pdf],
-  [AS_HELP_STRING([--disable-pdf],
-		  [Disable the PDF support])],
-  [enable_pdf=$enableval],
-  [enable_pdf=yes])
-
-if test "x$enable_pdf" = "xyes"; then
-    POPPLER_REQUIRED=0.24.0
-    PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
-
-    if test "x$enable_pdf" = "xyes"; then
-	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
-	    if test x$enable_cairo_pdf = xyes; then
-	            AC_DEFINE([HAVE_CAIRO_PDF], [1], [defined if cairo-pdf is available])
-            fi
-
-	    PKG_CHECK_MODULES(CAIRO_PS, cairo-ps, enable_cairo_ps=yes, enable_cairo_ps=no)
-	    if test x$enable_cairo_ps = xyes; then
-	            AC_DEFINE([HAVE_CAIRO_PS], [1], [defined if cairo-ps is available])
-            fi
-    else
-	    AC_MSG_ERROR("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found")
-    fi 
-fi
-
-AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes)
-dnl ================== end of pdf checks ============================================
-
-dnl libspectre (used by ps and dvi backends)
-SPECTRE_REQUIRED=0.2.0 
-PKG_CHECK_MODULES(SPECTRE, libspectre >= $SPECTRE_REQUIRED,have_spectre=yes,have_spectre=no)
-AM_CONDITIONAL(HAVE_SPECTRE, test x$have_spectre = xyes)
-if test "x$have_spectre" = "xyes"; then
-   AC_DEFINE([HAVE_SPECTRE], [1], [Have libspectre])
-fi
-
-dnl ================== ps checks ====================================================
-AC_ARG_ENABLE(ps,
-  	[AS_HELP_STRING([--disable-ps],
-			[Disable the PostScript backend])],
-	[enable_ps=$enableval],
-	[enable_ps=yes])
-
-if test "x$enable_ps" = "xyes"; then
-   if test "x$have_spectre" = "xyes"; then
-      AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.])
-   else
-      enable_ps="no"
-      AC_MSG_WARN([PS support is disabled since libspectre (version >= $SPECTRE_REQUIRED) is needed])
-   fi
-fi
-AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes)
-dnl ======================== End of ps checks ===================================
-
-dnl ================== tiff checks ===================================================
-AC_ARG_ENABLE(tiff,
-            [AS_HELP_STRING([--disable-tiff],
-			    [Disable the support of multipage tiff])],
-	    [enable_tiff=$enableval],
-	    [enable_tiff=yes])
-
-if test "x$enable_tiff" = "xyes"; then
-    AC_CHECK_HEADERS([tiff.h],enable_tiff=yes,enable_tiff=no,)
-    if test "x$enable_tiff" = "xyes"; then
-	AC_CHECK_LIB([tiff],TIFFOpen,enable_tiff=yes,enable_tiff=no,"-lz")
-        AC_CHECK_LIB([tiff],TIFFReadRGBAImageOriented,enable_tiff=yes,enable_tiff=no,"-lz")
-    fi
-    if test "x$enable_tiff" = "xyes"; then
-	    AC_DEFINE([ENABLE_TIFF], [1], [Enable multipage tiff support.])
-    else
-	    AC_MSG_WARN("Tiff support is disabled since tiff library version 3.6 or newer not found")
-    fi 
-fi
-
-AM_CONDITIONAL(ENABLE_TIFF, test x$enable_tiff = xyes)
-dnl ================== end of tiff checks ============================================
-
-dnl ================== djvu checks ===================================================
-
-AC_ARG_ENABLE(djvu,
-            [AS_HELP_STRING([--disable-djvu],
-			    [Disable the support of djvu viewer])],
-	    [enable_djvu=$enableval],
-	    [enable_djvu=yes])
-
-if test "x$enable_djvu" = "xyes"; then
-    DJVULIBRE_REQUIRED=3.5.17
-    PKG_CHECK_MODULES(DJVU, ddjvuapi >= $DJVULIBRE_REQUIRED, enable_djvu=yes, enable_djvu=no)
-
-    if test "x$enable_djvu" = "xyes"; then
-        AC_DEFINE([ENABLE_DJVU], [1], [Enable djvu viewer support.])
-    else
-	AC_MSG_WARN([	
-** Djvu support is disabled since a recent version of the djvulibre 
-** library was not found. You need at least djvulibre-3.5.17 which 
-** can be found on http://djvulibre.djvuzone.org 
-])
-    fi 
-fi
-
-AM_CONDITIONAL(ENABLE_DJVU, test x$enable_djvu = xyes)
-
-dnl ================== End of djvu checks ===================================================
-
-dnl ================== dvi checks ===================================================
-
-AC_ARG_ENABLE(dvi,
-            [AS_HELP_STRING([--disable-dvi],
-	    [Disable the support of dvi viewer])],
-	    [enable_dvi=$enableval],
-	    [enable_dvi=yes])
-
-AC_ARG_ENABLE(t1lib,
-            [AS_HELP_STRING([--enable-t1lib],
-	                    [Compile with support of t1lib for type1 fonts in dvi])],
-	    [enable_type1_fonts=$enableval],
-	    [enable_type1_fonts=no])
-
-if test "x$enable_dvi" = "xyes"; then
-    AC_C_CONST
-    AC_C_INLINE
-    AC_TYPE_SIZE_T
-    AC_CHECK_SIZEOF(long, 4)
-    AC_CHECK_SIZEOF(int, 4)
-    AC_CHECK_SIZEOF(short, 2)
-    AC_CHECK_SIZEOF(long long, 4)
-    AC_CHECK_SIZEOF(void *, 4)
-    AC_CHECK_LIB([kpathsea],[kpse_init_prog],[enable_dvi=yes],[enable_dvi=no])
-
-    if test "x$enable_dvi" = "xyes"; then
-	AC_DEFINE([ENABLE_DVI], [1], [Enable dvi viewer support.])
-    else
-        AC_MSG_WARN("Dvi support is disabled since kpathsea library is not found. Check your TeX installation.")
-    fi
-fi
-AM_CONDITIONAL(ENABLE_DVI, test x$enable_dvi = xyes)
-
-if test "x$enable_dvi" = "xyes"; then
-    if test "x$enable_type1_fonts" = "xyes"; then
-	AC_CHECK_LIB([t1],T1_InitLib,enable_type1_fonts=yes,enable_type1_fonts=no,[-lm])
-    fi
-
-    if test "x$enable_type1_fonts" = xyes; then
-        AC_DEFINE([WITH_TYPE1_FONTS], [1], [Enable t1lib support in dvi.])
-    fi
-else 
-    enable_type1_fonts=no
-fi
-AM_CONDITIONAL(WITH_TYPE1_FONTS, test x$enable_type1_fonts = xyes)
-
-dnl ================== End of dvi checks ===================================================
-
-dnl ================== comic book checks ===================================================
- 
-AC_ARG_ENABLE(comics,
- 	[AS_HELP_STRING([--enable-comics],
-	                [Compile with support for comic book archives])],
-	[enable_comics=$enableval],
-	[enable_comics=yes])
-	
-if test "x$enable_comics" = "xyes"; then
-	AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
-fi
-AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
-
-dnl ================== End of comic book checks ============================================
-
-dnl ================== XPS checks ===================================================
-
-AC_ARG_ENABLE(xps,
-	[AS_HELP_STRING([--enable-xps],
-			[Compile with support for XPS documents.])],
-	[enable_xps=$enableval],
-	[enable_xps=yes])
-
-if test "x$enable_xps" = "xyes"; then
-   GXPS_REQUIRED=0.2.1
-   PKG_CHECK_MODULES(GXPS, libgxps >= $GXPS_REQUIRED,enable_xps=yes,enable_xps=no)
-
-   if test "x$enable_xps" = "xyes"; then
-      AC_DEFINE([ENABLE_XPS], [1], [Enable support for XPS documents.])
-   else
-      enable_xps="no"
-      AC_MSG_WARN(["XPS support is disabled since libgxps (version >= $GXPS_REQUIRED) is needed])
-   fi
-fi
-
-AM_CONDITIONAL(ENABLE_XPS, test x$enable_xps = xyes)
-
-dnl ================== End of XPS checks ===================================================
-
-dnl =================== Compile warnings ===================================================
-
-GNOME_COMPILE_WARNINGS
-
-CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[ \
-])
-
-AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
-AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS"
-
-dnl =================== End of compile warnings=============================================
-
-dnl =================== Mime types list ====================================================
-
-if test "x$enable_pdf" = "xyes" ; then
-        PDF_MIME_TYPES="application/pdf;application/x-bzpdf;application/x-gzpdf;application/x-xzpdf;application/x-ext-pdf"
-        APPDATA_PDF_MIME_TYPES=$(echo "<mimetype>$PDF_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${PDF_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${PDF_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(PDF_MIME_TYPES)
-AC_SUBST(APPDATA_PDF_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_PDF_MIME_TYPES)
-if test "x$enable_ps" = "xyes" ; then
-        PS_MIME_TYPES="application/postscript;application/x-bzpostscript;application/x-gzpostscript;image/x-eps;image/x-bzeps;image/x-gzeps;application/x-ext-ps;application/x-ext-eps"
-        APPDATA_PS_MIME_TYPES=$(echo "<mimetype>$PS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${PS_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${PS_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(PS_MIME_TYPES)
-AC_SUBST(APPDATA_PS_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_PS_MIME_TYPES)
-if test "x$enable_dvi" = "xyes"; then
-        DVI_MIME_TYPES="application/x-dvi;application/x-bzdvi;application/x-gzdvi;application/x-ext-dvi"
-        APPDATA_DVI_MIME_TYPES=$(echo "<mimetype>$DVI_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${DVI_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${DVI_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(DVI_MIME_TYPES)
-AC_SUBST(APPDATA_DVI_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_DVI_MIME_TYPES)
-if test "x$enable_djvu" = "xyes"; then
-        DJVU_MIME_TYPES="image/vnd.djvu;application/x-ext-djv;application/x-ext-djvu"
-        APPDATA_DJVU_MIME_TYPES=$(echo "<mimetype>$DJVU_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${DJVU_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${DJVU_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(DJVU_MIME_TYPES)
-AC_SUBST(APPDATA_DJVU_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_DJVU_MIME_TYPES)
-if test "x$enable_tiff" = "xyes"; then
-        TIFF_MIME_TYPES="image/tiff"
-        APPDATA_TIFF_MIME_TYPES=$(echo "<mimetype>$TIFF_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${TIFF_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${TIFF_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(TIFF_MIME_TYPES)
-AC_SUBST(APPDATA_TIFF_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
-if test "x$enable_comics" = "xyes"; then
-        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/x-ext-cb7;application/x-ext-cbt"
-        APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${COMICS_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(COMICS_MIME_TYPES)
-AC_SUBST(APPDATA_COMICS_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_COMICS_MIME_TYPES)
-if test "x$enable_xps" = "xyes"; then
-        XPS_MIME_TYPES="application/oxps;application/vnd.ms-xpsdocument"
-        APPDATA_XPS_MIME_TYPES=$(echo "<mimetype>$XPS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
-        if test -z "$EVINCE_MIME_TYPES"; then
-           EVINCE_MIME_TYPES="${XPS_MIME_TYPES}"
-        else
-           EVINCE_MIME_TYPES="${EVINCE_MIME_TYPES};${XPS_MIME_TYPES}"
-        fi
-fi
-AC_SUBST(XPS_MIME_TYPES)
-AC_SUBST(APPDATA_XPS_MIME_TYPES)
-AM_SUBST_NOTMAKE(APPDATA_XPS_MIME_TYPES)
-
-AC_SUBST(EVINCE_MIME_TYPES)
-
-AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
-
-# *****************
-# Help files
-# *****************
-
-YELP_HELP_INIT
-
-# *****************
-# API documentation
-# *****************
-
-GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
-
-AC_SUBST([GLIB_PREFIX],[$($PKG_CONFIG --variable=prefix glib-2.0)])
-AC_SUBST([GTK_PREFIX],[$($PKG_CONFIG --variable=prefix gtk+-3.0)])
-
-# ******************
-# Backends directory
-# ******************
-
-AC_SUBST([backenddir],"\$(libdir)/evince/ev_binary_version/backends")
-AC_SUBST([backend_binary_version],"ev_binary_version")
-
-# **********
-# Versioning
-# **********
-
-AC_SUBST([EV_MAJOR_VERSION],[ev_major_version])
-AC_SUBST([EV_MINOR_VERSION],[ev_minor_version])
-AC_SUBST([EV_MICRO_VERSION],[ev_micro_version])
-
-AC_SUBST([EV_API_VERSION],[ev_api_version])
-AC_SUBST([EV_API_VERSION_U],[AS_TR_SH([ev_api_version])])
-AC_SUBST([EV_BINARY_VERSION],[ev_binary_version])
-
-AC_SUBST([EV_DOCUMENT_LT_VERSION_INFO],[ev_document_lt_version_info])
-AC_SUBST([EV_DOCUMENT_LT_CURRENT_MINUS_AGE],[ev_document_lt_current_minus_age])
-AC_SUBST([EV_VIEW_LT_VERSION_INFO],[ev_view_lt_version_info])
-AC_SUBST([EV_VIEW_LT_CURRENT_MINUS_AGE],[ev_view_lt_current_minus_age])
-
-AC_SUBST([AM_CPPFLAGS])
-AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_CXXFLAGS])
-AC_SUBST([AM_LDFLAGS])
-
-# *****************************************************************************
-# *****************************************************************************
-
-AC_CONFIG_FILES([
-backend/Makefile
-backend/comics/comicsdocument.evince-backend.in
-backend/comics/evince-comicsdocument.metainfo.xml.in
-backend/comics/Makefile
-backend/djvu/djvudocument.evince-backend.in
-backend/djvu/evince-djvudocument.metainfo.xml.in
-backend/djvu/Makefile
-backend/dvi/dvidocument.evince-backend.in
-backend/dvi/evince-dvidocument.metainfo.xml.in
-backend/dvi/Makefile
-backend/dvi/mdvi-lib/Makefile
-backend/pdf/evince-pdfdocument.metainfo.xml.in
-backend/pdf/pdfdocument.evince-backend.in
-backend/pdf/Makefile
-backend/ps/evince-psdocument.metainfo.xml.in
-backend/ps/psdocument.evince-backend.in
-backend/ps/Makefile
-backend/tiff/evince-tiffdocument.metainfo.xml.in
-backend/tiff/tiffdocument.evince-backend.in
-backend/tiff/Makefile
-backend/xps/evince-xpsdocument.metainfo.xml.in
-backend/xps/xpsdocument.evince-backend.in
-backend/xps/Makefile
-browser-plugin/Makefile
-cut-n-paste/Makefile
-cut-n-paste/gimpcellrenderertoggle/Makefile
-cut-n-paste/synctex/Makefile
-cut-n-paste/libgd/Makefile
-data/evince.desktop.in
-data/evince-previewer.desktop.in
-data/Makefile
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/16x16/apps/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/16x16/mimetypes/Makefile
-data/icons/22x22/Makefile
-data/icons/22x22/apps/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/22x22/mimetypes/Makefile
-data/icons/24x24/Makefile
-data/icons/24x24/apps/Makefile
-data/icons/24x24/actions/Makefile
-data/icons/24x24/mimetypes/Makefile
-data/icons/32x32/Makefile
-data/icons/32x32/actions/Makefile
-data/icons/32x32/mimetypes/Makefile
-data/icons/48x48/Makefile
-data/icons/48x48/apps/Makefile
-data/icons/48x48/actions/Makefile
-data/icons/256x256/Makefile
-data/icons/256x256/apps/Makefile
-data/icons/scalable/Makefile
-data/icons/scalable/actions/Makefile
-data/icons/scalable/mimetypes/Makefile
-help/Makefile
-help/reference/Makefile
-help/reference/libdocument/Makefile
-help/reference/libdocument/version.xml
-help/reference/libview/Makefile
-help/reference/libview/version.xml
-help/reference/shell/Makefile
-help/reference/shell/version.xml
-libdocument/Makefile
-libdocument/ev-version.h
-libmisc/Makefile
-libview/Makefile
-Makefile
-po/Makefile.in
-previewer/Makefile
-properties/Makefile
-shell/Makefile
-thumbnailer/Makefile
-])
-
-AC_CONFIG_FILES(evince-document-[]ev_api_version[].pc:evince-document.pc.in)
-AC_CONFIG_FILES(evince-view-[]ev_api_version[].pc:evince-view.pc.in)
-
-AC_OUTPUT
-
-AC_MSG_NOTICE([
-
-Evince configure summary
-========================
-
-Platform .................:  $with_platform
-Debug mode ...............:  $enable_debug
-
-
-FRONTENDS
-
-Viewer ...................:  $enable_viewer
-Previewer ................:  $enable_previewer
-Thumbnailer ..............:  $enable_thumbnailer
-Nautilus Extensions.......:  $enable_nautilus
-Browser Plugin............:  $enable_browser_plugin
-
-
-BACKENDS
-
-PDF ......................:  $enable_pdf
-PostScript ...............:  $enable_ps
-TIFF .....................:  $enable_tiff
-DJVU .....................:  $enable_djvu
-DVI ......................:  $enable_dvi
-Comics ...................:  $enable_comics
-XPS ......................:  $enable_xps
-
-
-FEATURES
-
-GTK Doc reference ........:  $enable_gtk_doc
-GObject Introspection ....:  $enable_introspection
-DBUS communication .......:  $enable_dbus
-Keyring integration ......:  $with_keyring
-GTK+ Unix Print ..........:  $with_gtk_unix_print
-Thumbnail cache ..........:  $enable_gnome_desktop
-
-])

=== removed directory '.pc/11_grip_gestures.patch/libview'
=== removed file '.pc/11_grip_gestures.patch/libview/ev-view-private.h'
--- .pc/11_grip_gestures.patch/libview/ev-view-private.h	2014-09-15 12:46:26 +0000
+++ .pc/11_grip_gestures.patch/libview/ev-view-private.h	1970-01-01 00:00:00 +0000
@@ -1,312 +0,0 @@
-/* -*- 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) 2004 Red Hat, Inc
- *
- * Evince is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Evince is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#if !defined (EVINCE_COMPILATION)
-#error "This is a private header."
-#endif
-
-#ifndef __EV_VIEW_PRIVATE_H__
-#define __EV_VIEW_PRIVATE_H__
-
-#include "ev-view.h"
-#include "ev-document-model.h"
-#include "ev-pixbuf-cache.h"
-#include "ev-page-cache.h"
-#include "ev-jobs.h"
-#include "ev-image.h"
-#include "ev-form-field.h"
-#include "ev-selection.h"
-#include "ev-view-cursor.h"
-
-#define DRAG_HISTORY 10
-
-/* Information for middle clicking and moving around the doc */
-typedef struct {
-        gboolean in_drag;
-	GdkPoint start;
-	gdouble hadj;
-	gdouble vadj;
-	guint drag_timeout_id;
-	guint release_timeout_id;
-	GdkPoint buffer[DRAG_HISTORY];
-	GdkPoint momentum;
-} DragInfo;
-
-/* Autoscrolling */
-typedef struct {
-	gboolean autoscrolling;
-	guint last_y;
-	guint start_y;
-	guint timeout_id;	
-} AutoScrollInfo;
-
-/* Information for handling selection */
-typedef struct {
-	gboolean in_drag;
-	GdkPoint start;
-	GList *selections;
-	EvSelectionStyle style;
-} SelectionInfo;
-
-/* Information for handling images DND */
-typedef struct {
-	gboolean in_drag;
-	GdkPoint start;
-	EvImage *image;
-} ImageDNDInfo;
-
-typedef enum {
-	EV_PAN_ACTION_NONE,
-	EV_PAN_ACTION_NEXT,
-	EV_PAN_ACTION_PREV
-} EvPanAction;
-
-/* Annotation popup windows */
-typedef struct {
-	GtkWidget *window;
-	guint      page;
-
-	/* Current position */
-	gint       x;
-	gint       y;
-
-	/* EvView root position */
-	gint       parent_x;
-	gint       parent_y;
-
-	/* Document coords */
-	gdouble    orig_x;
-	gdouble    orig_y;
-
-	gboolean   visible;
-	gboolean   moved;
-} EvViewWindowChild;
-
-typedef enum {
-	SCROLL_TO_KEEP_POSITION,
-	SCROLL_TO_PAGE_POSITION,
-	SCROLL_TO_CENTER,
-	SCROLL_TO_FIND_LOCATION,
-} PendingScroll;
-
-typedef struct _EvHeightToPageCache {
-	gint rotation;
-	gboolean dual_even_left;
-	gdouble *height_to_page;
-	gdouble *dual_height_to_page;
-} EvHeightToPageCache;
-
-struct _EvView {
-	GtkContainer layout;
-
-	/* Container */
-	GList *children;
-
-	EvDocument *document;
-
-	/* Find */
-	EvJobFind *find_job;
-	GList **find_pages; /* Backwards compatibility */
-	gint find_page;
-	gint find_result;
-	gboolean jump_to_find_result;
-	gboolean highlight_find_results;
-
-	EvDocumentModel *model;
-	EvPixbufCache *pixbuf_cache;
-	gsize pixbuf_cache_size;
-	EvPageCache *page_cache;
-	EvHeightToPageCache *height_to_page_cache;
-	EvViewCursor cursor;
-	EvJobRender *current_job;
-
-	GtkRequisition requisition;
-	gboolean       internal_size_request;
-
-	/* Scrolling */
-	GtkAdjustment *hadjustment;
-	GtkAdjustment *vadjustment;
-	/* GtkScrollablePolicy needs to be checked when
-	 * driving the scrollable adjustment values */
-	guint hscroll_policy : 1;
-	guint vscroll_policy : 1;
-
-	gint scroll_x;
-	gint scroll_y;	
-
-	/* Delta sum for emulating normal scrolling */
-	gdouble       total_delta;
-	PendingScroll pending_scroll;
-	gboolean      pending_resize;
-	EvPoint       pending_point;
-
-	/* Current geometry */
-    
-	gint start_page;
-	gint end_page;
-	gint current_page;
-
-	gint rotation;
-	gdouble scale;
-	gint spacing;
-
-	gboolean loading;
-	gboolean can_zoom_in;
-	gboolean can_zoom_out;
-	gboolean continuous;
-	gboolean dual_even_left;
-	gboolean fullscreen;
-	EvSizingMode sizing_mode;
-	EvPageLayout page_layout;
-	GtkWidget *loading_window;
-	guint loading_timeout;
-	gboolean allow_links_change_zoom;
-
-	/* Common for button press handling */
-	int pressed_button;
-
-	/* Key bindings propagation */
-	gboolean key_binding_handled;
-
-	/* Information for middle clicking and dragging around. */
-	DragInfo drag_info;
-	
-	/* Autoscrolling */
-	AutoScrollInfo scroll_info;
-
-	/* Selection */
-	GdkPoint motion;
-	guint selection_update_id;
-	guint selection_scroll_id;
-
-	SelectionInfo selection_info;
-
-	/* Copy link address selection */
-	EvLinkAction *link_selected;
-
-	/* Image DND */
-	ImageDNDInfo image_dnd_info;
-
-	/* Annotations */
-	GList             *window_children;
-	EvViewWindowChild *window_child_focus;
-	gboolean           adding_annot;
-	EvAnnotationType   adding_annot_type;
-
-	/* Focus */
-	EvMapping *focused_element;
-	guint focused_element_page;
-	guint child_focus_idle_id;
-
-	/* Synctex */
-	EvMapping *synctex_result;
-
-	/* Accessibility */
-	AtkObject *accessible;
-
-	/* Caret navigation */
-	gboolean caret_enabled;
-	gint     cursor_offset;
-	gint     cursor_page;
-	gdouble  cursor_line_offset;
-	gboolean cursor_visible;
-	guint    cursor_blink_timeout_id;
-	guint    cursor_blink_time;
-
-	/* Gestures */
-	GtkGesture *pan_gesture;
-	GtkGesture *zoom_gesture;
-	gdouble prev_zoom_gesture_scale;
-	EvPanAction pan_action;
-};
-
-struct _EvViewClass {
-	GtkContainerClass parent_class;
-
-        void     (*scroll)            (EvView         *view,
-				       GtkScrollType   scroll,
-				       GtkOrientation  orientation);
-        void     (*handle_link)       (EvView         *view,
-				       EvLink         *link);
-        void     (*external_link)     (EvView         *view,
-				       EvLinkAction   *action);
-        void     (*popup_menu)        (EvView         *view,
-				       GList          *items);
-        void     (*selection_changed) (EvView         *view);
-        void     (*sync_source)       (EvView         *view,
-				       EvSourceLink   *link);
-        void     (*annot_added)       (EvView         *view,
-				       EvAnnotation   *annot);
-        void     (*annot_removed)     (EvView         *view,
-				       EvAnnotation   *annot);
-        void     (*layers_changed)    (EvView         *view);
-        gboolean (*move_cursor)       (EvView         *view,
-				       GtkMovementStep step,
-				       gint            count,
-				       gboolean        extend_selection);
-	void     (*activate)          (EvView         *view);
-};
-
-void _get_page_size_for_scale_and_rotation (EvDocument *document,
-					    gint        page,
-					    gdouble     scale,
-					    gint        rotation,
-					    gint       *page_width,
-					    gint       *page_height);
-void _ev_view_transform_view_point_to_doc_point (EvView       *view,
-						 GdkPoint     *view_point,
-						 GdkRectangle *page_area,
-						 GtkBorder    *border,
-						 double       *doc_point_x,
-						 double       *doc_point_y);
-void _ev_view_transform_view_rect_to_doc_rect (EvView       *view,
-					       GdkRectangle *view_rect,
-					       GdkRectangle *page_area,
-					       GtkBorder    *border,
-					       EvRectangle  *doc_rect);
-void _ev_view_transform_doc_point_to_view_point (EvView   *view,
-						 int       page,
-						 EvPoint  *doc_point,
-						 GdkPoint *view_point);
-void _ev_view_transform_doc_rect_to_view_rect (EvView       *view,
-					       int           page,
-					       EvRectangle  *doc_rect,
-					       GdkRectangle *view_rect);
-void _ev_view_get_selection_colors (EvView  *view,
-				    GdkRGBA *bg_color,
-				    GdkRGBA *fg_color);
-gint _ev_view_get_caret_cursor_offset_at_doc_point (EvView *view,
-						    gint    page,
-						    gdouble doc_x,
-						    gdouble doc_y);
-
-void _ev_view_clear_selection (EvView   *view);
-void _ev_view_set_selection   (EvView   *view,
-			       GdkPoint *start_point,
-			       GdkPoint *end_point);
-
-void _ev_view_set_focused_element (EvView *view,
-				   EvMapping *element_mapping,
-				   gint page);
-void _ev_view_focus_form_field    (EvView      *view,
-				   EvFormField *field);
-
-#endif  /* __EV_VIEW_PRIVATE_H__ */
-

=== removed file '.pc/11_grip_gestures.patch/libview/ev-view.c'
--- .pc/11_grip_gestures.patch/libview/ev-view.c	2014-09-15 12:46:26 +0000
+++ .pc/11_grip_gestures.patch/libview/ev-view.c	1970-01-01 00:00:00 +0000
@@ -1,8917 +0,0 @@
-/* -*- 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) 2004 Red Hat, Inc
- *
- * Evince is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Evince is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "ev-mapping-list.h"
-#include "ev-document-forms.h"
-#include "ev-document-images.h"
-#include "ev-document-links.h"
-#include "ev-document-layers.h"
-#include "ev-document-misc.h"
-#include "ev-pixbuf-cache.h"
-#include "ev-page-cache.h"
-#include "ev-view-marshal.h"
-#include "ev-document-annotations.h"
-#include "ev-annotation-window.h"
-#include "ev-view.h"
-#include "ev-view-accessible.h"
-#include "ev-view-private.h"
-#include "ev-view-type-builtins.h"
-#include "ev-debug.h"
-
-enum {
-	SIGNAL_SCROLL,
-	SIGNAL_HANDLE_LINK,
-	SIGNAL_EXTERNAL_LINK,
-	SIGNAL_POPUP_MENU,
-	SIGNAL_SELECTION_CHANGED,
-	SIGNAL_SYNC_SOURCE,
-	SIGNAL_ANNOT_ADDED,
-	SIGNAL_ANNOT_REMOVED,
-	SIGNAL_LAYERS_CHANGED,
-	SIGNAL_MOVE_CURSOR,
-	SIGNAL_CURSOR_MOVED,
-	SIGNAL_ACTIVATE,
-	N_SIGNALS
-};
-
-enum {
-	TARGET_DND_URI,
-	TARGET_DND_TEXT,
-	TARGET_DND_IMAGE
-};
-
-enum {
-	PROP_0,
-	PROP_IS_LOADING,
-	PROP_HADJUSTMENT,
-	PROP_VADJUSTMENT,
-	PROP_HSCROLL_POLICY,
-	PROP_VSCROLL_POLICY,
-	PROP_CAN_ZOOM_IN,
-	PROP_CAN_ZOOM_OUT
-};
-
-static guint signals[N_SIGNALS];
-
-typedef enum {
-	EV_VIEW_FIND_NEXT,
-	EV_VIEW_FIND_PREV
-} EvViewFindDirection;
-
-typedef struct {
-	GtkWidget  *widget;
-
-	/* View coords */
-	gint        x;
-	gint        y;
-
-	/* Document */
-	guint       page;
-	EvRectangle doc_rect;
-} EvViewChild;
-
-#define MIN_SCALE 0.2
-#define ZOOM_IN_FACTOR  1.2
-#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
-
-#define SCROLL_TIME 150
-
-#define DEFAULT_PIXBUF_CACHE_SIZE 52428800 /* 50MB */
-
-#define EV_STYLE_CLASS_DOCUMENT_PAGE "document-page"
-#define EV_STYLE_CLASS_INVERTED      "inverted"
-
-/*** Scrolling ***/
-static void       view_update_range_and_current_page         (EvView             *view);
-static void       ensure_rectangle_is_visible                (EvView             *view,
-							      GdkRectangle       *rect);
-
-/*** Geometry computations ***/
-static void       compute_border                             (EvView             *view,
-							      GtkBorder          *border);
-static void       get_page_y_offset                          (EvView             *view,
-							      int                 page,
-							      int                *y_offset);
-static void       find_page_at_location                      (EvView             *view,
-							      gdouble             x,
-							      gdouble             y,
-							      gint               *page,
-							      gint               *x_offset,
-							      gint               *y_offset);
-/*** Hyperrefs ***/
-static EvLink *   ev_view_get_link_at_location 		     (EvView             *view,
-				  	         	      gdouble             x,
-		            				      gdouble             y);
-static char*      tip_from_link                              (EvView             *view,
-							      EvLink             *link);
-/*** Forms ***/
-static EvFormField *ev_view_get_form_field_at_location       (EvView             *view,
-							       gdouble            x,
-							       gdouble            y);
-
-/*** Annotations ***/
-static EvAnnotation *ev_view_get_annotation_at_location      (EvView             *view,
-							      gdouble             x,
-							      gdouble             y);
-static void          show_annotation_windows                 (EvView             *view,
-							      gint                page);
-static void          hide_annotation_windows                 (EvView             *view,
-							      gint                page);
-/*** GtkWidget implementation ***/
-static void       ev_view_size_request_continuous_dual_page  (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request_continuous            (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request_dual_page             (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request_single_page           (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request                       (GtkWidget          *widget,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_allocate                      (GtkWidget          *widget,
-							      GtkAllocation      *allocation);
-static gboolean   ev_view_scroll_event                       (GtkWidget          *widget,
-							      GdkEventScroll     *event);
-static gboolean   ev_view_draw                               (GtkWidget          *widget,
-                                                              cairo_t            *cr);
-static gboolean   ev_view_popup_menu                         (GtkWidget 	 *widget);
-static gboolean   ev_view_button_press_event                 (GtkWidget          *widget,
-							      GdkEventButton     *event);
-static gboolean   ev_view_motion_notify_event                (GtkWidget          *widget,
-							      GdkEventMotion     *event);
-static gboolean   ev_view_button_release_event               (GtkWidget          *widget,
-							      GdkEventButton     *event);
-static gboolean   ev_view_enter_notify_event                 (GtkWidget          *widget,
-							      GdkEventCrossing   *event);
-static gboolean   ev_view_leave_notify_event                 (GtkWidget          *widget,
-							      GdkEventCrossing   *event);
-static void       ev_view_style_updated                      (GtkWidget          *widget);
-static void       ev_view_remove_all                         (EvView             *view);
-
-static AtkObject *ev_view_get_accessible                     (GtkWidget *widget);
-
-/*** Drawing ***/
-static void       highlight_find_results                     (EvView             *view,
-                                                              cairo_t            *cr,
-							      int                 page);
-static void       highlight_forward_search_results           (EvView             *view,
-                                                              cairo_t            *cr,
-							      int                 page);
-static void       draw_one_page                              (EvView             *view,
-							      gint                page,
-							      cairo_t            *cr,
-							      GdkRectangle       *page_area,
-							      GtkBorder          *border,
-							      GdkRectangle       *expose_area,
-							      gboolean		 *page_ready);
-static void       ev_view_reload_page                        (EvView             *view,
-							      gint                page,
-							      cairo_region_t     *region);
-/*** Callbacks ***/
-static void       ev_view_change_page                        (EvView             *view,
-							      gint                new_page);
-static void       job_finished_cb                            (EvPixbufCache      *pixbuf_cache,
-							      cairo_region_t     *region,
-							      EvView             *view);
-static void       ev_view_page_changed_cb                    (EvDocumentModel    *model,
-							      gint                old_page,
-							      gint                new_page,
-							      EvView             *view);
-static void       on_adjustment_value_changed                (GtkAdjustment      *adjustment,
-							      EvView             *view);
-/*** GObject ***/
-static void       ev_view_finalize                           (GObject            *object);
-static void       ev_view_dispose                            (GObject            *object);
-static void       ev_view_class_init                         (EvViewClass        *class);
-static void       ev_view_init                               (EvView             *view);
-
-/*** Zoom and sizing ***/
-static double   zoom_for_size_fit_width	 		     (gdouble doc_width,
-							      gdouble doc_height,
-	    						      int     target_width,
-							      int     target_height);
-static double   zoom_for_size_fit_height		     (gdouble doc_width,
-			  				      gdouble doc_height,
-							      int     target_width,
-							      int     target_height);
-static double	zoom_for_size_fit_page 			     (gdouble doc_width,
-							      gdouble doc_height,
-							      int     target_width,
-							      int     target_height);
-static double   zoom_for_size_automatic                      (GdkScreen *screen,
-							      gdouble    doc_width,
-							      gdouble    doc_height,
-							      int        target_width,
-							      int        target_height);
-static void     ev_view_zoom                                 (EvView *view,
-                                                              gdouble factor);
-static void     ev_view_zoom_for_size                        (EvView *view,
-							      int     width,
-							      int     height);
-static void	ev_view_zoom_for_size_continuous_and_dual_page (EvView *view,
-							        int     width,
-						     	        int     height);
-static void	ev_view_zoom_for_size_continuous	       (EvView *view,
-					    		        int     width,
-								int     height);
-static void 	ev_view_zoom_for_size_dual_page 	       (EvView *view,
-						    		int     width,
-								int     height);
-static void	ev_view_zoom_for_size_single_page 	       (EvView *view,
-				    			        int     width,
-					    			int     height);
-/*** Cursors ***/
-static void       ev_view_set_cursor                         (EvView             *view,
-							      EvViewCursor        new_cursor);
-static void       ev_view_handle_cursor_over_xy              (EvView *view,
-							      gint x,
-							      gint y);
-
-/*** Find ***/
-static gint         ev_view_find_get_n_results               (EvView             *view,
-							      gint                page);
-static EvRectangle *ev_view_find_get_result                  (EvView             *view,
-							      gint                page,
-							      gint                result);
-static void       jump_to_find_result                        (EvView             *view);
-static void       jump_to_find_page                          (EvView             *view, 
-							      EvViewFindDirection direction,
-							      gint                shift);
-/*** Selection ***/
-static void       compute_selections                         (EvView             *view,
-							      EvSelectionStyle    style,
-							      GdkPoint           *start,
-							      GdkPoint           *stop);
-static void       extend_selection                           (EvView             *view,
-							      GdkPoint           *start,
-							      GdkPoint           *stop);
-static void       clear_selection                            (EvView             *view);
-static void       clear_link_selected                        (EvView             *view);
-static void       selection_free                             (EvViewSelection    *selection);
-static char*      get_selected_text                          (EvView             *ev_view);
-static void       ev_view_primary_get_cb                     (GtkClipboard       *clipboard,
-							      GtkSelectionData   *selection_data,
-							      guint               info,
-							      gpointer            data);
-static void       ev_view_primary_clear_cb                   (GtkClipboard       *clipboard,
-							      gpointer            data);
-static void       ev_view_update_primary_selection           (EvView             *ev_view);
-
-/*** Caret navigation ***/
-static void       ev_view_check_cursor_blink                 (EvView             *ev_view);
-
-G_DEFINE_TYPE_WITH_CODE (EvView, ev_view, GTK_TYPE_CONTAINER,
-			 G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
-
-/* HeightToPage cache */
-#define EV_HEIGHT_TO_PAGE_CACHE_KEY "ev-height-to-page-cache"
-
-static void
-ev_view_build_height_to_page_cache (EvView		*view,
-                                    EvHeightToPageCache *cache)
-{
-	gboolean swap, uniform;
-	int i;
-	double uniform_height, page_height, next_page_height;
-	double saved_height;
-	gdouble u_width, u_height;
-	gint n_pages;
-	EvDocument *document = view->document;
-
-	swap = (view->rotation == 90 || view->rotation == 270);
-
-	uniform = ev_document_is_page_size_uniform (document);
-	n_pages = ev_document_get_n_pages (document);
-
-	g_free (cache->height_to_page);
-	g_free (cache->dual_height_to_page);
-
-	cache->rotation = view->rotation;
-	cache->dual_even_left = view->dual_even_left;
-	cache->height_to_page = g_new0 (gdouble, n_pages + 1);
-	cache->dual_height_to_page = g_new0 (gdouble, n_pages + 2);
-
-	if (uniform)
-		ev_document_get_page_size (document, 0, &u_width, &u_height);
-
-	saved_height = 0;
-	for (i = 0; i <= n_pages; i++) {
-		if (uniform) {
-			uniform_height = swap ? u_width : u_height;
-			cache->height_to_page[i] = i * uniform_height;
-		} else {
-			if (i < n_pages) {
-				gdouble w, h;
-
-				ev_document_get_page_size (document, i, &w, &h);
-				page_height = swap ? w : h;
-			} else {
-				page_height = 0;
-			}
-			cache->height_to_page[i] = saved_height;
-			saved_height += page_height;
-		}
-	}
-
-	if (cache->dual_even_left && !uniform) {
-		gdouble w, h;
-
-		ev_document_get_page_size (document, 0, &w, &h);
-		saved_height = swap ? w : h;
-	} else {
-		saved_height = 0;
-	}
-
-	for (i = cache->dual_even_left; i < n_pages + 2; i += 2) {
-    		if (uniform) {
-			uniform_height = swap ? u_width : u_height;
-			cache->dual_height_to_page[i] = ((i + cache->dual_even_left) / 2) * uniform_height;
-			if (i + 1 < n_pages + 2)
-				cache->dual_height_to_page[i + 1] = ((i + cache->dual_even_left) / 2) * uniform_height;
-		} else {
-			if (i + 1 < n_pages) {
-				gdouble w, h;
-
-				ev_document_get_page_size (document, i + 1, &w, &h);
-				next_page_height = swap ? w : h;
-			} else {
-				next_page_height = 0;
-			}
-
-			if (i < n_pages) {
-				gdouble w, h;
-
-				ev_document_get_page_size (document, i, &w, &h);
-				page_height = swap ? w : h;
-			} else {
-				page_height = 0;
-			}
-
-			if (i + 1 < n_pages + 2) {
-				cache->dual_height_to_page[i] = saved_height;
-				cache->dual_height_to_page[i + 1] = saved_height;
-				saved_height += MAX(page_height, next_page_height);
-			} else {
-				cache->dual_height_to_page[i] = saved_height;
-			}
-		}
-	}
-}
-
-static void
-ev_height_to_page_cache_free (EvHeightToPageCache *cache)
-{
-	if (cache->height_to_page) {
-		g_free (cache->height_to_page);
-		cache->height_to_page = NULL;
-	}
-
-	if (cache->dual_height_to_page) {
-		g_free (cache->dual_height_to_page);
-		cache->dual_height_to_page = NULL;
-	}
-	g_free (cache);
-}
-
-static EvHeightToPageCache *
-ev_view_get_height_to_page_cache (EvView *view)
-{
-	EvHeightToPageCache *cache;
-
-	if (!view->document)
-		return NULL;
-
-	cache = g_object_get_data (G_OBJECT (view->document), EV_HEIGHT_TO_PAGE_CACHE_KEY);
-	if (!cache) {
-		cache = g_new0 (EvHeightToPageCache, 1);
-		ev_view_build_height_to_page_cache (view, cache);
-		g_object_set_data_full (G_OBJECT (view->document),
-					EV_HEIGHT_TO_PAGE_CACHE_KEY,
-					cache,
-					(GDestroyNotify)ev_height_to_page_cache_free);
-	}
-
-	return cache;
-}
-
-static void
-ev_view_get_height_to_page (EvView *view,
-			    gint    page,
-			    gint   *height,
-			    gint   *dual_height)
-{
-	EvHeightToPageCache *cache = NULL;
-	gdouble h, dh;
-
-	if (!view->height_to_page_cache)
-		return;
-
-	cache = view->height_to_page_cache;
-	if (cache->rotation != view->rotation ||
-	    cache->dual_even_left != view->dual_even_left) {
-		ev_view_build_height_to_page_cache (view, cache);
-	}
-	h = cache->height_to_page[page];
-	dh = cache->dual_height_to_page[page];
-
-	if (height)
-		*height = (gint)(h * view->scale + 0.5);
-
-	if (dual_height)
-		*dual_height = (gint)(dh * view->scale + 0.5);
-}
-
-static gint
-ev_view_get_scrollbar_size (EvView        *view,
-			    GtkOrientation orientation)
-{
-	GtkWidget *widget = GTK_WIDGET (view);
-	GtkWidget *sb;
-	GtkWidget *swindow = gtk_widget_get_parent (GTK_WIDGET (view));
-	GtkAllocation allocation;
-	GtkRequisition req;
-	gint spacing;
-
-	if (!GTK_IS_SCROLLED_WINDOW (swindow))
-		return 0;
-
-	gtk_widget_get_allocation (widget, &allocation);
-
-	if (orientation == GTK_ORIENTATION_VERTICAL) {
-		if (allocation.height >= view->requisition.height)
-			sb = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (swindow));
-		else
-			return 0;
-	} else {
-		if (allocation.width >= view->requisition.width)
-			sb = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (swindow));
-		else
-			return 0;
-	}
-
-	gtk_widget_style_get (swindow, "scrollbar_spacing", &spacing, NULL);
-	gtk_widget_get_preferred_size (sb, &req, NULL);
-
-	return (orientation == GTK_ORIENTATION_VERTICAL ? req.width : req.height) + spacing;
-}
-
-static gboolean
-is_dual_page (EvView   *view,
-	      gboolean *odd_left_out)
-{
-	gboolean dual = FALSE;
-	gboolean odd_left = FALSE;
-
-	switch (view->page_layout) {
-	case EV_PAGE_LAYOUT_AUTOMATIC: {
-		GdkScreen    *screen;
-		double        scale;
-		double        doc_width;
-		double        doc_height;
-		GtkAllocation allocation;
-
-		screen = gtk_widget_get_screen (GTK_WIDGET (view));
-		scale = ev_document_misc_get_screen_dpi (screen) / 72.0;
-
-		ev_document_get_max_page_size (view->document, &doc_width, &doc_height);
-		gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
-
-		/* If the width is ok and the height is pretty close, try to fit it in */
-		if (ev_document_get_n_pages (view->document) > 1 &&
-		    doc_width < doc_height &&
-		    allocation.width > (2 * doc_width * scale) &&
-		    allocation.height > (doc_height * scale * 0.9)) {
-			odd_left = !view->dual_even_left;
-			dual = TRUE;
-		}
-	}
-		break;
-	case EV_PAGE_LAYOUT_DUAL:
-		odd_left = !view->dual_even_left;
-		dual = TRUE;
-		break;
-	case EV_PAGE_LAYOUT_SINGLE:
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (odd_left_out)
-		*odd_left_out = odd_left;
-
-	return dual;
-}
-
-static void
-scroll_to_point (EvView        *view,
-		 gdouble        x,
-		 gdouble        y,
-		 GtkOrientation orientation)
-{
-	gdouble page_size;
-	gdouble upper, lower;
-
-	if (orientation == GTK_ORIENTATION_VERTICAL) {
-		page_size = gtk_adjustment_get_page_size (view->vadjustment);
-		upper = gtk_adjustment_get_upper (view->vadjustment);
-		lower = gtk_adjustment_get_lower (view->vadjustment);
-
-		if (view->continuous) {
-    			gtk_adjustment_clamp_page (view->vadjustment,
-						   y, y + page_size);
-		} else {
-			gtk_adjustment_set_value (view->vadjustment,
-						  CLAMP (y, lower, upper - page_size));
-		}
-	} else {
-		page_size = gtk_adjustment_get_page_size (view->hadjustment);
-		upper = gtk_adjustment_get_upper (view->hadjustment);
-		lower = gtk_adjustment_get_lower (view->hadjustment);
-
-		if (is_dual_page (view, NULL)) {
-			gtk_adjustment_clamp_page (view->hadjustment, x,
-						   x + page_size);
-		} else {
-			gtk_adjustment_set_value (view->hadjustment,
-						  CLAMP (x, lower, upper - page_size));
-		}
-	}
-}
-
-static void
-ev_view_scroll_to_page_position (EvView *view, GtkOrientation orientation)
-{
-	gdouble x, y;
-
-	if (!view->document)
-		return;
-
-	if ((orientation == GTK_ORIENTATION_VERTICAL && view->pending_point.y == 0) ||
-	    (orientation == GTK_ORIENTATION_HORIZONTAL && view->pending_point.x == 0)) {
-		GdkRectangle page_area;
-		GtkBorder    border;
-
-		ev_view_get_page_extents (view, view->current_page, &page_area, &border);
-		x = page_area.x;
-		y = page_area.y;
-	} else {
-		GdkPoint view_point;
-
-		_ev_view_transform_doc_point_to_view_point (view, view->current_page,
-							    &view->pending_point, &view_point);
-		x = view_point.x;
-		y = view_point.y;
-	}
-
-	scroll_to_point (view, x, y, orientation);
-}
-
-static void
-ev_view_set_adjustment_values (EvView         *view,
-			       GtkOrientation  orientation)
-{
-	GtkWidget *widget = GTK_WIDGET (view);
-	GtkAdjustment *adjustment;
-	GtkAllocation allocation;
-	int req_size;
-	int alloc_size;
-	gdouble page_size;
-	gdouble value;
-	gdouble upper;
-	double factor;
-	gint new_value;
-
-	gtk_widget_get_allocation (widget, &allocation);
-
-	if (orientation == GTK_ORIENTATION_HORIZONTAL)  {
-		req_size = view->requisition.width;
-		alloc_size = allocation.width;
-		adjustment = view->hadjustment;
-	} else {
-		req_size = view->requisition.height;
-		alloc_size = allocation.height;
-		adjustment = view->vadjustment;
-	}
-
-	if (!adjustment)
-		return;
-
-	factor = 1.0;
-	value = gtk_adjustment_get_value (adjustment);
-	upper = gtk_adjustment_get_upper (adjustment);
-	page_size = gtk_adjustment_get_page_size (adjustment);
-
-	if (upper != .0) {
-		switch (view->pending_scroll) {
-    	        case SCROLL_TO_KEEP_POSITION:
-    	        case SCROLL_TO_FIND_LOCATION:
-			factor = value / upper;
-			break;
-    	        case SCROLL_TO_PAGE_POSITION:
-			break;
-    	        case SCROLL_TO_CENTER:
-			factor = (value + page_size * 0.5) / upper;
-			break;
-		}
-	}
-
-	upper = MAX (alloc_size, req_size);
-	page_size = alloc_size;
-
-	gtk_adjustment_set_page_size (adjustment, page_size);
-	gtk_adjustment_set_step_increment (adjustment, alloc_size * 0.1);
-	gtk_adjustment_set_page_increment (adjustment, alloc_size * 0.9);
-	gtk_adjustment_set_lower (adjustment, 0);
-	gtk_adjustment_set_upper (adjustment, upper);
-
-	/*
-	 * We add 0.5 to the values before to average out our rounding errors.
-	 */
-	switch (view->pending_scroll) {
-    	        case SCROLL_TO_KEEP_POSITION:
-    	        case SCROLL_TO_FIND_LOCATION:
-			new_value = CLAMP (upper * factor + 0.5, 0, upper - page_size);
-			gtk_adjustment_set_value (adjustment, (int)new_value);
-			break;
-    	        case SCROLL_TO_PAGE_POSITION:
-			ev_view_scroll_to_page_position (view, orientation);
-			break;
-    	        case SCROLL_TO_CENTER:
-			new_value = CLAMP (upper * factor - page_size * 0.5 + 0.5,
-					   0, upper - page_size);
-			gtk_adjustment_set_value (adjustment, (int)new_value);
-			break;
-	}
-
-	gtk_adjustment_changed (adjustment);
-}
-
-static void
-view_update_range_and_current_page (EvView *view)
-{
-	gint start = view->start_page;
-	gint end = view->end_page;
-	gboolean odd_left;
-
-	if (ev_document_get_n_pages (view->document) <= 0 ||
-	    !ev_document_check_dimensions (view->document))
-		return;
-
-	if (view->continuous) {
-		GdkRectangle current_area, unused, page_area;
-		GtkBorder border;
-		gboolean found = FALSE;
-		gint area_max = -1, area;
-		gint best_current_page = -1;
-		int i, j = 0;
-
-		if (!(view->vadjustment && view->hadjustment))
-			return;
-
-		current_area.x = gtk_adjustment_get_value (view->hadjustment);
-		current_area.width = gtk_adjustment_get_page_size (view->hadjustment);
-		current_area.y = gtk_adjustment_get_value (view->vadjustment);
-		current_area.height = gtk_adjustment_get_page_size (view->vadjustment);
-
-		for (i = 0; i < ev_document_get_n_pages (view->document); i++) {
-
-			ev_view_get_page_extents (view, i, &page_area, &border);
-
-			if (gdk_rectangle_intersect (&current_area, &page_area, &unused)) {
-				area = unused.width * unused.height;
-
-				if (!found) {
-					area_max = area;
-					view->start_page = i;
-					found = TRUE;
-					best_current_page = i;
-				}
-				if (area > area_max) {
-					best_current_page = (area == area_max) ? MIN (i, best_current_page) : i;
-					area_max = area;
-				}
-
-				view->end_page = i;
-				j = 0;
-			} else if (found && view->current_page <= view->end_page) {
-				if (is_dual_page (view, NULL) && j < 1) {
-					/* In dual mode  we stop searching
-					 * after two consecutive non-visible pages.
-					 */
-					j++;
-					continue;
-				}
-				break;
-			}
-		}
-
-		if (view->pending_scroll == SCROLL_TO_KEEP_POSITION ||
-		    view->pending_scroll == SCROLL_TO_FIND_LOCATION) {
-			best_current_page = MAX (best_current_page, view->start_page);
-
-			if (best_current_page >= 0 && view->current_page != best_current_page) {
-				view->current_page = best_current_page;
-				ev_view_set_loading (view, FALSE);
-				ev_document_model_set_page (view->model, best_current_page);
-			}
-		}
-	} else if (is_dual_page (view, &odd_left)) {
-		if (view->current_page % 2 == !odd_left) {
-			view->start_page = view->current_page;
-			if (view->current_page + 1 < ev_document_get_n_pages (view->document))
-				view->end_page = view->start_page + 1;
-			else
-				view->end_page = view->start_page;
-		} else {
-			if (view->current_page < 1)
-				view->start_page = view->current_page;
-			else
-				view->start_page = view->current_page - 1;
-			view->end_page = view->current_page;
-		}
-	} else {
-		view->start_page = view->current_page;
-		view->end_page = view->current_page;
-	}
-
-	if (view->start_page == -1 || view->end_page == -1)
-		return;
-
-	if (start != view->start_page || end != view->end_page) {
-		gint i;
-
-		for (i = start; i < view->start_page && start != -1; i++) {
-			hide_annotation_windows (view, i);
-		}
-
-		for (i = end; i > view->end_page && end != -1; i--) {
-			hide_annotation_windows (view, i);
-		}
-
-		ev_view_check_cursor_blink (view);
-	}
-
-	ev_page_cache_set_page_range (view->page_cache,
-				      view->start_page,
-				      view->end_page);
-	ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
-					view->start_page,
-					view->end_page,
-					view->selection_info.selections);
-	if (view->accessible)
-		ev_view_accessible_set_page_range (EV_VIEW_ACCESSIBLE (view->accessible),
-						   view->start_page,
-						   view->end_page);
-
-	if (ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page))
-	    gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-static void
-ev_view_set_scroll_adjustment (EvView         *view,
-			       GtkOrientation  orientation,
-			       GtkAdjustment  *adjustment)
-{
-	GtkAdjustment **to_set;
-	const gchar    *prop_name;
-
-	if (orientation == GTK_ORIENTATION_HORIZONTAL) {
-		to_set = &view->hadjustment;
-		prop_name = "hadjustment";
-	} else {
-		to_set = &view->vadjustment;
-		prop_name = "vadjustment";
-	}
-
-	if (adjustment && adjustment == *to_set)
-		return;
-
-	if (*to_set) {
-		g_signal_handlers_disconnect_by_func (*to_set,
-						      (gpointer) on_adjustment_value_changed,
-						      view);
-		g_object_unref (*to_set);
-	}
-
-	if (!adjustment)
-		adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
-	g_signal_connect (adjustment, "value_changed",
-			  G_CALLBACK (on_adjustment_value_changed),
-			  view);
-	*to_set = g_object_ref_sink (adjustment);
-	ev_view_set_adjustment_values (view, orientation);
-
-	g_object_notify (G_OBJECT (view), prop_name);
-}
-
-static void
-add_scroll_binding_keypad (GtkBindingSet  *binding_set,
-    			   guint           keyval,
-    			   GdkModifierType modifiers,
-    			   GtkScrollType   scroll,
-			   GtkOrientation  orientation)
-{
-	guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left;
-
-	gtk_binding_entry_add_signal (binding_set, keyval, modifiers,
-				      "scroll", 2,
-				      GTK_TYPE_SCROLL_TYPE, scroll,
-				      GTK_TYPE_ORIENTATION, orientation);
-	gtk_binding_entry_add_signal (binding_set, keypad_keyval, modifiers,
-				      "scroll", 2,
-				      GTK_TYPE_SCROLL_TYPE, scroll,
-				      GTK_TYPE_ORIENTATION, orientation);
-}
-
-static gdouble
-compute_scroll_increment (EvView        *view,
-			  GtkScrollType  scroll)
-{
-	GtkWidget *widget = GTK_WIDGET (view);
-	GtkAdjustment *adjustment = view->vadjustment;
-	cairo_region_t *text_region, *region;
-	GtkAllocation allocation;
-	gint page;
-	GdkRectangle rect;
-	EvRectangle doc_rect;
-	GdkRectangle page_area;
-	GtkBorder border;
-	gdouble fraction = 1.0;
-
-	if (scroll != GTK_SCROLL_PAGE_BACKWARD && scroll != GTK_SCROLL_PAGE_FORWARD)
-		return gtk_adjustment_get_page_size (adjustment);
-
-	page = scroll == GTK_SCROLL_PAGE_BACKWARD ? view->start_page : view->end_page;
-
-	text_region = ev_page_cache_get_text_mapping (view->page_cache, page);
-	if (!text_region || cairo_region_is_empty (text_region))
-		return gtk_adjustment_get_page_size (adjustment);
-
-	gtk_widget_get_allocation (widget, &allocation);
-	ev_view_get_page_extents (view, page, &page_area, &border);
-	rect.x = page_area.x + view->scroll_x;
-	rect.y = view->scroll_y + (scroll == GTK_SCROLL_PAGE_BACKWARD ? 5 : allocation.height - 5);
-	rect.width = page_area.width;
-	rect.height = 1;
-	_ev_view_transform_view_rect_to_doc_rect (view, &rect, &page_area, &border, &doc_rect);
-
-	/* Convert the doc rectangle into a GdkRectangle */
-	rect.x = doc_rect.x1;
-	rect.y = doc_rect.y1;
-	rect.width = doc_rect.x2 - doc_rect.x1;
-	rect.height = MAX (1, doc_rect.y2 - doc_rect.y1);
-	region = cairo_region_create_rectangle (&rect);
-
-	cairo_region_intersect (region, text_region);
-	if (cairo_region_num_rectangles (region)) {
-		EvRenderContext *rc;
-		EvPage  *ev_page;
-		cairo_region_t *sel_region;
-
-		cairo_region_get_rectangle (region, 0, &rect);
-		ev_page = ev_document_get_page (view->document, page);
-		rc = ev_render_context_new (ev_page, view->rotation, 0.);
-		ev_render_context_set_target_size (rc,
-						   page_area.width - (border.left + border.right),
-						   page_area.height - (border.left + border.right));
-		g_object_unref (ev_page);
-		/* Get the selection region to know the height of the line */
-		doc_rect.x1 = doc_rect.x2 = rect.x + 0.5;
-		doc_rect.y1 = doc_rect.y2 = rect.y + 0.5;
-
-		ev_document_doc_mutex_lock ();
-		sel_region = ev_selection_get_selection_region (EV_SELECTION (view->document),
-								rc, EV_SELECTION_STYLE_LINE,
-								&doc_rect);
-		ev_document_doc_mutex_unlock ();
-
-		g_object_unref (rc);
-
-		if (cairo_region_num_rectangles (sel_region) > 0) {
-			cairo_region_get_rectangle (sel_region, 0, &rect);
-			fraction = 1 - (rect.height / gtk_adjustment_get_page_size (adjustment));
-		}
-		cairo_region_destroy (sel_region);
-	}
-	cairo_region_destroy (region);
-
-	return gtk_adjustment_get_page_size (adjustment) * fraction;
-
-}
-
-static void
-ev_view_first_page (EvView *view)
-{
-	ev_document_model_set_page (view->model, 0);
-}
-
-static void
-ev_view_last_page (EvView *view)
-{
-	gint n_pages;
-
-	if (!view->document)
-		return;
-
-	n_pages = ev_document_get_n_pages (view->document);
-	if (n_pages <= 1)
-		return;
-
-	ev_document_model_set_page (view->model, n_pages - 1);
-}
-
-/**
- * ev_view_scroll:
- * @view: a #EvView
- * @scroll:
- * @horizontal:
- *
- * Deprecated: 3.10
- */
-void
-ev_view_scroll (EvView        *view,
-	        GtkScrollType  scroll,
-		gboolean       horizontal)
-{
-	GtkAdjustment *adjustment;
-	double value, increment;
-	gdouble upper, lower;
-	gdouble page_size;
-	gdouble step_increment;
-	gboolean first_page = FALSE;
-	gboolean last_page = FALSE;
-
-	if (view->key_binding_handled)
-		return;
-
-	view->jump_to_find_result = FALSE;
-
-	if (view->sizing_mode == EV_SIZING_FIT_PAGE) {
-		switch (scroll) {
-			case GTK_SCROLL_PAGE_BACKWARD:
-			case GTK_SCROLL_STEP_BACKWARD:
-				ev_view_previous_page (view);
-				break;
-			case GTK_SCROLL_PAGE_FORWARD:
-			case GTK_SCROLL_STEP_FORWARD:
-				ev_view_next_page (view);
-				break;
-			default:
-				break;
-		}
-		return;
-	}
-
-	/* Assign values for increment and vertical adjustment */
-	adjustment = horizontal ? view->hadjustment : view->vadjustment;
-	value = gtk_adjustment_get_value (adjustment);
-	upper = gtk_adjustment_get_upper (adjustment);
-	lower = gtk_adjustment_get_lower (adjustment);
-	page_size = gtk_adjustment_get_page_size (adjustment);
-	step_increment = gtk_adjustment_get_step_increment (adjustment);
-
-	/* Assign boolean for first and last page */
-	if (view->current_page == 0)
-		first_page = TRUE;
-	if (view->current_page == ev_document_get_n_pages (view->document) - 1)
-		last_page = TRUE;
-
-	switch (scroll) {
-		case GTK_SCROLL_PAGE_BACKWARD:
-			/* Do not jump backwards if at the first page */
-			if (value == lower && first_page) {
-				/* Do nothing */
-				/* At the top of a page, assign the upper bound limit of previous page */
-			} else if (value == lower) {
-				value = upper - page_size;
-				ev_view_previous_page (view);
-				/* Jump to the top */
-			} else {
-				increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_BACKWARD);
-				value = MAX (value - increment, lower);
-			}
-			break;
-		case GTK_SCROLL_PAGE_FORWARD:
-			/* Do not jump forward if at the last page */
-			if (value == (upper - page_size) && last_page) {
-				/* Do nothing */
-			/* At the bottom of a page, assign the lower bound limit of next page */
-			} else if (value == (upper - page_size)) {
-				value = 0;
-				ev_view_next_page (view);
-			/* Jump to the bottom */
-			} else {
-				increment = compute_scroll_increment (view, GTK_SCROLL_PAGE_FORWARD);
-				value = MIN (value + increment, upper - page_size);
-			}
-			break;
-	        case GTK_SCROLL_STEP_BACKWARD:
-			value -= step_increment;
-			break;
-	        case GTK_SCROLL_STEP_FORWARD:
-			value += step_increment;
-			break;
-        	case GTK_SCROLL_STEP_DOWN:
-			value -= step_increment / 10;
-			break;
-        	case GTK_SCROLL_STEP_UP:
-			value += step_increment / 10;
-			break;
-	        case GTK_SCROLL_START:
-			value = lower;
-			if (!first_page)
-				ev_view_first_page (view);
-			break;
-	        case GTK_SCROLL_END:
-			value = upper - page_size;
-			if (!last_page)
-				ev_view_last_page (view);
-			/* Changing pages causes the top to be shown. Here we want the bottom shown. */
-			view->pending_point.y = value;
-			break;
-        	default:
-			break;
-	}
-
-	value = CLAMP (value, lower, upper - page_size);
-
-	gtk_adjustment_set_value (adjustment, value);
-}
-
-static void
-ev_view_scroll_internal (EvView        *view,
-			 GtkScrollType  scroll,
-			 GtkOrientation orientation)
-{
-	ev_view_scroll (view, scroll, orientation == GTK_ORIENTATION_HORIZONTAL);
-}
-
-#define MARGIN 5
-
-static void
-ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect)
-{
-	GtkWidget *widget = GTK_WIDGET (view);
-	GtkAdjustment *adjustment;
-	GtkAllocation allocation;
-	gdouble adj_value;
-	int value;
-
-	view->pending_scroll = SCROLL_TO_FIND_LOCATION;
-
-	gtk_widget_get_allocation (widget, &allocation);
-
-	adjustment = view->vadjustment;
-	adj_value = gtk_adjustment_get_value (adjustment);
-
-	if (rect->y < adj_value) {
-		value = MAX (gtk_adjustment_get_lower (adjustment), rect->y - MARGIN);
-		gtk_adjustment_set_value (view->vadjustment, value);
-	} else if (rect->y + rect->height > adj_value + allocation.height) {
-		value = MIN (gtk_adjustment_get_upper (adjustment), rect->y + rect->height -
-			     allocation.height + MARGIN);
-		gtk_adjustment_set_value (view->vadjustment, value);
-	}
-
-	adjustment = view->hadjustment;
-	adj_value = gtk_adjustment_get_value (adjustment);
-
-	if (rect->x < adj_value) {
-		value = MAX (gtk_adjustment_get_lower (adjustment), rect->x - MARGIN);
-		gtk_adjustment_set_value (view->hadjustment, value);
-	} else if (rect->x + rect->height > adj_value + allocation.width) {
-		value = MIN (gtk_adjustment_get_upper (adjustment), rect->x + rect->width -
-			     allocation.width + MARGIN);
-		gtk_adjustment_set_value (view->hadjustment, value);
-	}
-}
-
-/*** Geometry computations ***/
-
-static void
-compute_border (EvView *view, GtkBorder *border)
-{
-	GtkWidget       *widget = GTK_WIDGET (view);
-	GtkStyleContext *context = gtk_widget_get_style_context (widget);
-	GtkStateFlags    state = gtk_widget_get_state_flags (widget);
-
-	gtk_style_context_save (context);
-	gtk_style_context_add_class (context, EV_STYLE_CLASS_DOCUMENT_PAGE);
-	gtk_style_context_get_border (context, state, border);
-	gtk_style_context_restore (context);
-}
-
-void
-_get_page_size_for_scale_and_rotation (EvDocument *document,
-				       gint        page,
-				       gdouble     scale,
-				       gint        rotation,
-				       gint       *page_width,
-				       gint       *page_height)
-{
-	gdouble w, h;
-	gint    width, height;
-
-	ev_document_get_page_size (document, page, &w, &h);
-
-	width = (gint)(w * scale + 0.5);
-	height = (gint)(h * scale + 0.5);
-
-	if (page_width)
-		*page_width = (rotation == 0 || rotation == 180) ? width : height;
-	if (page_height)
-		*page_height = (rotation == 0 || rotation == 180) ? height : width;
-}
-
-static void
-ev_view_get_page_size (EvView *view,
-		       gint    page,
-		       gint   *page_width,
-		       gint   *page_height)
-{
-	_get_page_size_for_scale_and_rotation (view->document,
-					       page,
-					       view->scale,
-					       view->rotation,
-					       page_width,
-					       page_height);
-}
-
-static void
-ev_view_get_max_page_size (EvView *view,
-			   gint   *max_width,
-			   gint   *max_height)
-{
-	double w, h;
-	gint   width, height;
-
-	ev_document_get_max_page_size (view->document, &w, &h);
-
-	width = (gint)(w * view->scale + 0.5);
-	height = (gint)(h * view->scale + 0.5);
-
-	if (max_width)
-		*max_width = (view->rotation == 0 || view->rotation == 180) ? width : height;
-	if (max_height)
-		*max_height = (view->rotation == 0 || view->rotation == 180) ? height : width;
-}
-
-static void
-get_page_y_offset (EvView *view, int page, int *y_offset)
-{
-	int offset = 0;
-	GtkBorder border;
-	gboolean odd_left;
-
-	g_return_if_fail (y_offset != NULL);
-
-	compute_border (view, &border);
-
-	if (is_dual_page (view, &odd_left)) {
-		ev_view_get_height_to_page (view, page, NULL, &offset);
-		offset += ((page + !odd_left) / 2 + 1) * view->spacing +
-			((page + !odd_left) / 2 ) * (border.top + border.bottom);
-	} else {
-		ev_view_get_height_to_page (view, page, &offset, NULL);
-		offset += (page + 1) * view->spacing + page * (border.top + border.bottom);
-	}
-
-	*y_offset = offset;
-	return;
-}
-
-gboolean
-ev_view_get_page_extents (EvView       *view,
-			  gint          page,
-			  GdkRectangle *page_area,
-			  GtkBorder    *border)
-{
-	GtkWidget *widget;
-	int width, height;
-	GtkAllocation allocation;
-
-	widget = GTK_WIDGET (view);
-	gtk_widget_get_allocation (widget, &allocation);
-
-	/* Get the size of the page */
-	ev_view_get_page_size (view, page, &width, &height);
-	compute_border (view, border);
-	page_area->width = width + border->left + border->right;
-	page_area->height = height + border->top + border->bottom;
-
-	if (view->continuous) {
-		gint max_width;
-		gint x, y;
-		gboolean odd_left;
-
-		ev_view_get_max_page_size (view, &max_width, NULL);
-		max_width = max_width + border->left + border->right;
-		/* Get the location of the bounding box */
-		if (is_dual_page (view, &odd_left)) {
-			x = view->spacing + ((page % 2 == !odd_left) ? 0 : 1) * (max_width + view->spacing);
-			x = x + MAX (0, allocation.width - (max_width * 2 + view->spacing * 3)) / 2;
-			if (page % 2 == !odd_left)
-				x = x + (max_width - width - border->left - border->right);
-		} else {
-			x = view->spacing;
-			x = x + MAX (0, allocation.width - (width + border->left + border->right + view->spacing * 2)) / 2;
-		}
-
-		get_page_y_offset (view, page, &y);
-
-		page_area->x = x;
-		page_area->y = y;
-	} else {
-		gint x, y;
-		gboolean odd_left;
-
-		if (is_dual_page (view, &odd_left)) {
-			gint width_2, height_2;
-			gint max_width = width;
-			gint max_height = height;
-			GtkBorder overall_border;
-			gint other_page;
-
-			other_page = (page % 2 == !odd_left) ? page + 1: page - 1;
-
-			/* First, we get the bounding box of the two pages */
-			if (other_page < ev_document_get_n_pages (view->document)
-			    && (0 <= other_page)) {
-				ev_view_get_page_size (view, other_page,
-						       &width_2, &height_2);
-				if (width_2 > width)
-					max_width = width_2;
-				if (height_2 > height)
-					max_height = height_2;
-			}
-			compute_border (view, &overall_border);
-
-			/* Find the offsets */
-			x = view->spacing;
-			y = view->spacing;
-
-			/* Adjust for being the left or right page */
-			if (page % 2 == !odd_left)
-				x = x + max_width - width;
-			else
-				x = x + (max_width + overall_border.left + overall_border.right) + view->spacing;
-
-			y = y + (max_height - height)/2;
-
-			/* Adjust for extra allocation */
-			x = x + MAX (0, allocation.width -
-				     ((max_width + overall_border.left + overall_border.right) * 2 + view->spacing * 3))/2;
-			y = y + MAX (0, allocation.height - (height + view->spacing * 2))/2;
-		} else {
-			x = view->spacing;
-			y = view->spacing;
-
-			/* Adjust for extra allocation */
-			x = x + MAX (0, allocation.width - (width + border->left + border->right + view->spacing * 2))/2;
-			y = y + MAX (0, allocation.height - (height + border->top + border->bottom +  view->spacing * 2))/2;
-		}
-
-		page_area->x = x;
-		page_area->y = y;
-	}
-
-	return TRUE;
-}
-
-static void
-get_doc_page_size (EvView  *view,
-		   gint     page,
-		   gdouble *width,
-		   gdouble *height)
-{
-	double w, h;
-
-	ev_document_get_page_size (view->document, page, &w, &h);
-	if (view->rotation == 0 || view->rotation == 180) {
-		if (width) *width = w;
-		if (height) *height = h;
-	} else {
-		if (width) *width = h;
-		if (height) *height = w;
-	}
-}
-
-void
-_ev_view_transform_view_point_to_doc_point (EvView       *view,
-					    GdkPoint     *view_point,
-					    GdkRectangle *page_area,
-					    GtkBorder    *border,
-					    double       *doc_point_x,
-					    double       *doc_point_y)
-{
-	*doc_point_x = MAX ((double) (view_point->x - page_area->x - border->left) / view->scale, 0);
-	*doc_point_y = MAX ((double) (view_point->y - page_area->y - border->right) / view->scale, 0);
-}
-
-void
-_ev_view_transform_view_rect_to_doc_rect (EvView       *view,
-					  GdkRectangle *view_rect,
-					  GdkRectangle *page_area,
-					  GtkBorder    *border,
-					  EvRectangle  *doc_rect)
-{
-	doc_rect->x1 = MAX ((double) (view_rect->x - page_area->x - border->left) / view->scale, 0);
-	doc_rect->y1 = MAX ((double) (view_rect->y - page_area->y - border->right) / view->scale, 0);
-	doc_rect->x2 = doc_rect->x1 + (double) view_rect->width / view->scale;
-	doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
-}
-
-void
-_ev_view_transform_doc_point_to_view_point (EvView   *view,
-					    int       page,
-					    EvPoint  *doc_point,
-					    GdkPoint *view_point)
-{
-	GdkRectangle page_area;
-	GtkBorder border;
-	double x, y, view_x, view_y;
-
-	switch (view->rotation) {
-	case 0:
-		x = doc_point->x;
-		y = doc_point->y;
-
-		break;
-	case 90: {
-		gdouble width;
-
-		get_doc_page_size (view, page, &width, NULL);
-		x = width - doc_point->y;
-		y = doc_point->x;
-	}
-		break;
-	case 180: {
-		gdouble width, height;
-
-		get_doc_page_size (view, page, &width, &height);
-		x = width - doc_point->x;
-		y = height - doc_point->y;
-	}
-		break;
-	case 270: {
-		gdouble height;
-
-		get_doc_page_size (view, page, NULL, &height);
-		x = doc_point->y;
-		y = height - doc_point->x;
-	}
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	ev_view_get_page_extents (view, page, &page_area, &border);
-
-	view_x = CLAMP ((gint)(x * view->scale + 0.5), 0, page_area.width);
-	view_y = CLAMP ((gint)(y * view->scale + 0.5), 0, page_area.height);
-	view_point->x = view_x + page_area.x + border.left;
-	view_point->y = view_y + page_area.y + border.top;
-}
-
-void
-_ev_view_transform_doc_rect_to_view_rect (EvView       *view,
-					  int           page,
-					  EvRectangle  *doc_rect,
-					  GdkRectangle *view_rect)
-{
-	GdkRectangle page_area;
-	GtkBorder border;
-	double x, y, w, h;
-
-	switch (view->rotation) {
-	case 0:
-		x = doc_rect->x1;
-		y = doc_rect->y1;
-		w = doc_rect->x2 - doc_rect->x1;
-		h = doc_rect->y2 - doc_rect->y1;
-
-		break;
-	case 90: {
-		gdouble width;
-
-		get_doc_page_size (view, page, &width, NULL);
-		x = width - doc_rect->y2;
-		y = doc_rect->x1;
-		w = doc_rect->y2 - doc_rect->y1;
-		h = doc_rect->x2 - doc_rect->x1;
-	}
-		break;
-	case 180: {
-		gdouble width, height;
-
-		get_doc_page_size (view, page, &width, &height);
-		x = width - doc_rect->x2;
-		y = height - doc_rect->y2;
-		w = doc_rect->x2 - doc_rect->x1;
-		h = doc_rect->y2 - doc_rect->y1;
-	}
-		break;
-	case 270: {
-		gdouble height;
-
-		get_doc_page_size (view, page, NULL, &height);
-		x = doc_rect->y1;
-		y = height - doc_rect->x2;
-		w = doc_rect->y2 - doc_rect->y1;
-		h = doc_rect->x2 - doc_rect->x1;
-	}
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-
-	ev_view_get_page_extents (view, page, &page_area, &border);
-
-	view_rect->x = (gint)(x * view->scale + 0.5) + page_area.x + border.left;
-	view_rect->y = (gint)(y * view->scale + 0.5) + page_area.y + border.top;
-	view_rect->width = (gint)(w * view->scale + 0.5);
-	view_rect->height = (gint)(h * view->scale + 0.5);
-}
-
-static void
-find_page_at_location (EvView  *view,
-		       gdouble  x,
-		       gdouble  y,
-		       gint    *page,
-		       gint    *x_offset,
-		       gint    *y_offset)
-{
-	int i;
-
-	if (view->document == NULL)
-		return;
-
-	g_assert (page);
-	g_assert (x_offset);
-	g_assert (y_offset);
-
-	for (i = view->start_page; i >= 0 && i <= view->end_page; i++) {
-		GdkRectangle page_area;
-		GtkBorder border;
-
-		if (! ev_view_get_page_extents (view, i, &page_area, &border))
-			continue;
-
-		if ((x >= page_area.x + border.left) &&
-		    (x < page_area.x + page_area.width - border.right) &&
-		    (y >= page_area.y + border.top) &&
-		    (y < page_area.y + page_area.height - border.bottom)) {
-			*page = i;
-			*x_offset = x - (page_area.x + border.left);
-			*y_offset = y - (page_area.y + border.top);
-			return;
-		}
-	}
-
-	*page = -1;
-}
-
-static gboolean
-location_in_text (EvView  *view,
-		  gdouble  x,
-		  gdouble  y)
-{
-	cairo_region_t *region;
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-
-	if (page == -1)
-		return FALSE;
-	
-	region = ev_page_cache_get_text_mapping (view->page_cache, page);
-
-	if (region)
-		return cairo_region_contains_point (region, x_offset / view->scale, y_offset / view->scale);
-	else
-		return FALSE;
-}
-
-static gboolean
-location_in_selected_text (EvView  *view,
-			   gdouble  x,
-			   gdouble  y)
-{
-	cairo_region_t *region;
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-
-	if (page == -1)
-		return FALSE;
-
-	region = ev_pixbuf_cache_get_selection_region (view->pixbuf_cache, page, view->scale);
-
-	if (region)
-		return cairo_region_contains_point (region, x_offset, y_offset);
-	else
-		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)
-{
-        gdouble width, height;
-	double x, y;
-
-	get_doc_page_size (view, page, &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;
-}
-
-static gboolean
-get_doc_point_from_location (EvView  *view,
-			     gdouble  x,
-			     gdouble  y,
-			     gint    *page,
-			     gint    *x_new,
-			     gint    *y_new)
-{
-	gint x_offset = 0, y_offset = 0;
-
-	x += view->scroll_x;
-	y += view->scroll_y;
-	find_page_at_location (view, x, y, page, &x_offset, &y_offset);
-	if (*page == -1)
-		return FALSE;
-
-	return get_doc_point_from_offset (view, *page, x_offset, y_offset, x_new, y_new);
-}
-
-static void
-ev_view_get_area_from_mapping (EvView        *view,
-			       guint          page,
-			       EvMappingList *mapping_list,
-			       gconstpointer  data,
-			       GdkRectangle  *area)
-{
-	EvMapping *mapping;
-
-	mapping = ev_mapping_list_find (mapping_list, data);
-	_ev_view_transform_doc_rect_to_view_rect (view, page, &mapping->area, area);
-	area->x -= view->scroll_x;
-	area->y -= view->scroll_y;
-}
-
-static void
-ev_view_put (EvView      *view,
-	     GtkWidget   *child_widget,
-	     gint         x,
-	     gint         y,
-	     guint        page,
-	     EvRectangle *doc_rect)
-{
-	EvViewChild *child;
-
-	child = g_slice_new (EvViewChild);
-
-	child->widget = child_widget;
-	child->x = x;
-	child->y = y;
-	child->page = page;
-	child->doc_rect = *doc_rect;
-
-	gtk_widget_set_parent (child_widget, GTK_WIDGET (view));
-	view->children = g_list_append (view->children, child);
-}
-
-static void
-ev_view_put_to_doc_rect (EvView      *view,
-			 GtkWidget   *child_widget,
-			 guint        page,
-			 EvRectangle *doc_rect)
-{
-	GdkRectangle area;
-
-	_ev_view_transform_doc_rect_to_view_rect (view, page, doc_rect, &area);
-	area.x -= view->scroll_x;
-	area.y -= view->scroll_y;
-	ev_view_put (view, child_widget, area.x, area.y, page, doc_rect);
-}
-
-/*** Hyperref ***/
-static EvMapping *
-get_link_mapping_at_location (EvView  *view,
-			      gdouble  x,
-			      gdouble  y,
-			      gint    *page)
-{
-	gint x_new = 0, y_new = 0;
-	EvMappingList *link_mapping;
-
-	if (!EV_IS_DOCUMENT_LINKS (view->document))
-		return NULL;
-
-	if (!get_doc_point_from_location (view, x, y, page, &x_new, &y_new))
-		return NULL;
-
-	link_mapping = ev_page_cache_get_link_mapping (view->page_cache, *page);
-	if (link_mapping)
-		return ev_mapping_list_get (link_mapping, x_new, y_new);
-
-	return NULL;
-}
-
-static EvLink *
-ev_view_get_link_at_location (EvView  *view,
-			      gdouble  x,
-			      gdouble  y)
-{
-	EvMapping *mapping;
-	gint page;
-
-	mapping = get_link_mapping_at_location (view, x, y, &page);
-
-	return mapping ? mapping->data : NULL;
-}
-
-static void
-goto_fitr_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	gdouble left, top;
-	gboolean change_left, change_top;
-
-	left = ev_link_dest_get_left (dest, &change_left);
-	top = ev_link_dest_get_top (dest, &change_top);
-
-	if (view->allow_links_change_zoom) {
-		gdouble doc_width, doc_height;
-		gdouble zoom;
-		GtkAllocation allocation;
-
-		gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
-
-		doc_width = ev_link_dest_get_right (dest) - left;
-		doc_height = ev_link_dest_get_bottom (dest) - top;
-
-		zoom = zoom_for_size_fit_page (doc_width,
-					       doc_height,
-					       allocation.width,
-					       allocation.height);
-
-		ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
-		ev_document_model_set_scale (view->model, zoom);
-
-		/* center the target box within the view */
-		left -= (allocation.width / zoom - doc_width) / 2;
-		top -= (allocation.height / zoom - doc_height) / 2;
-	}
-
-	doc_point.x = change_left ? left : 0;
-	doc_point.y = change_top ? top : 0;
-	view->pending_point = doc_point;
-
-	ev_view_change_page (view, ev_link_dest_get_page (dest));
-}
-
-static void
-goto_fitv_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	gint page;
-	double left;
-	gboolean change_left;
-
-	page = ev_link_dest_get_page (dest);
-
-	left = ev_link_dest_get_left (dest, &change_left);
-	doc_point.x = change_left ? left : 0;
-	doc_point.y = 0;
-
-	if (view->allow_links_change_zoom) {
-		GtkAllocation allocation;
-		gdouble doc_width, doc_height;
-		double zoom;
-
-		gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
-
-		ev_document_get_page_size (view->document, page, &doc_width, &doc_height);
-
-		zoom = zoom_for_size_fit_height (doc_width - doc_point.x, doc_height,
-						 allocation.width,
-						 allocation.height);
-
-		ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
-		ev_document_model_set_scale (view->model, zoom);
-	}
-
-	view->pending_point = doc_point;
-
-	ev_view_change_page (view, page);
-}
-
-static void
-goto_fith_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	gint page;
-	gdouble top;
-	gboolean change_top;
-
-	page = ev_link_dest_get_page (dest);
-
-	top = ev_link_dest_get_top (dest, &change_top);
-	doc_point.x = 0;
-	doc_point.y = change_top ? top : 0;
-
-	if (view->allow_links_change_zoom) {
-		GtkAllocation allocation;
-		gdouble doc_width;
-		gdouble zoom;
-
-		gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
-
-		ev_document_get_page_size (view->document, page, &doc_width, NULL);
-
-		zoom = zoom_for_size_fit_width (doc_width, top,
-						allocation.width,
-						allocation.height);
-
-		ev_document_model_set_sizing_mode (view->model, EV_SIZING_FIT_WIDTH);
-		ev_document_model_set_scale (view->model, zoom);
-	}
-
-	view->pending_point = doc_point;
-
-	ev_view_change_page (view, page);
-}
-
-static void
-goto_fit_dest (EvView *view, EvLinkDest *dest)
-{
-	int page;
-
-	page = ev_link_dest_get_page (dest);
-
-	if (view->allow_links_change_zoom) {
-		double zoom;
-		gdouble doc_width, doc_height;
-		GtkAllocation allocation;
-
-		gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
-
-		ev_document_get_page_size (view->document, page, &doc_width, &doc_height);
-
-		zoom = zoom_for_size_fit_page (doc_width, doc_height,
-					       allocation.width,
-					       allocation.height);
-
-		ev_document_model_set_sizing_mode (view->model, EV_SIZING_FIT_PAGE);
-		ev_document_model_set_scale (view->model, zoom);
-	}
-
-	ev_view_change_page (view, page);
-}
-
-static void
-goto_xyz_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	gint page;
-	gdouble zoom, left, top;
-	gboolean change_zoom, change_left, change_top; 
-
-	zoom = ev_link_dest_get_zoom (dest, &change_zoom);
-	page = ev_link_dest_get_page (dest);
-
-	if (view->allow_links_change_zoom && change_zoom && zoom > 1) {
-		ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
-		ev_document_model_set_scale (view->model, zoom);
-	}
-
-	left = ev_link_dest_get_left (dest, &change_left);
-	top = ev_link_dest_get_top (dest, &change_top);
-
-	doc_point.x = change_left ? left : 0;
-	doc_point.y = change_top ? top : 0;
-	view->pending_point = doc_point;
-
-	ev_view_change_page (view, page);
-}
-
-static void
-goto_dest (EvView *view, EvLinkDest *dest)
-{
-	EvLinkDestType type;
-	int page, n_pages, current_page;
-
-	page = ev_link_dest_get_page (dest);
-	n_pages = ev_document_get_n_pages (view->document);
-
-	if (page < 0 || page >= n_pages)
-		return;
-
-	current_page = view->current_page;
-	
-	type = ev_link_dest_get_dest_type (dest);
-
-	switch (type) {
-		case EV_LINK_DEST_TYPE_PAGE:
-			ev_document_model_set_page (view->model, page);
-			break;
-		case EV_LINK_DEST_TYPE_FIT:
-			goto_fit_dest (view, dest);
-			break;
-		case EV_LINK_DEST_TYPE_FITH:
-			goto_fith_dest (view, dest);
-			break;
-		case EV_LINK_DEST_TYPE_FITV:
-			goto_fitv_dest (view, dest);
-			break;
-		case EV_LINK_DEST_TYPE_FITR:
-			goto_fitr_dest (view, dest);
-			break;
-		case EV_LINK_DEST_TYPE_XYZ:
-			goto_xyz_dest (view, dest);
-			break;
-		case EV_LINK_DEST_TYPE_PAGE_LABEL:
-			ev_document_model_set_page_by_label (view->model, ev_link_dest_get_page_label (dest));
-			break;
-		default:
-			g_assert_not_reached ();
- 	}
-
-	if (current_page != view->current_page)
-		ev_document_model_set_page (view->model, view->current_page);
-}
-
-static void
-ev_view_goto_dest (EvView *view, EvLinkDest *dest)
-{
-	EvLinkDestType type;
-
-	type = ev_link_dest_get_dest_type (dest);
-
-	if (type == EV_LINK_DEST_TYPE_NAMED) {
-		EvLinkDest  *dest2;	
-		const gchar *named_dest;
-
-		named_dest = ev_link_dest_get_named_dest (dest);
-		dest2 = ev_document_links_find_link_dest (EV_DOCUMENT_LINKS (view->document),
-							  named_dest);
-		if (dest2) {
-			goto_dest (view, dest2);
-			g_object_unref (dest2);
-		}
-
-		return;
-	}
-
-	goto_dest (view, dest);
-}
-	
-void
-ev_view_handle_link (EvView *view, EvLink *link)
-{
-	EvLinkAction    *action = NULL;
-	EvLinkActionType type;
-
-	action = ev_link_get_action (link);
-	if (!action)
-		return;
-
-	type = ev_link_action_get_action_type (action);
-
-	switch (type) {
-	        case EV_LINK_ACTION_TYPE_GOTO_DEST: {
-			EvLinkDest *dest;
-			
-			g_signal_emit (view, signals[SIGNAL_HANDLE_LINK], 0, link);
-		
-			dest = ev_link_action_get_dest (action);
-			ev_view_goto_dest (view, dest);
-		}
-			break;
-	        case EV_LINK_ACTION_TYPE_LAYERS_STATE: {
-			GList            *show, *hide, *toggle;
-			GList            *l;
-			EvDocumentLayers *document_layers;
-
-			document_layers = EV_DOCUMENT_LAYERS (view->document);
-
-			show = ev_link_action_get_show_list (action);
-			for (l = show; l; l = g_list_next (l)) {
-				ev_document_layers_show_layer (document_layers, EV_LAYER (l->data));
-			}
-
-			hide = ev_link_action_get_hide_list (action);
-			for (l = hide; l; l = g_list_next (l)) {
-				ev_document_layers_hide_layer (document_layers, EV_LAYER (l->data));
-			}
-
-			toggle = ev_link_action_get_toggle_list (action);
-			for (l = toggle; l; l = g_list_next (l)) {
-				EvLayer *layer = EV_LAYER (l->data);
-
-				if (ev_document_layers_layer_is_visible (document_layers, layer)) {
-					ev_document_layers_hide_layer (document_layers, layer);
-				} else {
-					ev_document_layers_show_layer (document_layers, layer);
-				}
-			}
-
-			g_signal_emit (view, signals[SIGNAL_LAYERS_CHANGED], 0);
-			ev_view_reload_page (view, view->current_page, NULL);
-		}
-			break;
-	        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
-	        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
-	        case EV_LINK_ACTION_TYPE_LAUNCH:
-	        case EV_LINK_ACTION_TYPE_NAMED:
-			g_signal_emit (view, signals[SIGNAL_EXTERNAL_LINK], 0, action);
-			break;
-	}
-}
-
-static char *
-tip_from_action_named (EvLinkAction *action)
-{
-	const gchar *name = ev_link_action_get_name (action);
-	
-	if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
-		return g_strdup (_("Go to first page"));
-	} else if (g_ascii_strcasecmp (name, "PrevPage") == 0) {
-		return g_strdup (_("Go to previous page"));
-	} else if (g_ascii_strcasecmp (name, "NextPage") == 0) {
-		return g_strdup (_("Go to next page"));
-	} else if (g_ascii_strcasecmp (name, "LastPage") == 0) {
-		return g_strdup (_("Go to last page"));
-	} else if (g_ascii_strcasecmp (name, "GoToPage") == 0) {
-		return g_strdup (_("Go to page"));
-	} else if (g_ascii_strcasecmp (name, "Find") == 0) {
-		return g_strdup (_("Find"));
-	}
-	
-	return NULL;
-}
-
-static char *
-tip_from_link (EvView *view, EvLink *link)
-{
-	EvLinkAction *action;
-	EvLinkActionType type;
-	char *msg = NULL;
-	char *page_label;
-	const char *title;
-
-	action = ev_link_get_action (link);
-	title = ev_link_get_title (link);
-	
-	if (!action)
-		return title ? g_strdup (title) : NULL;
-		
-	type = ev_link_action_get_action_type (action);
-
-	switch (type) {
-	        case EV_LINK_ACTION_TYPE_GOTO_DEST:
-			page_label = ev_document_links_get_dest_page_label (EV_DOCUMENT_LINKS (view->document),
-									    ev_link_action_get_dest (action));
-			if (page_label) {
-    				msg = g_strdup_printf (_("Go to page %s"), page_label);
-				g_free (page_label);
-			}
-			break;
-	        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
-			if (title) {
-				msg = g_strdup_printf (_("Go to %s on file “%s”"), title,
-						       ev_link_action_get_filename (action));
-			} else {
-				msg = g_strdup_printf (_("Go to file “%s”"),
-						       ev_link_action_get_filename (action));
-			}
-			break;
-	        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
-			msg = g_strdup (ev_link_action_get_uri (action));
-			break;
-	        case EV_LINK_ACTION_TYPE_LAUNCH:
-			msg = g_strdup_printf (_("Launch %s"),
-					       ev_link_action_get_filename (action));
-			break;
-	        case EV_LINK_ACTION_TYPE_NAMED:
-			msg = tip_from_action_named (action);
-			break;
-	        default:
-			if (title)
-				msg = g_strdup (title);
-			break;
-	}
-	
-	return msg;
-}
-
-static void
-ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y)
-{
-	EvLink       *link;
-	EvFormField  *field;
-	EvAnnotation *annot = NULL;
-
-	if (view->cursor == EV_VIEW_CURSOR_HIDDEN)
-		return;
-
-	if (view->adding_annot) {
-		if (view->cursor != EV_VIEW_CURSOR_ADD)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_ADD);
-		return;
-	}
-
-	if (view->drag_info.in_drag) {
-		if (view->cursor != EV_VIEW_CURSOR_DRAG)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_DRAG);
-		return;
-	}
-
-	if (view->scroll_info.autoscrolling) {
-		if (view->cursor != EV_VIEW_CURSOR_AUTOSCROLL)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_AUTOSCROLL);
-		return;
-	}
-
-	link = ev_view_get_link_at_location (view, x, y);
-        if (link) {
-		ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
-	} else if ((field = ev_view_get_form_field_at_location (view, x, y))) {
-		if (field->is_read_only) {
-			if (view->cursor == EV_VIEW_CURSOR_LINK ||
-			    view->cursor == EV_VIEW_CURSOR_IBEAM ||
-			    view->cursor == EV_VIEW_CURSOR_DRAG)
-				ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-		} else if (EV_IS_FORM_FIELD_TEXT (field)) {
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
-		} else {
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
-		}
-	} else if ((annot = ev_view_get_annotation_at_location (view, x, y))) {
-		ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
-	} else if (location_in_text (view, x + view->scroll_x, y + view->scroll_y)) {
-		ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
-	} else {
-		if (view->cursor == EV_VIEW_CURSOR_LINK ||
-		    view->cursor == EV_VIEW_CURSOR_IBEAM ||
-		    view->cursor == EV_VIEW_CURSOR_DRAG ||
-		    view->cursor == EV_VIEW_CURSOR_AUTOSCROLL ||
-		    view->cursor == EV_VIEW_CURSOR_ADD)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-	}
-
-	if (link || annot)
-		g_object_set (view, "has-tooltip", TRUE, NULL);
-}
-
-/*** Images ***/
-static EvImage *
-ev_view_get_image_at_location (EvView  *view,
-			       gdouble  x,
-			       gdouble  y)
-{
-	gint page = -1;
-	gint x_new = 0, y_new = 0;
-	EvMappingList *image_mapping;
-
-	if (!EV_IS_DOCUMENT_IMAGES (view->document))
-		return NULL;
-
-	if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new))
-		return NULL;
-
-	image_mapping = ev_page_cache_get_image_mapping (view->page_cache, page);
-
-	if (image_mapping)
-		return ev_mapping_list_get_data (image_mapping, x_new, y_new);
-	else
-		return NULL;
-}
-
-/*** Focus ***/
-static gboolean
-ev_view_get_focused_area (EvView       *view,
-			  GdkRectangle *area)
-{
-	if (!view->focused_element)
-		return FALSE;
-
-	_ev_view_transform_doc_rect_to_view_rect (view,
-						  view->focused_element_page,
-						  &view->focused_element->area,
-						  area);
-	area->x -= view->scroll_x + 1;
-	area->y -= view->scroll_y + 1;
-	area->width += 1;
-	area->height += 1;
-
-	return TRUE;
-}
-
-void
-_ev_view_set_focused_element (EvView *view,
-			     EvMapping *element_mapping,
-			     gint page)
-{
-	GdkRectangle    view_rect;
-	cairo_region_t *region = NULL;
-
-	if (view->focused_element == element_mapping)
-		return;
-
-	if (view->accessible)
-		ev_view_accessible_set_focused_element (EV_VIEW_ACCESSIBLE (view->accessible), element_mapping, page);
-
-	if (ev_view_get_focused_area (view, &view_rect))
-		region = cairo_region_create_rectangle (&view_rect);
-
-	view->focused_element = element_mapping;
-	view->focused_element_page = page;
-
-	if (ev_view_get_focused_area (view, &view_rect)) {
-		if (!region)
-			region = cairo_region_create_rectangle (&view_rect);
-		else
-			cairo_region_union_rectangle (region, &view_rect);
-
-		ev_document_model_set_page (view->model, page);
-		view_rect.x += view->scroll_x;
-		view_rect.y += view->scroll_y;
-		ensure_rectangle_is_visible (view, &view_rect);
-	}
-
-	if (region) {
-		gdk_window_invalidate_region (gtk_widget_get_window (GTK_WIDGET (view)),
-					      region, TRUE);
-		cairo_region_destroy (region);
-	}
-}
-
-/*** Forms ***/
-static EvMapping *
-get_form_field_mapping_at_location (EvView  *view,
-				    gdouble  x,
-				    gdouble  y,
-				    gint    *page)
-{
-	gint x_new = 0, y_new = 0;
-	EvMappingList *forms_mapping;
-
-	if (!EV_IS_DOCUMENT_FORMS (view->document))
-		return NULL;
-
-	if (!get_doc_point_from_location (view, x, y, page, &x_new, &y_new))
-		return NULL;
-
-	forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache, *page);
-
-	if (forms_mapping)
-		return ev_mapping_list_get (forms_mapping, x_new, y_new);
-
-	return NULL;
-}
-
-static EvFormField *
-ev_view_get_form_field_at_location (EvView  *view,
-				    gdouble  x,
-				    gdouble  y)
-{
-	EvMapping *field_mapping;
-	gint page;
-
-	field_mapping = get_form_field_mapping_at_location (view, x, y, &page);
-
-	return field_mapping ? field_mapping->data : NULL;
-}
-
-static cairo_region_t *
-ev_view_form_field_get_region (EvView      *view,
-			       EvFormField *field)
-{
-	GdkRectangle   view_area;
-	EvMappingList *forms_mapping;
-
-	forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
-							      field->page->index);
-	ev_view_get_area_from_mapping (view, field->page->index,
-				       forms_mapping,
-				       field, &view_area);
-
-	return cairo_region_create_rectangle (&view_area);
-}
-
-static gboolean
-ev_view_forms_remove_widgets (EvView *view)
-{
-	ev_view_remove_all (view);
-
-	return FALSE;
-}
-
-static void
-ev_view_form_field_destroy (GtkWidget *widget,
-			    EvView    *view)
-{
-	g_idle_add ((GSourceFunc)ev_view_forms_remove_widgets, view);
-}
-
-static void
-ev_view_form_field_button_toggle (EvView      *view,
-				  EvFormField *field)
-{
-	EvMappingList     *forms_mapping;
-	cairo_region_t    *region;
-	gboolean           state;
-	GList             *l;
-	EvFormFieldButton *field_button = EV_FORM_FIELD_BUTTON (field);
-
-	if (field_button->type == EV_FORM_FIELD_BUTTON_PUSH)
-		return;
-
-	state = ev_document_forms_form_field_button_get_state (EV_DOCUMENT_FORMS (view->document),
-							       field);
-
-	/* FIXME: it actually depends on NoToggleToOff flags */
-	if (field_button->type == EV_FORM_FIELD_BUTTON_RADIO && state && field_button->state)
-		return;
-
-	region = ev_view_form_field_get_region (view, field);
-
-	/* For radio buttons and checkbox buttons that are in a set
-	 * we need to update also the region for the current selected item
-	 */
-	forms_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
-							      field->page->index);
-
-	for (l = ev_mapping_list_get_list (forms_mapping); l; l = g_list_next (l)) {
-		EvFormField *button = ((EvMapping *)(l->data))->data;
-		cairo_region_t *button_region;
-
-		if (button->id == field->id)
-			continue;
-
-		/* FIXME: only buttons in the same group should be updated */
-		if (!EV_IS_FORM_FIELD_BUTTON (button) ||
-		    EV_FORM_FIELD_BUTTON (button)->type != field_button->type ||
-		    EV_FORM_FIELD_BUTTON (button)->state != TRUE)
-			continue;
-
-		button_region = ev_view_form_field_get_region (view, button);
-		cairo_region_union (region, button_region);
-		cairo_region_destroy (button_region);
-	}
-
-	/* Update state */
-	ev_document_forms_form_field_button_set_state (EV_DOCUMENT_FORMS (view->document),
-						       field,
-						       !state);
-	field_button->state = !state;
-
-	if (view->accessible)
-		ev_view_accessible_update_element_state (EV_VIEW_ACCESSIBLE (view->accessible),
-							 ev_mapping_list_find (forms_mapping, field),
-							 field->page->index);
-
-	ev_view_reload_page (view, field->page->index, region);
-	cairo_region_destroy (region);
-}
-
-static GtkWidget *
-ev_view_form_field_button_create_widget (EvView      *view,
-					 EvFormField *field)
-{
-	EvMappingList *form_mapping;
-	EvMapping     *mapping;
-
-	/* We need to do this focus grab prior to setting the focused element for accessibility */
-	if (!gtk_widget_has_focus (GTK_WIDGET (view)))
-		gtk_widget_grab_focus (GTK_WIDGET (view));
-
-	form_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
-							     field->page->index);
-	mapping = ev_mapping_list_find (form_mapping, field);
-	_ev_view_set_focused_element (view, mapping, field->page->index);
-
-	return NULL;
-}
-
-static void
-ev_view_form_field_text_save (EvView    *view,
-			      GtkWidget *widget)
-{
-	EvFormField *field;
-
-	if (!view->document)
-		return;
-	
-	field = g_object_get_data (G_OBJECT (widget), "form-field");
-	
-	if (field->changed) {
-		EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field);
-		cairo_region_t  *field_region;
-
-		field_region = ev_view_form_field_get_region (view, field);
-		
-		ev_document_forms_form_field_text_set_text (EV_DOCUMENT_FORMS (view->document),
-							    field, field_text->text);
-		field->changed = FALSE;
-		ev_view_reload_page (view, field->page->index, field_region);
-		cairo_region_destroy (field_region);
-	}
-}
-
-static void
-ev_view_form_field_text_changed (GtkWidget   *widget,
-				 EvFormField *field)
-{
-	EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field);
-	gchar           *text = NULL;
-
-	if (GTK_IS_ENTRY (widget)) {
-		text = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
-	} else if (GTK_IS_TEXT_BUFFER (widget)) {
-		GtkTextIter start, end;
-
-		gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (widget), &start, &end);
-		text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (widget),
-						 &start, &end, FALSE);
-	}
-
-	if (!field_text->text ||
-	    (field_text->text && g_ascii_strcasecmp (field_text->text, text) != 0)) {
-		g_free (field_text->text);
-		field_text->text = text;
-		field->changed = TRUE;
-	}
-}
-
-static gboolean
-ev_view_form_field_text_focus_out (GtkWidget     *widget,
-				   GdkEventFocus *event,
-				   EvView        *view)
-{
-	ev_view_form_field_text_save (view, widget);
-
-	return FALSE;
-}
-
-static GtkWidget *
-ev_view_form_field_text_create_widget (EvView      *view,
-				       EvFormField *field)
-{
-	EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field);
-	GtkWidget       *text = NULL;
-	gchar           *txt;
-
-	txt = ev_document_forms_form_field_text_get_text (EV_DOCUMENT_FORMS (view->document),
-							  field);
-
-	switch (field_text->type) {
-	        case EV_FORM_FIELD_TEXT_FILE_SELECT:
-			/* TODO */
-	        case EV_FORM_FIELD_TEXT_NORMAL:
-			text = gtk_entry_new ();
-			gtk_entry_set_has_frame (GTK_ENTRY (text), FALSE);
-			gtk_entry_set_max_length (GTK_ENTRY (text), field_text->max_len);
-			gtk_entry_set_visibility (GTK_ENTRY (text), !field_text->is_password);
-			
-			if (txt) {
-				gtk_entry_set_text (GTK_ENTRY (text), txt);
-				g_free (txt);
-			}
-
-			g_signal_connect (text, "focus-out-event",
-					  G_CALLBACK (ev_view_form_field_text_focus_out),
-					  view);
-			g_signal_connect (text, "changed",
-					  G_CALLBACK (ev_view_form_field_text_changed),
-					  field);
-			g_signal_connect_after (text, "activate",
-						G_CALLBACK (ev_view_form_field_destroy),
-						view);
-			break;
-	        case EV_FORM_FIELD_TEXT_MULTILINE: {
-			GtkTextBuffer *buffer;
-		
-			text = gtk_text_view_new ();
-			buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
-			
-			if (txt) {
-				gtk_text_buffer_set_text (buffer, txt, -1);
-				g_free (txt);
-			}
-
-			g_signal_connect (text, "focus-out-event",
-					  G_CALLBACK (ev_view_form_field_text_focus_out),
-					  view);
-			g_signal_connect (buffer, "changed",
-					  G_CALLBACK (ev_view_form_field_text_changed),
-					  field);
-		}
-			break;
-	}			
-
-	g_object_weak_ref (G_OBJECT (text),
-			   (GWeakNotify)ev_view_form_field_text_save,
-			   view);
-
-	return text;
-}
-
-static void
-ev_view_form_field_choice_save (EvView    *view,
-				GtkWidget *widget)
-{
-	EvFormField *field;
-
-	if (!view->document)
-		return;
-	
-	field = g_object_get_data (G_OBJECT (widget), "form-field");
-
-	if (field->changed) {
-		GList             *l;
-		EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field);
-		cairo_region_t    *field_region;
-
-		field_region = ev_view_form_field_get_region (view, field);
-
-		if (field_choice->is_editable) {
-			ev_document_forms_form_field_choice_set_text (EV_DOCUMENT_FORMS (view->document),
-								      field, field_choice->text);
-		} else {
-			ev_document_forms_form_field_choice_unselect_all (EV_DOCUMENT_FORMS (view->document), field);
-			for (l = field_choice->selected_items; l; l = g_list_next (l)) {
-				ev_document_forms_form_field_choice_select_item (EV_DOCUMENT_FORMS (view->document),
-										 field,
-										 GPOINTER_TO_INT (l->data));
-			}
-		}
-		field->changed = FALSE;
-		ev_view_reload_page (view, field->page->index, field_region);
-		cairo_region_destroy (field_region);
-	}
-}
-
-static void
-ev_view_form_field_choice_changed (GtkWidget   *widget,
-				   EvFormField *field)
-{
-	EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field);
-	
-	if (GTK_IS_COMBO_BOX (widget)) {
-		gint item;
-		
-		item = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
-		if (!field_choice->selected_items ||
-		    GPOINTER_TO_INT (field_choice->selected_items->data) != item) {
-			g_list_free (field_choice->selected_items);
-			field_choice->selected_items = NULL;
-			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
-								       GINT_TO_POINTER (item));
-			field->changed = TRUE;
-		}
-
-		if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (widget))) {
-			const gchar *text;
-
-			text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
-			if (!field_choice->text ||
-			    (field_choice->text && g_ascii_strcasecmp (field_choice->text, text) != 0)) {
-				g_free (field_choice->text);
-				field_choice->text = g_strdup (text);
-				field->changed = TRUE;
-			}
-		}
-	} else if (GTK_IS_TREE_SELECTION (widget)) {
-		GtkTreeSelection *selection = GTK_TREE_SELECTION (widget);
-		GtkTreeModel     *model;
-		GList            *items, *l;
-		
-		items = gtk_tree_selection_get_selected_rows (selection, &model);
-		g_list_free (field_choice->selected_items);
-		field_choice->selected_items = NULL;
-
-		for (l = items; l && l->data; l = g_list_next (l)) {
-			GtkTreeIter  iter;
-			GtkTreePath *path = (GtkTreePath *)l->data;
-			gint         item;
-			
-			gtk_tree_model_get_iter (model, &iter, path);
-			gtk_tree_model_get (model, &iter, 1, &item, -1);
-
-			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
-								       GINT_TO_POINTER (item));
-
-			gtk_tree_path_free (path);
-		}
-
-		g_list_free (items);
-
-		field->changed = TRUE;
-	}
-}
-
-static GtkWidget *
-ev_view_form_field_choice_create_widget (EvView      *view,
-					 EvFormField *field)
-{
-	EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field);
-	GtkWidget         *choice;
-	GtkTreeModel      *model;
-	gint               n_items, i;
-	gint               selected_item = 0;
-
-	n_items = ev_document_forms_form_field_choice_get_n_items (EV_DOCUMENT_FORMS (view->document),
-								   field);
-	model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT));
-	for (i = 0; i < n_items; i++) {
-		GtkTreeIter iter;
-		gchar      *item;
-
-		item = ev_document_forms_form_field_choice_get_item (EV_DOCUMENT_FORMS (view->document),
-								     field, i);
-		if (ev_document_forms_form_field_choice_is_item_selected (
-			    EV_DOCUMENT_FORMS (view->document), field, i)) {
-			selected_item = i;
-			/* FIXME: we need a get_selected_items function in poppler */
-			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
-								       GINT_TO_POINTER (i));
-		}
-		
-		if (item) {
-			gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-			gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-					    0, item,
-					    1, i,
-					    -1);
-			g_free (item);
-		}
-	}
-
-	if (field_choice->type == EV_FORM_FIELD_CHOICE_LIST) {
-		GtkCellRenderer  *renderer;
-		GtkWidget        *tree_view;
-		GtkTreeSelection *selection;
-
-		tree_view = gtk_tree_view_new_with_model (model);
-		gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
-
-		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-		if (field_choice->multi_select) {
-			gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-		}
-
-		/* TODO: set selected items */
-
-		renderer = gtk_cell_renderer_text_new ();
-		gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-							     0,
-							     "choix", renderer,
-							     "text", 0,
-							     NULL);
-
-		choice = gtk_scrolled_window_new (NULL, NULL);
-		gtk_container_add (GTK_CONTAINER (choice), tree_view);
-		gtk_widget_show (tree_view);
-
-		g_signal_connect (selection, "changed",
-				  G_CALLBACK (ev_view_form_field_choice_changed),
-				  field);
-		g_signal_connect_after (selection, "changed",
-					G_CALLBACK (ev_view_form_field_destroy),
-					view);
-	} else if (field_choice->is_editable) { /* ComboBoxEntry */
-		gchar *text;
-
-		choice = gtk_combo_box_new_with_model_and_entry (model);
-		gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (choice), 0);
-
-		text = ev_document_forms_form_field_choice_get_text (EV_DOCUMENT_FORMS (view->document), field);
-		if (text) {
-			gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (choice))), text);
-			g_free (text);
-		}
-
-		g_signal_connect (choice, "changed",
-				  G_CALLBACK (ev_view_form_field_choice_changed),
-				  field);
-		g_signal_connect_after (gtk_bin_get_child (GTK_BIN (choice)),
-					"activate",
-					G_CALLBACK (ev_view_form_field_destroy),
-					view);
-	} else { /* ComboBoxText */
-		GtkCellRenderer *renderer;
-
-		choice = gtk_combo_box_new_with_model (model);
-		renderer = gtk_cell_renderer_text_new ();
-		gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (choice),
-					    renderer, TRUE);
-		gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (choice),
-						renderer,
-						"text", 0,
-						NULL);
-		gtk_combo_box_set_active (GTK_COMBO_BOX (choice), selected_item);
-		gtk_combo_box_popup (GTK_COMBO_BOX (choice));
-		
-		g_signal_connect (choice, "changed",
-				  G_CALLBACK (ev_view_form_field_choice_changed),
-				  field);
-		g_signal_connect_after (choice, "changed",
-					G_CALLBACK (ev_view_form_field_destroy),
-					view);
-	}
-
-	g_object_unref (model);
-
-	g_object_weak_ref (G_OBJECT (choice),
-			   (GWeakNotify)ev_view_form_field_choice_save,
-			   view);
-
-	return choice;
-}
-
-void
-_ev_view_focus_form_field (EvView      *view,
-			  EvFormField *field)
-{
-	GtkWidget     *field_widget = NULL;
-	EvMappingList *form_field_mapping;
-	EvMapping     *mapping;
-
-	_ev_view_set_focused_element (view, NULL, -1);
-
-	if (field->is_read_only)
-		return;
-
-	if (EV_IS_FORM_FIELD_BUTTON (field)) {
-		field_widget = ev_view_form_field_button_create_widget (view, field);
-	} else if (EV_IS_FORM_FIELD_TEXT (field)) {
-		field_widget = ev_view_form_field_text_create_widget (view, field);
-	} else if (EV_IS_FORM_FIELD_CHOICE (field)) {
-		field_widget = ev_view_form_field_choice_create_widget (view, field);
-	} else if (EV_IS_FORM_FIELD_SIGNATURE (field)) {
-		/* TODO */
-	}
-
-	/* Form field doesn't require a widget */
-	if (!field_widget) {
-		if (!gtk_widget_has_focus (GTK_WIDGET (view)))
-			gtk_widget_grab_focus (GTK_WIDGET (view));
-		return;
-	}
-
-	g_object_set_data_full (G_OBJECT (field_widget), "form-field",
-				g_object_ref (field),
-				(GDestroyNotify)g_object_unref);
-
-	form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
-								   field->page->index);
-	mapping = ev_mapping_list_find (form_field_mapping, field);
-	_ev_view_set_focused_element (view, mapping, field->page->index);
-	ev_view_put_to_doc_rect (view, field_widget, field->page->index, &mapping->area);
-	gtk_widget_show (field_widget);
-	gtk_widget_grab_focus (field_widget);
-}
-
-static void
-ev_view_handle_form_field (EvView      *view,
-			   EvFormField *field)
-{
-	if (field->is_read_only)
-		return;
-
-	_ev_view_focus_form_field (view, field);
-
-	if (field->activation_link)
-		ev_view_handle_link (view, field->activation_link);
-
-	if (EV_IS_FORM_FIELD_BUTTON (field))
-		ev_view_form_field_button_toggle (view, field);
-
-}
-
-/* Annotations */
-static EvViewWindowChild *
-ev_view_get_window_child (EvView    *view,
-			  GtkWidget *window)
-{
-	GList *children = view->window_children;
-
-	while (children) {
-		EvViewWindowChild *child;
-
-		child = (EvViewWindowChild *)children->data;
-		children = children->next;
-
-		if (child->window == window)
-			return child;
-	}
-
-	return NULL;
-}
-
-static void
-ev_view_window_child_move (EvView            *view,
-			   EvViewWindowChild *child,
-			   gint               x,
-			   gint               y)
-{
-	GtkAllocation allocation;
-	gint          width, height;
-
-	gtk_widget_get_allocation (GTK_WIDGET (view), &allocation);
-	gtk_window_get_size (GTK_WINDOW (child->window), &width, &height);
-
-	child->x = x;
-	child->y = y;
-	gtk_window_move (GTK_WINDOW (child->window),
-			 CLAMP (x, child->parent_x,
-				child->parent_x + allocation.width - width),
-			 CLAMP (y, child->parent_y,
-				child->parent_y + allocation.height - height));
-}
-
-static void
-ev_view_window_child_move_with_parent (EvView    *view,
-				       GtkWidget *window)
-{
-	EvViewWindowChild *child;
-	gint               root_x, root_y;
-
-	child = ev_view_get_window_child (view, window);
-	gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)),
-			       &root_x, &root_y);
-	if (root_x != child->parent_x || root_y != child->parent_y) {
-		gint dest_x, dest_y;
-
-		dest_x = child->x + (root_x - child->parent_x);
-		dest_y = child->y + (root_y - child->parent_y);
-		child->parent_x = root_x;
-		child->parent_y = root_y;
-		ev_view_window_child_move (view, child, dest_x, dest_y);
-	}
-
-	if (child->visible && !gtk_widget_get_visible (window))
-		gtk_widget_show (window);
-}
-
-static void
-ev_view_window_child_put (EvView    *view,
-			  GtkWidget *window,
-			  guint      page,
-			  gint       x,
-			  gint       y,
-			  gdouble    orig_x,
-			  gdouble    orig_y)
-{
-	EvViewWindowChild *child;
-	gint               root_x, root_y;
-
-	gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)),
-			       &root_x, &root_y);
-
-	child = g_new0 (EvViewWindowChild, 1);
-	child->window = window;
-	child->page = page;
-	child->orig_x = orig_x;
-	child->orig_y = orig_y;
-	child->parent_x = root_x;
-	child->parent_y = root_y;
-	child->visible = ev_annotation_window_is_open (EV_ANNOTATION_WINDOW (window));
-	ev_view_window_child_move (view, child, x + root_x, y + root_y);
-
-	if (child->visible)
-		gtk_widget_show (window);
-	else
-		gtk_widget_hide (window);
-
-	view->window_children = g_list_append (view->window_children, child);
-}
-
-static EvViewWindowChild *
-ev_view_find_window_child_for_annot (EvView       *view,
-				     guint         page,
-				     EvAnnotation *annot)
-{
-	GList *children = view->window_children;
-
-	while (children) {
-		EvViewWindowChild *child;
-		EvAnnotation      *wannot;
-
-		child = (EvViewWindowChild *)children->data;
-		children = children->next;
-
-		if (child->page != page)
-			continue;
-
-		wannot = ev_annotation_window_get_annotation (EV_ANNOTATION_WINDOW (child->window));
-		if (ev_annotation_equal (wannot, annot))
-			return child;
-	}
-
-	return NULL;
-}
-
-static void
-ev_view_window_children_free (EvView *view)
-{
-	GList *l;
-
-	if (!view->window_children)
-		return;
-
-	for (l = view->window_children; l && l->data; l = g_list_next (l)) {
-		EvViewWindowChild *child;
-
-		child = (EvViewWindowChild *)l->data;
-		gtk_widget_destroy (GTK_WIDGET (child->window));
-		g_free (child);
-	}
-	g_list_free (view->window_children);
-	view->window_children = NULL;
-	view->window_child_focus = NULL;
-}
-
-static void
-annotation_window_grab_focus (GtkWidget *widget,
-			      EvView    *view)
-{
-	if (view->window_child_focus)
-		ev_annotation_window_ungrab_focus (EV_ANNOTATION_WINDOW (view->window_child_focus->window));
-	view->window_child_focus = ev_view_get_window_child (view, widget);
-}
-
-static void
-annotation_window_closed (EvAnnotationWindow *window,
-			  EvView             *view)
-{
-	EvViewWindowChild *child;
-
-	child = ev_view_get_window_child (view, GTK_WIDGET (window));
-	child->visible = FALSE;
-}
-
-static void
-annotation_window_moved (EvAnnotationWindow *window,
-			 gint                x,
-			 gint                y,
-			 EvView             *view)
-{
-	EvViewWindowChild *child;
-	GdkRectangle       page_area;
-	GtkBorder          border;
-	GdkRectangle       view_rect;
-	EvRectangle        doc_rect;
-	gint               width, height;
-
-	child = ev_view_get_window_child (view, GTK_WIDGET (window));
-	if (child->x == x && child->y == y)
-		return;
-
-	child->moved = TRUE;
-	child->x = x;
-	child->y = y;
-
-	/* Window has been moved by the user,
-	 * we have to set a new origin in doc coords
-	 */
-	gtk_window_get_size (GTK_WINDOW (window), &width, &height);
-	view_rect.x = (x - child->parent_x) + view->scroll_x;
-	view_rect.y = (y - child->parent_y) + view->scroll_y;
-	view_rect.width = width;
-	view_rect.height = height;
-
-	ev_view_get_page_extents (view, child->page, &page_area, &border);
-	_ev_view_transform_view_rect_to_doc_rect (view, &view_rect, &page_area, &border, &doc_rect);
-	child->orig_x = doc_rect.x1;
-	child->orig_y = doc_rect.y1;
-}
-
-static void
-ev_view_annotation_save_contents (EvView       *view,
-				  GParamSpec   *pspec,
-				  EvAnnotation *annot)
-{
-	if (!view->document)
-		return;
-
-	ev_document_doc_mutex_lock ();
-	ev_document_annotations_save_annotation (EV_DOCUMENT_ANNOTATIONS (view->document),
-						 annot, EV_ANNOTATIONS_SAVE_CONTENTS);
-	ev_document_doc_mutex_unlock ();
-}
-
-static GtkWidget *
-ev_view_create_annotation_window (EvView       *view,
-				  EvAnnotation *annot,
-				  GtkWindow    *parent)
-{
-	GtkWidget   *window;
-	EvRectangle  doc_rect;
-	GdkRectangle view_rect;
-	guint        page;
-
-	window = ev_annotation_window_new (annot, parent);
-	g_signal_connect (window, "grab_focus",
-			  G_CALLBACK (annotation_window_grab_focus),
-			  view);
-	g_signal_connect (window, "closed",
-			  G_CALLBACK (annotation_window_closed),
-			  view);
-	g_signal_connect (window, "moved",
-			  G_CALLBACK (annotation_window_moved),
-			  view);
-	g_signal_connect_swapped (annot, "notify::contents",
-				  G_CALLBACK (ev_view_annotation_save_contents),
-				  view);
-	g_object_set_data (G_OBJECT (annot), "popup", window);
-
-	page = ev_annotation_get_page_index (annot);
-	ev_annotation_window_get_rectangle (EV_ANNOTATION_WINDOW (window), &doc_rect);
-	_ev_view_transform_doc_rect_to_view_rect (view, page, &doc_rect, &view_rect);
-	view_rect.x -= view->scroll_x;
-	view_rect.y -= view->scroll_y;
-
-	ev_view_window_child_put (view, window, page,
-				  view_rect.x, view_rect.y,
-				  doc_rect.x1, doc_rect.y1);
-
-	return window;
-}
-
-static void
-show_annotation_windows (EvView *view,
-			 gint    page)
-{
-	EvMappingList *annots;
-	GList         *l;
-	GtkWindow     *parent;
-
-	parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
-
-	annots = ev_page_cache_get_annot_mapping (view->page_cache, page);
-
-	for (l = ev_mapping_list_get_list (annots); l && l->data; l = g_list_next (l)) {
-		EvAnnotation      *annot;
-		EvViewWindowChild *child;
-		GtkWidget         *window;
-
-		annot = ((EvMapping *)(l->data))->data;
-
-		if (!EV_IS_ANNOTATION_MARKUP (annot))
-			continue;
-
-		if (!ev_annotation_markup_has_popup (EV_ANNOTATION_MARKUP (annot)))
-			continue;
-
-		window = g_object_get_data (G_OBJECT (annot), "popup");
-		if (window) {
-			ev_view_window_child_move_with_parent (view, window);
-			continue;
-		}
-
-		/* Look if we already have a popup for this annot */
-		child = ev_view_find_window_child_for_annot (view, page, annot);
-		window = child ? child->window : NULL;
-		if (window) {
-			ev_annotation_window_set_annotation (EV_ANNOTATION_WINDOW (window), annot);
-			g_object_set_data (G_OBJECT (annot), "popup", window);
-			ev_view_window_child_move_with_parent (view, window);
-		} else {
-			ev_view_create_annotation_window (view, annot, parent);
-		}
-	}
-}
-
-static void
-hide_annotation_windows (EvView *view,
-			 gint    page)
-{
-	EvMappingList *annots;
-	GList         *l;
-
-	annots = ev_page_cache_get_annot_mapping (view->page_cache, page);
-
-	for (l = ev_mapping_list_get_list (annots); l && l->data; l = g_list_next (l)) {
-		EvAnnotation *annot;
-		GtkWidget    *window;
-
-		annot = ((EvMapping *)(l->data))->data;
-
-		if (!EV_IS_ANNOTATION_MARKUP (annot))
-			continue;
-
-		window = g_object_get_data (G_OBJECT (annot), "popup");
-		if (window)
-			gtk_widget_hide (window);
-	}
-}
-
-static EvMapping *
-get_annotation_mapping_at_location (EvView *view,
-				    gdouble x,
-				    gdouble y,
-				    gint *page)
-{
-	gint x_new = 0, y_new = 0;
-	EvMappingList *annotations_mapping;
-
-	if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document))
-		return NULL;
-
-	if (!get_doc_point_from_location (view, x, y, page, &x_new, &y_new))
-		return NULL;
-
-	annotations_mapping = ev_page_cache_get_annot_mapping (view->page_cache, *page);
-
-	if (annotations_mapping)
-		return ev_mapping_list_get (annotations_mapping, x_new, y_new);
-
-	return NULL;
-}
-
-static EvAnnotation *
-ev_view_get_annotation_at_location (EvView  *view,
-				    gdouble  x,
-				    gdouble  y)
-{
-	EvMapping *annotation_mapping;
-	gint page;
-
-	annotation_mapping = get_annotation_mapping_at_location (view, x, y, &page);
-
-	return annotation_mapping ? annotation_mapping->data : NULL;
-}
-
-static void
-ev_view_annotation_show_popup_window (EvView    *view,
-				      GtkWidget *window)
-{
-	EvViewWindowChild *child;
-
-	if (!window)
-		return;
-
-	child = ev_view_get_window_child (view, window);
-	if (!child->visible) {
-		child->visible = TRUE;
-		ev_view_window_child_move (view, child, child->x, child->y);
-		gtk_widget_show (window);
-	}
-}
-
-static void
-ev_view_handle_annotation (EvView       *view,
-			   EvAnnotation *annot,
-			   gdouble       x,
-			   gdouble       y,
-			   guint32       timestamp)
-{
-	if (EV_IS_ANNOTATION_MARKUP (annot)) {
-		GtkWidget *window;
-
-		window = g_object_get_data (G_OBJECT (annot), "popup");
-		ev_view_annotation_show_popup_window (view, window);
-	}
-
-	if (EV_IS_ANNOTATION_ATTACHMENT (annot)) {
-		EvAttachment *attachment;
-
-		attachment = ev_annotation_attachment_get_attachment (EV_ANNOTATION_ATTACHMENT (annot));
-		if (attachment) {
-			GError *error = NULL;
-
-			ev_attachment_open (attachment,
-					    gtk_widget_get_screen (GTK_WIDGET (view)),
-					    timestamp,
-					    &error);
-
-			if (error) {
-				g_warning ("%s", error->message);
-				g_error_free (error);
-			}
-		}
-	}
-}
-
-static void
-ev_view_create_annotation (EvView          *view,
-			   EvAnnotationType annot_type,
-			   gint             x,
-			   gint             y)
-{
-	EvAnnotation   *annot;
-	GdkPoint        point;
-	GdkRectangle    page_area;
-	GtkBorder       border;
-	EvRectangle     doc_rect, popup_rect;
-	EvPage         *page;
-	GdkColor        color = { 0, 65535, 65535, 0 };
-	GdkRectangle    view_rect;
-	cairo_region_t *region;
-
-	point.x = x;
-	point.y = y;
-	ev_view_get_page_extents (view, view->current_page, &page_area, &border);
-	_ev_view_transform_view_point_to_doc_point (view, &point, &page_area, &border,
-						    &doc_rect.x1, &doc_rect.y1);
-	doc_rect.x2 = doc_rect.x1 + 24;
-	doc_rect.y2 = doc_rect.y1 + 24;
-
-	ev_document_doc_mutex_lock ();
-	page = ev_document_get_page (view->document, view->current_page);
-	switch (annot_type) {
-	case EV_ANNOTATION_TYPE_TEXT:
-		annot = ev_annotation_text_new (page);
-		break;
-	case EV_ANNOTATION_TYPE_ATTACHMENT:
-		/* TODO */
-		g_object_unref (page);
-		ev_document_doc_mutex_unlock ();
-		return;
-	default:
-		g_assert_not_reached ();
-	}
-	g_object_unref (page);
-
-	ev_annotation_set_color (annot, &color);
-
-	if (EV_IS_ANNOTATION_MARKUP (annot)) {
-		popup_rect.x1 = doc_rect.x2;
-		popup_rect.x2 = popup_rect.x1 + 200;
-		popup_rect.y1 = doc_rect.y2;
-		popup_rect.y2 = popup_rect.y1 + 150;
-		g_object_set (annot,
-			      "rectangle", &popup_rect,
-			      "has_popup", TRUE,
-			      "popup_is_open", FALSE,
-			      "label", g_get_real_name (),
-			      "opacity", 1.0,
-			      NULL);
-	}
-	ev_document_annotations_add_annotation (EV_DOCUMENT_ANNOTATIONS (view->document),
-						annot, &doc_rect);
-	ev_document_doc_mutex_unlock ();
-
-	/* If the page didn't have annots, mark the cache as dirty */
-	if (!ev_page_cache_get_annot_mapping (view->page_cache, view->current_page))
-		ev_page_cache_mark_dirty (view->page_cache, view->current_page, EV_PAGE_DATA_INCLUDE_ANNOTS);
-
-	if (EV_IS_ANNOTATION_MARKUP (annot)) {
-		GtkWindow *parent;
-		GtkWidget *window;
-
-		parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));
-		window = ev_view_create_annotation_window (view, annot, parent);
-
-		/* Show the annot window the first time */
-		ev_view_annotation_show_popup_window (view, window);
-	}
-
-	_ev_view_transform_doc_rect_to_view_rect (view, view->current_page, &doc_rect, &view_rect);
-	view_rect.x -= view->scroll_x;
-	view_rect.y -= view->scroll_y;
-	region = cairo_region_create_rectangle (&view_rect);
-	ev_view_reload_page (view, view->current_page, region);
-	cairo_region_destroy (region);
-
-	g_signal_emit (view, signals[SIGNAL_ANNOT_ADDED], 0, annot);
-}
-
-void
-ev_view_focus_annotation (EvView    *view,
-			  EvMapping *annot_mapping)
-{
-
-	if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document))
-		return;
-
-	_ev_view_set_focused_element (view, annot_mapping,
-				     ev_annotation_get_page_index (EV_ANNOTATION (annot_mapping->data)));
-}
-
-void
-ev_view_begin_add_annotation (EvView          *view,
-			      EvAnnotationType annot_type)
-{
-	if (annot_type == EV_ANNOTATION_TYPE_UNKNOWN)
-		return;
-
-	if (view->adding_annot)
-		return;
-
-	view->adding_annot = TRUE;
-	view->adding_annot_type = annot_type;
-	ev_view_set_cursor (view, EV_VIEW_CURSOR_ADD);
-}
-
-void
-ev_view_cancel_add_annotation (EvView *view)
-{
-	gint x, y;
-
-	if (!view->adding_annot)
-		return;
-
-	view->adding_annot = FALSE;
-	ev_document_misc_get_pointer_position (GTK_WIDGET (view), &x, &y);
-	ev_view_handle_cursor_over_xy (view, x, y);
-}
-
-void
-ev_view_remove_annotation (EvView       *view,
-                           EvAnnotation *annot)
-{
-        guint page;
-
-        g_return_if_fail (EV_IS_VIEW (view));
-        g_return_if_fail (EV_IS_ANNOTATION (annot));
-
-	g_object_ref (annot);
-
-        page = ev_annotation_get_page_index (annot);
-
-        if (EV_IS_ANNOTATION_MARKUP (annot)) {
-		EvViewWindowChild *child;
-
-		child = ev_view_find_window_child_for_annot (view, page, annot);
-		if (child) {
-			view->window_children = g_list_remove (view->window_children, child);
-			gtk_widget_destroy (child->window);
-			g_free (child);
-		}
-        }
-        _ev_view_set_focused_element (view, NULL, -1);
-
-        ev_document_doc_mutex_lock ();
-        ev_document_annotations_remove_annotation (EV_DOCUMENT_ANNOTATIONS (view->document),
-                                                   annot);
-        ev_document_doc_mutex_unlock ();
-
-        ev_page_cache_mark_dirty (view->page_cache, page, EV_PAGE_DATA_INCLUDE_ANNOTS);
-
-	/* FIXME: only redraw the annot area */
-        ev_view_reload_page (view, page, NULL);
-
-	g_signal_emit (view, signals[SIGNAL_ANNOT_REMOVED], 0, annot);
-	g_object_unref (annot);
-}
-
-static gboolean
-ev_view_synctex_backward_search (EvView *view,
-				 gdouble x,
-				 gdouble y)
-{
-	gint page = -1;
-	gint x_new = 0, y_new = 0;
-	EvSourceLink *link;
-
-	if (!ev_document_has_synctex (view->document))
-		return FALSE;
-
-	if (!get_doc_point_from_location (view, x, y, &page, &x_new, &y_new))
-		return FALSE;
-
-	link = ev_document_synctex_backward_search (view->document, page, x_new, y_new);
-	if (link) {
-		g_signal_emit (view, signals[SIGNAL_SYNC_SOURCE], 0, link);
-		ev_source_link_free (link);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/* Caret navigation */
-#define CURSOR_ON_MULTIPLIER 2
-#define CURSOR_OFF_MULTIPLIER 1
-#define CURSOR_PEND_MULTIPLIER 3
-#define CURSOR_DIVIDER 3
-
-static inline gboolean
-cursor_is_in_visible_page (EvView *view)
-{
-	return (view->cursor_page == view->current_page ||
-		(view->cursor_page >= view->start_page &&
-		 view->cursor_page <= view->end_page));
-}
-
-static gboolean
-cursor_should_blink (EvView *view)
-{
-	if (view->caret_enabled &&
-	    view->rotation == 0 &&
-	    cursor_is_in_visible_page (view) &&
-	    gtk_widget_has_focus (GTK_WIDGET (view)) &&
-	    view->pixbuf_cache &&
-	    !ev_pixbuf_cache_get_selection_region (view->pixbuf_cache, view->cursor_page, view->scale)) {
-		GtkSettings *settings;
-		gboolean blink;
-
-		settings = gtk_widget_get_settings (GTK_WIDGET (view));
-		g_object_get (settings, "gtk-cursor-blink", &blink, NULL);
-
-		return blink;
-	}
-
-	return FALSE;
-}
-
-static gint
-get_cursor_blink_time (EvView *view)
-{
-	GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (view));
-	gint time;
-
-	g_object_get (settings, "gtk-cursor-blink-time", &time, NULL);
-
-	return time;
-}
-
-static gint
-get_cursor_blink_timeout_id (EvView *view)
-{
-	GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (view));
-	gint timeout;
-
-	g_object_get (settings, "gtk-cursor-blink-timeout", &timeout, NULL);
-
-	return timeout;
-}
-
-static gboolean
-get_caret_cursor_area (EvView       *view,
-		       gint          page,
-		       gint          offset,
-		       GdkRectangle *area)
-{
-	EvRectangle *areas = NULL;
-	EvRectangle *doc_rect;
-	guint        n_areas = 0;
-	gfloat       cursor_aspect_ratio;
-	gint         stem_width;
-
-	if (!view->caret_enabled || view->rotation != 0)
-		return FALSE;
-
-	if (!view->page_cache)
-		return FALSE;
-
-	ev_page_cache_get_text_layout (view->page_cache, page, &areas, &n_areas);
-	if (!areas)
-		return FALSE;
-
-	if (offset > n_areas)
-		return FALSE;
-
-	doc_rect = areas + offset;
-	if (offset == n_areas ||
-	    ((doc_rect->x1 == doc_rect->x2 || doc_rect->y1 == doc_rect->y2) && offset > 0)) {
-		EvRectangle *prev;
-		EvRectangle  last_rect;
-
-		/* Special characters like \n have an empty bounding box
-		 * and the end of a page doesn't have any bounding box,
-		 * use the size of the previous area.
-		 */
-		prev = areas + offset - 1;
-		last_rect.x1 = prev->x2;
-		last_rect.y1 = prev->y1;
-		last_rect.x2 = prev->x2 + (prev->x2 - prev->x1);
-		last_rect.y2 = prev->y2;
-
-		_ev_view_transform_doc_rect_to_view_rect (view, page, &last_rect, area);
-	} else {
-		_ev_view_transform_doc_rect_to_view_rect (view, page, doc_rect, area);
-	}
-
-	area->x -= view->scroll_x;
-	area->y -= view->scroll_y;
-
-	gtk_style_context_get_style (gtk_widget_get_style_context (GTK_WIDGET (view)),
-				     "cursor-aspect-ratio", &cursor_aspect_ratio,
-				     NULL);
-	stem_width = area->height * cursor_aspect_ratio + 1;
-	area->x -= (stem_width / 2);
-	area->width = stem_width;
-
-	return TRUE;
-}
-
-static void
-show_cursor (EvView *view)
-{
-	GtkWidget   *widget;
-	GdkRectangle view_rect;
-
-	if (view->cursor_visible)
-		return;
-
-	widget = GTK_WIDGET (view);
-	view->cursor_visible = TRUE;
-	if (gtk_widget_has_focus (widget) &&
-	    get_caret_cursor_area (view, view->cursor_page, view->cursor_offset, &view_rect)) {
-		gtk_widget_queue_draw_area (widget,
-					    view_rect.x, view_rect.y,
-					    view_rect.width, view_rect.height);
-	}
-}
-
-static void
-hide_cursor (EvView *view)
-{
-	GtkWidget   *widget;
-	GdkRectangle view_rect;
-
-	if (!view->cursor_visible)
-		return;
-
-	widget = GTK_WIDGET (view);
-	view->cursor_visible = FALSE;
-	if (gtk_widget_has_focus (widget) &&
-	    get_caret_cursor_area (view, view->cursor_page, view->cursor_offset, &view_rect)) {
-		gtk_widget_queue_draw_area (widget,
-					    view_rect.x, view_rect.y,
-					    view_rect.width, view_rect.height);
-	}
-}
-
-static gboolean
-blink_cb (EvView *view)
-{
-	gint blink_timeout;
-	guint blink_time;
-
-	blink_timeout = get_cursor_blink_timeout_id (view);
-	if (view->cursor_blink_time > 1000 * blink_timeout && blink_timeout < G_MAXINT / 1000) {
-		/* We've blinked enough without the user doing anything, stop blinking */
-		show_cursor (view);
-		view->cursor_blink_timeout_id = 0;
-
-		return FALSE;
-	}
-
-	blink_time = get_cursor_blink_time (view);
-	if (view->cursor_visible) {
-		hide_cursor (view);
-		blink_time *= CURSOR_OFF_MULTIPLIER;
-	} else {
-		show_cursor (view);
-		view->cursor_blink_time += blink_time;
-		blink_time *= CURSOR_ON_MULTIPLIER;
-	}
-
-	view->cursor_blink_timeout_id = gdk_threads_add_timeout (blink_time / CURSOR_DIVIDER, (GSourceFunc)blink_cb, view);
-
-	return FALSE;
-}
-
-static void
-ev_view_check_cursor_blink (EvView *view)
-{
-	if (cursor_should_blink (view))	{
-		if (view->cursor_blink_timeout_id == 0) {
-			show_cursor (view);
-			view->cursor_blink_timeout_id = gdk_threads_add_timeout (get_cursor_blink_time (view) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER,
-										 (GSourceFunc)blink_cb, view);
-		}
-
-		return;
-	}
-
-	if (view->cursor_blink_timeout_id > 0) {
-		g_source_remove (view->cursor_blink_timeout_id);
-		view->cursor_blink_timeout_id = 0;
-	}
-
-	view->cursor_visible = TRUE;
-	view->cursor_blink_time = 0;
-}
-
-static void
-ev_view_pend_cursor_blink (EvView *view)
-{
-	if (!cursor_should_blink (view))
-		return;
-
-	if (view->cursor_blink_timeout_id > 0)
-		g_source_remove (view->cursor_blink_timeout_id);
-
-	show_cursor (view);
-	view->cursor_blink_timeout_id = gdk_threads_add_timeout (get_cursor_blink_time (view) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER,
-								 (GSourceFunc)blink_cb, view);
-}
-
-static void
-preload_pages_for_caret_navigation (EvView *view)
-{
-	gint n_pages;
-
-	if (!view->document)
-		return;
-
-	/* Upload to the cache the first and last pages,
-	 * this information is needed to position the cursor
-	 * in the beginning/end of the document, for example
-	 * when pressing <Ctr>Home/End
-	 */
-	n_pages = ev_document_get_n_pages (view->document);
-
-	/* For documents with at least 3 pages, those are already cached anyway */
-	if (n_pages > 0 && n_pages <= 3)
-		return;
-
-	ev_page_cache_ensure_page (view->page_cache, 0);
-	ev_page_cache_ensure_page (view->page_cache, n_pages - 1);
-}
-
-/**
- * ev_view_supports_caret_navigation:
- * @view: a #EvView
- *
- * Returns: whether the document supports caret navigation
- *
- * Since: 3.10
- */
-gboolean
-ev_view_supports_caret_navigation (EvView *view)
-{
-	EvDocumentTextInterface *iface;
-
-	if (!view->document || !EV_IS_DOCUMENT_TEXT (view->document))
-		return FALSE;
-
-	iface = EV_DOCUMENT_TEXT_GET_IFACE (view->document);
-	if (!iface->get_text_layout || !iface->get_text)
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * ev_view_set_caret_navigation_enabled:
- * @view: a #EvView
- * @enabled: whether to enable caret navigation mode
- *
- * Enables or disables caret navigation mode for the document.
- *
- * Since: 3.10
- */
-void
-ev_view_set_caret_navigation_enabled (EvView   *view,
-				      gboolean enabled)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	if (view->caret_enabled != enabled) {
-		view->caret_enabled = enabled;
-		if (view->caret_enabled)
-			preload_pages_for_caret_navigation (view);
-
-		ev_view_check_cursor_blink (view);
-
-		if (cursor_is_in_visible_page (view))
-			gtk_widget_queue_draw (GTK_WIDGET (view));
-	}
-}
-
-/**
- * ev_view_get_caret_navigation_enabled:
- * @view: a #EvView
- *
- * Returns: whether caret navigation mode is enabled for the document
- *
- * Since: 3.10
- */
-gboolean
-ev_view_is_caret_navigation_enabled (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-
-	return view->caret_enabled;
-}
-
-/**
- * ev_view_set_caret_cursor_position:
- * @view: a #EvView
- * @page:
- * @offset:
- *
- * Since: 3.10
- */
-void
-ev_view_set_caret_cursor_position (EvView *view,
-				   guint   page,
-				   guint   offset)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-	g_return_if_fail (EV_IS_DOCUMENT (view->document));
-	g_return_if_fail (page < ev_document_get_n_pages (view->document));
-
-	if (view->cursor_page != page || view->cursor_offset != offset) {
-		view->cursor_page = page;
-		view->cursor_offset = offset;
-
-		g_signal_emit (view, signals[SIGNAL_CURSOR_MOVED], 0,
-			       view->cursor_page, view->cursor_offset);
-
-		if (view->caret_enabled && cursor_is_in_visible_page (view))
-			gtk_widget_queue_draw (GTK_WIDGET (view));
-	}
-}
-
-/*** GtkWidget implementation ***/
-
-static void
-ev_view_size_request_continuous_dual_page (EvView         *view,
-			     	           GtkRequisition *requisition)
-{
-	gint n_pages;
-
-	n_pages = ev_document_get_n_pages (view->document) + 1;
-	get_page_y_offset (view, n_pages, &requisition->height);
-
-	switch (view->sizing_mode) {
-	        case EV_SIZING_FIT_WIDTH:
-	        case EV_SIZING_FIT_PAGE:
-	        case EV_SIZING_AUTOMATIC:
-			requisition->width = 1;
-
-			break;
-	        case EV_SIZING_FREE: {
-			gint max_width;
-			GtkBorder border;
-
-			ev_view_get_max_page_size (view, &max_width, NULL);
-			compute_border (view, &border);
-			requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3);
-		}
-			break;
-	        default:
-			g_assert_not_reached ();
-	}
-}
-
-static void
-ev_view_size_request_continuous (EvView         *view,
-				 GtkRequisition *requisition)
-{
-	gint n_pages;
-
-	n_pages = ev_document_get_n_pages (view->document);
-	get_page_y_offset (view, n_pages, &requisition->height);
-
-	switch (view->sizing_mode) {
-	        case EV_SIZING_FIT_WIDTH: