]> gitweb.factorcode.org Git - factor.git/blobdiff - basis/windows/directx/dwrite/dwrite.factor
Change C-ENUM: to always take a type. Use f for anonymous enums. Update all uses.
[factor.git] / basis / windows / directx / dwrite / dwrite.factor
index 3e4167ebad2001dfa1e3886a94da4af72b31340f..3d635a0dc481a5251e616b7949a920b5223ec1ac 100644 (file)
@@ -5,7 +5,7 @@ IN: windows.directx.dwrite
 
 LIBRARY: dwrite
 
-C-ENUM:
+C-ENUM: DWRITE_FONT_FILE_TYPE
     DWRITE_FONT_FILE_TYPE_UNKNOWN
     DWRITE_FONT_FILE_TYPE_CFF
     DWRITE_FONT_FILE_TYPE_TRUETYPE
@@ -14,9 +14,8 @@ C-ENUM:
     DWRITE_FONT_FILE_TYPE_TYPE1_PFB
     DWRITE_FONT_FILE_TYPE_VECTOR
     DWRITE_FONT_FILE_TYPE_BITMAP ;
-TYPEDEF: int DWRITE_FONT_FILE_TYPE
 
-C-ENUM:
+C-ENUM: DWRITE_FONT_FACE_TYPE
     DWRITE_FONT_FACE_TYPE_CFF
     DWRITE_FONT_FACE_TYPE_TRUETYPE
     DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION
@@ -24,51 +23,49 @@ C-ENUM:
     DWRITE_FONT_FACE_TYPE_VECTOR
     DWRITE_FONT_FACE_TYPE_BITMAP
     DWRITE_FONT_FACE_TYPE_UNKNOWN ;
