- Removed obsoleted options from WMGLOBAL and from the WINGs internal

structures (no longer needed with xft)
- Fixed default system font names (converted from xlfd to fontconfig names)
- A bit of code cleanups related to xft
- Replaced harcoded xlfd font names in wmaker and WPrefs with fontconfig
  names.

util/convertfonts.c

@@ -65,10 +65,6 @@ print_help()
     puts("               about what the original font was to allow hand tuning the");
     puts("               result or restoring the xlfd. The default is to not add it");
     puts("               as it results in long, unreadable and confusing names.");
-    puts("  --sets-too   try to approximate fontsets by using their first complete xlfd.");
-    puts("               This only works for singlebyte languages. The default is to");
-    puts("               replace the fontset with the default: 'sans-serif:pixelsize=12'");
-    puts("               which should display properly for any language.");
     puts("");
 }
 

util/fontconv.c

@@ -6,7 +6,7 @@
 
 #include "../src/wconfig.h"
 
-#define DEFAULT_FONT "sans-serif:pixelsize=12"
+#define DEFAULT_FONT "sans:pixelsize=12"
 
 static int
 countChar(char *str, char c)
@@ -161,18 +161,19 @@ xlfdToFc(char *xlfd, char *useFamily, Bool keepXLFD)
 
 
 /* return converted font (if conversion is needed) else the original font */
-char* convertFont(char *font, Bool keepXLFD)
+char*
+convertFont(char *font, Bool keepXLFD)
 {
     if (font[0]=='-') {
         char *res;
         char *tmp= wstrdup(font);
         
         if (MB_CUR_MAX < 2) {
-            char *ptr= strchr(tmp, ',');
+            char *ptr = strchr(tmp, ',');
             if (ptr) *ptr= 0;
-            res= xlfdToFc(tmp, NULL, keepXLFD);
+            res = xlfdToFc(tmp, NULL, keepXLFD);
         } else {
-            res= xlfdToFc(tmp, "sans", keepXLFD);
+            res = xlfdToFc(tmp, "sans", keepXLFD);
         }
         wfree(tmp);
         
@@ -181,3 +182,4 @@ char* convertFont(char *font, Bool keepXLFD)
         return font;
     }
 }
+

util/getstyle.c

@@ -115,8 +115,6 @@ static char *font_options[] = {
     NULL
 };
 
-#define DEFAULT_FONT "sans-serif:pixelsize=12"
-
 char *ProgName;
 
 WMPropList *PixmapPath = NULL;

util/setstyle.c

@@ -37,8 +37,6 @@
 
 #define MAX_OPTIONS 128
 
-#define DEFAULT_FONT "sans:pixelsize=12"
-
 char *FontOptions[] = {
     "IconTitleFont",
     "ClipTitleFont",