Changeset 3499 in Sophya for trunk/SophyaPI

Timestamp:

Jun 17, 2008, 4:52:49 PM (17 years ago)

Author:

mansoux

Message:

contournement pb XLoadQueryFont avec serveur X (XOrg) Mandriva - Bruno+Reza 17/06/2008

File:

• trunk/SophyaPI/PI/pifontx.cc (modified) (3 diffs)

trunk/SophyaPI/PI/pifontx.cc

@@ -289 +289 @@
   int count,k;
   Display * mdsp = PIXDisplay();
-  char **list;
+  char **list = NULL;
 
   for (k=0; k<5; k++)  {  // Recherche de la fonte pour tailles croissantes
     sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbi_b[jat], fntsz[isz]+k);
     list = XListFonts(mdsp, buff, 10, &count);
-    XFreeFontNames(list);
     if ((count <= 0) && (fnbo_b[jat] != NULL)) {
+      if (list) XFreeFontNames(list);  
       sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbo_b[jat], fntsz[isz]+k);
       list = XListFonts(mdsp, buff, 10, &count);
-      XFreeFontNames(list);
     }
     if (count > 0)  break;
-    }
+  }
   // certaines fontes n'ont pas de version  bold ou italique
   if ( (count == 0) && (jat > 0) ) {
     for (k=0; k<5; k++)  {  // Recherche de la fonte pour tailles croissantes
+      if (list) XFreeFontNames(list);  
       sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbi_b[0], fntsz[isz]+k);
       list = XListFonts(mdsp, buff, 10, &count);
-      XFreeFontNames(list);
       if (count > 0)  break;
-      }
     }
-  if (count > 0) 
-    fntst[isz][jat][kfn] = XLoadQueryFont(mdsp, buff);
-  else
-    { printf("PIFontX::LoadFontSt/ Pb font %s - Using default \n", buff);    
-    fntst[isz][jat][kfn] = defnt; }
+  }
+  if (count > 0) {
+    for (int kkk=0; kkk<count; kkk++) {
+      fntst[isz][jat][kfn] = XLoadQueryFont(mdsp, list[kkk]);
+      if (fntst[isz][jat][kfn] != NULL) break;
+    }
+    if (list) XFreeFontNames(list);  
+  }
+  else  { 
+    if (list) XFreeFontNames(list);  
+    printf("PIFontX::LoadFontSt/ Pb font %s - Using default \n", buff);    
+    fntst[isz][jat][kfn] = defnt; 
+    }
   }
 
@@ -343 +349 @@
                           XtNumber(resources), NULL, 0);
 sprintf(buff,"-%s-*-*-*-*-*-*-*-*-*-*-*-*", apd.fntFam[0]);
+list = NULL;
 list = XListFonts(mdsp, buff, 15, &count);
-XFreeFontNames(list);
 if (count < 5)
   { 
@@ -350 +356 @@
          count, apd.fntFam[0]);
   apd.fntFam[0] = "*-courier";
+  if (list) XFreeFontNames(list);
   }
 sprintf(buff,"-%s-%s-*-*-*-*-12-*-*-*-*", apd.fntFam[0], fnbi_b[0]);
 list = XListFonts(mdsp, buff, 10, &count);
-XFreeFontNames(list);
 if (count < 1) {
+  if (list) XFreeFontNames(list);
   sprintf(buff,"-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*");
   list = XListFonts(mdsp, buff, 10, &count);
-  XFreeFontNames(list);
   if (count < 1)   {  
+    if (list) XFreeFontNames(list);
     sprintf(buff,"fixed");
     list = XListFonts(mdsp, buff, 10, &count);
-    XFreeFontNames(list);
   }
   if (count < 1)   {  
+    if (list) XFreeFontNames(list);
     strcpy(buff,"");
     list = XListFonts(mdsp, buff, 10, &count);
-    XFreeFontNames(list);
   }
 }
 if (count < 1) {  
+  if (list) XFreeFontNames(list);
   printf("PIFontX::Init/ Erreur, no font found ... \n");
   defnt = NULL;
-  }
-else defnt = XLoadQueryFont(mdsp, buff);
-
+  //Reza+Bruno, 17 Juin 2008 - Il faut lancer une exception 
+  }
+else { 
+  defnt = NULL;
+  for (int kkk=0; kkk<count; kkk++) {
+    defnt = XLoadQueryFont(mdsp, list[kkk]);
+    if (defnt != NULL) break;
+  }
+  if (list) XFreeFontNames(list);  
+}
 for (i=0; i<NMAXFONTSZ; i++)
   for (j=0; j<NMAXFONTATT; j++)