diff options
author | Fredy García | 2022-04-05 10:29:20 -0500 |
---|---|---|
committer | Fredy García | 2022-04-05 10:29:20 -0500 |
commit | bd805b2cd2712b28c096275f48844af0f789bb5d (patch) | |
tree | 800179eff14c3fa7d240717c175056b0d1e3f0cf /SDL_Pango-0.1.2-API-adds.patch | |
parent | 60c584a1dd4c94967e93df60a9ec4eb94b497da2 (diff) | |
download | aur-sdl_pango.tar.gz |
Changing end of lines of patches as previously they were.
Diffstat (limited to 'SDL_Pango-0.1.2-API-adds.patch')
-rw-r--r-- | SDL_Pango-0.1.2-API-adds.patch | 210 |
1 files changed, 105 insertions, 105 deletions
diff --git a/SDL_Pango-0.1.2-API-adds.patch b/SDL_Pango-0.1.2-API-adds.patch index e35f49bbc842..1535a5673246 100644 --- a/SDL_Pango-0.1.2-API-adds.patch +++ b/SDL_Pango-0.1.2-API-adds.patch @@ -1,116 +1,116 @@ --- src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100 +++ src/SDL_Pango.c 2006-09-24 22:46:24.000000000 +0200 @@ -723,13 +723,8 @@ - SDL_UnlockSurface(surface); - } - --/*! -- Create a context which contains Pango objects. -- -- @return A pointer to the context as a SDLPango_Context*. --*/ - SDLPango_Context* --SDLPango_CreateContext() -+SDLPango_CreateContext_GivenFontDesc(const char* font_desc) - { - SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context)); - G_CONST_RETURN char *charset; + SDL_UnlockSurface(surface);
+ }
+
+-/*!
+- Create a context which contains Pango objects.
+-
+- @return A pointer to the context as a SDLPango_Context*.
+-*/
+ SDLPango_Context*
+-SDLPango_CreateContext()
++SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
+ {
+ SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
+ G_CONST_RETURN char *charset;
@@ -743,8 +738,7 @@ - pango_context_set_language (context->context, pango_language_from_string (charset)); - pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR); - -- context->font_desc = pango_font_description_from_string( -- MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); -+ context->font_desc = pango_font_description_from_string(font_desc); - - context->layout = pango_layout_new (context->context); - + pango_context_set_language (context->context, pango_language_from_string (charset));
+ pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
+
+- context->font_desc = pango_font_description_from_string(
+- MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++ context->font_desc = pango_font_description_from_string(font_desc);
+
+ context->layout = pango_layout_new (context->context);
+
@@ -762,6 +756,17 @@ - } - - /*! -+ Create a context which contains Pango objects. -+ -+ @return A pointer to the context as a SDLPango_Context*. -+*/ -+SDLPango_Context* -+SDLPango_CreateContext() -+{ -+ SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE)); -+} -+ -+/*! - Free a context. - - @param *context [i/o] Context to be free + }
+
+ /*!
++ Create a context which contains Pango objects.
++
++ @return A pointer to the context as a SDLPango_Context*.
++*/
++SDLPango_Context*
++SDLPango_CreateContext()
++{
++ SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++}
++
++/*!
+ Free a context.
+
+ @param *context [i/o] Context to be free
@@ -1053,6 +1058,20 @@ - pango_layout_set_font_description (context->layout, context->font_desc); - } - -+void -+SDLPango_SetText_GivenAlignment( -+ SDLPango_Context *context, -+ const char *text, -+ int length, -+ SDLPango_Alignment alignment) -+{ -+ pango_layout_set_attributes(context->layout, NULL); -+ pango_layout_set_text (context->layout, text, length); -+ pango_layout_set_auto_dir (context->layout, TRUE); -+ pango_layout_set_alignment (context->layout, alignment); -+ pango_layout_set_font_description (context->layout, context->font_desc); -+} -+ - /*! - Set plain text to context. - Text must be utf-8. + pango_layout_set_font_description (context->layout, context->font_desc);
+ }
+
++void
++SDLPango_SetText_GivenAlignment(
++ SDLPango_Context *context,
++ const char *text,
++ int length,
++ SDLPango_Alignment alignment)
++{
++ pango_layout_set_attributes(context->layout, NULL);
++ pango_layout_set_text (context->layout, text, length);
++ pango_layout_set_auto_dir (context->layout, TRUE);
++ pango_layout_set_alignment (context->layout, alignment);
++ pango_layout_set_font_description (context->layout, context->font_desc);
++}
++
+ /*!
+ Set plain text to context.
+ Text must be utf-8.
@@ -1067,11 +1086,7 @@ - const char *text, - int length) - { -- pango_layout_set_attributes(context->layout, NULL); -- pango_layout_set_text (context->layout, text, length); -- pango_layout_set_auto_dir (context->layout, TRUE); -- pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT); -- pango_layout_set_font_description (context->layout, context->font_desc); -+ SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT); - } - - /*! + const char *text,
+ int length)
+ {
+- pango_layout_set_attributes(context->layout, NULL);
+- pango_layout_set_text (context->layout, text, length);
+- pango_layout_set_auto_dir (context->layout, TRUE);
+- pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
+- pango_layout_set_font_description (context->layout, context->font_desc);
++ SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
+ }
+
+ /*!
--- src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100 +++ src/SDL_Pango.h 2006-09-24 22:46:01.000000000 +0200 @@ -109,12 +109,20 @@ - SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */ - } SDLPango_Direction; - -- -+/*! -+ Specifies alignment of text. See Pango reference for detail -+*/ -+typedef enum { -+ SDLPANGO_ALIGN_LEFT, -+ SDLPANGO_ALIGN_CENTER, -+ SDLPANGO_ALIGN_RIGHT -+} SDLPango_Alignment; - - extern DECLSPEC int SDLCALL SDLPango_Init(); - - extern DECLSPEC int SDLCALL SDLPango_WasInit(); - -+extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc); - extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext(); - - extern DECLSPEC void SDLCALL SDLPango_FreeContext( + SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */
+ } SDLPango_Direction;
+
+-
++/*!
++ Specifies alignment of text. See Pango reference for detail
++*/
++typedef enum {
++ SDLPANGO_ALIGN_LEFT,
++ SDLPANGO_ALIGN_CENTER,
++ SDLPANGO_ALIGN_RIGHT
++} SDLPango_Alignment;
+
+ extern DECLSPEC int SDLCALL SDLPango_Init();
+
+ extern DECLSPEC int SDLCALL SDLPango_WasInit();
+
++extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
+ extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
+
+ extern DECLSPEC void SDLCALL SDLPango_FreeContext(
@@ -157,6 +165,12 @@ - const char *markup, - int length); - -+extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment( -+ SDLPango_Context *context, -+ const char *text, -+ int length, -+ SDLPango_Alignment alignment); -+ - extern DECLSPEC void SDLCALL SDLPango_SetText( - SDLPango_Context *context, - const char *markup, + const char *markup,
+ int length);
+
++extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
++ SDLPango_Context *context,
++ const char *text,
++ int length,
++ SDLPango_Alignment alignment);
++
+ extern DECLSPEC void SDLCALL SDLPango_SetText(
+ SDLPango_Context *context,
+ const char *markup,
|