* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <math.h>
#include <gtk/gtkalignment.h>
#include <glib/gi18n.h>
#include <gtk/gtkbindings.h>
TARGET_TEXT_BUFFER_CONTENTS
};
+enum {
+ EV_SCROLL_PAGE_FORWARD,
+ EV_SCROLL_PAGE_BACKWARD
+};
+
static const GtkTargetEntry targets[] = {
{ "STRING", 0, TARGET_STRING },
{ "TEXT", 0, TARGET_TEXT },
GtkWidget parent_instance;
EvDocument *document;
-
+
GdkWindow *bin_window;
char *status;
char *find_status;
-
+
int scroll_x;
int scroll_y;
gboolean pressed_button;
gboolean has_selection;
GdkPoint selection_start;
- GdkRectangle selection;
+ EvRectangle selection;
EvViewCursor cursor;
GtkAdjustment *hadjustment;
double scale;
int width;
int height;
+ GtkBorder border;
+ gboolean show_border;
};
struct _EvViewClass {
void (*scroll_view) (EvView *view,
GtkScrollType scroll,
gboolean horizontal);
-
+
};
static void ev_view_set_scroll_adjustments (EvView *view,
GtkAdjustment *hadjustment,
GtkAdjustment *vadjustment);
-
+
G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_WIDGET)
-/*** Helper functions ***/
-
+/*** Helper functions ***/
+
static void
view_update_adjustments (EvView *view)
{
int old_x = view->scroll_x;
int old_y = view->scroll_y;
-
+
if (view->hadjustment)
view->scroll_x = view->hadjustment->value;
else
view->scroll_y = view->vadjustment->value;
else
view->scroll_y = 0;
-
+
if (GTK_WIDGET_REALIZED (view) &&
(view->scroll_x != old_x || view->scroll_y != old_y)) {
gdk_window_move (view->bin_window, - view->scroll_x, - view->scroll_y);
if (!adjustment)
return;
-
+
adjustment->page_size = allocation;
adjustment->step_increment = allocation * 0.1;
adjustment->page_increment = allocation * 0.9;
gtk_adjustment_value_changed (adjustment);
}
-/*** Virtual function implementations ***/
-
+/*** Virtual function implementations ***/
+
static void
ev_view_finalize (GObject *object)
{
LOG ("Finalize");
-
- ev_view_set_scroll_adjustments (view, NULL, NULL);
+ g_free (view->status);
+ g_free (view->find_status);
G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
}
view->pixbuf_cache = NULL;
}
ev_view_set_scroll_adjustments (view, NULL, NULL);
-
+
GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object);
}
EvDocument *document = view->document;
GtkWidget *widget = GTK_WIDGET (view);
int width, height, target_width, target_height;
- GtkBorder border;
g_return_if_fail (EV_IS_DOCUMENT (document));
view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
-
*x_offset = view->spacing;
*y_offset = view->spacing;
- target_width = width + border.left + border.right + view->spacing * 2;
- target_height = height + border.top + border.bottom + view->spacing * 2;
+ target_width = width + view->border.left +
+ view->border.right + view->spacing * 2;
+ target_height = height + view->border.top +
+ view->border.bottom + view->spacing * 2;
*x_offset += MAX (0, (widget->allocation.width - target_width) / 2);
*y_offset += MAX (0, (widget->allocation.height - target_height) / 2);
}
static void
-view_rect_to_doc_rect (EvView *view, GdkRectangle *view_rect, GdkRectangle *doc_rect)
+view_rect_to_doc_rect (EvView *view, GdkRectangle *view_rect, EvRectangle *doc_rect)
{
int x_offset, y_offset;
- ev_view_get_offsets (view, &x_offset, &y_offset);
- doc_rect->x = (view_rect->x - x_offset) / view->scale;
- doc_rect->y = (view_rect->y - y_offset) / view->scale;
- doc_rect->width = view_rect->width / view->scale;
- doc_rect->height = view_rect->height / view->scale;
+ ev_view_get_offsets (view, &x_offset, &y_offset);
+ doc_rect->x1 = (double) (view_rect->x - x_offset) / view->scale;
+ doc_rect->y1 = (double) (view_rect->y - y_offset) / view->scale;
+ doc_rect->x2 = doc_rect->x1 + (double) view_rect->width / view->scale;
+ doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
}
static void
-doc_rect_to_view_rect (EvView *view, GdkRectangle *doc_rect, GdkRectangle *view_rect)
+doc_rect_to_view_rect (EvView *view, EvRectangle *doc_rect, GdkRectangle *view_rect)
{
int x_offset, y_offset;
- ev_view_get_offsets (view, &x_offset, &y_offset);
- view_rect->x = doc_rect->x * view->scale + x_offset;
- view_rect->y = doc_rect->y * view->scale + y_offset;
- view_rect->width = doc_rect->width * view->scale;
- view_rect->height = doc_rect->height * view->scale;
+ ev_view_get_offsets (view, &x_offset, &y_offset);
+ view_rect->x = floor (doc_rect->x1 * view->scale) + x_offset;
+ view_rect->y = floor (doc_rect->y1 * view->scale) + y_offset;
+ view_rect->width = ceil (doc_rect->x2 * view->scale) + x_offset - view_rect->x;
+ view_rect->height = ceil (doc_rect->y2 * view->scale) + y_offset - view_rect->y;
}
+static void
+compute_border (EvView *view, int width, int height, GtkBorder *border)
+{
+ if (view->show_border) {
+ ev_document_misc_get_page_border_size (width, height, border);
+ } else {
+ border->left = 0;
+ border->right = 0;
+ border->top = 0;
+ border->bottom = 0;
+ }
+}
+
+static void
+compute_zoom_factor (EvView *view)
+{
+ int doc_width, doc_height;
+ double scale, scale_w, scale_h;
+ GtkBorder border;
+
+ if (view->width <= 0 && view->height <= 0) {
+ return;
+ }
+
+ doc_width = doc_height = 0;
+ scale = scale_w = scale_h = 1.0;
+ ev_page_cache_get_size (view->page_cache,
+ view->current_page,
+ 1.0,
+ &doc_width,
+ &doc_height);
+
+ compute_border (view, doc_width, doc_height, &border);
+
+ if (doc_width == 0 || doc_height == 0) {
+ return;
+ }
+
+ if (view->width >= 0) {
+ int target_width;
+
+ target_width = view->width - (view->spacing * 2 + view->border.left +
+ view->border.right);
+ scale = scale_w = (double)target_width / doc_width;
+ }
+
+ if (view->height >= 0) {
+ int target_height;
+
+ target_height = view->height - (view->spacing * 2 + view->border.top +
+ view->border.bottom);
+ scale = scale_h = (double)target_height / doc_height;
+ }
+
+ if (view->width >= 0 && view->height >= 0) {
+ scale = (scale_w < scale_h) ? scale_w : scale_h;
+ }
+
+ view->scale = scale;
+}
/* Called by size_request to make sure we have appropriate jobs running.
*/
GtkRequisition *requisition)
{
EvView *view = EV_VIEW (widget);
- GtkBorder border;
gint width, height;
if (!GTK_WIDGET_REALIZED (widget))
return;
}
+ compute_zoom_factor (view);
+
ev_page_cache_get_size (view->page_cache,
view->current_page,
view->scale,
&width, &height);
+ compute_border (view, width, height, &(view->border));
+
ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
view->current_page,
view->current_page,
view->scale);
- ev_document_misc_get_page_border_size (width, height, &border);
if (view->width >= 0) {
requisition->width = 0;
} else {
- requisition->width = width + border.left + border.right +
- view->spacing * 2;
+ requisition->width = width + view->border.left +
+ view->border.right + view->spacing * 2;
}
-
+
if (view->height >= 0) {
requisition->height = 0;
} else {
- requisition->height = height + border.top + border.bottom +
- view->spacing * 2;
+ requisition->height = height + view->border.top +
+ view->border.bottom + view->spacing * 2;
}
}
GdkWindowAttr attributes;
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-
+
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
attributes.colormap = gtk_widget_get_colormap (widget);
-
+
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
attributes.width = widget->allocation.width;
attributes.height = widget->allocation.height;
attributes.event_mask = 0;
-
+
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes,
GDK_WA_X | GDK_WA_Y |
gdk_window_set_user_data (widget->window, widget);
widget->style = gtk_style_attach (widget->style, widget->window);
gdk_window_set_background (widget->window, &widget->style->mid[widget->state]);
-
+
attributes.x = 0;
attributes.y = 0;
attributes.width = MAX (widget->allocation.width, widget->requisition.width);
GDK_KEY_PRESS_MASK |
GDK_POINTER_MOTION_MASK |
GDK_LEAVE_NOTIFY_MASK;
-
+
view->bin_window = gdk_window_new (widget->window,
&attributes,
GDK_WA_X | GDK_WA_Y |
gdk_draw_pixbuf (window, NULL, pixbuf,
0, 0,
- rect->x,rect->y,
+ rect->x, rect->y,
rect->width, rect->height,
GDK_RGB_DITHER_NONE,
0, 0);
find = EV_DOCUMENT_FIND (view->document);
-#if 0
g_mutex_lock (EV_DOC_MUTEX);
- results = ev_document_find_get_n_results (find);
+ results = ev_document_find_get_n_results (find, view->current_page);
g_mutex_unlock (EV_DOC_MUTEX);
-#endif
-
+
for (i = 0; i < results; i++) {
- GdkRectangle rectangle;
+ EvRectangle rectangle;
+ GdkRectangle view_rectangle;
guchar alpha;
alpha = (i == view->find_result) ? 0x90 : 0x20;
g_mutex_lock (EV_DOC_MUTEX);
- ev_document_find_get_result (find, i, &rectangle);
+ ev_document_find_get_result (find, view->current_page,
+ i, &rectangle);
g_mutex_unlock (EV_DOC_MUTEX);
+ doc_rect_to_view_rect (view, &rectangle, &view_rectangle);
draw_rubberband (GTK_WIDGET (view), view->bin_window,
- &rectangle, alpha);
+ &view_rectangle, alpha);
}
}
GdkEventExpose *event)
{
EvView *view = EV_VIEW (widget);
- GtkBorder border;
gint width, height;
GdkRectangle area;
int x_offset, y_offset;
if (view->document == NULL)
return;
- ev_view_get_offsets (view, &x_offset, &y_offset);
+ ev_view_get_offsets (view, &x_offset, &y_offset);
ev_page_cache_get_size (view->page_cache,
view->current_page,
view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
-
/* Paint the frame */
area.x = x_offset;
area.y = y_offset;
- area.width = width + border.left + border.right;
- area.height = height + border.top + border.bottom;
- ev_document_misc_paint_one_page (view->bin_window, widget, &area, &border);
+ area.width = width + view->border.left + view->border.right;
+ area.height = height + view->border.top + view->border.bottom;
+
+ if (view->show_border) {
+ ev_document_misc_paint_one_page (view->bin_window, widget, &area,
+ &(view->border));
+ }
/* Render the document itself */
LOG ("Render area %d %d %d %d - Offset %d %d",
GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
scaled_image,
0, 0,
- area.x + border.left,
- area.y + border.top,
+ area.x + view->border.left,
+ area.y + view->border.top,
width, height,
GDK_RGB_DITHER_NORMAL,
0, 0);
GdkRectangle selection;
int width, height;
int x_offset, y_offset;
- GtkBorder border;
g_return_if_fail (EV_IS_VIEW (ev_view));
ev_view->current_page,
ev_view->scale,
&width, &height);
- ev_document_misc_get_page_border_size (width, height, &border);
ev_view->has_selection = TRUE;
- selection.x = x_offset + border.left;
- selection.y = y_offset + border.top;
+ selection.x = x_offset + ev_view->border.left;
+ selection.y = y_offset + ev_view->border.top;
selection.width = width;
selection.height = height;
view_rect_to_doc_rect (ev_view, &selection, &ev_view->selection);
ev_view_copy (EvView *ev_view)
{
GtkClipboard *clipboard;
- GdkRectangle selection;
char *text;
- doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection);
+ if (!ev_document_can_get_text (ev_view->document)) {
+ return;
+ }
+
g_mutex_lock (EV_DOC_MUTEX);
- text = ev_document_get_text (ev_view->document, &selection);
+ text = ev_document_get_text (ev_view->document,
+ ev_view->current_page,
+ &ev_view->selection);
g_mutex_unlock (EV_DOC_MUTEX);
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
g_free (text);
}
+void
+ev_view_set_show_border (EvView *view, gboolean show_border)
+{
+ g_return_if_fail (EV_IS_VIEW (view));
+
+ view->show_border = show_border;
+
+ gtk_widget_queue_resize (GTK_WIDGET (view));
+}
+
static void
ev_view_primary_get_cb (GtkClipboard *clipboard,
GtkSelectionData *selection_data,
gpointer data)
{
EvView *ev_view = EV_VIEW (data);
- GdkRectangle selection;
char *text;
- doc_rect_to_view_rect (ev_view, &ev_view->selection, &selection);
+ if (!ev_document_can_get_text (ev_view->document)) {
+ return;
+ }
+
g_mutex_lock (EV_DOC_MUTEX);
- text = ev_document_get_text (ev_view->document, &selection);
+ text = ev_document_get_text (ev_view->document,
+ ev_view->current_page,
+ &ev_view->selection);
g_mutex_unlock (EV_DOC_MUTEX);
gtk_selection_data_set_text (selection_data, text, -1);
}
}
static char *
-status_message_from_link (EvLink *link)
+status_message_from_link (EvView *view, EvLink *link)
{
EvLinkType type;
- char *msg;
- int page;
+ char *msg = NULL;
+ char *page_label;
type = ev_link_get_link_type (link);
-
+
switch (type) {
case EV_LINK_TYPE_TITLE:
- msg = g_strdup (ev_link_get_title (link));
+ if (ev_link_get_title (link))
+ msg = g_strdup (ev_link_get_title (link));
break;
case EV_LINK_TYPE_PAGE:
- page = ev_link_get_page (link);
- msg = g_strdup_printf (_("Go to page %d"), page);
+ page_label = ev_page_cache_get_page_label (view->page_cache, ev_link_get_page (link));
+ msg = g_strdup_printf (_("Go to page %s"), page_label);
+ g_free (page_label);
break;
case EV_LINK_TYPE_EXTERNAL_URI:
msg = g_strdup (ev_link_get_uri (link));
break;
default:
- msg = NULL;
+ break;
}
return msg;
ev_view_set_find_status (EvView *view, const char *message)
{
g_return_if_fail (EV_IS_VIEW (view));
-
+
g_free (view->find_status);
view->find_status = g_strdup (message);
g_object_notify (G_OBJECT (view), "find-status");
}
}
+
+static void
+find_page_at_location (EvView *view,
+ gdouble x,
+ gdouble y,
+ gint *page,
+ gint *x_offset,
+ gint *y_offset)
+{
+ gint width, height;
+
+ ev_page_cache_get_size (view->page_cache,
+ view->current_page,
+ view->scale,
+ &width, &height);
+
+ x -= (view->border.left + view->spacing);
+ y -= (view->border.top + view->spacing);
+
+ if ((x < 0) || (y < 0) ||
+ (x >= width) || (y >= height)) {
+ *page = -1;
+ return;
+ }
+ *page = view->current_page;
+ *x_offset = (gint) x;
+ *y_offset = (gint) y;
+}
+
+static EvLink *
+get_link_at_location (EvView *view,
+ gdouble x,
+ gdouble y)
+{
+ gint page;
+ gint x_offset, y_offset;
+ GList *link_mapping;
+
+ find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
+ if (page == -1)
+ return NULL;
+
+ link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page);
+
+ return ev_link_mapping_find (link_mapping, x_offset /view->scale, y_offset /view->scale);
+}
+
+
static gboolean
ev_view_motion_notify_event (GtkWidget *widget,
GdkEventMotion *event)
view_rect_to_doc_rect (view, &selection, &view->selection);
gtk_widget_queue_draw (widget);
- } else if (FALSE && view->document) {
+ } else if (view->document) {
EvLink *link;
- g_mutex_lock (EV_DOC_MUTEX);
- link = ev_document_get_link (view->document, event->x, event->y);
- g_mutex_unlock (EV_DOC_MUTEX);
-
+ link = get_link_at_location (view, event->x, event->y);
if (link) {
char *msg;
- msg = status_message_from_link (link);
+ msg = status_message_from_link (view, link);
ev_view_set_status (view, msg);
ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
g_free (msg);
-
- g_object_unref (link);
} else {
ev_view_set_status (view, NULL);
if (view->cursor == EV_VIEW_CURSOR_LINK) {
return TRUE;
}
+/* FIXME: standardize this sometime */
+static void
+go_to_link (EvView *view, EvLink *link)
+{
+ EvLinkType type;
+ const char *uri;
+ int page;
+
+ type = ev_link_get_link_type (link);
+
+ switch (type) {
+ case EV_LINK_TYPE_TITLE:
+ break;
+ case EV_LINK_TYPE_PAGE:
+ page = ev_link_get_page (link);
+ ev_page_cache_set_current_page (view->page_cache, page);
+ break;
+ case EV_LINK_TYPE_EXTERNAL_URI:
+ uri = ev_link_get_uri (link);
+ gnome_vfs_url_show (uri);
+ break;
+ }
+}
+
+
static gboolean
ev_view_button_release_event (GtkWidget *widget,
GdkEventButton *event)
} else if (view->document) {
EvLink *link;
- g_mutex_lock (EV_DOC_MUTEX);
- link = ev_document_get_link (view->document,
- event->x,
- event->y);
- g_mutex_unlock (EV_DOC_MUTEX);
+ link = get_link_at_location (view, event->x, event->y);
if (link) {
- ev_view_go_to_link (view, link);
- g_object_unref (link);
+ go_to_link (view, link);
}
}
to_set = &view->hadjustment;
else
to_set = &view->vadjustment;
-
+
if (*to_set != adjustment) {
if (*to_set) {
g_signal_handlers_disconnect_by_func (*to_set,
}
static void
-add_scroll_binding (GtkBindingSet *binding_set,
- guint keyval,
- GtkScrollType scroll,
- gboolean horizontal)
+add_scroll_binding_keypad (GtkBindingSet *binding_set,
+ guint keyval,
+ GtkScrollType scroll,
+ gboolean horizontal)
{
guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
-
+
gtk_binding_entry_add_signal (binding_set, keyval, 0,
"scroll_view", 2,
GTK_TYPE_SCROLL_TYPE, scroll,
G_TYPE_BOOLEAN, horizontal);
}
+static void
+add_scroll_binding_shifted (GtkBindingSet *binding_set,
+ guint keyval,
+ GtkScrollType scroll_normal,
+ GtkScrollType scroll_shifted,
+ gboolean horizontal)
+{
+ gtk_binding_entry_add_signal (binding_set, keyval, 0,
+ "scroll_view", 2,
+ GTK_TYPE_SCROLL_TYPE, scroll_normal,
+ G_TYPE_BOOLEAN, horizontal);
+ gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK,
+ "scroll_view", 2,
+ GTK_TYPE_SCROLL_TYPE, scroll_shifted,
+ G_TYPE_BOOLEAN, horizontal);
+}
+
+static void
+ev_view_jump (EvView *view,
+ GtkScrollType scroll)
+{
+ GtkAdjustment *adjustment;
+ double value, increment;
+ gboolean first_page = FALSE;
+ gboolean last_page = FALSE;
+
+ /* Assign values for increment and vertical adjustment */
+ adjustment = view->vadjustment;
+ increment = adjustment->page_size * 0.75;
+ value = adjustment->value;
+
+ /* Assign boolean for first and last page */
+ if (view->current_page == 0)
+ first_page = TRUE;
+ if (view->current_page == ev_page_cache_get_n_pages (view->page_cache) - 1)
+ last_page = TRUE;
+
+ switch (scroll) {
+ case EV_SCROLL_PAGE_BACKWARD:
+ /* Do not jump backwards if at the first page */
+ if (value == (adjustment->lower) && first_page) {
+ /* Do nothing */
+ /* At the top of a page, assign the upper bound limit of previous page */
+ } else if (value == (adjustment->lower)) {
+ value = adjustment->upper - adjustment->page_size;
+ ev_page_cache_set_current_page (view->page_cache, view->current_page - 1);
+ /* Jump to the top */
+ } else {
+ value = MAX (value - increment, adjustment->lower);
+ }
+ break;
+ case EV_SCROLL_PAGE_FORWARD:
+ /* Do not jump forward if at the last page */
+ if (value == (adjustment->upper - adjustment->page_size) && last_page) {
+ /* Do nothing */
+ /* At the bottom of a page, assign the lower bound limit of next page */
+ } else if (value == (adjustment->upper - adjustment->page_size)) {
+ value = 0;
+ ev_page_cache_set_current_page (view->page_cache, view->current_page + 1);
+ /* Jump to the bottom */
+ } else {
+ value = MIN (value + increment, adjustment->upper - adjustment->page_size);
+ }
+ break;
+ default:
+ break;
+ }
+
+ gtk_adjustment_set_value (adjustment, value);
+}
+
static void
ev_view_scroll_view (EvView *view,
GtkScrollType scroll,
ev_page_cache_prev_page (view->page_cache);
} else if (scroll == GTK_SCROLL_PAGE_FORWARD) {
ev_page_cache_next_page (view->page_cache);
+ } else if (scroll == EV_SCROLL_PAGE_BACKWARD || scroll == EV_SCROLL_PAGE_FORWARD) {
+ ev_view_jump (view, scroll);
} else {
GtkAdjustment *adjustment;
double value;
if (horizontal) {
- adjustment = view->hadjustment;
+ adjustment = view->hadjustment;
} else {
adjustment = view->vadjustment;
}
value = adjustment->value;
switch (scroll) {
- case GTK_SCROLL_STEP_BACKWARD:
- value -= adjustment->step_increment;
+ case GTK_SCROLL_STEP_BACKWARD:
+ value -= adjustment->step_increment;
break;
case GTK_SCROLL_STEP_FORWARD:
- value += adjustment->step_increment;
+ value += adjustment->step_increment;
break;
default:
break;
G_PARAM_READABLE));
g_object_class_install_property (object_class,
- PROP_STATUS,
+ PROP_FIND_STATUS,
g_param_spec_string ("find-status",
"Find Status Message",
"The find status message",
binding_set = gtk_binding_set_by_class (class);
- add_scroll_binding (binding_set, GDK_Left, GTK_SCROLL_STEP_BACKWARD, TRUE);
- add_scroll_binding (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD, TRUE);
- add_scroll_binding (binding_set, GDK_Up, GTK_SCROLL_STEP_BACKWARD, FALSE);
- add_scroll_binding (binding_set, GDK_Down, GTK_SCROLL_STEP_FORWARD, FALSE);
+ add_scroll_binding_keypad (binding_set, GDK_Left, GTK_SCROLL_STEP_BACKWARD, TRUE);
+ add_scroll_binding_keypad (binding_set, GDK_Right, GTK_SCROLL_STEP_FORWARD, TRUE);
+ add_scroll_binding_keypad (binding_set, GDK_Up, GTK_SCROLL_STEP_BACKWARD, FALSE);
+ add_scroll_binding_keypad (binding_set, GDK_Down, GTK_SCROLL_STEP_FORWARD, FALSE);
- add_scroll_binding (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_BACKWARD, FALSE);
- add_scroll_binding (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD, FALSE);
+ add_scroll_binding_keypad (binding_set, GDK_Page_Up, GTK_SCROLL_PAGE_BACKWARD, FALSE);
+ add_scroll_binding_keypad (binding_set, GDK_Page_Down, GTK_SCROLL_PAGE_FORWARD, FALSE);
+
+ add_scroll_binding_shifted (binding_set, GDK_space, EV_SCROLL_PAGE_FORWARD, EV_SCROLL_PAGE_BACKWARD, FALSE);
+ add_scroll_binding_shifted (binding_set, GDK_BackSpace, EV_SCROLL_PAGE_BACKWARD, EV_SCROLL_PAGE_FORWARD, FALSE);
+}
+
+void
+ev_view_set_spacing (EvView *view,
+ int spacing)
+{
+ g_return_if_fail (EV_IS_VIEW (view));
+
+ view->spacing = spacing;
+
+ if (view->document) {
+ gtk_widget_queue_resize (GTK_WIDGET (view));
+ }
}
static void
{
GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
- view->spacing = 10;
+ view->spacing = 0;
view->scale = 1.0;
- view->current_page = 1;
+ view->current_page = 0;
view->pressed_button = -1;
view->cursor = EV_VIEW_CURSOR_NORMAL;
+ view->show_border = TRUE;
}
static void
char *message;
// g_mutex_lock (EV_DOC_MUTEX);
- if (ev_document_get_page (view->document) == view->find_page) {
+ if (view->current_page == view->find_page) {
int results;
// g_mutex_lock (EV_DOC_MUTEX);
results = ev_document_find_get_n_results
- (EV_DOCUMENT_FIND (view->document));
+ (EV_DOCUMENT_FIND (view->document),
+ view->current_page);
// g_mutex_unlock (EV_DOC_MUTEX);
/* TRANS: Sometimes this could be better translated as
"%d hit(s) on this page". Therefore this string
message = g_strdup_printf (_("%3d%% remaining to search"),
(int) ((1.0 - percent) * 100));
}
-
+
}
// g_mutex_unlock (EV_DOC_MUTEX);
jump_to_find_result (EvView *view)
{
EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
- GdkRectangle rect;
+ EvRectangle rect;
+ GdkRectangle view_rect;
int n_results;
g_mutex_lock (EV_DOC_MUTEX);
- n_results = ev_document_find_get_n_results (find);
+ n_results = ev_document_find_get_n_results (find, view->current_page);
g_mutex_unlock (EV_DOC_MUTEX);
if (n_results > view->find_result) {
g_mutex_lock (EV_DOC_MUTEX);
ev_document_find_get_result
- (find, view->find_result, &rect);
+ (find, view->current_page, view->find_result, &rect);
g_mutex_unlock (EV_DOC_MUTEX);
- ensure_rectangle_is_visible (view, &rect);
+ doc_rect_to_view_rect (view, &rect, &view_rect);
+ ensure_rectangle_is_visible (view, &view_rect);
}
}
n_pages = ev_page_cache_get_n_pages (view->page_cache);
- for (i = 0; i <= n_pages; i++) {
+ for (i = 0; i < n_pages; i++) {
int has_results;
int page;
page = i + view->find_page;
- if (page > n_pages) {
+ if (page >= n_pages) {
page = page - n_pages;
}
- g_mutex_lock (EV_DOC_MUTEX);
+ // g_mutex_lock (EV_DOC_MUTEX);
has_results = ev_document_find_page_has_results
(EV_DOCUMENT_FIND (view->document), page);
if (has_results == -1) {
jump_to_find_result (view);
update_find_status_message (view);
-#if 0
- /* FIXME: */
- if (ev_document_get_page (document) == page) {
+ if (view->current_page == page)
gtk_widget_queue_draw (GTK_WIDGET (view));
- }
-#endif
}
-/*** Public API ***/
-
+/*** Public API ***/
+
GtkWidget*
ev_view_new (void)
{
old_page,
view->scale,
&old_width, &old_height);
+
+ view->current_page = new_page;
+ view->has_selection = FALSE;
+
+ compute_zoom_factor (view);
+
ev_page_cache_get_size (page_cache,
new_page,
view->scale,
&new_width, &new_height);
- if (view->cursor != EV_VIEW_CURSOR_HIDDEN) {
- //ev_view_set_cursor (view, EV_VIEW_CURSOR_WAIT);
- }
-
- view->current_page = new_page;
- view->has_selection = FALSE;
+ compute_border (view, new_width, new_height, &(view->border));
ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
view->current_page,
gtk_widget_queue_resize (GTK_WIDGET (view));
else
gtk_widget_queue_draw (GTK_WIDGET (view));
-
+
gtk_adjustment_set_value (view->vadjustment,
view->vadjustment->lower);
view);
g_object_unref (view->document);
view->page_cache = NULL;
-
+
}
view->document = document;
- view->find_page = 1;
+ view->find_page = 0;
view->find_result = 0;
if (view->document) {
view->pixbuf_cache = ev_pixbuf_cache_new (view->document);
g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);
}
-
- gtk_widget_queue_resize (GTK_WIDGET (view));
- }
-}
-static void
-go_to_link (EvView *view, EvLink *link)
-{
- EvLinkType type;
- const char *uri;
- int page;
-
- type = ev_link_get_link_type (link);
-
- switch (type) {
- case EV_LINK_TYPE_TITLE:
- break;
- case EV_LINK_TYPE_PAGE:
- page = ev_link_get_page (link);
- ev_page_cache_set_current_page (view->page_cache, page);
- break;
- case EV_LINK_TYPE_EXTERNAL_URI:
- uri = ev_link_get_uri (link);
- gnome_vfs_url_show (uri);
- break;
+ gtk_widget_queue_resize (GTK_WIDGET (view));
}
}
-void
-ev_view_go_to_link (EvView *view, EvLink *link)
-{
- go_to_link (view, link);
-}
-
static void
ev_view_zoom (EvView *view,
double factor,
scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
view->scale = scale;
+ view->width = view->height = -1;
gtk_widget_queue_resize (GTK_WIDGET (view));
}
void
ev_view_zoom_in (EvView *view)
{
- view->width = view->height = -1;
ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE);
}
void
ev_view_zoom_out (EvView *view)
{
- view->width = view->height = -1;
ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE);
}
-static double
-size_to_zoom_factor (EvView *view, int width, int height)
-{
- int doc_width, doc_height;
- double scale, scale_w, scale_h;
- GtkBorder border;
-
- doc_width = doc_height = 0;
- scale = scale_w = scale_h = 1.0;
- ev_page_cache_get_size (view->page_cache,
- view->current_page,
- view->scale,
- &doc_width,
- &doc_height);
-
- /* FIXME: The border size isn't constant. Ugh. Still, if we have extra
- * space, we just cut it from the border */
- ev_document_misc_get_page_border_size (doc_width, doc_height, &border);
-
- if (doc_width == 0 && doc_height == 0) {
- return 0;
- }
-
- if (width >= 0) {
- int target_width;
-
- target_width = width - (view->spacing * 2 + border.left + border.right);
- scale = scale_w = (double)target_width * view->scale / doc_width;
- }
-
- if (height >= 0) {
- int target_height;
-
- target_height = height - (view->spacing * 2 + border.top + border.bottom);
- scale = scale_h = (double)target_height * view->scale / doc_height;
- }
-
- if (width >= 0 && height >= 0) {
- scale = (scale_w < scale_h) ? scale_w : scale_h;
- }
-
- return scale;
-}
-
void
ev_view_set_size (EvView *view,
int width,
int height)
{
- double factor;
-
- if (!view->document)
+ if (!view->document) {
return;
+ }
- if (view->width != width ||
- view->height != height) {
+ if (width != view->width || height != view->height) {
view->width = width;
view->height = height;
- factor = size_to_zoom_factor (view, width, height);
- ev_view_zoom (view, factor, FALSE);
gtk_widget_queue_resize (GTK_WIDGET (view));
}
}
return view->find_status;
}
+gboolean
+ev_view_can_find_next (EvView *view)
+{
+ int n_results = 0;
+
+ if (EV_IS_DOCUMENT_FIND (view->document)) {
+ EvDocumentFind *find = EV_DOCUMENT_FIND (view->document);
+
+ g_mutex_lock (EV_DOC_MUTEX);
+ n_results = ev_document_find_get_n_results (find, view->current_page);
+ g_mutex_unlock (EV_DOC_MUTEX);
+ }
+
+ return n_results > 0;
+}
+
void
ev_view_find_next (EvView *view)
{
page_cache = ev_document_get_page_cache (view->document);
g_mutex_lock (EV_DOC_MUTEX);
- n_results = ev_document_find_get_n_results (find);
+ n_results = ev_document_find_get_n_results (find, view->current_page);
g_mutex_unlock (EV_DOC_MUTEX);
n_pages = ev_page_cache_get_n_pages (page_cache);
view->find_result = 0;
view->find_page++;
- if (view->find_page > n_pages) {
- view->find_page = 1;
+ if (view->find_page >= n_pages) {
+ view->find_page = 0;
}
jump_to_find_page (view);
page_cache = ev_document_get_page_cache (view->document);
g_mutex_lock (EV_DOC_MUTEX);
- n_results = ev_document_find_get_n_results (find);
+ n_results = ev_document_find_get_n_results (find, view->current_page);
g_mutex_unlock (EV_DOC_MUTEX);
n_pages = ev_page_cache_get_n_pages (page_cache);
view->find_result = 0;
view->find_page--;
- if (view->find_page < 1) {
- view->find_page = n_pages;
+ if (view->find_page < 0) {
+ view->find_page = n_pages - 1;
}
jump_to_find_page (view);
void
ev_view_show_cursor (EvView *view)
{
- ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
+ ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff