Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-25 19:13:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tune the TextRunsInfo and LayoutInfo related APIs

Browse Source
This commit is contained in:
Vincent Wei
2019-03-28 17:47:12 +08:00
parent 86965a0e9c
commit 1c79cf510f
12 changed files with 645 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.h
+13 -11
View File
@@ -846,25 +846,28 @@ typedef DWORD32 RGBCOLOR;
* \brief Makes a RGBA triple value from red \a r, green \a g, * \brief Makes a RGBA triple value from red \a r, green \a g,
* blue \a b and alpha \a components. * blue \a b and alpha \a components.
* *
* \note The red, green, blue and alpha components are all ranged from 0 to 255, * \note The red, green, blue, and alpha components are all ranged
* and the returned value will be a double word. * from 0 to 255, and the returned value will be a 32-bit double word.
* *
* \sa GetRValue, GetGValue, GetBValue, GetAValue * \sa GetRValue, GetGValue, GetBValue, GetAValue
*/ */
#define MakeRGBA(r, g, b, a) (((DWORD32)((BYTE)(r))) | ((DWORD32)((BYTE)(g)) << 8) \ #define MakeRGBA(r, g, b, a) \
| ((DWORD32)((BYTE)(b)) << 16) | ((DWORD32)((BYTE)(a)) << 24)) (((DWORD32)((BYTE)(r))) \
| ((DWORD32)((BYTE)(g)) << 8) \
| ((DWORD32)((BYTE)(b)) << 16) \
| ((DWORD32)((BYTE)(a)) << 24))
/** /**
* \def MakeRGB(r, g, b) * \def MakeRGB(r, g, b)
* \brief Makes a RGB triple value from red \a r, green \a g, and blue \a b components. * \brief Makes a RGB triple value from red \a r, green \a g,
* and blue \a b components.
* *
* \note The red, green, and blue components are all ranged from 0 to 255, * \note The red, green, and blue components are all ranged from 0 to 255,
* and the returned value will be a double word. * and the returned value will be a 32-bit double word.
* *
* \sa GetRValue, GetGValue, GetBValue * \sa GetRValue, GetGValue, GetBValue, GetAValue
*/ */
#define MakeRGB(r, g, b) (((DWORD32)((BYTE)(r))) | ((DWORD32)((BYTE)(g)) << 8) \ #define MakeRGB(r, g, b) MakeRGBA((r), (g), (b), 255)
| ((DWORD32)((BYTE)(b)) << 16))
/** /**
* A rectangle defined by coordinates of corners. * A rectangle defined by coordinates of corners.
@@ -875,8 +878,7 @@ typedef DWORD32 RGBCOLOR;
* *
* \sa PRECT, GAL_Rect * \sa PRECT, GAL_Rect
*/ */
typedef struct _RECT typedef struct _RECT {
{
/** /**
* The x coordinate of the upper-left corner of the rectangle. * The x coordinate of the upper-left corner of the rectangle.
*/ */
include/gdi.h
+110 -115
View File
@@ -9075,94 +9075,79 @@ typedef enum {
GLYPH_RUN_DIR_RTL, GLYPH_RUN_DIR_RTL,
GLYPH_RUN_DIR_TTB, GLYPH_RUN_DIR_TTB,
GLYPH_RUN_DIR_BTT, GLYPH_RUN_DIR_BTT,
GLYPH_RUN_DIR_NEUTRAL,
GLYPH_RUN_DIR_WEAK_LTR,
GLYPH_RUN_DIR_WEAK_RTL,
} GlyphRunDir; } GlyphRunDir;
typedef enum { typedef enum {
WRITING_MODE_HORIZONTAL_TTB = 0, LAYOUT_GRAVITY_SOUTH = 0,
WRITING_MODE_HORIZONTAL_BTT, LAYOUT_GRAVITY_EAST,
WRITING_MODE_VERTICAL_RL, LAYOUT_GRAVITY_NORTH,
WRITING_MODE_VERTICAL_LR, LAYOUT_GRAVITY_WEST,
} ParagraphWritingMode; LAYOUT_GRAVITY_AUTO,
} LayoutGravity;
#define GLYPH_GRAVITY_SOUTH 0
#define GLYPH_GRAVITY_EAST 1
#define GLYPH_GRAVITY_NORTH 2
#define GLYPH_GRAVITY_WEST 3
#define GLYPH_GRAVITY_AUTO 4
typedef enum { typedef enum {
GLYPH_ORIENT_UPRIGHT = GLYPH_GRAVITY_SOUTH, LAYOUT_GRAVITY_POLICY_NATURAL,
GLYPH_ORIENT_SIDEWAYS = GLYPH_GRAVITY_EAST, LAYOUT_GRAVITY_POLICY_STRONG,
GLYPH_ORIENT_UPSIDE_DOWN = GLYPH_GRAVITY_NORTH, LAYOUT_GRAVITY_POLICY_LINE,
GLYPH_ORIENT_SIDEWAYS_LEFT = GLYPH_GRAVITY_WEST, } LayoutGravityPolicy;
GLYPH_ORIENT_AUTO = GLYPH_GRAVITY_AUTO,
} GlyphOrient;
typedef enum { #define LAYOUT_GRAVITY_IS_VERTICAL(gravity) \
GLYPH_ORIENT_POLICY_NATURAL, ((gravity) == LAYOUT_GRAVITY_EAST || (gravity) == LAYOUT_GRAVITY_WEST)
GLYPH_ORIENT_POLICY_STRONG,
GLYPH_ORIENT_POLICY_LINE,
} GlyphOrientPolicy;
#define GLYPH_ORIENT_IS_VERTICAL(orient) \
((orient) == GLYPH_ORIENT_SIDEWAYS || (orient) == GLYPH_ORIENT_SIDEWAYS_LEFT)
/** Get the vertical orientation property of a Unicode character */ /** Get the vertical orientation property of a Unicode character */
MG_EXPORT UVerticalOrient GUIAPI UCharGetVerticalOrientation(Uchar32 uc); MG_EXPORT UVerticalOrient GUIAPI UCharGetVerticalOrientation(Uchar32 uc);
/** /**
* ScriptGetGlyphOrientation: * \fn LayoutGravity GUIAPI ScriptGetLayoutGravity(ScriptType script,
* @script: #ScriptType to query * LayoutGravity base_gravity, LayoutGravityPolicy policy)
* @base_orient: base orientation of the paragraph * \brief Based on the script, base gravity, and policy, returns actual gravity
* @policy: orientation policy * to use in laying out a single glyph run.
* *
* Based on the script, base orientation, and policy, returns actual orientation * If @base_orient is %LAYOUT_GRAVITY_AUTO, it is first replaced with the
* to use in laying out a single glyph run.
*
* If @base_orient is %GLYPH_ORIENT_AUTO, it is first replaced with the
* preferred orientation of @script. To get the preferred orientation of a script, * preferred orientation of @script. To get the preferred orientation of a script,
* pass %GLYPH_ORIENT_AUTO and %GLYPH_ORIENT_POLICY_STRONG in. * pass %LAYOUT_GRAVITY_AUTO and %LAYOUT_GRAVITY_POLICY_STRONG in.
* *
* Return value: resolved orientation suitable to use for a run of text * \param script The script type to query
* \param base_gravity The base gravity of the paragraph/layout
* \param policy The gravity policy
*
* \param The resolved gravity suitable to use for a layout run of text
* with @script. * with @script.
* *
* Since: 3.4.0 * Since: 3.4.0
*/ */
MG_EXPORT GlyphOrient GUIAPI ScriptGetGlyphOrientation (ScriptType script, MG_EXPORT LayoutGravity GUIAPI ScriptGetLayoutGravity(ScriptType script,
GlyphOrient base_orient, GlyphOrientPolicy policy); LayoutGravity base_gravity, LayoutGravityPolicy policy);
/** /**
* GetWideGlyphOrientationForScript: * \fn LayoutGravity GUIAPI ScriptGetLayoutGravityForWide (ScriptType script,
* @script: #ScriptType to query * BOOL wide, LayoutGravity base_gravity, LayoutGravityPolicy policy)
* @wide: %TRUE for wide characters as returned by IsUCharWide() * \brief Based on the script, East Asian width, base gravity, and policy,
* @base_orient: base orientation of the paragraph * returns the actual gravity to use in laying out a single character
* @policy: orientation policy * or a run of text.
* *
* Based on the script, East Asian width, base orientation, and policy, * This function is similar to ScriptGetLayoutGravity() except
* returns actual orientation to use in laying out a single character
* or a run of glyph.
*
* This function is similar to ScriptGetGlyphOrientation() except
* that this function makes a distinction between narrow/half-width and * that this function makes a distinction between narrow/half-width and
* wide/full-width characters also. Wide/full-width characters always * wide/full-width characters also. Wide/full-width characters always
* stand <emphasis>upright</emphasis>, that is, they always take the * stand upright, that is, they always take the
* base orientation, whereas narrow/full-width characters are always * base gravity, whereas narrow/half-width characters are always
* rotated in vertical context. * rotated in vertical context.
* *
* If @base_orient is %GLYPH_ORIENT_AUTO, it is first replaced with the * If @base_orient is %LAYOUT_GRAVITY_AUTO, it is first replaced with the
* preferred orientation of @script. * preferred gravity of @script.
* *
* Return value: resolved orientation suitable to use for a run of text * \param script The script type to query
* with @script and @wide. * \param wide TRUE for wide characters as returned by IsUCharWide()
* \param base_gravity The base gravity of the paragraph
* \param policy The gravity policy
*
* \return The resolved gravity suitable to use for a run of text
* with \a script and \a wide.
* *
* Since: 3.4.0 * Since: 3.4.0
*/ */
GlyphOrient GetWideGlyphOrientationForScript (ScriptType script, LayoutGravity ScriptGetLayoutGravityForWide (ScriptType script,
BOOL wide, GlyphOrient base_orient, GlyphOrientPolicy policy); BOOL wide, LayoutGravity base_gravity, LayoutGravityPolicy policy);
/** @} end of unicode_ops */ /** @} end of unicode_ops */
@@ -12196,32 +12181,40 @@ MG_EXPORT int GUIAPI UChars2AChars(LOGFONT* logfont, const Uchar32* ucs,
#define GRF_WRITING_MODE_MASK 0xF0000000 #define GRF_WRITING_MODE_MASK 0xF0000000
/** /**
* Top-to-bottom direction. * Top-to-bottom horizontal direction.
* Both the writing mode and the typographic mode are horizontal. * Both the writing mode and the typographic mode are horizontal.
*/ */
#define GRF_WRITING_MODE_HORIZONTAL_TB 0x00000000 #define GRF_WRITING_MODE_HORIZONTAL_TB 0x00000000
/** /**
* Right-to-left direction. * Bottom-to-top horizontal direction.
* Both the writing mode and the typographic mode are vertical. * Both the writing mode and the typographic mode are horizontal,
* but lines are generated from bottom to top.
*/ */
#define GRF_WRITING_MODE_VERTICAL_RL 0x10000000 #define GRF_WRITING_MODE_HORIZONTAL_BT 0x10000000
/** /**
* Left-to-right direction. * Right-to-left vertical direction.
* Both the writing mode and the typographic mode are vertical. * Both the writing mode and the typographic mode are vertical,
* but the lines are generated from right to left.
*/ */
#define GRF_WRITING_MODE_VERTICAL_LR 0x20000000 #define GRF_WRITING_MODE_VERTICAL_RL 0x20000000
/**
* Left-to-right vertical direction.
* Both the writing mode and the typographic mode are vertical.
* but the lines are generated from left to right.
*/
#define GRF_WRITING_MODE_VERTICAL_LR 0x30000000
#define GRF_TEXT_ORIENTATION_MASK 0x0F000000 #define GRF_TEXT_ORIENTATION_MASK 0x0F000000
/** /**
* The glyphs are individually typeset upright in * The glyphs are individually typeset upright in
* vertical lines with vertical font metrics. * vertical lines with vertical font metrics.
*/ */
#define GRF_TEXT_ORIENTATION_UPRIGHT 0x00000000 #define GRF_TEXT_ORIENTATION_UPRIGHT 0x00000000
/** /**
* The glyphs typeset a run rotated 90° clockwise * The glyphs typeset a run rotated 90° clockwise
* from their upright orientation. * from their upright orientation.
*/ */
#define GRF_TEXT_ORIENTATION_SIDEWAYS 0x01000000 #define GRF_TEXT_ORIENTATION_SIDEWAYS 0x01000000
/** /**
* The glyphs are individually typeset upside down in * The glyphs are individually typeset upside down in
* vertical lines with vertical font metrics. * vertical lines with vertical font metrics.
@@ -12236,7 +12229,7 @@ MG_EXPORT int GUIAPI UChars2AChars(LOGFONT* logfont, const Uchar32* ucs,
* In vertical writing modes, all typographic character units * In vertical writing modes, all typographic character units
* keep in their intrinsic orientation. * keep in their intrinsic orientation.
*/ */
#define GRF_TEXT_ORIENTATION_AUTO 0x04000000 #define GRF_TEXT_ORIENTATION_AUTO 0x04000000
/** /**
* In vertical writing modes, typographic character units from * In vertical writing modes, typographic character units from
* horizontal-only scripts are typeset sideways, i.e. 90° clockwise * horizontal-only scripts are typeset sideways, i.e. 90° clockwise
@@ -12244,7 +12237,7 @@ MG_EXPORT int GUIAPI UChars2AChars(LOGFONT* logfont, const Uchar32* ucs,
* Typographic character units from vertical scripts are * Typographic character units from vertical scripts are
* typeset with their intrinsic orientation. * typeset with their intrinsic orientation.
*/ */
#define GRF_TEXT_ORIENTATION_MIXED 0x05000000 #define GRF_TEXT_ORIENTATION_MIXED 0x05000000
#define GRF_OVERFLOW_WRAP_MASK 0x00F00000 #define GRF_OVERFLOW_WRAP_MASK 0x00F00000
/** /**
@@ -12384,10 +12377,12 @@ MG_EXPORT int GUIAPI UChars2AChars(LOGFONT* logfont, const Uchar32* ucs,
/** @} end of glyph_render_flags */ /** @} end of glyph_render_flags */
#define GLYPH_ORIENTATION_UPRIGHT GLYPH_GRAVITY_SOUTH typedef enum {
#define GLYPH_ORIENTATION_SIDEWAYS GLYPH_GRAVITY_EAST GLYPH_ORIENT_UPRIGHT,
#define GLYPH_ORIENTATION_UPSIDE_DOWN GLYPH_GRAVITY_NORTH GLYPH_ORIENT_SIDEWAYS,
#define GLYPH_ORIENTATION_SIDEWAYS_LEFT GLYPH_GRAVITY_WEST GLYPH_ORIENT_UPSIDE_DOWN,
GLYPH_ORIENT_SIDEWAYS_LEFT,
} GlyphOrient;
#define GLYPH_HANGED_NONE 0 #define GLYPH_HANGED_NONE 0
#define GLYPH_HANGED_START 1 #define GLYPH_HANGED_START 1
@@ -12415,13 +12410,13 @@ typedef struct _GLYPHEXTINFO {
Uint8 whitespace:1; Uint8 whitespace:1;
/** /**
* The orientation of the glyph; can be one of the following values: * The orientation of the glyph; can be one of the following values:
* - GLYPH_ORIENTATION_UPRIGHT\n * - GLYPH_ORIENT_UPRIGHT\n
* the glyph is in the standard horizontal orientation. * the glyph is in the standard horizontal orientation.
* - GLYPH_ORIENTATION_SIDEWAYS\n * - GLYPH_ORIENT_SIDEWAYS\n
* the glyph rotates 90° clockwise from horizontal. * the glyph rotates 90° clockwise from horizontal.
* - GLYPH_ORIENTATION_SIDEWAYS_LEFT\n * - GLYPH_ORIENT_SIDEWAYS_LEFT\n
* the glyph rotates 90° counter-clockwise from horizontal. * the glyph rotates 90° counter-clockwise from horizontal.
* - GLYPH_ORIENTATION_INVERTED\n * - GLYPH_ORIENT_UPSIDE_DOWN\n
* the glyph is in the inverted horizontal orientation. * the glyph is in the inverted horizontal orientation.
*/ */
Uint8 orientation:2; Uint8 orientation:2;
@@ -12465,13 +12460,13 @@ typedef struct _GLYPHPOS {
Uint8 ellipsis:1; Uint8 ellipsis:1;
/** /**
* The orientation of the glyph; can be one of the following values: * The orientation of the glyph; can be one of the following values:
* - GLYPH_ORIENTATION_UPRIGHT\n * - GLYPH_ORIENT_UPRIGHT\n
* the glyph is in the standard horizontal orientation. * the glyph is in the standard horizontal orientation.
* - GLYPH_ORIENTATION_SIDEWAYS\n * - GLYPH_ORIENT_SIDEWAYS\n
* the glyph rotates 90° clockwise from horizontal. * the glyph rotates 90° clockwise from horizontal.
* - GLYPH_ORIENTATION_SIDEWAYS_LEFT\n * - GLYPH_ORIENT_SIDEWAYS_LEFT\n
* the glyph rotates 90° counter-clockwise from horizontal. * the glyph rotates 90° counter-clockwise from horizontal.
* - GLYPH_ORIENTATION_UPSIDE_DOWN\n * - GLYPH_ORIENT_UPSIDE_DOWN\n
* the glyph is upside down. * the glyph is upside down.
*/ */
Uint8 orientation:2; Uint8 orientation:2;
@@ -12607,9 +12602,8 @@ typedef struct _TEXTRUNSINFO TEXTRUNSINFO;
/** /**
* \fn TEXTRUNSINFO* GUIAPI CreateTextRunsInfo(const Uchar32* ucs, int nr_ucs, * \fn TEXTRUNSINFO* GUIAPI CreateTextRunsInfo(const Uchar32* ucs, int nr_ucs,
* LanguageCode lang_code, ParagraphDir base_dir, GlyphRunDir run_dir, * LanguageCode lang_code, ParagraphDir base_dir,
* GlyphOrient glyph_orient, GlyphOrientPolicy orient_policy, * const char* logfont_name, RGBCOLOR color, RGBCOLOR bg_color,
* const char* logfont_name, RGBCOLOR color,
* BreakOppo* break_oppos) * BreakOppo* break_oppos)
* *
* \brief Split a Uchar32 paragraph string in mixed scripts into text runs. * \brief Split a Uchar32 paragraph string in mixed scripts into text runs.
@@ -12619,16 +12613,16 @@ typedef struct _TEXTRUNSINFO TEXTRUNSINFO;
* *
* \param ucs The Uchar32 string returned by \a GetUCharsUntilParagraphBoundary. * \param ucs The Uchar32 string returned by \a GetUCharsUntilParagraphBoundary.
* \param nr_ucs The length of the Uchar32 string. * \param nr_ucs The length of the Uchar32 string.
* \param
* \param lang_code The language code. * \param lang_code The language code.
* \param base_dir The base direction of the paragraph. * \param base_dir The base direction of the paragraph.
* \param run_dir The writing direction of the paragraph.
* \param glyph_orient The glyph orientation.
* \param orient_policy THe glyph orientation policy of the paragraph.
* \param logfont_name The default logfont name. You can change the font * \param logfont_name The default logfont name. You can change the font
* of some text in the paragraph by calling \a SetFontInTextRuns. * of some text in the paragraph by calling \a SetFontInTextRuns.
* \param color The default text color. You can change the text color * \param color The default text color. You can change the text color
* of some text in the paragraph by calling \a SetTextColorInTextRuns * of some text in the paragraph by calling \a SetTextColorInTextRuns.
* \param bg_color The default background color. You can change the background
* color of some text in the paragraph by calling
* \a SetBackgroundColorInTextRuns. If the background is transparent,
* please pass MakeRGBA(0,0,0,0) for this argument.
* \param break_oppos If not NULL, the break opportunities will be tailored * \param break_oppos If not NULL, the break opportunities will be tailored
* according to the script type of every text run. Please skip the first * according to the script type of every text run. Please skip the first
* entry when you pass the pointer. * entry when you pass the pointer.
@@ -12644,35 +12638,35 @@ typedef struct _TEXTRUNSINFO TEXTRUNSINFO;
* \sa GetUCharsUntilParagraphBoundary, UStrGetBreaks, * \sa GetUCharsUntilParagraphBoundary, UStrGetBreaks,
* SetFontInTextRuns, SetTextColorInTextRuns * SetFontInTextRuns, SetTextColorInTextRuns
*/ */
MG_EXPORT TEXTRUNSINFO* GUIAPI CreateTextRunsInfo(const Uchar32* ucs, int nr_ucs, MG_EXPORT TEXTRUNSINFO* GUIAPI CreateTextRunsInfo(
LanguageCode lang_code, ParagraphDir base_dir, GlyphRunDir run_dir, const Uchar32* ucs, int nr_ucs,
GlyphOrient glyph_orient, GlyphOrientPolicy orient_policy, LanguageCode lang_code, ParagraphDir base_dir,
const char* logfont_name, RGBCOLOR color, const char* logfont_name, RGBCOLOR color, RGBCOLOR bg_color,
BreakOppo* break_oppos); BreakOppo* break_oppos);
/** /**
* Set logfont of text runs * Set logfont name of text runs
*/ */
MG_EXPORT BOOL GUIAPI SetFontInTextRuns(TEXTRUNSINFO* truninfo, MG_EXPORT BOOL GUIAPI SetFontNameInTextRuns(TEXTRUNSINFO* truninfo,
int start_index, int length, const char* logfont_name); int start_index, int length, const char* logfont_name);
/**
* Get logfont name of a specific character in text runs
*/
MG_EXPORT const char* GUIAPI GetFontNameInTextRuns(
const TEXTRUNSINFO* truninfo, int index);
/** /**
* Set text olor in text runs. * Set text olor in text runs.
*/ */
MG_EXPORT BOOL GUIAPI SetTextColorInTextRuns(TEXTRUNSINFO* truninfo, MG_EXPORT BOOL GUIAPI SetTextColorInTextRuns(TEXTRUNSINFO* truninfo,
int start_index, int length, RGBCOLOR color); int start_index, int length, RGBCOLOR color);
/** /**
* Set underline color in text runs. * Get text color of a specific character in text runs
*/ */
MG_EXPORT BOOL GUIAPI SetUnderlineColorInTextRuns(TEXTRUNSINFO* truninfo, MG_EXPORT RGBCOLOR GUIAPI GetTextColorInTextRuns(
int start_index, int length, RGBCOLOR color); const TEXTRUNSINFO* truninfo, int index);
/**
* Set strikethrough color in text runs.
*/
MG_EXPORT BOOL GUIAPI SetStrikethroughColorInTextRuns(TEXTRUNSINFO* truninfo,
int start_index, int length, RGBCOLOR color);
/** /**
* Set background color in text runs. * Set background color in text runs.
@@ -12681,10 +12675,10 @@ MG_EXPORT BOOL GUIAPI SetBackgroundColorInTextRuns(TEXTRUNSINFO* truninfo,
int start_index, int length, RGBCOLOR color); int start_index, int length, RGBCOLOR color);
/** /**
* Set outline color in text runs. * Get background color of a specific character in text runs
*/ */
MG_EXPORT BOOL GUIAPI SetOutlineColorInTextRuns(TEXTRUNSINFO* truninfo, MG_EXPORT RGBCOLOR GUIAPI GetBackgroundColorInTextRuns(
int start_index, int length, RGBCOLOR color); const TEXTRUNSINFO* truninfo, int index);
/** /**
* \fn BOOL GUIAPI DestroyTextRunsInfo(TEXTRUNSINFO* truninfo) * \fn BOOL GUIAPI DestroyTextRunsInfo(TEXTRUNSINFO* truninfo)
@@ -12886,12 +12880,13 @@ MG_EXPORT int DrawLayoutLine(HDC hdc, LAYOUTLINE* line,
int x, int y, RECT* rc_bouding); int x, int y, RECT* rc_bouding);
#ifdef _MGDEVEL_MODE #ifdef _MGDEVEL_MODE
void* GetNextTextRunInfo(TEXTRUNSINFO* runinfo, typedef struct _TextRun TEXTRUN;
void* prev,
MG_EXPORT TEXTRUN* GetNextTextRunInfo(TEXTRUNSINFO* runinfo,
TEXTRUN* prev,
const char** fontname, int* start_index, int* length, const char** fontname, int* start_index, int* length,
LanguageCode* lang_code, ScriptType* script, LanguageCode* lang_code, ScriptType* script,
BidiLevel* embedding_level, GlyphRunDir* run_dir, BidiLevel* embedding_level, Uint8* flags);
GlyphOrient* orient, Uint8* flags);
/* Get layout line information */ /* Get layout line information */
MG_EXPORT BOOL GUIAPI GetLayoutLineInfo(LAYOUTLINE* line, MG_EXPORT BOOL GUIAPI GetLayoutLineInfo(LAYOUTLINE* line,
src/font/unicode-script.c
+41 -35
View File
@@ -386,21 +386,27 @@ ScriptType GUIAPI NormalizeScriptType(LanguageCode cl,
return ws; return ws;
} }
typedef enum {
HORIZONTAL_DIRECTION_LTR,
HORIZONTAL_DIRECTION_RTL,
HORIZONTAL_DIRECTION_WEAK,
} HorizontalDirection;
typedef enum { typedef enum {
VERTICAL_DIRECTION_NONE, VERTICAL_DIRECTION_NONE,
VERTICAL_DIRECTION_TTB, VERTICAL_DIRECTION_TTB,
VERTICAL_DIRECTION_BTT VERTICAL_DIRECTION_BTT,
} VerticalDirection; } VerticalDirection;
typedef struct { typedef struct {
/* GlyphRunDir */ /* GlyphRunDir */
Uint8 horiz_dir; /* Orientation in horizontal context */ Uint8 horiz_dir; /* Orientation in horizontal context */
/* PangoVerticalDirection */ /* VerticalDirection */
Uint8 vert_dir; /* Orientation in vertical context */ Uint8 vert_dir; /* Orientation in vertical context */
/* GlyphOrient */ /* LayoutGravity */
Uint8 preferred_orient; /* Preferred context orientation */ Uint8 preferred_gravity; /* Preferred context gravity */
/* BOOL */ /* BOOL */
Uint8 wide; /* Whether script is mostly wide. Uint8 wide; /* Whether script is mostly wide.
@@ -412,13 +418,13 @@ typedef struct {
#define TTB VERTICAL_DIRECTION_TTB #define TTB VERTICAL_DIRECTION_TTB
#define BTT VERTICAL_DIRECTION_BTT #define BTT VERTICAL_DIRECTION_BTT
#define LTR GLYPH_RUN_DIR_LTR #define LTR HORIZONTAL_DIRECTION_LTR
#define RTL GLYPH_RUN_DIR_RTL #define RTL HORIZONTAL_DIRECTION_RTL
#define WEAK GLYPH_RUN_DIR_WEAK_LTR #define WEAK HORIZONTAL_DIRECTION_WEAK
#define S GLYPH_ORIENT_UPRIGHT #define S LAYOUT_GRAVITY_SOUTH
#define E GLYPH_ORIENT_SIDEWAYS #define E LAYOUT_GRAVITY_EAST
#define W GLYPH_ORIENT_SIDEWAYS_LEFT #define W LAYOUT_GRAVITY_WEST
#define UNKNOWN_SCRIPT_PROPERTY \ #define UNKNOWN_SCRIPT_PROPERTY \
{LTR, NONE, S, FALSE} {LTR, NONE, S, FALSE}
@@ -627,61 +633,61 @@ static inline ScriptTypeProperties get_script_properties (ScriptType script)
return script_properties[script]; return script_properties[script];
} }
GlyphOrient ScriptGetGlyphOrientation (ScriptType script, LayoutGravity ScriptGetLayoutGravity (ScriptType script,
GlyphOrient base_orient, GlyphOrientPolicy hint) LayoutGravity base_gravity, LayoutGravityPolicy hint)
{ {
ScriptTypeProperties props = get_script_properties (script); ScriptTypeProperties props = get_script_properties (script);
if (base_orient == GLYPH_ORIENT_AUTO) if (base_gravity == LAYOUT_GRAVITY_AUTO)
base_orient = props.preferred_orient; base_gravity = props.preferred_gravity;
return GetWideGlyphOrientationForScript (script, props.wide, return ScriptGetLayoutGravityForWide (script, props.wide,
base_orient, hint); base_gravity, hint);
} }
GlyphOrient GetWideGlyphOrientationForScript (ScriptType script, LayoutGravity ScriptGetLayoutGravityForWide (ScriptType script,
BOOL wide, GlyphOrient base_orient, GlyphOrientPolicy hint) BOOL wide, LayoutGravity base_gravity, LayoutGravityPolicy hint)
{ {
ScriptTypeProperties props = get_script_properties (script); ScriptTypeProperties props = get_script_properties (script);
BOOL vertical; BOOL vertical;
if (base_orient == GLYPH_ORIENT_AUTO) if (base_gravity == LAYOUT_GRAVITY_AUTO)
base_orient = props.preferred_orient; base_gravity = props.preferred_gravity;
vertical = GLYPH_ORIENT_IS_VERTICAL(base_orient); vertical = LAYOUT_GRAVITY_IS_VERTICAL(base_gravity);
/* Everything is designed such that a system with no vertical support /* Everything is designed such that a system with no vertical support
* renders everything correctly horizontally. So, if not in a vertical * renders everything correctly horizontally. So, if not in a vertical
* orientation, base and resolved gravities are always the same. * gravity, base and resolved gravities are always the same.
* *
* Wide characters are always upright. * Wide characters are always upright.
*/ */
if (!vertical || wide) if (!vertical || wide)
return base_orient; return base_gravity;
/* If here, we have a narrow character in a vertical orientation setting. /* If here, we have a narrow character in a vertical gravity setting.
* Resolve depending on the hint. * Resolve depending on the hint.
*/ */
switch (hint) { switch (hint) {
default: default:
case GLYPH_ORIENT_POLICY_NATURAL: case LAYOUT_GRAVITY_POLICY_NATURAL:
if (props.vert_dir == VERTICAL_DIRECTION_NONE) if (props.vert_dir == VERTICAL_DIRECTION_NONE)
return GLYPH_ORIENT_UPRIGHT; return LAYOUT_GRAVITY_SOUTH;
if ((base_orient == GLYPH_ORIENT_SIDEWAYS) ^ if ((base_gravity == LAYOUT_GRAVITY_EAST) ^
(props.vert_dir == VERTICAL_DIRECTION_BTT)) (props.vert_dir == VERTICAL_DIRECTION_BTT))
return GLYPH_ORIENT_UPRIGHT; return LAYOUT_GRAVITY_SOUTH;
else else
return GLYPH_ORIENT_UPSIDE_DOWN; return LAYOUT_GRAVITY_NORTH;
case GLYPH_ORIENT_POLICY_STRONG: case LAYOUT_GRAVITY_POLICY_STRONG:
return base_orient; return base_gravity;
case GLYPH_ORIENT_POLICY_LINE: case LAYOUT_GRAVITY_POLICY_LINE:
if ((base_orient == GLYPH_ORIENT_SIDEWAYS) ^ if ((base_gravity == LAYOUT_GRAVITY_EAST) ^
(props.horiz_dir == GLYPH_RUN_DIR_RTL)) (props.horiz_dir == GLYPH_RUN_DIR_RTL))
return GLYPH_ORIENT_UPRIGHT; return LAYOUT_GRAVITY_SOUTH;
else else
return GLYPH_ORIENT_UPSIDE_DOWN; return LAYOUT_GRAVITY_NORTH;
} }
} }
#endif /* _MGCHARSET_UNICODE */ #endif /* _MGCHARSET_UNICODE */
src/newgdi/Makefile.am
+1 -1
View File
@@ -19,7 +19,7 @@ SRC_FILES = gdi.c attr.c clip.c map.c coor.c rect.c \
simple-glyph-renderer.c glyph-shaped.c \ simple-glyph-renderer.c glyph-shaped.c \
textrunsinfo.c \ textrunsinfo.c \
shape-glyphs-basic.c shape-glyphs-complex.c \ shape-glyphs-basic.c shape-glyphs-complex.c \
layout-utils.c layout-ellipsize.c layoutinfo.c layoutinfo.c layout-utils.c layout-ellipsize.c
endif endif
HDR_FILES = glyph.h drawtext.h mi.h midc.h mistruct.h miwideline.h \ HDR_FILES = glyph.h drawtext.h mi.h midc.h mistruct.h miwideline.h \
src/newgdi/glyph-shaped.c
+1 -1
View File
@@ -93,7 +93,7 @@ int GUIAPI DrawShapedGlyphString(HDC hdc,
Glyph32 gv = shaped_glyphs->cb_get_glyph_info( Glyph32 gv = shaped_glyphs->cb_get_glyph_info(
shaped_glyphs->shaping_engine, shaped_glyphs->glyph_infos, shaped_glyphs->shaping_engine, shaped_glyphs->glyph_infos,
i, NULL); i, NULL);
if (glyph_pos[i].orientation == GLYPH_ORIENTATION_UPRIGHT) { if (glyph_pos[i].orientation == GLYPH_ORIENT_UPRIGHT) {
if (logfont_upright) if (logfont_upright)
SelectFont(hdc, logfont_upright); SelectFont(hdc, logfont_upright);
else else
src/newgdi/layout-ellipsize.c
+2 -2
View File
@@ -339,7 +339,7 @@ static void shape_ellipsis (EllipsizeState *state)
ellipsis_ucs = _ellipsis_baseline; ellipsis_ucs = _ellipsis_baseline;
} }
text_run = __mg_text_run_get_by_offset(state->layout->truninfo, text_run = __mg_text_run_get_by_offset_const(state->layout->truninfo,
state->gap_start_iter.run_iter.start_index, NULL); state->gap_start_iter.run_iter.start_index, NULL);
layout_run = __mg_layout_run_new_ellipsis (state->layout, text_run, layout_run = __mg_layout_run_new_ellipsis (state->layout, text_run,
@@ -384,7 +384,7 @@ static void update_ellipsis_shape (EllipsizeState *state)
BOOL is_cjk; BOOL is_cjk;
const TextRun* text_run; const TextRun* text_run;
text_run = __mg_text_run_get_by_offset(state->layout->truninfo, text_run = __mg_text_run_get_by_offset_const(state->layout->truninfo,
state->gap_start_iter.run_iter.start_index, NULL); state->gap_start_iter.run_iter.start_index, NULL);
if (state->fontname != text_run->fontname) { if (state->fontname != text_run->fontname) {
src/newgdi/layout-utils.c
+83 -11
View File
@@ -124,6 +124,72 @@ void __mg_release_logfont_for_layout(const LAYOUTINFO* layout,
ReleaseRes(Str2Key(my_fontname)); ReleaseRes(Str2Key(my_fontname));
} }
static GlyphOrient resolve_glyph_orient(const LAYOUTINFO* layout,
const TextRun* trun)
{
LayoutGravity gravity;
if (layout->grv_plc == LAYOUT_GRAVITY_POLICY_STRONG) {
return layout->orient;
}
gravity = ScriptGetLayoutGravityForWide(trun->st,
trun->flags & TEXTRUN_FLAG_UPRIGHT,
layout->grv_base, layout->grv_plc);
switch (gravity) {
case LAYOUT_GRAVITY_SOUTH:
return GLYPH_ORIENT_UPRIGHT;
case LAYOUT_GRAVITY_EAST:
return GLYPH_ORIENT_SIDEWAYS;
case LAYOUT_GRAVITY_NORTH:
return GLYPH_ORIENT_SIDEWAYS_LEFT;
case LAYOUT_GRAVITY_WEST:
return GLYPH_ORIENT_UPSIDE_DOWN;
default:
break;
}
return GLYPH_ORIENT_UPRIGHT;
}
static void resolve_layout_run_dir(const LAYOUTINFO* layout,
LayoutRun* lrun)
{
/* The level vs. gravity dance:
* If gravity is SOUTH, leave level untouched.
* If gravity is NORTH, step level one up, to
* not get mirrored upside-down text.
* If gravity is EAST, step up to an even level, as
* it's a clockwise-rotated layout, so the rotated
* top is unrotated left.
* If gravity is WEST, step up to an odd level, as
* it's a counter-clockwise-rotated layout, so the rotated
* top is unrotated right.
*/
switch (layout->grv_base) {
case LAYOUT_GRAVITY_SOUTH:
default:
lrun->dir = (lrun->el & 1) ? GLYPH_RUN_DIR_RTL : GLYPH_RUN_DIR_LTR;
break;
case LAYOUT_GRAVITY_NORTH:
lrun->el++;
lrun->dir = (lrun->el & 1) ? GLYPH_RUN_DIR_RTL : GLYPH_RUN_DIR_LTR;
break;
case LAYOUT_GRAVITY_EAST:
lrun->el += 1;
lrun->el &= ~1;
lrun->dir = (lrun->el & 1) ? GLYPH_RUN_DIR_TTB : GLYPH_RUN_DIR_BTT;
break;
case LAYOUT_GRAVITY_WEST:
lrun->el |= 1;
lrun->dir = (lrun->el & 1) ? GLYPH_RUN_DIR_TTB : GLYPH_RUN_DIR_BTT;
break;
}
if (LAYOUT_GRAVITY_IS_VERTICAL(layout->grv_base))
lrun->flags |= LAYOUTRUN_FLAG_CENTERED_BASELINE;
}
/* /*
* Not like Pango, we simply use the properties of the referenced TextRun * Not like Pango, we simply use the properties of the referenced TextRun
* for the new orphan LayoutRun, including the direction, the orientation, * for the new orphan LayoutRun, including the direction, the orientation,
@@ -136,10 +202,12 @@ void __mg_release_logfont_for_layout(const LAYOUTINFO* layout,
LayoutRun* __mg_layout_run_new_ellipsis(const LAYOUTINFO* layout, LayoutRun* __mg_layout_run_new_ellipsis(const LAYOUTINFO* layout,
const TextRun* trun, const Uchar32* ucs, int nr_ucs) const TextRun* trun, const Uchar32* ucs, int nr_ucs)
{ {
GlyphOrient ort;
LOGFONT* lf; LOGFONT* lf;
LayoutRun* lrun; LayoutRun* lrun;
lf = __mg_create_logfont_for_layout(layout, trun->fontname, trun->ort); ort = resolve_glyph_orient(layout, trun);
lf = __mg_create_logfont_for_layout(layout, trun->fontname, ort);
if (lf == NULL) if (lf == NULL)
return NULL; return NULL;
@@ -151,20 +219,22 @@ LayoutRun* __mg_layout_run_new_ellipsis(const LAYOUTINFO* layout,
lrun->lc = trun->lc; lrun->lc = trun->lc;
lrun->st = UCharGetScriptType(ucs[0]); lrun->st = UCharGetScriptType(ucs[0]);
lrun->el = trun->el; lrun->el = trun->el;
lrun->dir = trun->dir; lrun->ort = ort;
lrun->ort = trun->ort;
lrun->flags = trun->flags | LAYOUTRUN_FLAG_ELLIPSIS; lrun->flags = trun->flags | LAYOUTRUN_FLAG_ELLIPSIS;
resolve_layout_run_dir(layout, lrun);
return lrun; return lrun;
} }
LayoutRun* __mg_layout_run_new_from(const LAYOUTINFO* layout, LayoutRun* __mg_layout_run_new_from(const LAYOUTINFO* layout,
const TextRun* trun) const TextRun* trun)
{ {
GlyphOrient ort;
LOGFONT* lf; LOGFONT* lf;
LayoutRun* lrun; LayoutRun* lrun;
lf = __mg_create_logfont_for_layout(layout, trun->fontname, trun->ort); ort = resolve_glyph_orient(layout, trun);
lf = __mg_create_logfont_for_layout(layout, trun->fontname, ort);
if (lf == NULL) if (lf == NULL)
return NULL; return NULL;
@@ -176,26 +246,28 @@ LayoutRun* __mg_layout_run_new_from(const LAYOUTINFO* layout,
lrun->lc = trun->lc; lrun->lc = trun->lc;
lrun->st = trun->st; lrun->st = trun->st;
lrun->el = trun->el; lrun->el = trun->el;
lrun->dir = trun->dir; lrun->ort = ort;
lrun->ort = trun->ort;
lrun->flags = trun->flags; lrun->flags = trun->flags;
resolve_layout_run_dir(layout, lrun);
return lrun; return lrun;
} }
LayoutRun* __mg_layout_run_new_from_offset(const LAYOUTINFO* layout, LayoutRun* __mg_layout_run_new_from_offset(const LAYOUTINFO* layout,
const TextRun* trun, int offset) const TextRun* trun, int offset)
{ {
GlyphOrient ort;
LOGFONT* lf; LOGFONT* lf;
LayoutRun* lrun; LayoutRun* lrun;
if (offset >= trun->len) { if (offset >= trun->len) {
_DBG_PRINTF("%s: offset(%d) >= trun->len(%p, %d)\n", _WRN_PRINTF("offset(%d) >= trun->len(%p, %d)",
__FUNCTION__, offset, trun, trun->len); offset, trun, trun->len);
return NULL; return NULL;
} }
lf = __mg_create_logfont_for_layout(layout, trun->fontname, trun->ort); ort = resolve_glyph_orient(layout, trun);
lf = __mg_create_logfont_for_layout(layout, trun->fontname, ort);
if (lf == NULL) if (lf == NULL)
return NULL; return NULL;
@@ -208,10 +280,10 @@ LayoutRun* __mg_layout_run_new_from_offset(const LAYOUTINFO* layout,
lrun->lc = trun->lc; lrun->lc = trun->lc;
lrun->st = trun->st; lrun->st = trun->st;
lrun->el = trun->el; lrun->el = trun->el;
lrun->dir = trun->dir; lrun->ort = ort;
lrun->ort = trun->ort;
lrun->flags = trun->flags; lrun->flags = trun->flags;
resolve_layout_run_dir(layout, lrun);
return lrun; return lrun;
} }
src/newgdi/layoutinfo.c
+60 -17
View File
@@ -106,6 +106,49 @@ LAYOUTINFO* GUIAPI CreateLayoutInfo(
INIT_LIST_HEAD(&layout->lines); INIT_LIST_HEAD(&layout->lines);
layout->nr_left_ucs = truninfo->nr_ucs; layout->nr_left_ucs = truninfo->nr_ucs;
switch (render_flags & GRF_WRITING_MODE_MASK) {
default:
case GRF_WRITING_MODE_HORIZONTAL_TB:
layout->grv_base = LAYOUT_GRAVITY_SOUTH;
break;
case GRF_WRITING_MODE_HORIZONTAL_BT:
layout->grv_base = LAYOUT_GRAVITY_NORTH;
break;
case GRF_WRITING_MODE_VERTICAL_RL:
layout->grv_base = LAYOUT_GRAVITY_WEST;
break;
case GRF_WRITING_MODE_VERTICAL_LR:
layout->grv_base = LAYOUT_GRAVITY_EAST;
break;
}
switch (render_flags & GRF_TEXT_ORIENTATION_MASK) {
case GRF_TEXT_ORIENTATION_AUTO:
layout->grv_plc = LAYOUT_GRAVITY_POLICY_NATURAL;
layout->orient = GLYPH_ORIENT_UPRIGHT;
break;
case GRF_TEXT_ORIENTATION_MIXED:
layout->grv_plc = LAYOUT_GRAVITY_POLICY_LINE;
layout->orient = GLYPH_ORIENT_UPRIGHT;
break;
case GRF_TEXT_ORIENTATION_UPRIGHT:
layout->grv_plc = LAYOUT_GRAVITY_POLICY_STRONG;
layout->orient = GLYPH_ORIENT_UPRIGHT;
break;
case GRF_TEXT_ORIENTATION_SIDEWAYS:
layout->grv_plc = LAYOUT_GRAVITY_POLICY_STRONG;
layout->orient = GLYPH_ORIENT_SIDEWAYS;
break;
case GRF_TEXT_ORIENTATION_UPSIDE_DOWN:
layout->grv_plc = LAYOUT_GRAVITY_POLICY_STRONG;
layout->orient = GLYPH_ORIENT_UPSIDE_DOWN;
break;
case GRF_TEXT_ORIENTATION_SIDEWAYS_LEFT:
layout->grv_plc = LAYOUT_GRAVITY_POLICY_STRONG;
layout->orient = GLYPH_ORIENT_SIDEWAYS_LEFT;
break;
}
layout->persist = persist_lines ? 1 : 0; layout->persist = persist_lines ? 1 : 0;
return layout; return layout;
@@ -165,7 +208,7 @@ struct _LayoutState {
/* maintained per paragraph */ /* maintained per paragraph */
// Current resolved base direction // Current resolved base direction
GlyphRunDir base_dir; ParagraphDir base_dir;
// Line of the paragraph, starting at 1 for first line // Line of the paragraph, starting at 1 for first line
int line_of_par; int line_of_par;
// Glyphs for the current glyph run // Glyphs for the current glyph run
@@ -536,7 +579,7 @@ static inline void print_line_runs(const LAYOUTLINE* line, const char* func)
_DBG_PRINTF(" LENGHT: %d\n", run->lrun->len); _DBG_PRINTF(" LENGHT: %d\n", run->lrun->len);
_DBG_PRINTF(" EMBEDDING LEVEL:%d\n", run->lrun->el); _DBG_PRINTF(" EMBEDDING LEVEL:%d\n", run->lrun->el);
_DBG_PRINTF(" NO SHAPING :%s\n", _DBG_PRINTF(" NO SHAPING :%s\n",
(run->lrun->flags & LAYOUTRUN_FLAG_NO_SHAPING) ? "YES" : "NO"); (run->lrun->noshape) ? "YES" : "NO");
_DBG_PRINTF(" NR GLYPHS: %d\n", run->gstr->nr_glyphs); _DBG_PRINTF(" NR GLYPHS: %d\n", run->gstr->nr_glyphs);
j++; j++;
} }
@@ -861,17 +904,17 @@ static LAYOUTLINE *layout_line_new(LAYOUTINFO *layout)
/* The resolved direction for the line is always one /* The resolved direction for the line is always one
* of LTR/RTL; not a week or neutral directions * of LTR/RTL; not a week or neutral directions
*/ */
static void line_set_resolved_dir(LAYOUTLINE *line, GlyphRunDir direction) static void line_set_resolved_dir(LAYOUTLINE *line, ParagraphDir direction)
{ {
switch (direction) { switch (direction) {
default: default:
case GLYPH_RUN_DIR_LTR: case BIDI_PGDIR_LTR:
case GLYPH_RUN_DIR_WEAK_LTR: case BIDI_PGDIR_WLTR:
case GLYPH_RUN_DIR_NEUTRAL: case BIDI_PGDIR_ON:
line->resolved_dir = GLYPH_RUN_DIR_LTR; line->resolved_dir = GLYPH_RUN_DIR_LTR;
break; break;
case GLYPH_RUN_DIR_RTL: case BIDI_PGDIR_RTL:
case GLYPH_RUN_DIR_WEAK_RTL: case BIDI_PGDIR_WRTL:
line->resolved_dir = GLYPH_RUN_DIR_RTL; line->resolved_dir = GLYPH_RUN_DIR_RTL;
break; break;
} }
@@ -889,20 +932,20 @@ static void line_set_resolved_dir(LAYOUTLINE *line, GlyphRunDir direction)
* A similar dance is performed in textrunsinfo.c: * A similar dance is performed in textrunsinfo.c:
* state_add_character(). Keep in sync. * state_add_character(). Keep in sync.
*/ */
switch (line->layout->truninfo->ort_rsv) { switch (line->layout->grv_base) {
default: default:
case GLYPH_GRAVITY_AUTO: case LAYOUT_GRAVITY_AUTO:
case GLYPH_GRAVITY_SOUTH: case LAYOUT_GRAVITY_SOUTH:
break; break;
case GLYPH_GRAVITY_NORTH: case LAYOUT_GRAVITY_NORTH:
line->resolved_dir = GLYPH_RUN_DIR_LTR line->resolved_dir = GLYPH_RUN_DIR_LTR
+ GLYPH_RUN_DIR_RTL + GLYPH_RUN_DIR_RTL
- line->resolved_dir; - line->resolved_dir;
break; break;
case GLYPH_GRAVITY_EAST: case LAYOUT_GRAVITY_EAST:
line->resolved_dir = GLYPH_RUN_DIR_LTR; line->resolved_dir = GLYPH_RUN_DIR_LTR;
break; break;
case GLYPH_GRAVITY_WEST: case LAYOUT_GRAVITY_WEST:
line->resolved_dir = GLYPH_RUN_DIR_RTL; line->resolved_dir = GLYPH_RUN_DIR_RTL;
break; break;
} }
@@ -1609,7 +1652,7 @@ static LAYOUTLINE* check_next_line(LAYOUTINFO* layout, LayoutState* state)
state->remaining_width = break_remaining_width; state->remaining_width = break_remaining_width;
/* determine start text run again */ /* determine start text run again */
state->trun = __mg_text_run_get_by_offset(layout->truninfo, state->trun = __mg_text_run_get_by_offset_const(layout->truninfo,
state->start_offset, &state->start_index_in_trun); state->start_offset, &state->start_index_in_trun);
if (state->start_index_in_trun > 0) { if (state->start_index_in_trun > 0) {
state->lrun = __mg_layout_run_new_from_offset(layout, state->lrun = __mg_layout_run_new_from_offset(layout,
@@ -1744,7 +1787,7 @@ LAYOUTLINE* GUIAPI LayoutNextLine(
//state.shape_ink_rect; //state.shape_ink_rect;
//state.shape_logical_rect; //state.shape_logical_rect;
state.base_dir = layout->truninfo->run_dir; state.base_dir = layout->truninfo->base_dir;
state.line_of_par = 1; state.line_of_par = 1;
state.glyphs = NULL; state.glyphs = NULL;
state.log_widths = NULL; state.log_widths = NULL;
@@ -1766,7 +1809,7 @@ LAYOUTLINE* GUIAPI LayoutNextLine(
state.line_start_index = layout->truninfo->nr_ucs - layout->nr_left_ucs; state.line_start_index = layout->truninfo->nr_ucs - layout->nr_left_ucs;
state.start_offset = state.line_start_index; state.start_offset = state.line_start_index;
state.start_index_in_trun = 0; state.start_index_in_trun = 0;
state.trun = __mg_text_run_get_by_offset(layout->truninfo, state.trun = __mg_text_run_get_by_offset_const(layout->truninfo,
state.line_start_index, &state.start_index_in_trun); state.line_start_index, &state.start_index_in_trun);
_DBG_PRINTF("%s: line_start_index: %d, start_index_in_trun: %d(%p)\n", _DBG_PRINTF("%s: line_start_index: %d, start_index_in_trun: %d(%p)\n",
src/newgdi/layoutinfo.h
+15 -11
View File
@@ -65,22 +65,23 @@ struct _GlyphString {
unsigned int space; unsigned int space;
}; };
#define LAYOUTRUN_FLAG_CENTERED_BASELINE TEXTRUN_FLAG_CENTERED_BASELINE
#define LAYOUTRUN_FLAG_NO_SHAPING TEXTRUN_FLAG_NO_SHAPING #define LAYOUTRUN_FLAG_NO_SHAPING TEXTRUN_FLAG_NO_SHAPING
#define LAYOUTRUN_FLAG_UPRIGHT TEXTRUN_FLAG_UPRIGHT
#define LAYOUTRUN_FLAG_ELLIPSIS 0x04 #define LAYOUTRUN_FLAG_ELLIPSIS 0x04
#define LAYOUTRUN_FLAG_CENTERED_BASELINE 0x08
struct _LayoutRun { struct _LayoutRun {
LOGFONT* lf; // the logfont for this run LOGFONT* lf; // the logfont for this run
const Uchar32* ucs; // the uchar string const Uchar32* ucs; // the uchar string
int si; // the start index of this run int si; // the start index of this run
int len; // the length of the uchar string int len; // the length of the uchar string
Uint32 lc:8; // language code Uint32 lc:8; // language code
Uint32 st:8; // script type Uint32 st:8; // script type
Uint32 el:8; // the bidi embedding level Uint32 el:8; // the bidi embedding level
Uint32 dir:2; // the run direction; value rage: [0, 3] Uint32 dir:2; // the run direction; value rage: [0, 3]
Uint32 ort:2; // the glyph orientation; value range: [0, 3] Uint32 ort:2; // the glyph orientation; value range: [0, 3]
Uint32 flags:4;// other flags Uint32 flags:4; // other flags
}; };
struct _GlyphRun { struct _GlyphRun {
@@ -127,6 +128,9 @@ struct _LAYOUTINFO {
int nr_left_ucs;// the number of chars not laied out int nr_left_ucs;// the number of chars not laied out
int nr_lines; // the number of lines int nr_lines; // the number of lines
Uint32 grv_base:4; // the base gravity
Uint32 grv_plc:2; // the gravity policy specified
Uint32 orient:2; // the glyph orientation specified
Uint32 persist:1; // persist lines? Uint32 persist:1; // persist lines?
Uint32 single_paragraph:1; Uint32 single_paragraph:1;
}; };
src/newgdi/simple-glyph-renderer.c
+6 -6
View File
@@ -536,14 +536,14 @@ static void adjust_glyph_position(MYGLYPHARGS* args,
{ {
switch (args->rf & GRF_WRITING_MODE_MASK) { switch (args->rf & GRF_WRITING_MODE_MASK) {
case GRF_WRITING_MODE_VERTICAL_RL: case GRF_WRITING_MODE_VERTICAL_RL:
if (gi->orientation == GLYPH_ORIENTATION_UPRIGHT) { if (gi->orientation == GLYPH_ORIENT_UPRIGHT) {
x -= (args->lw + ge->bbox_w) / 2; x -= (args->lw + ge->bbox_w) / 2;
x -= ge->bbox_x; x -= ge->bbox_x;
} }
break; break;
case GRF_WRITING_MODE_VERTICAL_LR: case GRF_WRITING_MODE_VERTICAL_LR:
if (gi->orientation == GLYPH_ORIENTATION_SIDEWAYS) { if (gi->orientation == GLYPH_ORIENT_SIDEWAYS) {
x += args->lfsw->size; x += args->lfsw->size;
} }
else { else {
@@ -858,7 +858,7 @@ static void init_glyph_info(MYGLYPHARGS* args, int i,
gi->whitespace = 0; gi->whitespace = 0;
gi->suppressed = 0; gi->suppressed = 0;
gi->hanged = GLYPH_HANGED_NONE; gi->hanged = GLYPH_HANGED_NONE;
gi->orientation = GLYPH_ORIENTATION_UPRIGHT; gi->orientation = GLYPH_ORIENT_UPRIGHT;
} }
static inline int shrink_total_extent(MYGLYPHARGS* args, int total_extent, static inline int shrink_total_extent(MYGLYPHARGS* args, int total_extent,
@@ -899,13 +899,13 @@ static int get_glyph_extent_info(MYGLYPHARGS* args, Glyph32 gv,
== GRF_TEXT_ORIENTATION_MIXED) { == GRF_TEXT_ORIENTATION_MIXED) {
if (is_horizontal_only_script(gi->uc)) { if (is_horizontal_only_script(gi->uc)) {
logfont = args->lfsw; logfont = args->lfsw;
gi->orientation = GLYPH_ORIENTATION_SIDEWAYS; gi->orientation = GLYPH_ORIENT_SIDEWAYS;
} }
} }
else if ((args->rf & GRF_TEXT_ORIENTATION_MASK) else if ((args->rf & GRF_TEXT_ORIENTATION_MASK)
== GRF_TEXT_ORIENTATION_SIDEWAYS) { == GRF_TEXT_ORIENTATION_SIDEWAYS) {
logfont = args->lfsw; logfont = args->lfsw;
gi->orientation = GLYPH_ORIENTATION_SIDEWAYS; gi->orientation = GLYPH_ORIENT_SIDEWAYS;
} }
} }
@@ -1364,7 +1364,7 @@ int GUIAPI DrawGlyphStringEx(HDC hdc,
for (i = 0; i < nr_glyphs; i++) { for (i = 0; i < nr_glyphs; i++) {
if (glyph_pos[i].suppressed == 0 && glyph_pos[i].whitespace == 0) { if (glyph_pos[i].suppressed == 0 && glyph_pos[i].whitespace == 0) {
if (glyph_pos[i].orientation == GLYPH_ORIENTATION_UPRIGHT) { if (glyph_pos[i].orientation == GLYPH_ORIENT_UPRIGHT) {
if (logfont_upright) if (logfont_upright)
SelectFont(hdc, logfont_upright); SelectFont(hdc, logfont_upright);
else else
src/newgdi/textrunsinfo.c
+283 -108
View File
File diff suppressed because it is too large Load Diff
src/newgdi/textrunsinfo.h
+30 -28
View File
@@ -47,7 +47,7 @@ typedef struct _LayoutRun LayoutRun;
typedef struct _TextRun TextRun; typedef struct _TextRun TextRun;
typedef struct _GlyphString GlyphString; typedef struct _GlyphString GlyphString;
typedef struct _SEInstance SEInstance; typedef struct _SEInstance SEInstance;
typedef struct _TextAttrMap TextAttrMap; typedef struct _TextColorMap TextColorMap;
typedef BOOL (*CB_SHAPE_LAYOUT_RUN)(SEInstance* instance, typedef BOOL (*CB_SHAPE_LAYOUT_RUN)(SEInstance* instance,
const TEXTRUNSINFO* info, const LayoutRun* run, const TEXTRUNSINFO* info, const LayoutRun* run,
@@ -68,36 +68,31 @@ struct _ShapingEngineInfo {
CB_DESTROY_INSTANCE free; CB_DESTROY_INSTANCE free;
}; };
#define TEXTRUN_FLAG_CENTERED_BASELINE 0x01 #define TEXTRUN_FLAG_NO_SHAPING 0x01
#define TEXTRUN_FLAG_NO_SHAPING 0x02 #define TEXTRUN_FLAG_UPRIGHT 0x02
struct _TextRun { struct _TextRun {
struct list_head list; struct list_head list;
char* fontname; // the logfont name for this run; NULL for default char* fontname; // the logfont name for this run; NULL for default
int si; // start index in the uchar string int si; // start index in the uchar string
int len; // the length in uchars int len; // the length in uchars
Uint32 lc:8; // language code Uint32 lc:8; // language code
Uint32 st:8; // script type Uint32 st:8; // script type
Uint32 el:8; // the bidi embedding level Uint32 el:8; // the bidi embedding level
Uint32 flags:2; // other flags
#if 0
Uint32 dir:2; // the run direction; value range: [0, 3] Uint32 dir:2; // the run direction; value range: [0, 3]
Uint32 ort:2; // the glyph orientation; value range: [0, 3] Uint32 ort:2; // the glyph orientation; value range: [0, 3]
Uint32 flags:4;// other flags #endif
}; };
#define TEXT_ATTR_TEXT_COLOR 0x00 struct _TextColorMap {
#define TEXT_ATTR_UNDERLINE_COLOR 0x01
#define TEXT_ATTR_STRIKETHROUGH_COLOR 0x02
#define TEXT_ATTR_OUTLINE_COLOR 0x03
#define TEXT_ATTR_BACKGROUND_COLOR 0x04
struct _TextAttrMap {
struct list_head list; struct list_head list;
int si; int si;
int len; int len;
int type; // attribute type RGBCOLOR value; // attribute value
Uint32 value; // attribute value
}; };
struct _TEXTRUNSINFO { struct _TEXTRUNSINFO {
@@ -105,17 +100,22 @@ struct _TEXTRUNSINFO {
const Uchar32* ucs; // the uchars const Uchar32* ucs; // the uchars
char* fontname; // the default logfont name specified char* fontname; // the default logfont name specified
TextAttrMap attrs; // the head of color map (list) TextColorMap fg_colors; // the head of foreground color map (list)
TextColorMap bg_colors; // the head of background color map (list)
struct list_head truns; // the head of text runs (list) struct list_head truns; // the head of text runs (list)
int nr_ucs; // number of uchars int nr_ucs; // number of uchars
int nr_runs; // number of runs int nr_runs; // number of runs
LanguageCode lc; // language code specified
ParagraphDir base_dir; // paragraph base direction
#if 0
Uint32 lc:8; // language code specified Uint32 lc:8; // language code specified
Uint32 ort_base:3; // the glyph orientation specified Uint32 grv_base:4; // the gravity specified
Uint32 ort_rsv:3; // the glyph orientation resolved Uint32 grv_plc:2; // the gravity policy specified
Uint32 ort_plc:2; // the glyph orientation policy specified Uint32 grv_rsv:4; // the gravity resolved
Uint32 run_dir:4; // the run direction specified
Uint32 base_level:1; // the paragraph direction; 0 for LTR, 1 for RTL Uint32 base_level:1; // the paragraph direction; 0 for LTR, 1 for RTL
#endif
/* The following fields will be initialized by the shaping engine. */ /* The following fields will be initialized by the shaping engine. */
ShapingEngineInfo sei; // the shaping engine information ShapingEngineInfo sei; // the shaping engine information
@@ -125,9 +125,11 @@ struct _TEXTRUNSINFO {
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
RGBCOLOR __mg_textruns_get_text_color(const TEXTRUNSINFO* runinfo, int index); TextRun* __mg_text_run_copy(const TextRun *orig);
TextRun* __mg_text_run_split(TextRun *orig, int split_index);
const TextRun* __mg_text_run_get_by_offset(const TEXTRUNSINFO* runinfo, TextRun* __mg_text_run_get_by_offset(TEXTRUNSINFO* runinfo,
int index, int *start_offset);
const TextRun* __mg_text_run_get_by_offset_const(const TEXTRUNSINFO* runinfo,
int index, int *start_offset); int index, int *start_offset);
#ifdef __cplusplus #ifdef __cplusplus