Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
7a31ef2d
Commit
7a31ef2d
authored
Dec 14, 1998
by
Huw D M Davies
Committed by
Alexandre Julliard
Dec 14, 1998
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XLFDs should be well-formed (14 hyphens) to match scalable fonts.
Stop slant field becoming wildcarded too early.
parent
8e7950a0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
14 deletions
+20
-14
xfont.c
graphics/x11drv/xfont.c
+20
-14
No files found.
graphics/x11drv/xfont.c
View file @
7a31ef2d
...
...
@@ -458,7 +458,7 @@ static BOOL32 LFD_ComposeLFD( fontObject* fo,
else
strcat
(
lpLFD
,
"-i"
);
else
strcat
(
lpLFD
,
(
uRelax
<
4
)
?
"-r"
:
"-*"
);
strcat
(
lpLFD
,
(
uRelax
<
6
)
?
"-r"
:
"-*"
);
/* add width style and skip serifs */
if
(
fo
->
fi
->
fi_flags
&
FI_NORMAL
)
...
...
@@ -511,15 +511,18 @@ static BOOL32 LFD_ComposeLFD( fontObject* fo,
#define CHRS_CASE1(charset) case 0: \
case 3: \
case 6: \
case 9: sprintf(lpEncoding, charset ); break;
case 9: \
case 12: sprintf(lpEncoding, charset ); break;
#define CHRS_CASE2(charset) case 1: \
case 4: \
case 7: \
case 10: sprintf(lpEncoding, charset ); break;
case 10: \
case 13: sprintf(lpEncoding, charset ); break;
#define CHRS_CASE3(charset) case 2: \
case 5: \
case 8: \
case 11: sprintf(lpEncoding, charset ); break;
case 11: \
case 14: sprintf(lpEncoding, charset ); break;
#define CHRS_DEF(charset) default: sprintf(lpEncoding, charset ); break;
if
(
fo
->
fi
->
df
.
dfCharSet
==
ANSI_CHARSET
)
...
...
@@ -651,7 +654,7 @@ static BOOL32 LFD_ComposeLFD( fontObject* fo,
switch
(
uRelax
)
{
CHRS_CASE1
(
"*-fontspecific"
);
CHRS_CASE2
(
"*-symbol"
);
CHRS_DEF
(
"*"
);
/* whatever */
CHRS_DEF
(
"*
-*
"
);
/* whatever */
}
}
...
...
@@ -678,30 +681,33 @@ static BOOL32 LFD_ComposeLFD( fontObject* fo,
case
3
:
case
4
:
case
5
:
case
6
:
/* 6-8 will have replaced an 'r' in slant by '*' */
case
7
:
case
8
:
sprintf
(
lpch
,
"%s-*-%i-%c-%c-*-%s"
,
h_string
,
fo
->
fi
->
lfd_resolution
,
ch
,
w
,
lpEncoding
);
break
;
case
6
:
case
7
:
case
8
:
case
9
:
case
10
:
case
11
:
sprintf
(
lpch
,
"%s-*-%i-%c-*-*-%s"
,
h_string
,
fo
->
fi
->
lfd_resolution
,
ch
,
lpEncoding
);
break
;
case
9
:
case
1
0
:
case
1
1
:
case
12
:
case
1
3
:
case
1
4
:
sprintf
(
lpch
,
"%i-*-%i-%c-*-*-%s"
,
fo
->
fi
->
lfd_height
,
fo
->
fi
->
lfd_resolution
,
ch
,
lpEncoding
);
break
;
case
1
2
:
case
1
5
:
sprintf
(
lpch
,
"%i-*-*-*-*-*-%s"
,
fo
->
fi
->
lfd_height
,
lpEncoding
);
break
;
default:
sprintf
(
lpch
,
"%i-*-*-*-*-*-*"
,
fo
->
fi
->
lfd_height
);
sprintf
(
lpch
,
"%i-*-*-*-*-*-*
-*
"
,
fo
->
fi
->
lfd_height
);
break
;
/* to avoid an infinite loop; those will allways match */
...
...
@@ -709,7 +715,7 @@ static BOOL32 LFD_ComposeLFD( fontObject* fo,
sprintf
(
lpLFD
,
"-*-*-*-*-*-*-*-*-*-*-*-*-iso8859-1"
);
break
;
case
201
:
sprintf
(
lpLFD
,
"-*-*-*-*-*-*-*-*-*-*-*-*-*"
);
sprintf
(
lpLFD
,
"-*-*-*-*-*-*-*-*-*-*-*-*-*
-*
"
);
break
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment