- If fonts are specified as xlfd, convert to fc names before creating them.

This was we internally only deal with fc names and properties. It will
  incur a small performance hit as the font needs to be parsed/unparsed,
  but this is only for backward-compatibility to support old xlfd names.
  People are encouraged to swtich to fontconfig names.
- WINGs no longer adds sans as a fallback for internal fonts. It is
  automatically done by fontconfig (if it can't find the requested font
  it will use the closest match which is the default font: sans-serif)
- Added code to honor the AntialiasesText global option
- Fixed style names for WMCopyFontWithStyle()
- Added fonts in style files where they were missing. Also changed some
  fonts to better defaults.

FAQ.I18N

@@ -32,24 +32,35 @@ If I18N support does not work for you, check these:
 		here:
 		ftp://ftp.linux.or.jp/pub/RPM/glibc
 
-	- if you'd like to display multibyte characters, set the
-	  MultiByteText option to YES in ~/GNUstep/Defaults/WindowMaker
-	  and ~/GNUstep/Defaults/WMGLOBAL
-
 	- the fonts you're using support your locale. if your font
 	  setting on $HOME/GNUstep/Defaults/WindowMaker is like..
 
-	  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+	  WindowTitleFont = "Trebuchet MS:bold:pixelsize=12";
-	  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+	  MenuTitleFont   = "Trebuchet MS:bold:pixelsize=12";
 	  ......................................................
 
-	  then you can't display non iso8859-x charcters by helvetica. 
+	  then you can't display asian language (ja,ko,ch) characters using
-	  so quick way to display various languages' font is to change
+          Trebuchet MS. A font that is guaranteed to work for any language is
-	  all the font settings into:
+          sans (or sans-serif). sans is not a font itself, but an alias which
-	  
+          points to multiple fonts and will load the first in that list that
-		"-*-*-medium-r-normal-*-14-*-*-*-*-*-*-*"
+          has the ability to show glyphs in your language. If you don't know
+          a font that is suited for you language you can always set all your
+          fonts to something like:
 
-	  and also you need to change font settings in style files in
+		"sans:pixelsize=12"
+
+          However, please note that if your font is something like:
+
+          	"Trebuchet MS,Luxi Sans,sans:pixelsize=12"
+
+	  this will not be able to display asian languages if any of the
+          previous fonts before sans are installed. This is because unlike
+          the proper font pickup that sans guarantees for your language,
+          this construct only allows a font fallback mechanism, which tries
+          all the fonts in the list in order, until it finds one that is
+          available, even if it doesn't support your language.
+
+	  Also you need to change font settings in style files in
 	  the "$HOME/Library/WindowMaker/Style" directory.
 
 	- the LC_CTYPE environment variable is unset or it has the correct

FAQ.I18N.cs

@@ -44,12 +44,6 @@ Pokud v
 
                 ftp://ftp.linux.or.jp/pub/RPM/glibc
 
-        - pokud chcete zobrazovat multibyte znaky, nastavte volbu MultiByteText
-          na YES v souborech:
-
-                ~/GNUstep/Defaults/WindowMaker
-                ~/GNUstep/Defaults/WMGLOBAL
-
         - fonty, které používáte by měli být podporované vaším místním nastavením.
           Jestliže vaše nastavení fontů v souboru ~/GNUstep/Defaults/WindowMaker
           vypadá takto:

FAQ.I18N.sk

@@ -35,10 +35,6 @@ Ak v
 
 		 ftp://ftp.linux.or.jp/pub/RPM/glibc
 
-	- ak chcete zobrazovať multibyte znaky, nastavte možnosť
-	  MultiByteText YES v ~/GNUstep/Defaults/WindowMaker a
-	  ~/GNUstep/Defaults/WMGLOBAL	
-
 	- fonty, ktoré používate, podporujú vaše miesne nastavenia.
 	  Ak vaše nastavenia fontov v ~/GNUstep/Defaults/WindowMaker
 	  vyzerajú takto:

TODO

@@ -5,13 +5,9 @@ To do before next release:
   and give a warning if font is not converted, but let user manually convert
   it with convertfonts as the process may need manual tweaking for best
   results)
-- figure out a better gnustep path for wprefs.app installation
 - check whether window states are being saved/restored properly via netwm
   on restart/crash-restart (grep for XXX/TODO)
 