-TYPEDEF: int DWRITE_FONT_FACE_TYPE
-
-CONSTANT: DWRITE_FONT_SIMULATIONS_NONE    0
-CONSTANT: DWRITE_FONT_SIMULATIONS_BOLD    1
-CONSTANT: DWRITE_FONT_SIMULATIONS_OBLIQUE 2
-TYPEDEF: int DWRITE_FONT_SIMULATIONS
-
-CONSTANT: DWRITE_FONT_WEIGHT_THIN        100
-CONSTANT: DWRITE_FONT_WEIGHT_EXTRA_LIGHT 200
-CONSTANT: DWRITE_FONT_WEIGHT_ULTRA_LIGHT 200
-CONSTANT: DWRITE_FONT_WEIGHT_LIGHT       300
-CONSTANT: DWRITE_FONT_WEIGHT_NORMAL      400
-CONSTANT: DWRITE_FONT_WEIGHT_REGULAR     400
-CONSTANT: DWRITE_FONT_WEIGHT_MEDIUM      500
-CONSTANT: DWRITE_FONT_WEIGHT_DEMI_BOLD   600
-CONSTANT: DWRITE_FONT_WEIGHT_SEMI_BOLD   600
-CONSTANT: DWRITE_FONT_WEIGHT_BOLD        700
-CONSTANT: DWRITE_FONT_WEIGHT_EXTRA_BOLD  800
-CONSTANT: DWRITE_FONT_WEIGHT_ULTRA_BOLD  800
-CONSTANT: DWRITE_FONT_WEIGHT_BLACK       900
-CONSTANT: DWRITE_FONT_WEIGHT_HEAVY       900
-CONSTANT: DWRITE_FONT_WEIGHT_EXTRA_BLACK 950
-CONSTANT: DWRITE_FONT_WEIGHT_ULTRA_BLACK 950
-TYPEDEF: int DWRITE_FONT_WEIGHT
-
-CONSTANT: DWRITE_FONT_STRETCH_UNDEFINED       0
-CONSTANT: DWRITE_FONT_STRETCH_ULTRA_CONDENSED 1
-CONSTANT: DWRITE_FONT_STRETCH_EXTRA_CONDENSED 2
-CONSTANT: DWRITE_FONT_STRETCH_CONDENSED       3
-CONSTANT: DWRITE_FONT_STRETCH_SEMI_CONDENSED  4
-CONSTANT: DWRITE_FONT_STRETCH_NORMAL          5
-CONSTANT: DWRITE_FONT_STRETCH_MEDIUM          5
-CONSTANT: DWRITE_FONT_STRETCH_SEMI_EXPANDED   6
-CONSTANT: DWRITE_FONT_STRETCH_EXPANDED        7
-CONSTANT: DWRITE_FONT_STRETCH_EXTRA_EXPANDED  8
-CONSTANT: DWRITE_FONT_STRETCH_ULTRA_EXPANDED  9
-TYPEDEF: int DWRITE_FONT_STRETCH
-
-C-ENUM:
+
+C-ENUM: DWRITE_FONT_SIMULATIONS
+    DWRITE_FONT_SIMULATIONS_NONE
+    DWRITE_FONT_SIMULATIONS_BOLD
+    DWRITE_FONT_SIMULATIONS_OBLIQUE ;
+
+C-ENUM: DWRITE_FONT_WEIGHT
+    { DWRITE_FONT_WEIGHT_THIN        100 }
+    { DWRITE_FONT_WEIGHT_EXTRA_LIGHT 200 }
+    { DWRITE_FONT_WEIGHT_ULTRA_LIGHT 200 }
+    { DWRITE_FONT_WEIGHT_LIGHT       300 }
+    { DWRITE_FONT_WEIGHT_NORMAL      400 }
+    { DWRITE_FONT_WEIGHT_REGULAR     400 }
+    { DWRITE_FONT_WEIGHT_MEDIUM      500 }
+    { DWRITE_FONT_WEIGHT_DEMI_BOLD   600 }
+    { DWRITE_FONT_WEIGHT_SEMI_BOLD   600 }
+    { DWRITE_FONT_WEIGHT_BOLD        700 }
+    { DWRITE_FONT_WEIGHT_EXTRA_BOLD  800 }
+    { DWRITE_FONT_WEIGHT_ULTRA_BOLD  800 }
+    { DWRITE_FONT_WEIGHT_BLACK       900 }
+    { DWRITE_FONT_WEIGHT_HEAVY       900 }
+    { DWRITE_FONT_WEIGHT_EXTRA_BLACK 950 }
+    { DWRITE_FONT_WEIGHT_ULTRA_BLACK 950 } ;
+
+C-ENUM: DWRITE_FONT_STRETCH
+    { DWRITE_FONT_STRETCH_UNDEFINED       0 }
+    { DWRITE_FONT_STRETCH_ULTRA_CONDENSED 1 }
+    { DWRITE_FONT_STRETCH_EXTRA_CONDENSED 2 }
+    { DWRITE_FONT_STRETCH_CONDENSED       3 }
+    { DWRITE_FONT_STRETCH_SEMI_CONDENSED  4 }
+    { DWRITE_FONT_STRETCH_NORMAL          5 }
+    { DWRITE_FONT_STRETCH_MEDIUM          5 }
+    { DWRITE_FONT_STRETCH_SEMI_EXPANDED   6 }
+    { DWRITE_FONT_STRETCH_EXPANDED        7 }
+    { DWRITE_FONT_STRETCH_EXTRA_EXPANDED  8 }
+    { DWRITE_FONT_STRETCH_ULTRA_EXPANDED  9 } ;
+
+C-ENUM: DWRITE_FONT_STYLE
     DWRITE_FONT_STYLE_NORMAL
     DWRITE_FONT_STYLE_OBLIQUE
     DWRITE_FONT_STYLE_ITALIC ;
-TYPEDEF: int DWRITE_FONT_STYLE
 
