Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
xserver
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Adam Jackson
xserver
Commits
bd147e6f
Commit
bd147e6f
authored
Dec 01, 2008
by
Alan Coopersmith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove hack to only load font modules if magic strings appear in font path
parent
5f3f1417
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
26 deletions
+1
-26
hw/xfree86/common/xf86Configure.c
hw/xfree86/common/xf86Configure.c
+1
-26
No files found.
hw/xfree86/common/xf86Configure.c
View file @
bd147e6f
...
...
@@ -481,12 +481,9 @@ static XF86ConfModulePtr
configureModuleSection
(
void
)
{
char
**
elist
,
**
el
;
/* Find the list of extension modules. */
/* Find the list of extension
& font
modules. */
const
char
*
esubdirs
[]
=
{
"extensions"
,
NULL
};
const
char
*
fsubdirs
[]
=
{
"fonts"
,
NULL
};
...
...
@@ -505,28 +502,6 @@ configureModuleSection (void)
xfree
(
elist
);
}
/* Process list of font backends separately to include only required ones */
elist
=
LoaderListDirs
(
fsubdirs
,
NULL
);
if
(
elist
)
{
for
(
el
=
elist
;
*
el
;
el
++
)
{
XF86LoadPtr
module
;
module
=
xf86confcalloc
(
1
,
sizeof
(
XF86LoadRec
));
module
->
load_name
=
*
el
;
/* Add only those font backends which are referenced by fontpath */
/* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
if
(
defaultFontPath
&&
(
(
strcmp
(
*
el
,
"freetype"
)
==
0
&&
strstr
(
defaultFontPath
,
"/TTF"
))
||
(
strcmp
(
*
el
,
"type1"
)
==
0
&&
strstr
(
defaultFontPath
,
"/Type1"
))))
ptr
->
mod_load_lst
=
(
XF86LoadPtr
)
xf86addListItem
(
(
glp
)
ptr
->
mod_load_lst
,
(
glp
)
module
);
}
xfree
(
elist
);
}
return
ptr
;
}
...
...
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