gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

- Removed obsoleted options from WMGLOBAL and from the WINGs internal

Browse Source 
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.
This commit is contained in:
dan
2004-10-17 06:27:51 +00:00
parent 19c7a99197
commit 6cfad0b10f
12 changed files with 51 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/fontconv.c
View File

@@ -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;
}
}