icewm/src/icehelp.cc | 2 +- icewm/src/iceicon.cc | 2 +- icewm/src/yconfig.h | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/icewm/src/icehelp.cc b/icewm/src/icehelp.cc index 89b56a7..46ee154 100644 --- a/icewm/src/icehelp.cc +++ b/icewm/src/icehelp.cc @@ -666,7 +666,7 @@ HTextView::HTextView(HTListener *fL, YScrollView *v, YWindow *parent): //-adobe-helvetica-bold-o-normal--11-80-100-100-p-60-iso8859-1 //font = YFont::getFont("-adobe-helvetica-medium-r-normal--8-80-75-75-p-46-iso8859-1"); //font = YFont::getFont("-adobe-helvetica-medium-r-normal--24-240-75-75-p-130-iso8859-1"); - font = YFont::getFont("-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1", "sans-serif-12"); + font = YFont::getFont("-*-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1", "sans-serif-12"); //font = YFont::getFont("-adobe-helvetica-medium-r-normal--11-80-100-100-p-56-iso8859-1"); //font = YFont::getFont("-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1"); normalFg = new YColor("rgb:00/00/00"); diff --git a/icewm/src/iceicon.cc b/icewm/src/iceicon.cc index 05aaef7..3acbac4 100644 --- a/icewm/src/iceicon.cc +++ b/icewm/src/iceicon.cc @@ -189,7 +189,7 @@ YIconView::YIconView(YScrollView *view, YWindow *aParent): YWindow(aParent) { bg = new YColor("rgb:CC/CC/CC"); fg = YColor::black; //new YColor("rgb:00/00/00"); - font = YFont::getFont("-b&h-lucida-medium-r-*-*-*-120-*-*-*-*-*-*", "monospace:size=10"); + font = YFont::getFont("-*-lucida-medium-r-*-*-*-120-*-*-*-*-*-*", "monospace:size=10"); fontWidth = font->textWidth("M"); fontHeight = font->height(); diff --git a/icewm/src/yconfig.h b/icewm/src/yconfig.h index 01b40eb..0c4fec1 100644 --- a/icewm/src/yconfig.h +++ b/icewm/src/yconfig.h @@ -45,15 +45,15 @@ #define BOLDTTFONT(pt) "-*-monospace-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" #else #ifdef FONTS_ADOBE -#define FONT(pt) "-b&h-lucida-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" -#define BOLDFONT(pt) "-b&h-lucida-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" -#define TTFONT(pt) "-b&h-lucidatypewriter-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" -#define BOLDTTFONT(pt) "-b&h-lucidatypewriter-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define FONT(pt) "-*-*-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define BOLDFONT(pt) "-*-*-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define TTFONT(pt) "-*-*-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define BOLDTTFONT(pt) "-*-*-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" #else -#define FONT(pt) "-adobe-helvetica-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" -#define BOLDFONT(pt) "-adobe-helvetica-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" -#define TTFONT(pt) "-adobe-courier-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" -#define BOLDTTFONT(pt) "-adobe-courier-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define FONT(pt) "-*-helvetica-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define BOLDFONT(pt) "-*-helvetica-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define TTFONT(pt) "-*-courier-medium-r-*-*-*-" #pt "-*-*-*-*-*-*" +#define BOLDTTFONT(pt) "-*-courier-bold-r-*-*-*-" #pt "-*-*-*-*-*-*" #endif #endif