Attachment 12399 Details for Bug 13138 – drop fcprivate & import misc macros.

[patch] drop fcprivate & import misc macros.

drop_fcprivate.patch (text/plain), 3.79 KB, created by Shunichi Fuji on 2007-11-08 02:15:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shunichi Fuji

Created: 2007-11-08 02:15:03 UTC

Size: 3.79 KB

patch

obsolete

>commit 5f5f26942058cf5e8db3295baba2f0deaa92ac3e
>Author: Shunichi Fuji <palglowr@gmail.com>
>Date:   Thu Nov 8 19:08:29 2007 +0900
>
>    just drop fcprivate.h
>
>diff --git a/src/xftint.h b/src/xftint.h
>index 8623f82..11b4c0d 100644
>--- a/src/xftint.h
>+++ b/src/xftint.h
>@@ -59,7 +59,6 @@
> #include <X11/Xlibint.h>
> #define _XFT_NO_COMPAT_
> #include "Xft.h"
>-#include <fontconfig/fcprivate.h>
> #include <fontconfig/fcfreetype.h>
> 
> /* Added to <X11/Xfuncproto.h> in X11R6.9 and later */
>
>commit 0beb7f014c5f2556d8c11ea6fbbecf7688212166
>Author: Shunichi Fuji <palglowr@gmail.com>
>Date:   Thu Nov 8 19:07:54 2007 +0900
>
>    import macros from old fontconfig.
>    
>    because fontconfig drops fcprivate.h now.
>
>diff --git a/src/xftint.h b/src/xftint.h
>index 8668ec4..8623f82 100644
>--- a/src/xftint.h
>+++ b/src/xftint.h
>@@ -463,5 +463,99 @@ XftSwapCARD16 (CARD16 *data, int n);
> void
> XftSwapImage (XImage *image);
> 
>+/*
>+ * I tried this with functions that took va_list* arguments
>+ * but portability concerns made me change these functions
>+ * into macros (sigh).
>+ */
>+
>+#define FcPatternVapBuild(result, orig, va)			    \
>+{								    \
>+    FcPattern	*__p__ = (orig);				    \
>+    const char	*__o__;						    \
>+    FcValue	__v__;						    \
>+								    \
>+    if (!__p__)							    \
>+    {								    \
>+	__p__ = FcPatternCreate ();				    \
>+	if (!__p__)		    				    \
>+	    goto _FcPatternVapBuild_bail0;			    \
>+    }				    				    \
>+    for (;;)			    				    \
>+    {				    				    \
>+	__o__ = va_arg (va, const char *);			    \
>+	if (!__o__)		    				    \
>+	    break;		    				    \
>+	__v__.type = va_arg (va, FcType);			    \
>+	switch (__v__.type) {	    				    \
>+	case FcTypeVoid:					    \
>+	    goto _FcPatternVapBuild_bail1;       		    \
>+	case FcTypeInteger:	    				    \
>+	    __v__.u.i = va_arg (va, int);			    \
>+	    break;						    \
>+	case FcTypeDouble:					    \
>+	    __v__.u.d = va_arg (va, double);			    \
>+	    break;						    \
>+	case FcTypeString:					    \
>+	    __v__.u.s = va_arg (va, const FcChar8 *);		    \
>+	    break;						    \
>+	case FcTypeBool:					    \
>+	    __v__.u.b = va_arg (va, FcBool);			    \
>+	    break;						    \
>+	case FcTypeMatrix:					    \
>+	    __v__.u.m = va_arg (va, const FcMatrix *);		    \
>+	    break;						    \
>+	case FcTypeCharSet:					    \
>+	    __v__.u.c = va_arg (va, const FcCharSet *); 	    \
>+	    break;						    \
>+	case FcTypeFTFace:					    \
>+	    __v__.u.f = va_arg (va, FT_Face);			    \
>+	    break;						    \
>+	case FcTypeLangSet:					    \
>+	    __v__.u.l = va_arg (va, const FcLangSet *);		    \
>+	    break;						    \
>+	}							    \
>+	if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))	    \
>+	    goto _FcPatternVapBuild_bail1;			    \
>+    }								    \
>+    result = __p__;						    \
>+    goto _FcPatternVapBuild_return;				    \
>+								    \
>+_FcPatternVapBuild_bail1:					    \
>+    if (!orig)							    \
>+	FcPatternDestroy (__p__);				    \
>+_FcPatternVapBuild_bail0:					    \
>+    result = (void*)0;						    \
>+								    \
>+_FcPatternVapBuild_return:					    \
>+    ;								    \
>+}
>+
>+
>+#define FcObjectSetVapBuild(__ret__, __first__, __va__) 		\
>+{									\
>+    FcObjectSet    *__os__;						\
>+    const char	    *__ob__;						\
>+									\
>+    __ret__ = 0;						    	\
>+    __os__ = FcObjectSetCreate ();					\
>+    if (!__os__)							\
>+	goto _FcObjectSetVapBuild_bail0;				\
>+    __ob__ = __first__;							\
>+    while (__ob__)							\
>+    {									\
>+	if (!FcObjectSetAdd (__os__, __ob__))				\
>+	    goto _FcObjectSetVapBuild_bail1;				\
>+	__ob__ = va_arg (__va__, const char *);				\
>+    }									\
>+    __ret__ = __os__;							\
>+									\
>+_FcObjectSetVapBuild_bail1:						\
>+    if (!__ret__ && __os__)					    	\
>+	FcObjectSetDestroy (__os__);					\
>+_FcObjectSetVapBuild_bail0:						\
>+    ;									\
>+}
>+
> /* xftxlfd.c */
> #endif /* _XFT_INT_H_ */

Actions: View | Splinter Review

Attachments on bug 13138: 12399

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.