-1. make AntialiasedText in WMGLOBAL work
-2. make wmaker read old xlfd, but warn about them so people use convert 
-   (I think it reads them, but the warning needs to be added)
 
 =====================================================================
 
@@ -29,6 +25,7 @@ Do ASAP:
 
 Need to do:
 ===========
+- figure out a better gnustep path for wprefs.app installation
 - impelment a generic pixmap type, which receives attributes
   (scaled/maxscaled/centered/tiled, smoothed, size/position, ...)
 - allow user to select/restore default root menu from wprefs

WINGs/Tests/wtest.c

@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <string.h>
 
 /*
  * You need to define this function to link any program to WINGs.
@@ -590,6 +590,8 @@ testText(WMScreen *scr)
 {
     WMWindow *win;
     WMText *text;
+    WMFont *font;
+    void *tb;
     FILE *file = fopen("wm.html", "rb");
 
     windowCount++;
@@ -604,23 +606,22 @@ testText(WMScreen *scr)
     WMMoveWidget(text, 10, 10);
     WMSetTextHasVerticalScroller(text, True);
     WMSetTextEditable(text, False);
+    WMSetTextIgnoresNewline(text, False);
 
-    {
+#define FNAME "Verdana,Luxi Sans:pixelsize=12"
-        WMFont *font, *ifont;
+#define MSG \
+    "Window Maker is the GNU window manager for the " \
+    "X Window System. It was designed to emulate the " \
+    "look and feel of part of the NEXTSTEP(tm) GUI. It's " \
+    "supposed to be relatively fast and small, feature " \
+    "rich, easy to configure and easy to use, with a simple " \
+    "and elegant appearance borrowed from NEXTSTEP(tm)."
 
-        font = WMDefaultSystemFont(scr);
+    font = WMCreateFont(scr, FNAME":autohint=false");
-        //ifont = WMCopyFontWithStyle(scr, font, WFSEmphasized);
+    WMSetTextDefaultFont(text, font);
-        ifont = WMCreateFont(scr, "verdana,sans:pixelsize=12:italic");
+    WMReleaseFont(font);
-        if (ifont) {
-            WMSetTextDefaultFont(text, ifont);
-            WMReleaseFont(ifont);
-        } else {
-            WMSetTextDefaultFont(text, font);
-        }
-        WMReleaseFont(font);
-    }
 
-    if (file) {
+    if (0 && file) {
         char buf[1024];
 
         WMFreezeText(text);
@@ -630,13 +631,16 @@ testText(WMScreen *scr)
         fclose(file);
         WMThawText(text);
     } else {
-        WMAppendTextStream(text,
+        WMAppendTextStream(text, "First paragraph has autohinting turned off, "
-                           "Window Maker is the GNU window manager for the "
+                           "while the second has it turned on:");
-                           "X Window System. It was designed to emulate the "
+        WMAppendTextStream(text, "\n\n\n");
-                           "look and feel of part of the NEXTSTEP(tm) GUI. Its "
+        WMAppendTextStream(text, MSG);
-                           "supposed to be relatively fast and small, feature "
+        WMAppendTextStream(text, "\n\n\n");
-                           "rich, easy to configure and easy to use, with a simple "
+        font = WMCreateFont(scr, FNAME":autohint=true");
-                           "and elegant appearance borrowed from NEXTSTEP(tm).");
+        tb = WMCreateTextBlockWithText(text, MSG, font, WMBlackColor(scr),
+                                       0, strlen(MSG));
+        WMAppendTextBlock(text, tb);
+        WMReleaseFont(font);
     }
 
     WMRealizeWidget(win);
@@ -1043,7 +1047,6 @@ main(int argc, char **argv)
 
     testColorPanel(scr);
 
-    testFrame(scr);
 #if 0
 
     testBox(scr);

WINGs/WINGs/WINGs.h

@@ -431,8 +431,8 @@ typedef struct WMInputPanel {
 typedef enum WMFontStyle {
     WFSNormal = 0,
     WFSBold   = 1,
-    WFSEmphasized = 2,
+    WFSItalic = 2,
-    WFSBoldEmphasized = 3
+    WFSBoldItalic = 3
 } WMFontStyle;
 
 

WINGs/wfont.c

@@ -13,11 +13,15 @@
 #include <X11/Xlocale.h>
 
 
+#define DEFAULT_FONT "sans-serif:pixelsize=12"
+
 #define DEFAULT_SIZE WINGsConfiguration.defaultFontSize
 
-static char*
+
-fixXLFD(char *xlfd, int size)
+static FcPattern*
+xlfdToFcPattern(char *xlfd, int size)
 {
+    FcPattern *pattern;
     char *fname, *ptr;
 
     fname = wmalloc(strlen(xlfd) + 20);
@@ -30,6 +34,28 @@ fixXLFD(char *xlfd, int size)
         *ptr = 0;
     }
 
+    pattern = XftXlfdParse(fname, False, False);
+    wfree(fname);
+
+    if (!pattern) {
+        wwarning(_("invalid font: %s. Using default %s"), xlfd, DEFAULT_FONT);
+        pattern = FcNameParse(DEFAULT_FONT);
+    }
+
+    return pattern;
+}
+
+
+static char*
+xlfdToFcName(char *xlfd, int size)
+{
+    FcPattern *pattern;
+    char *fname;
+
+    pattern = xlfdToFcPattern(xlfd, size);
+    fname = FcNameUnparse(pattern);
+    FcPatternDestroy(pattern);
+
     return fname;
 }
 
@@ -68,7 +94,6 @@ hasPropertyWithStringValue(FcPattern *pattern, const char *object, char *value)
 }
 
 
-// also handle an xlfd with %d for size?
 static char*
 makeFontOfSize(char *font, int size, char *fallback)
 {
@@ -76,16 +101,13 @@ makeFontOfSize(char *font, int size, char *fallback)
     char *result;
 
     if (font[0]=='-') {
-        char *fname;
+        pattern = xlfdToFcPattern(font, size);
-
-        fname = fixXLFD(font, size);
-        pattern = XftXlfdParse(fname, False, False);
-        wfree(fname);
     } else {
         pattern = FcNameParse(font);
     }
 
-    //FcPatternPrint(pattern);
+    /*FcPatternPrint(pattern);*/
+
     if (size > 0) {
         FcPatternDel(pattern, FC_PIXEL_SIZE);
         FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)size);
@@ -98,6 +120,8 @@ makeFontOfSize(char *font, int size, char *fallback)
         FcPatternAddString(pattern, FC_FAMILY, fallback);
     }
 
+    /*FcPatternPrint(pattern);*/
+
     result = FcNameUnparse(pattern);
     FcPatternDestroy(pattern);
 
@@ -108,20 +132,20 @@ makeFontOfSize(char *font, int size, char *fallback)
 WMFont*
 WMCreateFont(WMScreen *scrPtr, char *fontName)
 {
-    WMFont *font;
     Display *display = scrPtr->display;
-    char *fname, *ptr;
+    WMFont *font;
+    char *fname;
 
-    /* This is for back-compat (to allow reading of old xlfd descriptions) */
+    if (fontName[0]=='-'){
-    if (fontName[0]=='-' && (ptr = strchr(fontName, ','))) {
+        fname = xlfdToFcName(fontName, 0);
-        // warn for deprecation
-        fname = wmalloc(ptr - fontName + 1);
-        strncpy(fname, fontName, ptr - fontName);
-        fname[ptr - fontName] = 0;
     } else {
         fname = wstrdup(fontName);
     }
 
+    if (!WINGsConfiguration.antialiasedText && !strstr(fname, ":antialias=")) {
+        fname = wstrappend(fname, ":antialias=false");
+    }
+
     font = WMHashGet(scrPtr->fontCache, fname);
     if (font) {
         WMRetainFont(font);
@@ -134,12 +158,7 @@ WMCreateFont(WMScreen *scrPtr, char *fontName)
 
     font->screen = scrPtr;
 
-    if (fname[0] == '-') {
+    font->font = XftFontOpenName(display, scrPtr->screen, fname);
-        // Backward compat thing. Remove in a later version
-        font->font = XftFontOpenXlfd(display, scrPtr->screen, fname);
-    } else {
-        font->font = XftFontOpenName(display, scrPtr->screen, fname);
-    }
     if (!font->font) {
         wfree(font);
         wfree(fname);
@@ -231,12 +250,12 @@ WMSystemFontOfSize(WMScreen *scrPtr, int size)
     WMFont *font;
     char *fontSpec;
 
-    fontSpec = makeFontOfSize(WINGsConfiguration.systemFont, size, "sans");
+    fontSpec = makeFontOfSize(WINGsConfiguration.systemFont, size, NULL);
 
     font = WMCreateFont(scrPtr, fontSpec);
 
     if (!font) {
-        wwarning(_("could not load font %s."), fontSpec);
+        wwarning(_("could not load font: %s."), fontSpec);
     }
 
     wfree(fontSpec);
@@ -251,12 +270,12 @@ WMBoldSystemFontOfSize(WMScreen *scrPtr, int size)
     WMFont *font;
     char *fontSpec;
 
-    fontSpec = makeFontOfSize(WINGsConfiguration.boldSystemFont, size, "sans");
+    fontSpec = makeFontOfSize(WINGsConfiguration.boldSystemFont, size, NULL);
 
     font = WMCreateFont(scrPtr, fontSpec);
 
     if (!font) {
-        wwarning(_("could not load font %s."), fontSpec);
+        wwarning(_("could not load font: %s."), fontSpec);
     }
 
     wfree(fontSpec);
@@ -348,23 +367,29 @@ WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style)
     case WFSNormal:
         FcPatternDel(pattern, FC_WEIGHT);
         FcPatternDel(pattern, FC_SLANT);
-        FcPatternAddString(pattern, FC_WEIGHT, "regular");
+        //FcPatternAddString(pattern, FC_WEIGHT, "medium");
-        FcPatternAddString(pattern, FC_WEIGHT, "medium");
+        //FcPatternAddString(pattern, FC_WEIGHT, "light");
-        FcPatternAddString(pattern, FC_SLANT, "roman");
+        //FcPatternAddString(pattern, FC_SLANT, "roman");
         break;
     case WFSBold:
         FcPatternDel(pattern, FC_WEIGHT);
         FcPatternAddString(pattern, FC_WEIGHT, "bold");
+        FcPatternAddString(pattern, FC_WEIGHT, "demibold");
+        FcPatternAddString(pattern, FC_WEIGHT, "black");
         break;
-    case WFSEmphasized:
+    case WFSItalic:
         FcPatternDel(pattern, FC_SLANT);
         FcPatternAddString(pattern, FC_SLANT, "italic");
         FcPatternAddString(pattern, FC_SLANT, "oblique");
+        //FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+        //FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_OBLIQUE);
         break;
-    case WFSBoldEmphasized:
+    case WFSBoldItalic:
         FcPatternDel(pattern, FC_WEIGHT);
         FcPatternDel(pattern, FC_SLANT);
         FcPatternAddString(pattern, FC_WEIGHT, "bold");
+        FcPatternAddString(pattern, FC_WEIGHT, "demibold");
+        FcPatternAddString(pattern, FC_WEIGHT, "black");
         FcPatternAddString(pattern, FC_SLANT, "italic");
         FcPatternAddString(pattern, FC_SLANT, "oblique");
         break;

WPrefs.app/Expert.c

@@ -73,7 +73,7 @@ createPanel(Panel *p)
         WMMoveWidget(panel->swi[i], 20, 20+i*25);
     }
 
-    WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));
+    WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."));
     WMSetButtonText(panel->swi[1], _("Do not set non-WindowMaker specific parameters (do not use xset)."));
     WMSetButtonText(panel->swi[2], _("Automatically save session when exiting Window Maker."));
     WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects."));

WPrefs.app/Focus.c

@@ -220,14 +220,14 @@ createPanel(Panel *p)
 
         panel->kfocB[0] = WMCreateRadioButton(box);
         WMSetButtonText(panel->kfocB[0], _("Manual:  Click on the window to set "\
-                                           "keyboard input focus"));
+                                           "keyboard input focus."));
         WMAddBoxSubview(box, WMWidgetView(panel->kfocB[0]), True, True,
                         20, 0, 0);
 
         panel->kfocB[1] = WMCreateRadioButton(box);
         WMGroupButtons(panel->kfocB[0], panel->kfocB[1]);
         WMSetButtonText(panel->kfocB[1], _("Auto:  Set keyboard input focus to "\
-                                           "the window under the mouse pointer"));
+                                           "the window under the mouse pointer."));
         WMAddBoxSubview(box, WMWidgetView(panel->kfocB[1]), True, True,
                         20, 0, 0);
 
@@ -250,7 +250,7 @@ createPanel(Panel *p)
     panel->autB = WMCreateRadioButton(panel->cfocF);
     WMResizeWidget(panel->autB, 225, 20);
     WMMoveWidget(panel->autB, 10, 43);
-    WMSetButtonText(panel->autB, _("...that is under the mouse pointer."));
+    WMSetButtonText(panel->autB, _("...that's under the mouse pointer."));
     WMGroupButtons(panel->manB, panel->autB);
 
     WMMapSubwidgets(panel->cfocF);

