Commit 28265953 authored by Moritz Lipp's avatar Moritz Lipp
Browse files

Merge branch 'develop' of pwmt.org:zathura into develop

parents fa40facc 87ef40e3
......@@ -21,11 +21,16 @@
#define KEY_SCALE "scale"
#define KEY_ROTATE "rotate"
#ifdef __GNU__
#include <sys/file.h>
#define file_lock_set(fd, cmd) flock(fd, cmd)
#else
#define file_lock_set(fd, cmd) \
{ \
struct flock lock = { .l_type = cmd, .l_start = 0, .l_whence = SEEK_SET, .l_len = 0}; \
fcntl(fd, F_SETLK, lock); \
fcntl(fd, F_SETLK, lock, NULL); \
}
#endif
static void zathura_database_interface_init(ZathuraDatabaseInterface* iface);
......@@ -441,7 +446,7 @@ zathura_db_read_key_file_from_file(const char* path)
}
/* open file */
FILE* file = fopen(path, "r");
FILE* file = fopen(path, "rw");
if (file == NULL) {
return NULL;
}
......
......@@ -377,11 +377,11 @@ zathura_page_widget_draw(GtkWidget* widget, cairo_t* cairo)
}
/* draw selection */
if (priv->selection.y2 != -1 && priv->selection.x2 != -1) {
GdkColor color = priv->zathura->ui.colors.highlight_color;
cairo_set_source_rgba(cairo, color.red, color.green, color.blue, transparency);
cairo_rectangle(cairo, priv->selection.x1, priv->selection.y1,
(priv->selection.x2 - priv->selection.x1), (priv->selection.y2 - priv->selection.y1));
cairo_fill(cairo);
GdkColor color = priv->zathura->ui.colors.highlight_color;
cairo_set_source_rgba(cairo, color.red, color.green, color.blue, transparency);
cairo_rectangle(cairo, priv->selection.x1, priv->selection.y1,
(priv->selection.x2 - priv->selection.x1), (priv->selection.y2 - priv->selection.y1));
cairo_fill(cairo);
}
} else {
/* set background color */
......@@ -649,9 +649,9 @@ zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
zathura_image_t* image = NULL;
GIRARA_LIST_FOREACH(priv->images, zathura_image_t*, iter, image_it)
zathura_rectangle_t rect = recalc_rectangle(priv->page, image_it->position);
if (rect.x1 <= event->x && rect.x2 >= event->x && rect.y1 <= event->y && rect.y2 >= event->y) {
image = image_it;
}
if (rect.x1 <= event->x && rect.x2 >= event->x && rect.y1 <= event->y && rect.y2 >= event->y) {
image = image_it;
}
GIRARA_LIST_FOREACH_END(priv->images, zathura_image_t*, iter, image_it);
if (image == NULL) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment