Mercurial > emacs

comparison src/macterm.c @ 68145:d88b44855af3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[USE_ATSUI] (atsu_get_text_layout_with_text_ptr) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1020]: Specify kATSLineUseQDRendering. (XLoadQueryFont) [USE_ATSUI]: Display diacritical marks in decomposed form.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Thu, 12 Jan 2006 08:14:58 +0000
parents 114d965dfb60
children 3bd95f4f2941 de425e4eb0bc 7beb78bc1f8e
comparison
equal deleted inserted replaced
68144:7429d61c0c66 68145:d88b44855af3
624 ATSUAttributeTag tags[] = {kATSULineLayoutOptionsTag}; 624 ATSUAttributeTag tags[] = {kATSULineLayoutOptionsTag};
625 ByteCount sizes[] = {sizeof (ATSLineLayoutOptions)}; 625 ByteCount sizes[] = {sizeof (ATSLineLayoutOptions)};
626 static ATSLineLayoutOptions line_layout = 626 static ATSLineLayoutOptions line_layout =
627 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 627 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
628 kATSLineDisableAllLayoutOperations | kATSLineUseDeviceMetrics 628 kATSLineDisableAllLayoutOperations | kATSLineUseDeviceMetrics
629 | kATSLineUseQDRendering
629 #else 630 #else
630 kATSLineIsDisplayOnly | kATSLineFractDisable 631 kATSLineIsDisplayOnly | kATSLineFractDisable
631 #endif 632 #endif
632 ; 633 ;
633 ATSUAttributeValuePtr values[] = {&line_layout}; 634 ATSUAttributeValuePtr values[] = {&line_layout};
7505 sizeof (Boolean), sizeof (Boolean)}; 7506 sizeof (Boolean), sizeof (Boolean)};
7506 static Fixed size_fixed; 7507 static Fixed size_fixed;
7507 static Boolean bold_p, italic_p; 7508 static Boolean bold_p, italic_p;
7508 ATSUAttributeValuePtr values[] = {&font_id, &size_fixed, 7509 ATSUAttributeValuePtr values[] = {&font_id, &size_fixed,
7509 &bold_p, &italic_p}; 7510 &bold_p, &italic_p};
7510 ATSUFontFeatureType types[] = {kAllTypographicFeaturesType}; 7511 ATSUFontFeatureType types[] = {kAllTypographicFeaturesType,
7511 ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector}; 7512 kDiacriticsType};
7513 ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector,
7514 kDecomposeDiacriticsSelector};
7512 Lisp_Object font_id_cons; 7515 Lisp_Object font_id_cons;
7513 7516
7514 font_id_cons = Fgethash (make_unibyte_string (family, strlen (family)), 7517 font_id_cons = Fgethash (make_unibyte_string (family, strlen (family)),
7515 atsu_font_id_hash, Qnil); 7518 atsu_font_id_hash, Qnil);
7516 if (NILP (font_id_cons)) 7519 if (NILP (font_id_cons))