--- lib/libxview/font/font.c +++ lib/libxview/font/font.c @@ -87,13 +91,13 @@ #define PTSIZEPOS 8 #define XRESOLUTIONPOS 9 -#define DEFAULT_SMALL_FONT "-b&h-lucida-medium-r-normal-sans-*-100-*-*-*-*-*-*" +#define DEFAULT_SMALL_FONT "-cronyx-helvetica-medium-r-normal--*-100-*-*-*-*-*-*" #define DEFAULT_SMALL_FONT_SIZE 10 -#define DEFAULT_MEDIUM_FONT "-b&h-lucida-medium-r-normal-sans-*-120-*-*-*-*-*-*" +#define DEFAULT_MEDIUM_FONT "-cronyx-helvetica-medium-r-normal--*-120-*-*-*-*-*-*" #define DEFAULT_MEDIUM_FONT_SIZE 12 -#define DEFAULT_LARGE_FONT "-b&h-lucida-medium-r-normal-sans-*-140-*-*-*-*-*-*" +#define DEFAULT_LARGE_FONT "-cronyx-helvetica-medium-r-normal--*-140-*-*-*-*-*-*" #define DEFAULT_LARGE_FONT_SIZE 14 -#define DEFAULT_XLARGE_FONT "-b&h-lucida-medium-r-normal-sans-*-190-*-*-*-*-*-*" +#define DEFAULT_XLARGE_FONT "-cronyx-helvetica-medium-r-normal--*-180-*-*-*-*-*-*" #define DEFAULT_XLARGE_FONT_SIZE 19 #ifndef _XVIEW_DEFAULT_FONT @@ -105,8 +109,8 @@ /* * Note: changed DEFAULT_FONT_STYLE to normal */ -#define DEFAULT_FONT_FAMILY "lucida" -#define DEFAULT_FONT_FIXEDWIDTH_FAMILY "lucidatypewriter" +#define DEFAULT_FONT_FAMILY "helvetica" +#define DEFAULT_FONT_FIXEDWIDTH_FAMILY "courier" #ifdef OW_I18N #define DEFAULT_FONT_STYLE "FONT_STYLE_NORMAL" #else @@ -119,14 +123,14 @@ #define DEFAULT_FONT_WEIGHT "medium" #define DEFAULT_FONT_SLANT "r" #define DEFAULT_FONT_SETWIDTHNAME "normal" -#define DEFAULT_FONT_ADDSTYLENAME "sans" +#define DEFAULT_FONT_ADDSTYLENAME "" #define DEFAULT_FONT_SIZE 12 #define DEFAULT_FONT_SCALE (int) WIN_SCALE_MEDIUM #ifdef OW_I18N #define DEFAULT_FONT_SCALE_STR "Medium" #endif /*OW_I18N*/ -static char *sunview1_prefix = "/usr/lib/fonts/fixedwidthfonts/"; +static char *sunview1_prefix = "/usr/local/lib/fonts/fixedwidthfonts/"; #ifndef OW_I18N static Font_locale_info *fs_locales = NULL; @@ -225,19 +229,19 @@ */ "cmr", "times", "cour", "courier", - "gallant", "lucidatypewriter", + "gallant", "fixed", "serif", "times", - "lucidasans", "lucida", + "lucidasans", "helvetica", "olglyph", "open look glyph", "olcursor", "open look cursor", /* * Semantic entries */ - FONT_FAMILY_DEFAULT, "lucida", - FONT_FAMILY_DEFAULT_FIXEDWIDTH, "lucidatypewriter", - FONT_FAMILY_LUCIDA, "lucida", - FONT_FAMILY_LUCIDA_FIXEDWIDTH, "lucidatypewriter", + FONT_FAMILY_DEFAULT, "helvetica", + FONT_FAMILY_DEFAULT_FIXEDWIDTH, "courier", + FONT_FAMILY_LUCIDA, "helvetica", + FONT_FAMILY_LUCIDA_FIXEDWIDTH, "courier", FONT_FAMILY_ROMAN, "times", FONT_FAMILY_SERIF, "times", FONT_FAMILY_CMR, "times", @@ -247,7 +251,7 @@ FONT_FAMILY_OLGLYPH, "open look glyph", FONT_FAMILY_OLCURSOR, "open look cursor", #ifdef OW_I18N - FONT_FAMILY_SANS_SERIF, "lucida", + FONT_FAMILY_SANS_SERIF, "helvetica", #endif /*OW_I18N*/ NULL, NULL }; @@ -314,10 +318,10 @@ (int)WIN_SCALE_MEDIUM, "Medium", 12, - "-*-lucida-medium-r-*-*-*-100-*-*-*-*-*-*", - "-*-lucida-medium-r-*-*-*-120-*-*-*-*-*-*", - "-*-lucida-medium-r-*-*-*-140-*-*-*-*-*-*", - "-*-lucida-medium-r-*-*-*-190-*-*-*-*-*-*" + "-*-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*", + "-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*", + "-*-helvetica-medium-r-*-*-*-140-*-*-*-*-*-*", + "-*-helvetica-medium-r-*-*-*-180-*-*-*-*-*-*" }; static Font_locale_info *fs_locales = &C_locale; #endif @@ -348,8 +352,8 @@ * certain font families. */ static Wildcards known_wildcards[] = { - "b&h", "lucida", NULL, NULL, NULL, NULL, NULL, NULL, - "b&h", "lucidatypewriter", NULL, NULL, NULL, NULL, NULL, NULL, + "cronyx", "helvetica", NULL, NULL, NULL, NULL, NULL, NULL, + "cronyx", "courier", NULL, NULL, NULL, NULL, NULL, NULL, "sun", "open look cursor", "", "", "", "", "sunolcursor", "1", "sun", "open look glyph", "", "", "", "", "sunolglyph", "1", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL @@ -646,10 +650,10 @@ #endif /* ASK ISA */ - linfo->default_small_font = "-*-lucida-medium-r-*-*-*-100-*-*-*-*-*-*"; - linfo->default_medium_font = "-*-lucida-medium-r-*-*-*-120-*-*-*-*-*-*"; - linfo->default_large_font = "-*-lucida-medium-r-*-*-*-140-*-*-*-*-*-*"; - linfo->default_xlarge_font = "-*-lucida-medium-r-*-*-*-190-*-*-*-*-*-*"; + linfo->default_small_font = "-*-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*"; + linfo->default_medium_font = "-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*"; + linfo->default_large_font = "-*-helvetica-medium-r-*-*-*-140-*-*-*-*-*-*"; + linfo->default_xlarge_font = "-*-helvetica-medium-r-*-*-*-180-*-*-*-*-*-*"; } static Font_locale_info * @@ -3435,8 +3439,8 @@ font_setup_defaults(linfo) Font_locale_info *linfo; { - linfo->default_family = strdup("lucida"); - linfo->default_fixedwidth_family = strdup("lucidatypewriter"); + linfo->default_family = strdup("helvetica"); + linfo->default_fixedwidth_family = strdup("courier"); linfo->default_style = strdup("normal"); linfo->default_weight = strdup("medium"); linfo->default_slant = strdup("r"); @@ -3445,13 +3449,13 @@ linfo->default_size = 12; linfo->default_small_font = - strdup("-b&h-lucida-medium-r-*-*-*-100-*-*-*-*-*-*"); + strdup("-cronyx-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*"); linfo->default_medium_font = - strdup("-b&h-lucida-medium-r-*-*-*-120-*-*-*-*-*-*"); + strdup("-cronyx-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*"); linfo->default_large_font = - strdup("-b&h-lucida-medium-r-*-*-*-140-*-*-*-*-*-*"); + strdup("-cronyx-helvetica-medium-r-*-*-*-140-*-*-*-*-*-*"); linfo->default_xlarge_font = - strdup("-b&h-lucida-medium-r-*-*-*-190-*-*-*-*-*-*"); + strdup("-cronyx-helvetica-medium-r-*-*-*-180-*-*-*-*-*-*"); } #endif OW_I18N