commit c253a00
Michael Forney
·
2014-01-13 12:30:03 +0000 UTC
parent ca95e85
Rename draw_text_utf8 -> draw_text
+3,
-3
1@@ -94,7 +94,7 @@ void wld_copy_region(struct wld_drawable * src, struct wld_drawable * dst,
2 }
3
4 EXPORT
5-void wld_draw_text_utf8_n(struct wld_drawable * drawable,
6+void wld_draw_text_n(struct wld_drawable * drawable,
7 struct wld_font * font_base, uint32_t color,
8 int32_t x, int32_t y,
9 const char * text, int32_t length,
10@@ -102,8 +102,8 @@ void wld_draw_text_utf8_n(struct wld_drawable * drawable,
11 {
12 struct font * font = (void *) font_base;
13
14- drawable->impl->draw_text_utf8(drawable, font, color, x, y,
15- text, length, extents);
16+ drawable->impl->draw_text(drawable, font, color, x, y,
17+ text, length, extents);
18 }
19
20 EXPORT
M
font.c
+3,
-3
1@@ -209,9 +209,9 @@ bool wld_font_ensure_char(struct wld_font * font_base, uint32_t character)
2 }
3
4 EXPORT
5-void wld_font_text_extents_utf8_n(struct wld_font * font_base,
6- const char * text, int32_t length,
7- struct wld_extents * extents)
8+void wld_font_text_extents_n(struct wld_font * font_base,
9+ const char * text, int32_t length,
10+ struct wld_extents * extents)
11 {
12 struct font * font = (void *) font_base;
13 int ret;
M
intel.c
+4,
-5
1@@ -199,11 +199,10 @@ void drawable_copy_rectangle(struct wld_drawable * src_drawable,
2 dst->bo, dst->base.pitch, dst_x, dst_y, width, height);
3 }
4
5-void drawable_draw_text_utf8(struct wld_drawable * drawable,
6- struct font * font, uint32_t color,
7- int32_t x, int32_t y,
8- const char * text, int32_t length,
9- struct wld_extents * extents)
10+void drawable_draw_text(struct wld_drawable * drawable,
11+ struct font * font, uint32_t color,
12+ int32_t x, int32_t y, const char * text, int32_t length,
13+ struct wld_extents * extents)
14 {
15 struct intel_drawable * intel = (void *) drawable;
16 int ret;
+6,
-6
1@@ -37,11 +37,11 @@ static void drawable_copy_region(struct wld_drawable * src,
2 pixman_region32_t * region,
3 int32_t dst_x, int32_t dst_y);
4 #endif
5-static void drawable_draw_text_utf8(struct wld_drawable * drawable,
6- struct font * font, uint32_t color,
7- int32_t x, int32_t y,
8- const char * text, int32_t length,
9- struct wld_extents * extents);
10+static void drawable_draw_text(struct wld_drawable * drawable,
11+ struct font * font, uint32_t color,
12+ int32_t x, int32_t y,
13+ const char * text, int32_t length,
14+ struct wld_extents * extents);
15 static void drawable_write(struct wld_drawable * drawable,
16 const void * data, size_t size);
17 static pixman_image_t * drawable_map(struct wld_drawable * drawable);
18@@ -58,7 +58,7 @@ static const struct wld_drawable_impl drawable_impl = {
19 .fill_region = &default_fill_region,
20 .copy_region = &default_copy_region,
21 #endif
22- .draw_text_utf8 = &drawable_draw_text_utf8,
23+ .draw_text = &drawable_draw_text,
24 .write = &drawable_write,
25 .map = &drawable_map,
26 .flush = &drawable_flush,
+6,
-6
1@@ -37,11 +37,11 @@ static void drawable_copy_region(struct wld_drawable * src,
2 pixman_region32_t * region,
3 int32_t dst_x, int32_t dst_y);
4 #endif
5-static void drawable_draw_text_utf8(struct wld_drawable * drawable,
6- struct font * font, uint32_t color,
7- int32_t x, int32_t y,
8- const char * text, int32_t length,
9- struct wld_extents * extents);
10+static void drawable_draw_text(struct wld_drawable * drawable,
11+ struct font * font, uint32_t color,
12+ int32_t x, int32_t y,
13+ const char * text, int32_t length,
14+ struct wld_extents * extents);
15 static void drawable_write(struct wld_drawable * drawable,
16 const void * data, size_t size);
17 static pixman_image_t * drawable_map(struct wld_drawable * drawable);
18@@ -62,7 +62,7 @@ static const struct drm_drawable_impl drawable_impl = {
19 .fill_region = &default_fill_region,
20 .copy_region = &default_copy_region,
21 #endif
22- .draw_text_utf8 = &drawable_draw_text_utf8,
23+ .draw_text = &drawable_draw_text,
24 .write = &drawable_write,
25 .map = &drawable_map,
26 .flush = &drawable_flush,
M
pixman.c
+4,
-5
1@@ -232,11 +232,10 @@ static inline uint8_t reverse(uint8_t byte)
2 return byte;
3 }
4
5-void drawable_draw_text_utf8(struct wld_drawable * drawable,
6- struct font * font, uint32_t color,
7- int32_t x, int32_t y,
8- const char * text, int32_t length,
9- struct wld_extents * extents)
10+void drawable_draw_text(struct wld_drawable * drawable,
11+ struct font * font, uint32_t color,
12+ int32_t x, int32_t y, const char * text, int32_t length,
13+ struct wld_extents * extents)
14 {
15 struct pixman_drawable * pixman = (void *) drawable;
16 int ret;
+7,
-7
1@@ -346,11 +346,11 @@ void drawable_copy_region(struct wld_drawable * src_drawable,
2 fprintf(stderr, "wayland: Copy region is not implemented\n");
3 }
4
5-void drawable_draw_text_utf8(struct wld_drawable * drawable,
6- struct font * font, uint32_t color,
7- int32_t x, int32_t y,
8- const char * text, int32_t length,
9- struct wld_extents * extents)
10+void drawable_draw_text(struct wld_drawable * drawable,
11+ struct font * font, uint32_t color,
12+ int32_t x, int32_t y,
13+ const char * text, int32_t length,
14+ struct wld_extents * extents)
15 {
16 struct wld_extents extents0;
17 struct wayland_drawable * wayland = (void *) drawable;
18@@ -359,8 +359,8 @@ void drawable_draw_text_utf8(struct wld_drawable * drawable,
19 extents = &extents0;
20
21 begin(wayland);
22- wld_draw_text_utf8_n(BACKBUF(wayland).drawable, &font->base, color,
23- x, y, text, length, extents);
24+ wld_draw_text_n(BACKBUF(wayland).drawable, &font->base, color,
25+ x, y, text, length, extents);
26
27 if (wayland->damage_tracking)
28 {
+4,
-5
1@@ -110,11 +110,10 @@ struct wld_drawable_impl
2 void (* copy_region)(struct wld_drawable * src, struct wld_drawable * dst,
3 pixman_region32_t * region,
4 int32_t dst_x, int32_t dst_y);
5- void (* draw_text_utf8)(struct wld_drawable * drawable,
6- struct font * font, uint32_t color,
7- int32_t x, int32_t y,
8- const char * text, int32_t length,
9- struct wld_extents * extents);
10+ void (* draw_text)(struct wld_drawable * drawable,
11+ struct font * font, uint32_t color,
12+ int32_t x, int32_t y, const char * text, int32_t length,
13+ struct wld_extents * extents);
14 void (* write)(struct wld_drawable * drawable,
15 const void * data, size_t size);
16 pixman_image_t * (* map)(struct wld_drawable * drawable);
M
wld.h
+17,
-19
1@@ -131,15 +131,15 @@ bool wld_font_ensure_char(struct wld_font * font, uint32_t character);
2 *
3 * @param length The maximum number of bytes in the string to process
4 */
5-void wld_font_text_extents_utf8_n(struct wld_font * font,
6- const char * text, int32_t length,
7- struct wld_extents * extents);
8+void wld_font_text_extents_n(struct wld_font * font,
9+ const char * text, int32_t length,
10+ struct wld_extents * extents);
11
12-static inline void wld_font_text_extents_utf8(struct wld_font * font,
13- const char * text,
14- struct wld_extents * extents)
15+static inline void wld_font_text_extents(struct wld_font * font,
16+ const char * text,
17+ struct wld_extents * extents)
18 {
19- wld_font_text_extents_utf8_n(font, text, INT32_MAX, extents);
20+ wld_font_text_extents_n(font, text, INT32_MAX, extents);
21 }
22
23 /**** Drawables ****/
24@@ -179,19 +179,17 @@ void wld_copy_region(struct wld_drawable * src, struct wld_drawable * dst,
25 * @param extents If not NULL, will be initialized to the extents of the
26 * drawn text
27 */
28-void wld_draw_text_utf8_n(struct wld_drawable * drawable,
29- struct wld_font * font, uint32_t color,
30- int32_t x, int32_t y,
31- const char * text, int32_t length,
32- struct wld_extents * extents);
33-
34-static inline void wld_draw_text_utf8(struct wld_drawable * drawable,
35- struct wld_font * font, uint32_t color,
36- int32_t x, int32_t y,
37- const char * text,
38- struct wld_extents * extents)
39+void wld_draw_text_n(struct wld_drawable * drawable,
40+ struct wld_font * font, uint32_t color,
41+ int32_t x, int32_t y, const char * text, int32_t length,
42+ struct wld_extents * extents);
43+
44+static inline void wld_draw_text(struct wld_drawable * drawable,
45+ struct wld_font * font, uint32_t color,
46+ int32_t x, int32_t y, const char * text,
47+ struct wld_extents * extents)
48 {
49- wld_draw_text_utf8_n(drawable, font, color, x, y, text, INT32_MAX, extents);
50+ wld_draw_text_n(drawable, font, color, x, y, text, INT32_MAX, extents);
51 }
52
53 void wld_write(struct wld_drawable * drawable, const void * data, size_t size);