Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
2da48e3c
Commit
2da48e3c
authored
Dec 25, 1999
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Dec 25, 1999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't skip usable X fonts. Add support for koi8 fonts.
parent
cb9c9649
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
xfont.c
graphics/x11drv/xfont.c
+9
-6
No files found.
graphics/x11drv/xfont.c
View file @
2da48e3c
...
...
@@ -168,6 +168,10 @@ static SuffixCharset sufch_windows[] = {
{
"1257"
,
BALTIC_CHARSET
},
{
NULL
,
BALTIC_CHARSET
}};
/* CHECK/FIXME is BALTIC really the default ? */
static
SuffixCharset
sufch_koi8
[]
=
{
{
"r"
,
RUSSIAN_CHARSET
},
{
NULL
,
RUSSIAN_CHARSET
}};
/* Each of these must be matched explicitly */
static
SuffixCharset
sufch_any
[]
=
{
{
"fontspecific"
,
SYMBOL_CHARSET
},
...
...
@@ -194,6 +198,7 @@ static fontEncodingTemplate __fETTable[] = {
{
"tis620.2533"
,
sufch_tis620
,
&
__fETTable
[
7
]
},
{
"viscii1.1"
,
sufch_viscii
,
&
__fETTable
[
8
]
},
{
"windows"
,
sufch_windows
,
&
__fETTable
[
9
]
},
{
"koi8"
,
sufch_koi8
,
&
__fETTable
[
10
]
},
/* NULL prefix matches anything so put it last */
{
NULL
,
sufch_any
,
NULL
},
};
...
...
@@ -287,7 +292,7 @@ static LFD* LFD_Parse(LPSTR lpFont)
int
i
;
if
(
*
lpch
!=
HYPHEN
)
{
/* WARN("font '%s' doesn't begin with '%c'\n", lpFont, HYPHEN); */
WARN
(
"font '%s' doesn't begin with '%c'
\n
"
,
lpFont
,
HYPHEN
);
return
NULL
;
}
...
...
@@ -549,13 +554,11 @@ static int LFD_InitFontInfo( fontInfo* fi, const LFD* lfd, LPCSTR fullname )
{
case
0
:
/* Bitmap */
break
;
case
2
:
/* Scalable bitmap */
case
4
:
/* Scalable */
fi
->
fi_flags
|=
FI_SCALABLE
;
break
;
case
2
:
/* #$%^!!! X11R6 mutant garbage (scalable bitmap) */
TRACE
(
"Skipping scalable bitmap '%s'
\n
"
,
fullname
);
return
FALSE
;
default:
WARN
(
"Font '%s' has weird scalability
\n
"
,
fullname
);
return
FALSE
;
...
...
@@ -643,7 +646,7 @@ static int LFD_InitFontInfo( fontInfo* fi, const LFD* lfd, LPCSTR fullname )
}
}
}
/* WARN("font '%s' has unknown character set '%s'\n", fullname, lpstr); */
WARN
(
"font '%s' has unknown character set '%s'
\n
"
,
fullname
,
lpstr
);
return
FALSE
;
done:
...
...
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