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