2511
|
1 |
--- xfig.3.2.5b-orig/xfig.3.2.5b/w_drawprim.c 2007-03-29 02:23:16.000000000 +0200
|
|
2 |
+++ xfig.3.2.5b/w_drawprim.c 2009-07-31 22:41:22.610182602 +0200
|
|
3 |
@@ -128,12 +128,19 @@
|
|
4 |
server really has them by checking for font of 0-0 size */
|
|
5 |
openwinfonts = False;
|
|
6 |
if (appres.scalablefonts) {
|
|
7 |
+ // F. Beffa 31 July 2009
|
|
8 |
+ //
|
|
9 |
+ // On OpenSolaris 2009.06 there are some rests from OpenWindows left and
|
|
10 |
+ // the following code fragmet thinks to be using OpenWindows. This is however
|
|
11 |
+ // not the case. The result is that fonts are not found.
|
|
12 |
+ // As a workaround we simply skip the test for OpenWindows.
|
|
13 |
+ //
|
|
14 |
/* first look for OpenWindow style font names (e.g. times-roman) */
|
|
15 |
- if ((fontlist = XListFonts(tool_d, ps_fontinfo[1].name, 1, &count))!=0) {
|
|
16 |
- openwinfonts = True; /* yes, use them */
|
|
17 |
- for (f=0; f<NUM_FONTS; f++) /* copy the OpenWindow font names */
|
|
18 |
- x_fontinfo[f].template = ps_fontinfo[f+1].name;
|
|
19 |
- } else {
|
|
20 |
+ //if ((fontlist = XListFonts(tool_d, ps_fontinfo[1].name, 1, &count))!=0) {
|
|
21 |
+ // openwinfonts = True; /* yes, use them */
|
|
22 |
+ // for (f=0; f<NUM_FONTS; f++) /* copy the OpenWindow font names */
|
|
23 |
+ // x_fontinfo[f].template = ps_fontinfo[f+1].name;
|
|
24 |
+ //} else {
|
|
25 |
strcpy(template,x_fontinfo[0].template); /* nope, check for font size 0 */
|
|
26 |
strcat(template,"0-0-*-*-*-*-");
|
|
27 |
/* add ISO8859 (if not Symbol font or ZapfDingbats) to font name */
|
|
28 |
@@ -143,7 +150,7 @@
|
|
29 |
else
|
|
30 |
strcat(template,"*-*");
|
|
31 |
fontlist = XListFonts(tool_d, template, 1, &count);
|
|
32 |
- }
|
|
33 |
+ //}
|
|
34 |
XFreeFontNames(fontlist);
|
|
35 |
}
|
|
36 |
|