WPrefs.app/WPrefs.c

@@ -322,7 +322,8 @@ createMainWindow(WMScreen *scr)
     WMMoveWidget(WPrefs.banner, FRAME_LEFT, FRAME_TOP);
     WMSetFrameRelief(WPrefs.banner, WRFlat);
 
-    font = WMCreateFont(scr, "Lucida Sans,URW Gothic L,Times New Roman,serif:bold:pixelsize=26");
+    font = WMCreateFont(scr, "Lucida Sans,URW Gothic L,Times New Roman,serif"
+                        ":bold:pixelsize=26:antialias=true");
     WPrefs.nameL = WMCreateLabel(WPrefs.banner);
     WMSetLabelTextAlignment(WPrefs.nameL, WACenter);
     WMResizeWidget(WPrefs.nameL, FRAME_WIDTH-20, 60);

WPrefs.app/font.data

@@ -1,161 +0,0 @@
-{
-    Encodings = (("default", 0, "iso8859-1",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("latin1 iso8859-1", 0, "iso8859-1",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("latin2 iso8859-2", 1, "iso8859-2",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("Greek iso8859-7", 1, "iso8859-7",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("Japanese jis", 1, "jis",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("Korean ksc5601", 1, "ksc5601",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("Korean2 ksc5601.1987", 1, "ksc5601.1987",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("Russian koi8-r", 1, "koi8-r",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890"),
-		 ("Ukrainian koi8-u", 1, "koi8-u",
-		  "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz\n1234567890")
-		 );
-
-    WindowTitleFont = {
-	"iso8859-1" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-1");
-	"iso8859-2" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-2");
-	"iso8859-7" = ("-*-georgia-bold-r-normal-*-14-*-*-*-*-*-iso8859-7");
-	"jis" = ("-*-fixed-bold-r-normal-*-16-*-*-*-*-*-jisx0208.1983-*",
-		 "-*-*-medium-r-normal-*-14-*",
-		 "-*-*-medium-r-normal-*-*-*");
-	"ksc5601" = ("-*-mincho-bold-r-normal-*-12-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"ksc5601.1987" = ("-*-gothic-medium-r-normal-*-16-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-helvetica-medium-r-normal--14-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--16-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"koi8-r" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-r");
-	"koi8-u" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-u");
-    };
-    
-    MenuTitleFont = {
-	"iso8859-1" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-1");
-	"iso8859-2" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-iso8859-2");
-	"iso8859-7" = ("-*-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-7");
-	"jis" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*",
-		 "-*-*-medium-r-normal-*-14-*",
-		 "-*-*-medium-r-normal-*-*-*");
-	"ksc5601" = ("-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*",
-		     "-*-kodig-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*",
-		     "-*-gothic-medium-r-normal--16-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-*-medium-r-normal--16-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"koi8-r" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-r");
-	"koi8-u" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-u");
-    };
-
-    MenuTextFont = {
-	"iso8859-1" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-1");
-	"iso8859-2" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-2");
-	"iso8859-7" = ("-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-7");
-	"jis" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*",
-		 "-*-*-medium-r-medium-*-14-*",
-		 "-*-*-medium-r-medium-*-*-*");
-	"ksc5601" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*",
-		     "-*-kodig-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-14-*-*-*-*-*-*-*",
-		     "-*-gothic-medium-r-normal--16-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-*-medium-r-normal--16-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"koi8-r" = ("-*-georgia-medium-r-normal-*-12-*-*-*-*-*-koi8-r");
-	"koi8-u" = ("-*-georgia-bold-r-normal-*-12-*-*-*-*-*-koi8-u");
-    };
-
-    IconTitleFont = {
-	"iso8859-1" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-iso8859-1");
-	"iso8859-2" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-iso8859-2");
-	"iso8859-7" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-iso8859-7");
-	"jis" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*",
-		 "-*-*-medium-r-medium-*-10-*",
-		 "-*-*-medium-r-medium-*-*-*");
-	"ksc5601" = ("-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*",
-		     "-*-kodig-medium-r-normal--8-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--8-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
-		     "-*-gothic-medium-r-normal--12-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"koi8-r" = ("-*-georgia-medium-r-normal-*-8-*-*-*-*-*-koi8-r");
-	"koi8-u" = ("-*-georgia-medium-r-normal-*-8-*-*-*-*-*-koi8-u");
-    };
-
-    ClipTitleFont = {
-	"iso8859-1" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-iso8859-1");
-	"iso8859-2" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-iso8859-2");
-	"iso8859-7" = ("-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-7");
-	"jis" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
-		 "-*-*-medium-r-medium-*-12-*",
-		 "-*-*-medium-r-medium-*-*-*");
-	"ksc5601" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
-		     "-*-kodig-medium-r-normal--10-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--10-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*",
-		     "-*-gothic-medium-r-normal--12-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-*-medium-r-normal--12-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"koi8-r" = ("-*-georgia-medium-r-normal-*-10-*-*-*-*-*-koi8-r");
-	"koi8-u" = ("-*-georgia-medium-r-normal-*-8-*-*-*-*-*-koi8-u");
-    };
-
-    LargeDisplayFont = {
-	"iso8859-1" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-iso8859-1");
-	"iso8859-2" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-iso8859-2");
-	"iso8859-7" = ("-*-helvetica-medium-r-normal-*-26-*-*-*-*-*-iso8859-7");
-	"jis" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*",
-		 "-*-*-medium-r-medium-*-26-*",
-		 "-*-*-medium-r-medium-*-*-*");
-	"ksc5601" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*",
-		     "-*-kodig-medium-r-normal--24-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--24-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"ksc5601.1987" = ("-*-helvetica-medium-r-normal-*-24-*-*-*-*-*-*-*",
-		     "-*-gothic-medium-r-normal--24-*-*-*-*-*-ksc5601.1987-*",
-		     "-*-*-medium-r-normal--24-*-*-*-*-*-*-*",
-		     "-*-*-medium-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-r-normal--*-*-*-*-*-*-*-*",
-		     "-*-*-*-*-*--*-*-*-*-*-*-*-*","*");
-	"koi8-r" = ("-*-georgia-medium-r-normal-*-24-*-*-*-*-*-koi8-r");
-	"koi8-u" = ("-*-georgia-medium-r-normal-*-24-*-*-*-*-*-koi8-u");
-    };
-}
-
-

WindowMaker/Defaults/WMGLOBAL

@@ -2,8 +2,7 @@
   SystemFont = "Trebuchet MS,Luxi Sans";
   BoldSystemFont = "Trebuchet MS,Luxi Sans:bold";
   DefaultFontSize = 12;
-  AntialiasedText = No;
+  AntialiasedText = Yes;
-  MultiByteText = AUTO;
   FloppyPath = "/floppy";
   DoubleClickTime = 250;
   MouseWheelUp = Button4;

WindowMaker/Defaults/WindowMaker.in

@@ -108,10 +108,10 @@
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=10";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
-  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  LargeDisplayFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=24";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = black;

WindowMaker/Styles/Autumn.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = white;

WindowMaker/Styles/Black.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/BlackTexture.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Blue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = left;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/BlueDawn.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = left;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/BlueishGreen.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = lightgoldenrod1;
   HighlightTextColor = black;

WindowMaker/Styles/Brown.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Brownish.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
   HighlightColor = "#c0b0b0";
   HighlightTextColor = "#201010";
   ClipTitleColor = white;

WindowMaker/Styles/Chumbo.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Copper.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/DarkBlue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/DarkRed.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Emerald.style

@@ -1,10 +1,11 @@
 {
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = "#595d8e";
   HighlightTextColor = "#71b6d7";
   ClipTitleColor = white;

WindowMaker/Styles/Fire.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = left;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Food.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Golden.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Green.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/GreyBlue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Gtk.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = blue;
   HighlightTextColor = white;

WindowMaker/Styles/IRednBlue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = left;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Interlace.style

@@ -1,12 +1,12 @@
 {
-  TitleJustify = right;
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  LargeDisplayFont = "-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = right;
   HighlightColor = "#000000";
   HighlightTextColor = "#bac4e0";
   ClipTitleColor = "#8a94b0";

WindowMaker/Styles/LightBlue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/NewBlue.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = left;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = left;
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = black;

WindowMaker/Styles/NightSky.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
   HighlightColor = "#ffe0ac";
   HighlightTextColor = "#000000";
   ClipTitleColor = "#fff38c";

WindowMaker/Styles/Pastel.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Pink.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = white;

WindowMaker/Styles/Pumpkin.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = black;

WindowMaker/Styles/Purple.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Purplish.style

@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
   DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
   HighlightColor = "#c0c0d0";
   HighlightTextColor = "#505070";
   ClipTitleColor = black;

WindowMaker/Styles/Red.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = left;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/RednBlue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Spring.style

@@ -1,10 +1,11 @@
 {
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
   WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
   MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
-  DisplayFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=24";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = "#ffffff";
   HighlightTextColor = "#000000";
   ClipTitleColor = black;

WindowMaker/Styles/Summer.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/Traditional.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Styles/VioletBlue.style

@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
   HighlightColor = white;
   HighlightTextColor = black;

WindowMaker/Themes/Default.style

@@ -1,11 +1,12 @@
 {
   TitleJustify = left;
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = black;

WindowMaker/Themes/OpenStep.style

@@ -1,12 +1,13 @@
 {
   NewStyle = YES;
   TitleJustify = left;
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = black;

WindowMaker/Themes/Pastel.style

@@ -1,11 +1,12 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = left;
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = "rgb:79/96/cf";

WindowMaker/Themes/SteelBlueSilk.style

@@ -1,11 +1,12 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
   TitleJustify = center;
-  ClipTitleFont = "-b&h-lucida-medium-r-normal-*-10-*-*-*-p-*-iso8859-1";
-  WindowTitleFont = "-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1";
-  MenuTitleFont = "-b&h-lucida-bold-r-normal-*-12-*-*-*-p-*-iso8859-1";
-  MenuTextFont = "-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1";
-  IconTitleFont = "-b&h-lucida-medium-r-normal-*-10-*-*-*-p-*-iso8859-1";
-  DisplayFont = "-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1";
   HighlightColor = white;
   HighlightTextColor = black;
   ClipTitleColor = white;

src/dialog.c

@@ -1270,7 +1270,8 @@ wShowInfoPanel(WScreen *scr)
     WMResizeWidget(panel->name1L, 240, 30 - sepWidth);
     WMMoveWidget(panel->name1L, 100, 30);
 
-    name = "Lucida Sans,Comic Sans MS,URW Gothic L,Trebuchet MS,sans:bold:pixelsize=26";
+    name = "Lucida Sans,Comic Sans MS,URW Gothic L,Trebuchet MS"
+        ":bold:pixelsize=26:antialias=true";
     font = WMCreateFont(scr->wmscreen, name);
     strbuf = "Window Maker";
     if (font) {
@@ -1290,7 +1291,7 @@ wShowInfoPanel(WScreen *scr)
     panel->name2L = WMCreateLabel(panel->win);
     WMResizeWidget(panel->name2L, 240, 24);
     WMMoveWidget(panel->name2L, 100, 60);
-    name = "URW Gothic L,Nimbus Sans L,sans:pixelsize=16";
+    name = "URW Gothic L,Nimbus Sans L:pixelsize=16:antialias=true";
     font = WMCreateFont(scr->wmscreen, name);
     if (font) {
         WMSetLabelFont(panel->name2L, font);

src/wconfig.h.in

@@ -272,11 +272,11 @@
 #define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
 #define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\""
 #define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
-#define DEF_ICON_TITLE_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=8\""
+#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=9\""
-#define DEF_CLIP_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=10\""
+#define DEF_CLIP_TITLE_FONT "\"Verdana:bold:pixelsize=10\""
 #define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\""
 
-#define DEF_WORKSPACE_NAME_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=24\""
+#define DEF_WORKSPACE_NAME_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=24\""
 
 
 #define DEF_FRAME_THICKNESS 1	       /* linewidth of the move/resize frame */