Line 0
Link Here
|
|
|
1 |
X-Git-Url: https://git.pwmt.org/?p=zathura.git;a=blobdiff_plain;f=zathura%2Fpage-widget.c;h=ad27c273f1ba04b66dd8a84337febec3729a68af;hp=309f63321cdbc27694fcba964faa3c4ecc48295f;hb=8d71a755d648c5856ef91d214bfdb46925f6c2f0;hpb=10f3da57c65a8ed7d4d3beff3e49da2bcddcf7a7 |
2 |
|
3 |
diff --git zathura/page-widget.c zathura/page-widget.c.orig |
4 |
index 309f633..ad27c27 100644 |
5 |
--- zathura/page-widget.c |
6 |
+++ zathura/page-widget.c.orig |
7 |
@@ -28,8 +28,8 @@ typedef struct zathura_page_widget_private_s { |
8 |
|
9 |
struct { |
10 |
girara_list_t* list; /**< List of links on the page */ |
11 |
- bool retrieved; /**< True if we already tried to retrieve the list of links */ |
12 |
- bool draw; /**< True if links should be drawn */ |
13 |
+ gboolean retrieved; /**< True if we already tried to retrieve the list of links */ |
14 |
+ gboolean draw; /**< True if links should be drawn */ |
15 |
unsigned int offset; /**< Offset to the links */ |
16 |
unsigned int n; /**< Number */ |
17 |
} links; |
18 |
@@ -37,12 +37,12 @@ typedef struct zathura_page_widget_private_s { |
19 |
struct { |
20 |
girara_list_t* list; /**< A list if there are search results that should be drawn */ |
21 |
int current; /**< The index of the current search result */ |
22 |
- bool draw; /**< Draw search results */ |
23 |
+ gboolean draw; /**< Draw search results */ |
24 |
} search; |
25 |
|
26 |
struct { |
27 |
girara_list_t* list; /**< List of images on the page */ |
28 |
- bool retrieved; /**< True if we already tried to retrieve the list of images */ |
29 |
+ gboolean retrieved; /**< True if we already tried to retrieve the list of images */ |
30 |
zathura_image_t* current; /**< Image data of selected image */ |
31 |
} images; |
32 |
|
33 |
@@ -52,7 +52,7 @@ typedef struct zathura_page_widget_private_s { |
34 |
int x; /**< X coordinate */ |
35 |
int y; /**< Y coordinate */ |
36 |
} selection_basepoint; |
37 |
- bool over_link; |
38 |
+ gboolean over_link; |
39 |
} mouse; |
40 |
} zathura_page_widget_private_t; |
41 |
|
42 |
@@ -313,13 +313,13 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v |
43 |
case PROP_DRAW_LINKS: |
44 |
priv->links.draw = g_value_get_boolean(value); |
45 |
/* get links */ |
46 |
- if (priv->links.draw == true && priv->links.retrieved == false) { |
47 |
+ if (priv->links.draw == TRUE && priv->links.retrieved == FALSE) { |
48 |
priv->links.list = zathura_page_links_get(priv->page, NULL); |
49 |
- priv->links.retrieved = true; |
50 |
+ priv->links.retrieved = TRUE; |
51 |
priv->links.n = (priv->links.list == NULL) ? 0 : girara_list_size(priv->links.list); |
52 |
} |
53 |
|
54 |
- if (priv->links.retrieved == true && priv->links.list != NULL) { |
55 |
+ if (priv->links.retrieved == TRUE && priv->links.list != NULL) { |
56 |
GIRARA_LIST_FOREACH(priv->links.list, zathura_link_t*, iter, link) |
57 |
if (link != NULL) { |
58 |
zathura_rectangle_t rectangle = recalc_rectangle(priv->page, zathura_link_get_position(link)); |
59 |
@@ -338,7 +338,7 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v |
60 |
} |
61 |
priv->search.list = g_value_get_pointer(value); |
62 |
if (priv->search.list != NULL && priv->search.draw) { |
63 |
- priv->links.draw = false; |
64 |
+ priv->links.draw = FALSE; |
65 |
redraw_all_rects(pageview, priv->search.list); |
66 |
} |
67 |
priv->search.current = -1; |
68 |
@@ -355,7 +355,7 @@ zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* v |
69 |
priv->search.current = girara_list_size(priv->search.list); |
70 |
} else { |
71 |
priv->search.current = val; |
72 |
- if (priv->search.draw == true && val >= 0 && val < (signed) girara_list_size(priv->search.list)) { |
73 |
+ if (priv->search.draw == TRUE && val >= 0 && val < (signed) girara_list_size(priv->search.list)) { |
74 |
zathura_rectangle_t* rect = girara_list_nth(priv->search.list, priv->search.current); |
75 |
zathura_rectangle_t rectangle = recalc_rectangle(priv->page, *rect); |
76 |
redraw_rect(pageview, &rectangle); |