-C-ENUM:
+C-ENUM: DWRITE_INFORMATIONAL_STRING_ID
     DWRITE_INFORMATIONAL_STRING_NONE
     DWRITE_INFORMATIONAL_STRING_COPYRIGHT_NOTICE
     DWRITE_INFORMATIONAL_STRING_VERSION_STRINGS
@@ -85,7 +82,6 @@ C-ENUM:
     DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES
     DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES
     DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT ;
-TYPEDEF: int DWRITE_INFORMATIONAL_STRING_ID
 
 STRUCT: DWRITE_FONT_METRICS
     { designUnitsPerEm       USHORT }
@@ -112,10 +108,9 @@ STRUCT: DWRITE_GLYPH_OFFSET
     { advanceOffset  FLOAT }
     { ascenderOffset FLOAT } ;
 
-C-ENUM:
+C-ENUM: DWRITE_FACTORY_TYPE
     DWRITE_FACTORY_TYPE_SHARED
     DWRITE_FACTORY_TYPE_ISOLATED ;
-TYPEDEF: int DWRITE_FACTORY_TYPE
 
 C-TYPE: IDWriteFontFileStream
 
@@ -138,14 +133,12 @@ COM-INTERFACE: IDWriteFontFile IUnknown {739d886a-cef5-47dc-8769-1a8b41bebbb0}
     HRESULT GetLoader ( IDWriteFontFileLoader** fontFileLoader )
     HRESULT Analyze ( BOOL* isSupportedFontType, DWRITE_FONT_FILE_TYPE* fontFileType, DWRITE_FONT_FACE_TYPE* fontFaceType, UINT32* numberOfFaces ) ;
 
-TYPEDEF: int DWRITE_PIXEL_GEOMETRY
-C-ENUM:
+C-ENUM: DWRITE_PIXEL_GEOMETRY
     DWRITE_PIXEL_GEOMETRY_FLAT
     DWRITE_PIXEL_GEOMETRY_RGB
     DWRITE_PIXEL_GEOMETRY_BGR ;
 
-TYPEDEF: int DWRITE_RENDERING_MODE
-C-ENUM:
+C-ENUM: DWRITE_RENDERING_MODE
     DWRITE_RENDERING_MODE_DEFAULT
     DWRITE_RENDERING_MODE_ALIASED
     DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC
@@ -240,39 +233,32 @@ COM-INTERFACE: IDWriteFont IUnknown {acd16696-8c14-4f5d-877e-fe3fc1d32737}
     HRESULT HasCharacter ( UINT32 unicodeValue, BOOL* exists )
     HRESULT CreateFontFace ( IDWriteFontFace** fontFace ) ;
 
-TYPEDEF: int DWRITE_READING_DIRECTION
-C-ENUM:
+C-ENUM: DWRITE_READING_DRECTION
     DWRITE_READING_DIRECTION_LEFT_TO_RIGHT
     DWRITE_READING_DIRECTION_RIGHT_TO_LEFT ;
 
-TYPEDEF: int DWRITE_FLOW_DIRECTION
-C-ENUM:
+C-ENUM: DWRITE_FLOW_DIRECTION
     DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM ;
 
-TYPEDEF: int DWRITE_TEXT_ALIGNMENT
-C-ENUM:
+C-ENUM: DWRITE_TEXT_ALIGNMENT
     DWRITE_TEXT_ALIGNMENT_LEADING
     DWRITE_TEXT_ALIGNMENT_TRAILING
     DWRITE_TEXT_ALIGNMENT_CENTER ;
 
-TYPEDEF: int DWRITE_PARAGRAPH_ALIGNMENT
-C-ENUM:
+C-ENUM: DWRITE_PARAGRAPH_ALIGNMENT
     DWRITE_PARAGRAPH_ALIGNMENT_NEAR
     DWRITE_PARAGRAPH_ALIGNMENT_FAR
     DWRITE_PARAGRAPH_ALIGNMENT_CENTER ;
 
