EV_VIEW_FIND_PREV
} EvViewFindDirection;
+typedef struct {
+ GtkWidget *widget;
+
+ /* View coords */
+ gint x;
+ gint y;
+
+ /* Document */
+ guint page;
+ EvRectangle doc_rect;
+} EvViewChild;
+
#define ZOOM_IN_FACTOR 1.2
#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
GdkEventCrossing *event);
static gboolean ev_view_leave_notify_event (GtkWidget *widget,
GdkEventCrossing *event);
-static void ev_view_style_set (GtkWidget *widget,
- GtkStyle *old_style);
+static void ev_view_style_updated (GtkWidget *widget);
static void ev_view_remove_all (EvView *view);
static AtkObject *ev_view_get_accessible (GtkWidget *widget);
gpointer data);
static void ev_view_update_primary_selection (EvView *ev_view);
-G_DEFINE_TYPE_WITH_CODE (EvView, ev_view, GTK_TYPE_FIXED,
+G_DEFINE_TYPE_WITH_CODE (EvView, ev_view, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
/* HeightToPage cache */
}
gtk_widget_style_get (swindow, "scrollbar_spacing", &spacing, NULL);
- gtk_widget_size_request (sb, &req);
+ gtk_widget_get_preferred_size (sb, &req, NULL);
return (orientation == GTK_ORIENTATION_VERTICAL ? req.width : req.height) + spacing;
}
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;
+
+ 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 EvLink *
}
}
+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)
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);
gtk_text_buffer_set_text (buffer, txt, -1);
g_free (txt);
}
-
+
+ g_signal_connect( buffer, "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);
{
GtkWidget *field_widget = NULL;
EvMappingList *form_field_mapping;
- GdkRectangle view_area;
+ EvMapping *mapping;
if (field->is_read_only)
return;
form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
field->page->index);
- ev_view_get_area_from_mapping (view, field->page->index,
- form_field_mapping,
- field, &view_area);
-
- gtk_fixed_put (GTK_FIXED (view), field_widget, view_area.x, view_area.y);
+ mapping = ev_mapping_list_find (form_field_mapping, field);
+ 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);
}
*requisition = view->requisition;
}
+static void
+ev_view_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkRequisition requisition;
+
+ ev_view_size_request (widget, &requisition);
+
+ *minimum = *natural = requisition.width;
+}
+
+static void
+ev_view_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkRequisition requisition;
+
+ ev_view_size_request (widget, &requisition);
+
+ *minimum = *natural = requisition.height;
+}
+
static void
ev_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
EvView *view = EV_VIEW (widget);
- GList *children, *l;
+ GList *l;
gint root_x, root_y;
- GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation);
+ gtk_widget_set_allocation (widget, allocation);
+
+ if (gtk_widget_get_realized (widget))
+ gdk_window_move_resize (gtk_widget_get_window (widget),
+ allocation->x,
+ allocation->y,
+ allocation->width,
+ allocation->height);
if (!view->document)
return;
ev_view_size_request (widget, &req);
view->internal_size_request = FALSE;
}
-
+
ev_view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL);
ev_view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL);
view->pending_point.x = 0;
view->pending_point.y = 0;
- children = gtk_container_get_children (GTK_CONTAINER (widget));
- for (l = children; l && l->data; l = g_list_next (l)) {
- EvFormField *field;
- GdkRectangle view_area;
- EvMappingList *form_field_mapping;
- GtkAllocation child_allocation;
- GtkRequisition child_requisition;
- GtkWidget *child = (GtkWidget *)l->data;
-
- field = g_object_get_data (G_OBJECT (child), "form-field");
- if (!field)
+ for (l = view->children; l && l->data; l = g_list_next (l)) {
+ GdkRectangle view_area;
+ EvViewChild *child = (EvViewChild *)l->data;
+
+ if (!gtk_widget_get_visible (child->widget))
continue;
- form_field_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
- field->page->index);
- ev_view_get_area_from_mapping (view, field->page->index,
- form_field_mapping,
- field, &view_area);
-
- gtk_widget_size_request (child, &child_requisition);
- if (child_requisition.width != view_area.width ||
- child_requisition.height != view_area.height)
- gtk_widget_set_size_request (child, view_area.width, view_area.height);
-
- gtk_container_child_get (GTK_CONTAINER (widget),
- child,
- "x", &child_allocation.x,
- "y", &child_allocation.y,
- NULL);
- if (child_allocation.x != view_area.x ||
- child_allocation.y != view_area.y) {
- gtk_fixed_move (GTK_FIXED (widget), child, view_area.x, view_area.y);
- }
+ doc_rect_to_view_rect (view, child->page, &child->doc_rect, &view_area);
+ view_area.x -= view->scroll_x;
+ view_area.y -= view->scroll_y;
+
+ gtk_widget_set_size_request (child->widget, view_area.width, view_area.height);
+ gtk_widget_size_allocate (child->widget, &view_area);
}
- g_list_free (children);
if (view->window_children)
gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (view)),
return NULL;
}
+static void
+ev_view_realize (GtkWidget *widget)
+{
+ GtkAllocation allocation;
+ GdkWindow *window;
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+
+ gtk_widget_set_realized (widget, TRUE);
+
+ gtk_widget_get_allocation (widget, &allocation);
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.x = allocation.x;
+ attributes.y = allocation.y;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.visual = gtk_widget_get_visual (widget);
+ attributes.event_mask = gtk_widget_get_events (widget);
+
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+
+ window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gtk_widget_set_window (widget, window);
+ gdk_window_set_user_data (window, widget);
+
+ gtk_style_context_set_background (gtk_widget_get_style_context (widget),
+ window);
+}
+
static gboolean
ev_view_draw (GtkWidget *widget,
cairo_t *cr)
static void
ev_view_remove_all (EvView *view)
{
- GList *children, *child;
-
- children = gtk_container_get_children (GTK_CONTAINER (view));
- for (child = children; child && child->data; child = g_list_next (child)) {
- gtk_container_remove (GTK_CONTAINER (view),
- GTK_WIDGET (child->data));
- }
- g_list_free (children);
+ gtk_container_foreach (GTK_CONTAINER (view), (GtkCallback) gtk_widget_destroy, NULL);
}
/*** Drag and Drop ***/
}
static void
-ev_view_style_set (GtkWidget *widget,
- GtkStyle *old_style)
+ev_view_style_updated (GtkWidget *widget)
{
if (EV_VIEW (widget)->pixbuf_cache)
ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache);
- GTK_WIDGET_CLASS (ev_view_parent_class)->style_set (widget, old_style);
+ GTK_WIDGET_CLASS (ev_view_parent_class)->style_updated (widget);
}
/*** Drawing ***/
const GdkRectangle *rect,
gdouble alpha)
{
- GtkStyle *style;
- const GdkColor *fill_color_gdk;
- gdouble r, g, b;
-
- style = gtk_widget_get_style (GTK_WIDGET (view));
- fill_color_gdk = &style->base[GTK_STATE_SELECTED];
- r = fill_color_gdk->red / 65535.;
- g = fill_color_gdk->green / 65535.;
- b = fill_color_gdk->blue / 65535.;
+ GtkStyleContext *context;
+ GdkRGBA color;
+ context = gtk_widget_get_style_context (GTK_WIDGET (view));
+ gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &color);
cairo_save (cr);
- cairo_set_source_rgba (cr, r, g, b, alpha);
+ cairo_set_source_rgba (cr, color.red, color.green, color.blue, alpha);
cairo_rectangle (cr,
rect->x - view->scroll_x,
rect->y - view->scroll_y,
cairo_fill_preserve (cr);
cairo_set_line_width (cr, 0.5);
- cairo_set_source_rgb (cr, r, g, b);
+ cairo_set_source_rgb (cr, color.red, color.green, color.blue);
cairo_stroke (cr);
cairo_restore (cr);
doc_rect_to_view_rect (view, page, &mapping->area, &rect);
- gtk_paint_focus (gtk_widget_get_style (widget),
- cr,
- gtk_widget_get_state (widget),
- widget, NULL,
- rect.x - view->scroll_x,
- rect.y - view->scroll_y,
- rect.width + 1, rect.height + 1);
+ gtk_render_focus (gtk_widget_get_style_context (widget),
+ cr,
+ rect.x - view->scroll_x,
+ rect.y - view->scroll_y,
+ rect.width + 1, rect.height + 1);
}
static void
}
}
-static AtkObject *
-ev_view_get_accessible (GtkWidget *widget)
+/* Accessibility */
+static void
+ev_view_init_accessibility (EvView *view)
{
static gboolean first_time = TRUE;
if (first_time) {
AtkObjectFactory *factory;
AtkRegistry *registry;
- GType derived_type;
- GType derived_atk_type;
+ GType derived_type;
+ GType derived_atk_type;
/*
* Figure out whether accessibility is enabled by looking at the
atk_registry_set_factory_type (registry,
EV_TYPE_VIEW,
ev_view_accessible_factory_get_type ());
- EV_VIEW (widget)->a11y_enabled = TRUE;
+ view->a11y_enabled = TRUE;
}
first_time = FALSE;
- }
+ }
+}
+
+static AtkObject *
+ev_view_get_accessible (GtkWidget *widget)
+{
+ ev_view_init_accessibility (EV_VIEW (widget));
return GTK_WIDGET_CLASS (ev_view_parent_class)->get_accessible (widget);
}
+static gboolean
+ev_view_is_a11y_enabled (EvView *view)
+{
+ ev_view_init_accessibility (view);
+ return view->a11y_enabled;
+}
+
+/* GtkContainer */
+static void
+ev_view_remove (GtkContainer *container,
+ GtkWidget *widget)
+{
+ EvView *view = EV_VIEW (container);
+ GList *tmp_list = view->children;
+ EvViewChild *child;
+
+ while (tmp_list) {
+ child = tmp_list->data;
+
+ if (child->widget == widget) {
+ gtk_widget_unparent (widget);
+
+ view->children = g_list_remove_link (view->children, tmp_list);
+ g_list_free_1 (tmp_list);
+ g_slice_free (EvViewChild, child);
+
+ return;
+ }
+
+ tmp_list = tmp_list->next;
+ }
+}
+
+static void
+ev_view_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
+{
+ EvView *view = EV_VIEW (container);
+ GList *tmp_list = view->children;
+ EvViewChild *child;
+
+ while (tmp_list) {
+ child = tmp_list->data;
+ tmp_list = tmp_list->next;
+
+ (* callback) (child->widget, callback_data);
+ }
+}
+
static void
ev_view_class_init (EvViewClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+ GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
GtkBindingSet *binding_set;
object_class->get_property = ev_view_get_property;
object_class->dispose = ev_view_dispose;
object_class->finalize = ev_view_finalize;
+ widget_class->realize = ev_view_realize;
widget_class->draw = ev_view_draw;
widget_class->button_press_event = ev_view_button_press_event;
widget_class->motion_notify_event = ev_view_motion_notify_event;
widget_class->focus_in_event = ev_view_focus_in;
widget_class->focus_out_event = ev_view_focus_out;
widget_class->get_accessible = ev_view_get_accessible;
- widget_class->size_request = ev_view_size_request;
+ widget_class->get_preferred_width = ev_view_get_preferred_width;
+ widget_class->get_preferred_height = ev_view_get_preferred_height;
widget_class->size_allocate = ev_view_size_allocate;
widget_class->scroll_event = ev_view_scroll_event;
widget_class->enter_notify_event = ev_view_enter_notify_event;
widget_class->leave_notify_event = ev_view_leave_notify_event;
- widget_class->style_set = ev_view_style_set;
+ widget_class->style_updated = ev_view_style_updated;
widget_class->drag_data_get = ev_view_drag_data_get;
widget_class->drag_motion = ev_view_drag_motion;
widget_class->popup_menu = ev_view_popup_menu;
widget_class->query_tooltip = ev_view_query_tooltip;
+ container_class->remove = ev_view_remove;
+ container_class->forall = ev_view_forall;
+
class->binding_activated = ev_view_scroll;
/* Scrollable interface */
{
gtk_widget_set_has_window (GTK_WIDGET (view), TRUE);
gtk_widget_set_can_focus (GTK_WIDGET (view), TRUE);
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (view), FALSE);
+ gtk_container_set_resize_mode (GTK_CONTAINER (view), GTK_RESIZE_QUEUE);
gtk_widget_set_events (GTK_WIDGET (view),
GDK_EXPOSURE_MASK |
on_adjustment_value_changed (GtkAdjustment *adjustment,
EvView *view)
{
+ GtkWidget *widget = GTK_WIDGET (view);
int dx = 0, dy = 0;
gint x, y;
gint value;
- GList *children, *l;
+ GList *l;
- if (!gtk_widget_get_realized (GTK_WIDGET (view)))
+ if (!gtk_widget_get_realized (widget))
return;
if (view->hadjustment) {
view->scroll_y = 0;
}
- children = gtk_container_get_children (GTK_CONTAINER (view));
- for (l = children; l && l->data; l = g_list_next (l)) {
- gint child_x, child_y;
- GtkWidget *child = (GtkWidget *)l->data;
-
- gtk_container_child_get (GTK_CONTAINER (view),
- child,
- "x", &child_x,
- "y", &child_y,
- NULL);
- gtk_fixed_move (GTK_FIXED (view), child, child_x + dx, child_y + dy);
+ for (l = view->children; l && l->data; l = g_list_next (l)) {
+ EvViewChild *child = (EvViewChild *)l->data;
+
+ child->x += dx;
+ child->y += dy;
+ if (gtk_widget_get_visible (child->widget) && gtk_widget_get_visible (widget))
+ gtk_widget_queue_resize (widget);
}
- g_list_free (children);
for (l = view->window_children; l && l->data; l = g_list_next (l)) {
EvViewWindowChild *child;
ev_view_window_child_move (view, child, child->x + dx, child->y + dy);
}
-
+
if (view->pending_resize) {
- gtk_widget_queue_draw (GTK_WIDGET (view));
+ gtk_widget_queue_draw (widget);
} else {
- gdk_window_scroll (gtk_widget_get_window (GTK_WIDGET (view)), dx, dy);
+ gdk_window_scroll (gtk_widget_get_window (widget), dx, dy);
}
- gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+ gtk_widget_get_pointer (widget, &x, &y);
ev_view_handle_cursor_over_xy (view, x, y);
if (view->document)
view->height_to_page_cache = ev_view_get_height_to_page_cache (view);
view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->model, view->pixbuf_cache_size);
view->page_cache = ev_page_cache_new (view->document);
- if (view->a11y_enabled) {
+ if (ev_view_is_a11y_enabled (view)) {
EvJobPageDataFlags flags = ev_page_cache_get_flags (view->page_cache);
ev_page_cache_set_flags (view->page_cache,
if (document != view->document) {
gint current_page;
+ ev_view_remove_all (view);
clear_caches (view);
if (view->document) {
gdk_window_set_cursor (window, cursor);
gdk_flush ();
if (cursor)
- gdk_cursor_unref (cursor);
+ g_object_unref (cursor);
}
void
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff