mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-30 06:54:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

CS

Browse source
This commit is contained in:
Sebastian Ramacher 2024-03-02 21:03:04 +01:00
parent 55f7088309
commit 0c395610ff
1 changed files with 168 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

276
zathura/page-widget.c
View file

@ -39,7 +39,7 @@ typedef struct zathura_page_widget_private_s {
} search; } search;
struct { struct {
girara_list_t *list; /**< List of selection rectangles that should be drawn */ girara_list_t* list; /**< List of selection rectangles that should be drawn */
gboolean draw; /** Draw selection */ gboolean draw; /** Draw selection */
} selection; } selection;
@ -89,7 +89,7 @@ static void cb_update_surface(ZathuraRenderRequest* request, cairo_surface_t* su
static void cb_cache_added(ZathuraRenderRequest* request, void* data); static void cb_cache_added(ZathuraRenderRequest* request, void* data);
static void cb_cache_invalidated(ZathuraRenderRequest* request, void* data); static void cb_cache_invalidated(ZathuraRenderRequest* request, void* data);
static bool surface_small_enough(cairo_surface_t* surface, size_t max_size, cairo_surface_t* old); static bool surface_small_enough(cairo_surface_t* surface, size_t max_size, cairo_surface_t* old);
static cairo_surface_t *draw_thumbnail_image(cairo_surface_t* surface, size_t max_size); static cairo_surface_t* draw_thumbnail_image(cairo_surface_t* surface, size_t max_size);
enum properties_e { enum properties_e {
PROP_0, PROP_0,
@ -112,14 +112,12 @@ enum {
BUTTON_RELEASE, BUTTON_RELEASE,
ENTER_LINK, ENTER_LINK,
LEAVE_LINK, LEAVE_LINK,
LAST_SIGNAL LAST_SIGNAL,
}; };
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = {0};
static void static void zathura_page_widget_class_init(ZathuraPageClass* class) {
zathura_page_widget_class_init(ZathuraPageClass* class)
{
/* overwrite methods */ /* overwrite methods */
GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(class); GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(class);
widget_class->draw = zathura_page_widget_draw; widget_class->draw = zathura_page_widget_draw;
@ -137,87 +135,62 @@ zathura_page_widget_class_init(ZathuraPageClass* class)
object_class->get_property = zathura_page_widget_get_property; object_class->get_property = zathura_page_widget_get_property;
/* add properties */ /* add properties */
g_object_class_install_property(object_class, PROP_PAGE, g_object_class_install_property(
g_param_spec_pointer("page", "page", "the page to draw", G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); object_class, PROP_PAGE,
g_object_class_install_property(object_class, PROP_ZATHURA, g_param_spec_pointer("page", "page", "the page to draw",
g_param_spec_pointer("zathura", "zathura", "the zathura instance", G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(
object_class, PROP_ZATHURA,
g_param_spec_pointer("zathura", "zathura", "the zathura instance",
G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_DRAW_LINKS, g_object_class_install_property(object_class, PROP_DRAW_LINKS,
g_param_spec_boolean("draw-links", "draw-links", "Set to true if links should be drawn", FALSE, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_boolean("draw-links", "draw-links",
"Set to true if links should be drawn", FALSE,
G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_LINKS_OFFSET, g_object_class_install_property(object_class, PROP_LINKS_OFFSET,
g_param_spec_int("offset-links", "offset-links", "Offset for the link numbers", 0, INT_MAX, 0, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_int("offset-links", "offset-links", "Offset for the link numbers", 0,
INT_MAX, 0, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_LINKS_NUMBER, g_object_class_install_property(object_class, PROP_LINKS_NUMBER,
g_param_spec_int("number-of-links", "number-of-links", "Number of links", 0, INT_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_int("number-of-links", "number-of-links", "Number of links", 0, INT_MAX,
0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_SEARCH_RESULTS, g_object_class_install_property(object_class, PROP_SEARCH_RESULTS,
g_param_spec_pointer("search-results", "search-results", "Set to the list of search results", G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_pointer("search-results", "search-results",
"Set to the list of search results",
G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_SEARCH_RESULTS_CURRENT, g_object_class_install_property(object_class, PROP_SEARCH_RESULTS_CURRENT,
g_param_spec_int("search-current", "search-current", "The current search result", -1, INT_MAX, 0, G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_int("search-current", "search-current", "The current search result", -1,
INT_MAX, 0,
G_PARAM_WRITABLE | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_SEARCH_RESULTS_LENGTH, g_object_class_install_property(object_class, PROP_SEARCH_RESULTS_LENGTH,
g_param_spec_int("search-length", "search-length", "The number of search results", -1, INT_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_int("search-length", "search-length", "The number of search results", -1,
INT_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_DRAW_SEARCH_RESULTS, g_object_class_install_property(object_class, PROP_DRAW_SEARCH_RESULTS,
g_param_spec_boolean("draw-search-results", "draw-search-results", "Set to true if search results should be drawn", FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); g_param_spec_boolean("draw-search-results", "draw-search-results",
"Set to true if search results should be drawn", FALSE,
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property(object_class, PROP_DRAW_SIGNATURES, g_object_class_install_property(object_class, PROP_DRAW_SIGNATURES,
g_param_spec_boolean("draw-signatures", "draw-signatures", g_param_spec_boolean("draw-signatures", "draw-signatures",
"Set to true if signatures should be drawn", FALSE, "Set to true if signatures should be drawn", FALSE,
G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
/* add signals */ /* add signals */
signals[TEXT_SELECTED] = g_signal_new("text-selected", signals[TEXT_SELECTED] = g_signal_new("text-selected", ZATHURA_TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
ZATHURA_TYPE_PAGE, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_STRING);
G_SIGNAL_RUN_LAST,
0,
NULL,
NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
1,
G_TYPE_STRING);
signals[IMAGE_SELECTED] = g_signal_new("image-selected", signals[IMAGE_SELECTED] = g_signal_new("image-selected", ZATHURA_TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
ZATHURA_TYPE_PAGE, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_OBJECT);
G_SIGNAL_RUN_LAST,
0,
NULL,
NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
1,
G_TYPE_OBJECT);
signals[ENTER_LINK] = g_signal_new("enter-link", signals[ENTER_LINK] = g_signal_new("enter-link", ZATHURA_TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
ZATHURA_TYPE_PAGE, g_cclosure_marshal_generic, G_TYPE_NONE, 0);
G_SIGNAL_RUN_LAST,
0,
NULL,
NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
0);
signals[LEAVE_LINK] = g_signal_new("leave-link", signals[LEAVE_LINK] = g_signal_new("leave-link", ZATHURA_TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
ZATHURA_TYPE_PAGE, g_cclosure_marshal_generic, G_TYPE_NONE, 0);
G_SIGNAL_RUN_LAST,
0,
NULL,
NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
0);
signals[BUTTON_RELEASE] = g_signal_new("scaled-button-release", signals[BUTTON_RELEASE] = g_signal_new("scaled-button-release", ZATHURA_TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
ZATHURA_TYPE_PAGE, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_POINTER);
G_SIGNAL_RUN_LAST,
0,
NULL,
NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
1,
G_TYPE_POINTER);
} }
static void static void zathura_page_widget_init(ZathuraPage* widget) {
zathura_page_widget_init(ZathuraPage* widget)
{
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
priv->page = NULL; priv->page = NULL;
priv->zathura = NULL; priv->zathura = NULL;
@ -264,9 +237,7 @@ zathura_page_widget_init(ZathuraPage* widget)
gtk_widget_add_events(GTK_WIDGET(widget), event_mask); gtk_widget_add_events(GTK_WIDGET(widget), event_mask);
} }
GtkWidget* GtkWidget* zathura_page_widget_new(zathura_t* zathura, zathura_page_t* page) {
zathura_page_widget_new(zathura_t* zathura, zathura_page_t* page)
{
g_return_val_if_fail(page != NULL, NULL); g_return_val_if_fail(page != NULL, NULL);
GObject* ret = g_object_new(ZATHURA_TYPE_PAGE, "page", page, "zathura", zathura, NULL); GObject* ret = g_object_new(ZATHURA_TYPE_PAGE, "page", page, "zathura", zathura, NULL);
@ -277,19 +248,14 @@ zathura_page_widget_new(zathura_t* zathura, zathura_page_t* page)
ZathuraPage* widget = ZATHURA_PAGE(ret); ZathuraPage* widget = ZATHURA_PAGE(ret);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
priv->render_request = zathura_render_request_new(zathura->sync.render_thread, page); priv->render_request = zathura_render_request_new(zathura->sync.render_thread, page);
g_signal_connect_object(priv->render_request, "completed", g_signal_connect_object(priv->render_request, "completed", G_CALLBACK(cb_update_surface), widget, 0);
G_CALLBACK(cb_update_surface), widget, 0); g_signal_connect_object(priv->render_request, "cache-added", G_CALLBACK(cb_cache_added), widget, 0);
g_signal_connect_object(priv->render_request, "cache-added", g_signal_connect_object(priv->render_request, "cache-invalidated", G_CALLBACK(cb_cache_invalidated), widget, 0);
G_CALLBACK(cb_cache_added), widget, 0);
g_signal_connect_object(priv->render_request, "cache-invalidated",
G_CALLBACK(cb_cache_invalidated), widget, 0);
return GTK_WIDGET(ret); return GTK_WIDGET(ret);
} }
static void static void zathura_page_widget_dispose(GObject* object) {
zathura_page_widget_dispose(GObject* object)
{
ZathuraPage* widget = ZATHURA_PAGE(object); ZathuraPage* widget = ZATHURA_PAGE(object);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
@ -298,9 +264,7 @@ zathura_page_widget_dispose(GObject* object)
G_OBJECT_CLASS(zathura_page_widget_parent_class)->dispose(object); G_OBJECT_CLASS(zathura_page_widget_parent_class)->dispose(object);
} }
static void static void zathura_page_widget_finalize(GObject* object) {
zathura_page_widget_finalize(GObject* object)
{
ZathuraPage* widget = ZATHURA_PAGE(object); ZathuraPage* widget = ZATHURA_PAGE(object);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
@ -323,9 +287,7 @@ zathura_page_widget_finalize(GObject* object)
G_OBJECT_CLASS(zathura_page_widget_parent_class)->finalize(object); G_OBJECT_CLASS(zathura_page_widget_parent_class)->finalize(object);
} }
static void static void set_font_from_property(cairo_t* cairo, zathura_t* zathura, cairo_font_weight_t weight) {
set_font_from_property(cairo_t* cairo, zathura_t* zathura, cairo_font_weight_t weight)
{
if (zathura == NULL) { if (zathura == NULL) {
return; return;
} }
@ -366,9 +328,10 @@ set_font_from_property(cairo_t* cairo, zathura_t* zathura, cairo_font_weight_t w
g_free(font); g_free(font);
} }
static cairo_text_extents_t static cairo_text_extents_t get_text_extents(const char* string, zathura_t* zathura, cairo_font_weight_t weight) {
get_text_extents(const char* string, zathura_t* zathura, cairo_font_weight_t weight) { cairo_text_extents_t text = {
cairo_text_extents_t text = {0,}; 0,
};
if (zathura == NULL) { if (zathura == NULL) {
return text; return text;
@ -514,9 +477,7 @@ static void zathura_page_widget_set_property(GObject* object, guint prop_id, con
} }
} }
static void static void zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec) {
zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
{
ZathuraPage* pageview = ZATHURA_PAGE(object); ZathuraPage* pageview = ZATHURA_PAGE(object);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(pageview); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(pageview);
@ -541,9 +502,7 @@ zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value,
} }
} }
static zathura_device_factors_t static zathura_device_factors_t get_safe_device_factors(cairo_surface_t* surface) {
get_safe_device_factors(cairo_surface_t* surface)
{
zathura_device_factors_t factors; zathura_device_factors_t factors;
cairo_surface_get_device_scale(surface, &factors.x, &factors.y); cairo_surface_get_device_scale(surface, &factors.x, &factors.y);
@ -815,9 +774,7 @@ static gboolean zathura_page_widget_draw(GtkWidget* widget, cairo_t* cairo) {
return FALSE; return FALSE;
} }
static void static void zathura_page_widget_redraw_canvas(ZathuraPage* pageview) {
zathura_page_widget_redraw_canvas(ZathuraPage* pageview)
{
GtkWidget* widget = GTK_WIDGET(pageview); GtkWidget* widget = GTK_WIDGET(pageview);
gtk_widget_queue_draw(widget); gtk_widget_queue_draw(widget);
} }
@ -827,9 +784,7 @@ zathura_page_widget_redraw_canvas(ZathuraPage* pageview)
/* small enough to make bilinear downscaling fast */ /* small enough to make bilinear downscaling fast */
#define THUMBNAIL_MAX_ZOOM 0.5 #define THUMBNAIL_MAX_ZOOM 0.5
static bool static bool surface_small_enough(cairo_surface_t* surface, size_t max_size, cairo_surface_t* old) {
surface_small_enough(cairo_surface_t* surface, size_t max_size, cairo_surface_t* old)
{
if (cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_IMAGE) { if (cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_IMAGE) {
return true; return true;
} }
@ -853,9 +808,7 @@ surface_small_enough(cairo_surface_t* surface, size_t max_size, cairo_surface_t*
return true; return true;
} }
static cairo_surface_t * static cairo_surface_t* draw_thumbnail_image(cairo_surface_t* surface, size_t max_size) {
draw_thumbnail_image(cairo_surface_t* surface, size_t max_size)
{
unsigned int width = cairo_image_surface_get_width(surface); unsigned int width = cairo_image_surface_get_width(surface);
unsigned int height = cairo_image_surface_get_height(surface); unsigned int height = cairo_image_surface_get_height(surface);
double scale = sqrt((double)max_size / (width * height)) * THUMBNAIL_INITIAL_ZOOM; double scale = sqrt((double)max_size / (width * height)) * THUMBNAIL_INITIAL_ZOOM;
@ -893,9 +846,7 @@ draw_thumbnail_image(cairo_surface_t* surface, size_t max_size)
return thumbnail; return thumbnail;
} }
void void zathura_page_widget_update_surface(ZathuraPage* widget, cairo_surface_t* surface, bool keep_thumbnail) {
zathura_page_widget_update_surface(ZathuraPage* widget, cairo_surface_t* surface, bool keep_thumbnail)
{
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
int thumbnail_size = 0; int thumbnail_size = 0;
girara_setting_get(priv->zathura->ui.session, "page-thumbnail-size", &thumbnail_size); girara_setting_get(priv->zathura->ui.session, "page-thumbnail-size", &thumbnail_size);
@ -931,18 +882,13 @@ zathura_page_widget_update_surface(ZathuraPage* widget, cairo_surface_t* surface
} }
} }
static void static void cb_update_surface(ZathuraRenderRequest* UNUSED(request), cairo_surface_t* surface, void* data) {
cb_update_surface(ZathuraRenderRequest* UNUSED(request),
cairo_surface_t* surface, void* data)
{
ZathuraPage* widget = data; ZathuraPage* widget = data;
g_return_if_fail(ZATHURA_IS_PAGE(widget)); g_return_if_fail(ZATHURA_IS_PAGE(widget));
zathura_page_widget_update_surface(widget, surface, false); zathura_page_widget_update_surface(widget, surface, false);
} }
static void static void cb_cache_added(ZathuraRenderRequest* UNUSED(request), void* data) {
cb_cache_added(ZathuraRenderRequest* UNUSED(request), void* data)
{
ZathuraPage* widget = data; ZathuraPage* widget = data;
g_return_if_fail(ZATHURA_IS_PAGE(widget)); g_return_if_fail(ZATHURA_IS_PAGE(widget));
@ -950,15 +896,12 @@ cb_cache_added(ZathuraRenderRequest* UNUSED(request), void* data)
priv->cached = true; priv->cached = true;
} }
static void static void cb_cache_invalidated(ZathuraRenderRequest* UNUSED(request), void* data) {
cb_cache_invalidated(ZathuraRenderRequest* UNUSED(request), void* data)
{
ZathuraPage* widget = data; ZathuraPage* widget = data;
g_return_if_fail(ZATHURA_IS_PAGE(widget)); g_return_if_fail(ZATHURA_IS_PAGE(widget));
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
if (zathura_page_widget_have_surface(widget) == true && if (zathura_page_widget_have_surface(widget) == true && priv->cached == true &&
priv->cached == true &&
zathura_page_get_visibility(priv->page) == false) { zathura_page_get_visibility(priv->page) == false) {
/* The page was in the cache but got removed and is invisible, so get rid of /* The page was in the cache but got removed and is invisible, so get rid of
* the surface. */ * the surface. */
@ -967,9 +910,7 @@ cb_cache_invalidated(ZathuraRenderRequest* UNUSED(request), void* data)
priv->cached = false; priv->cached = false;
} }
static void static void zathura_page_widget_size_allocate(GtkWidget* widget, GdkRectangle* allocation) {
zathura_page_widget_size_allocate(GtkWidget* widget, GdkRectangle* allocation)
{
GTK_WIDGET_CLASS(zathura_page_widget_parent_class)->size_allocate(widget, allocation); GTK_WIDGET_CLASS(zathura_page_widget_parent_class)->size_allocate(widget, allocation);
ZathuraPage* page = ZATHURA_PAGE(widget); ZathuraPage* page = ZATHURA_PAGE(widget);
@ -977,9 +918,7 @@ zathura_page_widget_size_allocate(GtkWidget* widget, GdkRectangle* allocation)
zathura_page_widget_update_surface(page, NULL, true); zathura_page_widget_update_surface(page, NULL, true);
} }
static void static void redraw_rect(ZathuraPage* widget, zathura_rectangle_t* rectangle) {
redraw_rect(ZathuraPage* widget, zathura_rectangle_t* rectangle)
{
/* cause the rect to be drawn */ /* cause the rect to be drawn */
GdkRectangle grect; GdkRectangle grect;
grect.x = rectangle->x1; grect.x = rectangle->x1;
@ -999,9 +938,7 @@ static void redraw_all_rects(ZathuraPage* widget, girara_list_t* rectangles) {
} }
} }
static void static void evaluate_link_at_mouse_position(ZathuraPage* page, int oldx, int oldy) {
evaluate_link_at_mouse_position(ZathuraPage* page, int oldx, int oldy)
{
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(page); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(page);
/* simple single click */ /* simple single click */
/* get links */ /* get links */
@ -1023,9 +960,7 @@ evaluate_link_at_mouse_position(ZathuraPage* page, int oldx, int oldy)
} }
} }
zathura_link_t* zathura_link_t* zathura_page_widget_link_get(ZathuraPage* widget, unsigned int index) {
zathura_page_widget_link_get(ZathuraPage* widget, unsigned int index)
{
g_return_val_if_fail(widget != NULL, NULL); g_return_val_if_fail(widget != NULL, NULL);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
g_return_val_if_fail(priv != NULL, NULL); g_return_val_if_fail(priv != NULL, NULL);
@ -1038,10 +973,7 @@ zathura_page_widget_link_get(ZathuraPage* widget, unsigned int index)
} }
} }
static void static void rotate_point(zathura_document_t* document, double orig_x, double orig_y, double* x, double* y) {
rotate_point(zathura_document_t* document, double orig_x, double orig_y,
double* x, double* y)
{
const unsigned int rotation = zathura_document_get_rotation(document); const unsigned int rotation = zathura_document_get_rotation(document);
if (rotation == 0) { if (rotation == 0) {
*x = orig_x; *x = orig_x;
@ -1070,9 +1002,7 @@ rotate_point(zathura_document_t* document, double orig_x, double orig_y,
} }
} }
static gboolean static gboolean cb_zathura_page_widget_button_press_event(GtkWidget* widget, GdkEventButton* button) {
cb_zathura_page_widget_button_press_event(GtkWidget* widget, GdkEventButton* button)
{
g_return_val_if_fail(widget != NULL, false); g_return_val_if_fail(widget != NULL, false);
g_return_val_if_fail(button != NULL, false); g_return_val_if_fail(button != NULL, false);
@ -1110,7 +1040,8 @@ cb_zathura_page_widget_button_press_event(GtkWidget* widget, GdkEventButton* but
} }
return true; return true;
} else if (gdk_event_triggers_context_menu((GdkEvent*) button) == TRUE && button->type == GDK_BUTTON_PRESS) { /* right click */ } else if (gdk_event_triggers_context_menu((GdkEvent*)button) == TRUE &&
button->type == GDK_BUTTON_PRESS) { /* right click */
zathura_page_widget_popup_menu(widget, button); zathura_page_widget_popup_menu(widget, button);
return true; return true;
} }
@ -1118,9 +1049,7 @@ cb_zathura_page_widget_button_press_event(GtkWidget* widget, GdkEventButton* but
return false; return false;
} }
static gboolean static gboolean cb_zathura_page_widget_button_release_event(GtkWidget* widget, GdkEventButton* button) {
cb_zathura_page_widget_button_release_event(GtkWidget* widget, GdkEventButton* button)
{
g_return_val_if_fail(widget != NULL, false); g_return_val_if_fail(widget != NULL, false);
g_return_val_if_fail(button != NULL, false); g_return_val_if_fail(button != NULL, false);
@ -1181,10 +1110,8 @@ cb_zathura_page_widget_button_release_event(GtkWidget* widget, GdkEventButton* b
return false; return false;
} }
static zathura_rectangle_t static zathura_rectangle_t next_selection_rectangle(double basepoint_x, double basepoint_y, double next_x,
next_selection_rectangle(double basepoint_x, double basepoint_y, double next_y) {
double next_x, double next_y)
{
zathura_rectangle_t rect; zathura_rectangle_t rect;
/* make sure that x2 > x1 && y2 > y1 holds */ /* make sure that x2 > x1 && y2 > y1 holds */
@ -1206,9 +1133,7 @@ next_selection_rectangle(double basepoint_x, double basepoint_y,
return rect; return rect;
} }
static gboolean static gboolean cb_zathura_page_widget_motion_notify(GtkWidget* widget, GdkEventMotion* event) {
cb_zathura_page_widget_motion_notify(GtkWidget* widget, GdkEventMotion* event)
{
g_return_val_if_fail(widget != NULL, false); g_return_val_if_fail(widget != NULL, false);
g_return_val_if_fail(event != NULL, false); g_return_val_if_fail(event != NULL, false);
@ -1222,9 +1147,7 @@ cb_zathura_page_widget_motion_notify(GtkWidget* widget, GdkEventMotion* event)
if (event->state & priv->zathura->global.highlighter_modmask) { if (event->state & priv->zathura->global.highlighter_modmask) {
double x, y; double x, y;
rotate_point(document, event->x, event->y, &x, &y); rotate_point(document, event->x, event->y, &x, &y);
priv->highlighter.bounds = next_selection_rectangle(priv->mouse.selection.x1, priv->highlighter.bounds = next_selection_rectangle(priv->mouse.selection.x1, priv->mouse.selection.y1, x, y);
priv->mouse.selection.y1,
x, y);
priv->highlighter.bounds.x1 /= scale; priv->highlighter.bounds.x1 /= scale;
priv->highlighter.bounds.y1 /= scale; priv->highlighter.bounds.y1 /= scale;
priv->highlighter.bounds.x2 /= scale; priv->highlighter.bounds.x2 /= scale;
@ -1234,8 +1157,7 @@ cb_zathura_page_widget_motion_notify(GtkWidget* widget, GdkEventMotion* event)
zathura_page_widget_redraw_canvas(page); zathura_page_widget_redraw_canvas(page);
} else { } else {
/* calculate next selection */ /* calculate next selection */
rotate_point(document, event->x, event->y, rotate_point(document, event->x, event->y, &priv->mouse.selection.x2, &priv->mouse.selection.y2);
&priv->mouse.selection.x2, &priv->mouse.selection.y2);
zathura_rectangle_t selection = priv->mouse.selection; zathura_rectangle_t selection = priv->mouse.selection;
selection.x1 /= scale; selection.x1 /= scale;
@ -1285,9 +1207,7 @@ cb_zathura_page_widget_motion_notify(GtkWidget* widget, GdkEventMotion* event)
return false; return false;
} }
static gboolean static gboolean cb_zathura_page_widget_leave_notify(GtkWidget* widget, GdkEventCrossing* UNUSED(event)) {
cb_zathura_page_widget_leave_notify(GtkWidget* widget, GdkEventCrossing* UNUSED(event))
{
g_return_val_if_fail(widget != NULL, false); g_return_val_if_fail(widget != NULL, false);
ZathuraPage* page = ZATHURA_PAGE(widget); ZathuraPage* page = ZATHURA_PAGE(widget);
@ -1303,9 +1223,7 @@ cb_zathura_page_widget_leave_notify(GtkWidget* widget, GdkEventCrossing* UNUSED(
return false; return false;
} }
static void static void zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event) {
zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
{
g_return_if_fail(widget != NULL); g_return_if_fail(widget != NULL);
if (event == NULL) { if (event == NULL) {
/* do something here in the future in case we have general popups */ /* do something here in the future in case we have general popups */
@ -1349,8 +1267,8 @@ zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
} menu_item_t; } menu_item_t;
const menu_item_t menu_items[] = { const menu_item_t menu_items[] = {
{ _("Copy image"), cb_menu_image_copy }, {_("Copy image"), cb_menu_image_copy},
{ _("Save image as"), cb_menu_image_save }, {_("Save image as"), cb_menu_image_save},
}; };
for (unsigned int i = 0; i < LENGTH(menu_items); i++) { for (unsigned int i = 0; i < LENGTH(menu_items); i++) {
@ -1362,20 +1280,16 @@ zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
/* attach and popup */ /* attach and popup */
gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL); gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL);
gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent*) event); gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent*)event);
} }
static gboolean static gboolean cb_zathura_page_widget_popup_menu(GtkWidget* widget) {
cb_zathura_page_widget_popup_menu(GtkWidget* widget)
{
zathura_page_widget_popup_menu(widget, NULL); zathura_page_widget_popup_menu(widget, NULL);
return TRUE; return TRUE;
} }
static void static void cb_menu_image_copy(GtkMenuItem* item, ZathuraPage* page) {
cb_menu_image_copy(GtkMenuItem* item, ZathuraPage* page)
{
g_return_if_fail(item != NULL); g_return_if_fail(item != NULL);
g_return_if_fail(page != NULL); g_return_if_fail(page != NULL);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(page); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(page);
@ -1398,9 +1312,7 @@ cb_menu_image_copy(GtkMenuItem* item, ZathuraPage* page)
priv->images.current = NULL; priv->images.current = NULL;
} }
static void static void cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page) {
cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page)
{
g_return_if_fail(item != NULL); g_return_if_fail(item != NULL);
g_return_if_fail(page != NULL); g_return_if_fail(page != NULL);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(page); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(page);
@ -1428,9 +1340,7 @@ cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page)
priv->images.current = NULL; priv->images.current = NULL;
} }
void void zathura_page_widget_update_view_time(ZathuraPage* widget) {
zathura_page_widget_update_view_time(ZathuraPage* widget)
{
g_return_if_fail(ZATHURA_IS_PAGE(widget)); g_return_if_fail(ZATHURA_IS_PAGE(widget));
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
@ -1439,17 +1349,13 @@ zathura_page_widget_update_view_time(ZathuraPage* widget)
} }
} }
bool bool zathura_page_widget_have_surface(ZathuraPage* widget) {
zathura_page_widget_have_surface(ZathuraPage* widget)
{
g_return_val_if_fail(ZATHURA_IS_PAGE(widget), false); g_return_val_if_fail(ZATHURA_IS_PAGE(widget), false);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
return priv->surface != NULL; return priv->surface != NULL;
} }
void void zathura_page_widget_abort_render_request(ZathuraPage* widget) {
zathura_page_widget_abort_render_request(ZathuraPage* widget)
{
g_return_if_fail(ZATHURA_IS_PAGE(widget)); g_return_if_fail(ZATHURA_IS_PAGE(widget));
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);
zathura_render_request_abort(priv->render_request); zathura_render_request_abort(priv->render_request);
@ -1458,14 +1364,12 @@ zathura_page_widget_abort_render_request(ZathuraPage* widget)
* surface. * surface.
* *
* TODO: Maybe this should be moved somewhere else. */ * TODO: Maybe this should be moved somewhere else. */
if (zathura_page_widget_have_surface(widget) == true && if (zathura_page_widget_have_surface(widget) == true && priv->cached == false) {
priv->cached == false) {
zathura_page_widget_update_surface(widget, NULL, false); zathura_page_widget_update_surface(widget, NULL, false);
} }
} }
zathura_page_t* zathura_page_t* zathura_page_widget_get_page(ZathuraPage* widget) {
zathura_page_widget_get_page(ZathuraPage* widget) {
g_return_val_if_fail(ZATHURA_IS_PAGE(widget), NULL); g_return_val_if_fail(ZATHURA_IS_PAGE(widget), NULL);
ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget); ZathuraPagePrivate* priv = zathura_page_widget_get_instance_private(widget);