mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-29 10:55:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Moritz Lipp 2012-03-27 11:19:45 +02:00
commit 2826595333
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
database-plain.c
View file

@ -21,11 +21,16 @@
#define KEY_SCALE "scale" #define KEY_SCALE "scale"
#define KEY_ROTATE "rotate" #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) \ #define file_lock_set(fd, cmd) \
{ \ { \
struct flock lock = { .l_type = cmd, .l_start = 0, .l_whence = SEEK_SET, .l_len = 0}; \ 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); static void zathura_database_interface_init(ZathuraDatabaseInterface* iface);
@ -441,7 +446,7 @@ zathura_db_read_key_file_from_file(const char* path)
} }
/* open file */ /* open file */
FILE* file = fopen(path, "r"); FILE* file = fopen(path, "rw");
if (file == NULL) { if (file == NULL) {
return NULL; return NULL;
} }

16
page-widget.c
View file

@ -377,11 +377,11 @@ zathura_page_widget_draw(GtkWidget* widget, cairo_t* cairo)
} }
/* draw selection */ /* draw selection */
if (priv->selection.y2 != -1 && priv->selection.x2 != -1) { if (priv->selection.y2 != -1 && priv->selection.x2 != -1) {
GdkColor color = priv->zathura->ui.colors.highlight_color; GdkColor color = priv->zathura->ui.colors.highlight_color;
cairo_set_source_rgba(cairo, color.red, color.green, color.blue, transparency); cairo_set_source_rgba(cairo, color.red, color.green, color.blue, transparency);
cairo_rectangle(cairo, priv->selection.x1, priv->selection.y1, cairo_rectangle(cairo, priv->selection.x1, priv->selection.y1,
(priv->selection.x2 - priv->selection.x1), (priv->selection.y2 - priv->selection.y1)); (priv->selection.x2 - priv->selection.x1), (priv->selection.y2 - priv->selection.y1));
cairo_fill(cairo); cairo_fill(cairo);
} }
} else { } else {
/* set background color */ /* set background color */
@ -649,9 +649,9 @@ zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
zathura_image_t* image = NULL; zathura_image_t* image = NULL;
GIRARA_LIST_FOREACH(priv->images, zathura_image_t*, iter, image_it) GIRARA_LIST_FOREACH(priv->images, zathura_image_t*, iter, image_it)
zathura_rectangle_t rect = recalc_rectangle(priv->page, image_it->position); 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) { if (rect.x1 <= event->x && rect.x2 >= event->x && rect.y1 <= event->y && rect.y2 >= event->y) {
image = image_it; image = image_it;
} }
GIRARA_LIST_FOREACH_END(priv->images, zathura_image_t*, iter, image_it); GIRARA_LIST_FOREACH_END(priv->images, zathura_image_t*, iter, image_it);
if (image == NULL) { if (image == NULL) {