1 --- src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100
2 +++ src/SDL_Pango.c 2006-09-24 22:46:24.000000000 +0200
4 SDL_UnlockSurface(surface);
\r
8 - Create a context which contains Pango objects.
\r
10 - @return A pointer to the context as a SDLPango_Context*.
\r
13 -SDLPango_CreateContext()
\r
14 +SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
\r
16 SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
\r
17 G_CONST_RETURN char *charset;
\r
19 pango_context_set_language (context->context, pango_language_from_string (charset));
\r
20 pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
\r
22 - context->font_desc = pango_font_description_from_string(
\r
23 - MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
\r
24 + context->font_desc = pango_font_description_from_string(font_desc);
\r
26 context->layout = pango_layout_new (context->context);
\r
32 + Create a context which contains Pango objects.
\r
34 + @return A pointer to the context as a SDLPango_Context*.
\r
37 +SDLPango_CreateContext()
\r
39 + SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
\r
45 @param *context [i/o] Context to be free
\r
46 @@ -1053,6 +1058,20 @@
47 pango_layout_set_font_description (context->layout, context->font_desc);
\r
51 +SDLPango_SetText_GivenAlignment(
\r
52 + SDLPango_Context *context,
\r
55 + SDLPango_Alignment alignment)
\r
57 + pango_layout_set_attributes(context->layout, NULL);
\r
58 + pango_layout_set_text (context->layout, text, length);
\r
59 + pango_layout_set_auto_dir (context->layout, TRUE);
\r
60 + pango_layout_set_alignment (context->layout, alignment);
\r
61 + pango_layout_set_font_description (context->layout, context->font_desc);
\r
65 Set plain text to context.
\r
67 @@ -1067,11 +1086,7 @@
71 - pango_layout_set_attributes(context->layout, NULL);
\r
72 - pango_layout_set_text (context->layout, text, length);
\r
73 - pango_layout_set_auto_dir (context->layout, TRUE);
\r
74 - pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
\r
75 - pango_layout_set_font_description (context->layout, context->font_desc);
\r
76 + SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
\r
80 --- src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100
81 +++ src/SDL_Pango.h 2006-09-24 22:46:01.000000000 +0200
83 SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */
\r
84 } SDLPango_Direction;
\r
88 + Specifies alignment of text. See Pango reference for detail
\r
91 + SDLPANGO_ALIGN_LEFT,
\r
92 + SDLPANGO_ALIGN_CENTER,
\r
93 + SDLPANGO_ALIGN_RIGHT
\r
94 +} SDLPango_Alignment;
\r
96 extern DECLSPEC int SDLCALL SDLPango_Init();
\r
98 extern DECLSPEC int SDLCALL SDLPango_WasInit();
\r
100 +extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
\r
101 extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
\r
103 extern DECLSPEC void SDLCALL SDLPango_FreeContext(
\r
105 const char *markup,
\r
108 +extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
\r
109 + SDLPango_Context *context,
\r
110 + const char *text,
\r
112 + SDLPango_Alignment alignment);
\r
114 extern DECLSPEC void SDLCALL SDLPango_SetText(
\r
115 SDLPango_Context *context,
\r
116 const char *markup,
\r