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

correct some bad names of BIDI-related APIs

Browse Source
This commit is contained in:
Vincent Wei
2019-02-14 17:27:11 +08:00
parent d673008f5a
commit 74a84362ca
4 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/gdi.h
+47 -46
View File
@@ -10451,9 +10451,9 @@ MG_EXPORT int GUIAPI GetGlyphsByRules(LOGFONT* logfont,
* - The direction of the glyphs;
* - The writing mode (horizontal or vertical) and text orientation;
* - The hyphenation handling method;
* - The BIDI methods;
* - The BIDI method;
* - The hanging punctation method;
* - Whether and how to adjust the glyph postion for alignment of justify.
* - Whether and how to adjust the glyph position for alignment of justify.
* @{
*/
@@ -10509,10 +10509,10 @@ MG_EXPORT int GUIAPI GetGlyphsByRules(LOGFONT* logfont,
#define GRF_ALIGN_MASK 0x0F000000
#define GRF_ALIGN_LEFT 0x00000000
#define GRF_ALGIN_RIGHT 0x01000000
#define GRF_ALGIN_TOP 0x02000000
#define GRF_ALGIN_BOTTOM 0x03000000
#define GRF_ALGIN_JUSTIFY 0x04000000
#define GRF_ALIGN_RIGHT 0x01000000
#define GRF_ALIGN_TOP 0x02000000
#define GRF_ALIGN_BOTTOM 0x03000000
#define GRF_ALIGN_JUSTIFY 0x04000000
#define GRF_TEXT_JUSTIFY_MASK 0x30000000
#define GRF_TEXT_JUSTIFY_AUTO 0x00000000
@@ -10619,7 +10619,7 @@ typedef struct _GLYPHPOSORT {
*
* \sa GetGlyphsByRules, DrawGlyphStringEx, GLYPHEXTINFO, glyph_render_flags, white_space_rule
*/
MG_EXPORT PLOGFONT GUIAPI GetGlyphsExtentPointEx (LOGFONT* logfont, int x, int y,
MG_EXPORT PLOGFONT GUIAPI GetGlyphsExtentPointEx(LOGFONT* logfont, int x, int y,
const Glyph32* glyphs, const Uint8* break_oppos, int nr_glyphs,
Uint32 render_flags, Uint32 space_rule,
int letter_spacing, int word_spacing, int tab_size, int max_extent,
@@ -10939,9 +10939,9 @@ MG_EXPORT BOOL GUIAPI GetGlyphBIDIType (LOGFONT* log_font,
Glyph32 glyph_value, Uint32 *bidi_type);
/**
* \fn int GUIAPI BIDIGetTextLogicalGlyphs(LOGFONT* log_font, \
const char* text, int text_len, Glyph32** glyphs, \
GLYPHMAPINFO** glyphs_map)
* \fn int GUIAPI BIDIGetTextLogicalGlyphs(LOGFONT* log_font,
* const char* text, int text_len, Glyph32** glyphs,
* GLYPHMAPINFO** glyphs_map)
* \brief Get logical glyphs string of the text.
*
* \param log_font The logical font.
@@ -10955,13 +10955,34 @@ MG_EXPORT BOOL GUIAPI GetGlyphBIDIType (LOGFONT* log_font,
*
* \sa GLYPHMAPINFO
*/
MG_EXPORT int GUIAPI BIDIGetTextLogicalGlyphs(LOGFONT* log_font,
MG_EXPORT int GUIAPI BIDIGetTextLogicalGlyphs (LOGFONT* log_font,
const char* text, int text_len, Glyph32** glyphs,
GLYPHMAPINFO** glyphs_map);
/**
* \fn void GUIAPI BIDIGetTextRangesLog2Vis (LOGFONT* log_font,
* const char* text, int text_len,
* int start_index, int end_index,
* int** ranges, int* nr_ranges)
* \brief Get a list of visual ranges corresponding to a given logical range.
*
* \param log_font The logical font.
* \param text The pointer to the logical text string.
* \param text_len The length of the logical text string in bytes.
* \param start_index The start index of the logical range.
* \param end_index The end index of the logical range.
* \param ranges The pointer to store a pointer to an array of arranges.
* \param nr_ranges The number of ranges stored in \a ranges.
*
* \return None.
*/
MG_EXPORT void GUIAPI BIDIGetTextRangesLog2Vis (LOGFONT* log_font,
const char* text, int text_len, int start_index, int end_index,
int** ranges, int* nr_ranges);
/** \fn int GUIAPI BIDIGetTextVisualGlyphs (LOGFONT* log_font,
const char* text, int text_len, Glyph32** glyphs,
GLYPHMAPINFO** glyphs_map)
* const char* text, int text_len, Glyph32** glyphs,
* GLYPHMAPINFO** glyphs_map)
* \brief Get visual glyphs and glyph_map info relative with logical
* string byte index.
*
@@ -10978,12 +10999,12 @@ MG_EXPORT int GUIAPI BIDIGetTextVisualGlyphs (LOGFONT* log_font,
const char* text, int text_len, Glyph32** glyphs,
GLYPHMAPINFO** glyphs_map);
/** \fn Glyph32* GUIAPI BIDILogGlyphs2VisGlyphs (LOGFONT* log_font, \
/** \fn Glyph32* GUIAPI BIDILogGlyphs2VisGlyphs (LOGFONT* log_font,
* Glyph32* glyphs, int nr_glyphs, GLYPHMAPINFO* glyphs_map)
* \brief Reorder the logical glyphs string to visual glyphs string.
*
* This function reorders the logical glyphs string to visual
* glyphs string. If \a glyphs_map is not NULL, get the visual
* glyphs string. If \a glyphs_map is not NULL, also returns the visual
* glyphs map info.
*
* \param log_font The logical font.
@@ -10998,28 +11019,8 @@ MG_EXPORT Glyph32* GUIAPI BIDILogGlyphs2VisGlyphs (LOGFONT* log_font,
Glyph32* glyphs, int nr_glyphs, GLYPHMAPINFO* glyphs_map);
/**
* \fn void GUIAPI GetTextRangesLog2Vis (LOGFONT* log_font, char* text, \
int text_len, int start_index, int end_index, int** ranges, \
int* nr_ranges)
* \brief Get a list of visual ranges corresponding to a given logical range.
*
* \param log_font The logical font.
* \param text The pointer to the logical text string.
* \param text_len The length of the logical text string in bytes.
* \param start_index The start index of the logical range.
* \param end_index The end index of the logical range.
* \param ranges The pointer to store a pointer to an array of arranges.
* \param nr_ranges The number of ranges stored in \a ranges.
*
* \return None.
*/
MG_EXPORT void GUIAPI GetTextRangesLog2Vis (LOGFONT* log_font, char* text,
int text_len, int start_index, int end_index, int** ranges,
int* nr_ranges);
/**
* \fn void GUIAPI BIDIGetLogicalEmbeddLevels (LOGFONT* log_font, \
Glyph32* glyphs, int nr_glyphs, Uint8** embedding_level_list)
* \fn void GUIAPI BIDIGetLogicalEmbedLevels (LOGFONT* log_font, \
Glyph32* glyphs, int nr_glyphs, Uint8** embed_levels)
* \brief Get the logical embedding levels for the logical glyph string
* and generate runs by embedding levels, the for reorder to get
* visual glyph string.
@@ -11027,28 +11028,28 @@ MG_EXPORT void GUIAPI GetTextRangesLog2Vis (LOGFONT* log_font, char* text,
* \param log_font The logical font.
* \param glyphs The pointer to the logical glyph string.
* \param nr_glyphs The length of the glyph string.
* \param embedding_level_list The logical embedding level.
* \param embed_levels The logical embedding level.
*
* \return None.
*/
MG_EXPORT void GUIAPI BIDIGetLogicalEmbeddLevels (LOGFONT* log_font,
Glyph32* glyphs, int nr_glyphs, Uint8** embedding_level_list);
MG_EXPORT void GUIAPI BIDIGetLogicalEmbedLevels (LOGFONT* log_font,
Glyph32* glyphs, int nr_glyphs, Uint8** embed_levels);
/**
* \fn void GUIAPI BIDIGetVisualEmbeddLevels (LOGFONT* log_font, \
Glyph32* glyphs, int nr_glyphs, Uint8** embedding_level_list)
* \fn void GUIAPI BIDIGetVisualEmbedLevels (LOGFONT* log_font,
Glyph32* glyphs, int nr_glyphs, Uint8** embed_levels)
* \brief Get the visual embedding levels for the given logical glyph
* string, then you can get the edge for visual glyphs.
*
* \param log_font The logical font.
* \param log_font The logical font.
* \param glyphs The pointer to the logical glyph string.
* \param nr_glyphs The length of the glyph string.
* \param embedding_level_list The embedding level logical to visual.
* \param embed_levels The embedding level logical to visual.
*
* \return void.
*/
MG_EXPORT void GUIAPI BIDIGetVisualEmbeddLevels (LOGFONT* log_font,
Glyph32* glyphs, int nr_glyphs, Uint8** embedding_level_list);
MG_EXPORT void GUIAPI BIDIGetVisualEmbedLevels (LOGFONT* log_font,
Glyph32* glyphs, int nr_glyphs, Uint8** embed_levels);
/** @} end of glyph */
/*
src/control/bidiedit.c
+1 -1
View File
@@ -513,7 +513,7 @@ static void slePaint (HWND hWnd, HDC hdc, PBIDISLEDITDATA sled)
int start_byte_index = get_glyph_text_index(sled, sled->selStart);
int end_byte_index = get_glyph_text_index (sled, sled->selEnd);
GetTextRangesLog2Vis(log_font, (char*)TEXT, TEXTLEN,
BIDIGetTextRangesLog2Vis(log_font, (char*)TEXT, TEXTLEN,
start_byte_index, end_byte_index,
&ranges, &nr_ranges);
src/newgdi/bidi.c
+6 -11
View File
@@ -1198,7 +1198,7 @@ static int* generate_ranges(PLOGFONT log_font, Glyph32* log_glyphs,
GLYPHMAPINFO* v_map = NULL;
Uint8* embedding_level_list = NULL;
BIDIGetLogicalEmbeddLevels(log_font, log_glyphs,
BIDIGetLogicalEmbedLevels(log_font, log_glyphs,
nr_glyphs, &embedding_level_list);
/* get all the logical ranges in the same language.
@@ -1412,14 +1412,9 @@ void GUIAPI GetTextRangesLog2VisTest(
*
* \return void .
*/
void GUIAPI GetTextRangesLog2Vis(
LOGFONT* log_font,
char* text,
int text_len,
int start_index,
int end_index,
int** ranges,
int* nr_ranges)
void GUIAPI BIDIGetTextRangesLog2Vis(LOGFONT* log_font,
const char* text, int text_len, int start_index, int end_index,
int** ranges, int* nr_ranges)
{
int i = 0;
int* p = NULL;
@@ -1512,7 +1507,7 @@ void GUIAPI GetTextRangesLog2Vis(
*
* \param return void.
*/
void GUIAPI BIDIGetLogicalEmbeddLevels(
void GUIAPI BIDIGetLogicalEmbedLevels(
LOGFONT* log_font,
Glyph32* glyphs,
int nr_glyphs,
@@ -1544,7 +1539,7 @@ void GUIAPI BIDIGetLogicalEmbeddLevels(
*
* \param return void.
*/
void GUIAPI BIDIGetVisualEmbeddLevels(
void GUIAPI BIDIGetVisualEmbedLevels(
LOGFONT* log_font,
Glyph32* glyphs,
int nr_glyphs,
src/newgdi/glyph-css.c
+2 -2
View File
@@ -1734,7 +1734,7 @@ error:
return 0;
}
PLOGFONT GUIAPI GetGlyphsExtentPointEx (LOGFONT* logfont, int x, int y,
PLOGFONT GUIAPI GetGlyphsExtentPointEx(LOGFONT* logfont, int x, int y,
const Glyph32* glyphs, const Uint8* break_oppos, int nr_glyphs,
Uint32 reander_flags, Uint32 space_rule,
int letter_spacing, int word_spacing, int tab_size, int max_extent,
@@ -1746,7 +1746,7 @@ PLOGFONT GUIAPI GetGlyphsExtentPointEx (LOGFONT* logfont, int x, int y,
#endif /* _MGCHARSET_UNICODE */
BOOL GUIAPI DrawGlyphStringEx (HDC hdc, const Glyph32* glyphs, int nr_glyphs,
BOOL GUIAPI DrawGlyphStringEx(HDC hdc, const Glyph32* glyphs, int nr_glyphs,
const GLYPHPOSORT* pos_orts, PLOGFONT logfont_sideways)
{
return TRUE;