Commit b4b18828 authored by Vincent Wei's avatar Vincent Wei
Browse files

change GLYPHTYPE_ to CHARTYPE_

parent 36167be7
......@@ -5818,40 +5818,40 @@ typedef Uint32 Uchar32;
*/
/**
* \def GLYPHTYPE_MCHAR_MASK
* \def CHARTYPE_MCHAR_MASK
* \brief The bits mask of glyph type for multi-byte character
*/
#define GLYPHTYPE_MCHAR_MASK 0x0000FFFF
#define CHARTYPE_MCHAR_MASK 0x0000FFFF
/**
* \def EXTRACT_MCHAR_TYPE(t)
* \brief Extracts multi-byte character type
*/
#define EXTRACT_MCHAR_TYPE(t) ((t) & GLYPHTYPE_MCHAR_MASK)
#define EXTRACT_MCHAR_TYPE(t) ((t) & CHARTYPE_MCHAR_MASK)
/**
* \def GLYPHTYPE_BASIC_MASK
* \def CHARTYPE_BASIC_MASK
* \brief The bits mask of glyph type for unicode charachter
*/
#define GLYPHTYPE_BASIC_MASK 0x00FF0000
#define CHARTYPE_BASIC_MASK 0x00FF0000
/**
* \def EXTRACT_BASIC_TYPE(t)
* \brief Extracts the basic UNICODE character type
*/
#define EXTRACT_BASIC_TYPE(t) (((t) & GLYPHTYPE_BASIC_MASK) >> 16)
#define EXTRACT_BASIC_TYPE(t) (((t) & CHARTYPE_BASIC_MASK) >> 16)
/**
* \def GLYPHTYPE_BREAK_MASK
* \def CHARTYPE_BREAK_MASK
* \brief The bits mask of break type for UNICODE charachter
*/
#define GLYPHTYPE_BREAK_MASK 0xFF000000
#define CHARTYPE_BREAK_MASK 0xFF000000
/**
* \def EXTRACT_BREAK_TYPE(t)
* \brief Extracts the break type of a UNICODE character
*/
#define EXTRACT_BREAK_TYPE(t) (((t) & GLYPHTYPE_BREAK_MASK) >> 24)
#define EXTRACT_BREAK_TYPE(t) (((t) & CHARTYPE_BREAK_MASK) >> 24)
#define MCHAR_TYPE_NOSPACING_MARK 0x0001
#define MCHAR_TYPE_ABOVE_MARK 0x0002
......
......@@ -147,12 +147,12 @@ void dbg_dumpDevFonts (void);
static inline BOOL check_zero_width(unsigned int t)
{
return (t & GLYPHTYPE_MCHAR_MASK) == MCHAR_TYPE_ZEROWIDTH;
return (t & CHARTYPE_MCHAR_MASK) == MCHAR_TYPE_ZEROWIDTH;
}
static inline BOOL check_vowel(unsigned int t)
{
return ((t & GLYPHTYPE_MCHAR_MASK) == MCHAR_TYPE_VOWEL);
return ((t & CHARTYPE_MCHAR_MASK) == MCHAR_TYPE_VOWEL);
}
static inline long get_file_size (const char* filename)
......
This diff is collapsed.
......@@ -107,7 +107,7 @@ static BOOL cb_drawtextex2 (void* context, Glyph32 glyph_value,
BBOX bbox;
int bkmode;
switch (char_type & GLYPHTYPE_MCHAR_MASK) {
switch (char_type & CHARTYPE_MCHAR_MASK) {
case MCHAR_TYPE_ZEROWIDTH:
case MCHAR_TYPE_CR:
adv_x = adv_y = 0;
......
......@@ -91,7 +91,7 @@ void _gdi_calc_glyphs_size_from_two_points (PDC pdc, int x0, int y0,
typedef BOOL (*CB_ONE_GLYPH) (void* context, Glyph32 glyph_value,
unsigned int char_type);
int _gdi_output_visual_glyphs(PDC pdc, Glyph32* visual_glyphs, int nr_glyphs,
int _gdi_output_visual_achars(PDC pdc, Glyph32* visual_glyphs, int nr_glyphs,
BOOL direction, CB_ONE_GLYPH cb_one_glyph, void* context);
int _gdi_reorder_text (PDC pdc, const unsigned char* text, int text_len,
......
......@@ -123,7 +123,7 @@ static BOOL cb_tabbedtextout (void* context, Glyph32 glyph_value,
BBOX bbox;
int bkmode = ctxt->pdc->bkmode;
switch (char_type & GLYPHTYPE_MCHAR_MASK) {
switch (char_type & CHARTYPE_MCHAR_MASK) {
case MCHAR_TYPE_ZEROWIDTH:
adv_x = adv_y = 0;
break;
......@@ -202,7 +202,7 @@ static BOOL cb_tabbedtextoutex (void* context, Glyph32 glyph_value,
int adv_x, adv_y;
int tab_pos = ctxt->nTabOrig;
switch (char_type & GLYPHTYPE_MCHAR_MASK) {
switch (char_type & CHARTYPE_MCHAR_MASK) {
case MCHAR_TYPE_ZEROWIDTH:
adv_x = adv_y = 0;
break;
......@@ -589,7 +589,7 @@ int GUIAPI GetTabbedTextExtentPoint (HDC hdc, const char* text,
glyph_value = SET_GLYPH_DFI(glyph_value, dfi);
}
switch (char_type & GLYPHTYPE_MCHAR_MASK) {
switch (char_type & CHARTYPE_MCHAR_MASK) {
case MCHAR_TYPE_ZEROWIDTH:
case MCHAR_TYPE_VOWEL:
break;
......
......@@ -138,10 +138,10 @@ int DrawGlyphString (HDC hdc, int startx, int starty, Glyph32* glyph_string, int
DRAW_GLYPHS_CTXT ctxt = {hdc, startx, starty, 0};
if ((((PDC)hdc)->ta_flags & TA_X_MASK) == TA_LEFT)
_gdi_output_visual_glyphs((PDC)hdc, glyph_string,
_gdi_output_visual_achars((PDC)hdc, glyph_string,
len, TRUE, cb_draw_glyph, &ctxt);
else
_gdi_output_visual_glyphs((PDC)hdc, glyph_string,
_gdi_output_visual_achars((PDC)hdc, glyph_string,
len, FALSE, cb_draw_glyph, &ctxt);
if (adv_x)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment