Replace deprecated embedded X font names with standardized ones.
This avoids segfaults on more modern OSes like Centos7.
This commit is contained in:
parent
c12f377989
commit
90ff4dedba
|
@ -64,9 +64,9 @@
|
||||||
|
|
||||||
# define DREAL_MAX_COLOR ( RDS_ALL_LAYER + 5 )
|
# define DREAL_MAX_COLOR ( RDS_ALL_LAYER + 5 )
|
||||||
|
|
||||||
# define DREAL_LARGE_TEXT_FONT_NAME "9x15"
|
# define DREAL_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define DREAL_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define DREAL_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define DREAL_SMALL_TEXT_FONT_NAME "5x8"
|
# define DREAL_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
|
@ -64,9 +64,9 @@
|
||||||
|
|
||||||
# define GRAAL_MAX_COLOR ( RDS_ALL_LAYER + 7 )
|
# define GRAAL_MAX_COLOR ( RDS_ALL_LAYER + 7 )
|
||||||
|
|
||||||
# define GRAAL_LARGE_TEXT_FONT_NAME "9x15"
|
# define GRAAL_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define GRAAL_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define GRAAL_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define GRAAL_SMALL_TEXT_FONT_NAME "5x8"
|
# define GRAAL_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
|
@ -59,9 +59,9 @@
|
||||||
|
|
||||||
# define XFSM_MAX_COLOR ( 5 + XFSM_MAX_LAYER )
|
# define XFSM_MAX_COLOR ( 5 + XFSM_MAX_LAYER )
|
||||||
|
|
||||||
# define XFSM_LARGE_TEXT_FONT_NAME "9x15"
|
# define XFSM_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define XFSM_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define XFSM_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define XFSM_SMALL_TEXT_FONT_NAME "5x8"
|
# define XFSM_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
|
@ -59,9 +59,9 @@
|
||||||
|
|
||||||
# define XGRA_MAX_COLOR ( 5 + XGRA_MAX_LAYER )
|
# define XGRA_MAX_COLOR ( 5 + XGRA_MAX_LAYER )
|
||||||
|
|
||||||
# define XGRA_LARGE_TEXT_FONT_NAME "9x15"
|
# define XGRA_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define XGRA_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define XGRA_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define XGRA_SMALL_TEXT_FONT_NAME "5x8"
|
# define XGRA_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
|
@ -59,9 +59,9 @@
|
||||||
|
|
||||||
# define XPAT_MAX_COLOR ( 5 + XPAT_MAX_LAYER )
|
# define XPAT_MAX_COLOR ( 5 + XPAT_MAX_LAYER )
|
||||||
|
|
||||||
# define XPAT_LARGE_TEXT_FONT_NAME "9x15"
|
# define XPAT_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define XPAT_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define XPAT_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define XPAT_SMALL_TEXT_FONT_NAME "5x8"
|
# define XPAT_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
|
@ -59,9 +59,9 @@
|
||||||
|
|
||||||
# define XSCH_MAX_COLOR ( 5 + XSCH_MAX_LAYER )
|
# define XSCH_MAX_COLOR ( 5 + XSCH_MAX_LAYER )
|
||||||
|
|
||||||
# define XSCH_LARGE_TEXT_FONT_NAME "9x15"
|
# define XSCH_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define XSCH_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define XSCH_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define XSCH_SMALL_TEXT_FONT_NAME "5x8"
|
# define XSCH_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
|
@ -59,9 +59,9 @@
|
||||||
|
|
||||||
# define XVPN_MAX_COLOR ( 5 + XVPN_MAX_LAYER )
|
# define XVPN_MAX_COLOR ( 5 + XVPN_MAX_LAYER )
|
||||||
|
|
||||||
# define XVPN_LARGE_TEXT_FONT_NAME "9x15"
|
# define XVPN_LARGE_TEXT_FONT_NAME "-*-fixed-medium-*-normal--15-*-*-*-*-90-iso10646-1"
|
||||||
# define XVPN_MEDIUM_TEXT_FONT_NAME "7x13"
|
# define XVPN_MEDIUM_TEXT_FONT_NAME "-*-fixed-medium-*-normal--13-*-*-*-*-70-iso10646-1"
|
||||||
# define XVPN_SMALL_TEXT_FONT_NAME "5x8"
|
# define XVPN_SMALL_TEXT_FONT_NAME "-*-fixed-medium-*-normal--8-*-*-*-*-50-iso10646-1"
|
||||||
|
|
||||||
/*------------------------------------------------------------\
|
/*------------------------------------------------------------\
|
||||||
| |
|
| |
|
||||||
|
|
Loading…
Reference in New Issue