-TYPEDEF: int DWRITE_WORD_WRAPPING
-C-ENUM:
+C-ENUM: DWRITE_WORD_WRAPPING
     DWRITE_WORD_WRAPPING_WRAP
     DWRITE_WORD_WRAPPING_NO_WRAP ;
 
-TYPEDEF: int DWRITE_LINE_SPACING_METHOD
-C-ENUM:
+C-ENUM: DWRITE_LINE_SPACING_METHOD
     DWRITE_LINE_SPACING_METHOD_DEFAULT
     DWRITE_LINE_SPACING_METHOD_UNIFORM ;
 
-TYPEDEF: int DWRITE_TRIMMING_GRANULARITY
-C-ENUM:
+C-ENUM: DWRITE_TRIMMING_GRANULARITY
     DWRITE_TRIMMING_GRANULARITY_NONE
     DWRITE_TRIMMING_GRANULARITY_CHARACTER
     DWRITE_TRIMMING_GRANULARITY_WORD ;
@@ -410,31 +396,29 @@ COM-INTERFACE: IDWriteTypography IUnknown {55f1112b-1dc2-4b3c-9541-f46894ed85b6}
     UINT32 GetFontFeatureCount ( )
     HRESULT GetFontFeature ( UINT32 fontFeatureIndex, DWRITE_FONT_FEATURE* fontFeature ) ;
 
-CONSTANT: DWRITE_SCRIPT_SHAPES_DEFAULT   0
-CONSTANT: DWRITE_SCRIPT_SHAPES_NO_VISUAL 1
-TYPEDEF: int DWRITE_SCRIPT_SHAPES
+C-ENUM: DWRITE_SCRIPT_SHAPES
+    DWRITE_SCRIPT_SHAPES_DEFAULT
+    DWRITE_SCRIPT_SHAPES_NO_VISUAL ;
 
 STRUCT: DWRITE_SCRIPT_ANALYSIS
     { script USHORT               }
     { shapes DWRITE_SCRIPT_SHAPES } ;
 
-C-ENUM:
+C-ENUM: DWRITE_BREAK_CONDITION
     DWRITE_BREAK_CONDITION_NEUTRAL
     DWRITE_BREAK_CONDITION_CAN_BREAK
     DWRITE_BREAK_CONDITION_MAY_NOT_BREAK
     DWRITE_BREAK_CONDITION_MUST_BREAK ;
-TYPEDEF: int DWRITE_BREAK_CONDITION
 
 STRUCT: DWRITE_LINE_BREAKPOINT
     { data BYTE } ;
 
-C-ENUM:
+C-ENUM: DWRITE_NUMBER_SUBSTITUTION_METHOD
     DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE
     DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL
     DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE
     DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL
     DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL ;
-TYPEDEF: int DWRITE_NUMBER_SUBSTITUTION_METHOD
 
 COM-INTERFACE: IDWriteNumberSubstitution IUnknown {14885CC9-BAB0-4f90-B6ED-5C366A2CD03D} ;
 
@@ -628,9 +612,9 @@ COM-INTERFACE: IDWriteGdiInterop IUnknown {1edd9491-9853-4299-898f-6432983b6f3a}
     HRESULT CreateFontFaceFromHdc ( HDC hdc, IDWriteFontFace** fontFace )
     HRESULT CreateBitmapRenderTarget ( HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget** renderTarget ) ;
 
-C-ENUM: DWRITE_TEXTURE_ALIASED_1x1
-        DWRITE_TEXTURE_CLEARTYPE_3x1 ;
-TYPEDEF: int DWRITE_TEXTURE_TYPE
+C-ENUM: DWRITE_TEXTURE_TYPE
+    DWRITE_TEXTURE_ALIASED_1x1
+    DWRITE_TEXTURE_CLEARTYPE_3x1 ;
 
 CONSTANT: DWRITE_ALPHA_MAX 255