diff options
author | Tor Lillqvist <tml@iki.fi> | 2000-11-11 15:32:57 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2000-11-11 15:32:57 +0000 |
commit | 9b6b1cc06cd9fdb18be644248577eae22ef6ee5f (patch) | |
tree | 0b1f32ca805f005c336c910226f79dfef7115133 /pango | |
parent | 3d3be7b21de8ba776faffc560cab565a0d7d5022 (diff) | |
download | pango-9b6b1cc06cd9fdb18be644248577eae22ef6ee5f.tar.gz |
Add code to call SetTextAlign, but commented out.
2000-11-11 Tor Lillqvist <tml@iki.fi>
* pango/pangowin32.c (pango_win32_render): Add code to call
SetTextAlign, but commented out.
* pango/makefile.mingw.in (PANGO_OBJS): Add new objects.
* pango/pango.def: Add new functions.
Diffstat (limited to 'pango')
-rw-r--r-- | pango/makefile.mingw.in | 2 | ||||
-rw-r--r-- | pango/pango.def | 6 | ||||
-rw-r--r-- | pango/pangoft2-private.h | 2 | ||||
-rw-r--r-- | pango/pangowin32-private.h | 7 | ||||
-rw-r--r-- | pango/pangowin32.c | 13 |
5 files changed, 26 insertions, 4 deletions
diff --git a/pango/makefile.mingw.in b/pango/makefile.mingw.in index 1e1fb33a..aa9b3a2f 100644 --- a/pango/makefile.mingw.in +++ b/pango/makefile.mingw.in @@ -29,8 +29,10 @@ PANGO_OBJS = \ pango-context.o \ pango-coverage.o \ pango-fontmap.o \ + pango-intset.o \ pango-item.o \ pango-layout.o \ + pango-markup.o \ pango-tabs.o \ pango-utils.o \ reorder-items.o \ diff --git a/pango/pango.def b/pango/pango.def index 0037f85f..9f516d3b 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -78,6 +78,11 @@ EXPORTS pango_glyph_string_new pango_glyph_string_set_size pango_glyph_string_x_to_index + pango_int_set_add + pango_int_set_add_range + pango_int_set_contains + pango_int_set_destroy + pango_int_set_new pango_item_copy pango_item_free pango_item_new @@ -122,6 +127,7 @@ EXPORTS pango_layout_xy_to_index pango_map_get_engine pango_map_get_entry + pango_parse_markup pango_parse_style pango_parse_variant pango_parse_weight diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h index bb8c84eb..d138a89a 100644 --- a/pango/pangoft2-private.h +++ b/pango/pangoft2-private.h @@ -38,7 +38,7 @@ (g_print ("%s:%d ", __FILE__, __LINE__), \ g_print printlist) #endif -#else +#else /* !DEBUGGING */ #define PING(printlist) #endif diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h index 08ab4ac2..e5c62e7b 100644 --- a/pango/pangowin32-private.h +++ b/pango/pangowin32-private.h @@ -22,7 +22,9 @@ #ifndef __PANGOWIN32_PRIVATE_H__ #define __PANGOWIN32_PRIVATE_H__ -/* Just for debugging, will be removed */ +#define DEBUGGING 1 + +#if defined(DEBUGGING) && DEBUGGING #ifdef __GNUC__ #define PING(printlist) \ (g_print ("%s:%d ", __PRETTY_FUNCTION__, __LINE__), \ @@ -34,6 +36,9 @@ g_print printlist, \ g_print ("\n")) #endif +#else /* !DEBUGGING */ +#define PING(printlist) +#endif #include "pango-modules.h" #include "pangowin32.h" diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 985cd0f9..c1ae86bf 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -316,6 +316,7 @@ pango_win32_render (HDC hdc, HFONT old_hfont = NULL; HFONT orig_hfont = NULL; HFONT hfont; + UINT orig_align = -1; int i; int x_off = 0; @@ -344,7 +345,11 @@ pango_win32_render (HDC hdc, SelectObject (hdc, hfont); old_hfont = hfont; } - +#if 0 + if (orig_align == (UINT) -1) + orig_align = + SetTextAlign (hdc, TA_LEFT|TA_BOTTOM|TA_NOUPDATECP); +#endif TextOutW (hdc, x + (x_off + glyphs->glyphs[i].geometry.x_offset) / PANGO_SCALE, y + glyphs->glyphs[i].geometry.y_offset / PANGO_SCALE, @@ -356,6 +361,10 @@ pango_win32_render (HDC hdc, } if (orig_hfont != NULL) SelectObject (hdc, orig_hfont); +#if 0 + if (orig_align != (UINT) -1) + SetTextAlign (hdc, orig_align); +#endif } /* This table classifies Unicode characters according to the Microsoft @@ -364,7 +373,7 @@ pango_win32_render (HDC hdc, * but not quite, the same as the official Unicode block table in * Blocks.txt from ftp.unicode.org. The bit number field is the bitfield * number as in the FONTSIGNATURE struct's fsUsb field. - * There are some grave bugs in the table in the books. For instance + * There are some grave bugs in the table in the book. For instance * it claims there are Hangul at U+3400..U+4DFF while this range in * fact contains CJK Unified Ideographs Extension A. Also, the whole * block of Hangul Syllables U+AC00..U+D7A3 is missing from the book. |