Changeset 402 in Sophya for trunk

Timestamp:

Sep 10, 1999, 10:39:11 AM (26 years ago)

Author:

ercodmgr

Message:

Correction bugs ds PIFontX , pb d'attribution clavier a PIConsole ds fenetre principale (nouvelle version OSF) -> modif de la gestion du menu des options de PIConsole - Reza 10/09/99

Location:

trunk/SophyaPI/PI

Files:

• Tests/pit1.cc (modified) (2 diffs)
• Tests/pitcons.cc (modified) (1 diff)
• picons.cc (modified) (6 diffs)
• pifontx.cc (modified) (2 diffs)

trunk/SophyaPI/PI/Tests/pit1.cc

@@ -116 +116 @@
 PIFont f3(14,PI_TimesFont,PI_BoldFont);
 g->SelFont(f3);
-g->DrawString(20, 170, "Times-Font");
+g->DrawString(20, 170, "Times-Font-Bold");
 PIFont f4(14,PI_HelveticaFont,PI_BoldFont);
 g->SelFont(f4);
@@ -123 +123 @@
 g->SelFont(f5);
 g->DrawString(20, 210, "Symbol-Font");
+g->SelFont(f0);
 
 

trunk/SophyaPI/PI/Tests/pitcons.cc

@@ -102 +102 @@
 PITApp::~PITApp()
 {
+  if (scons) delete scons;
+  if (cons) delete cons;
 }  
 

trunk/SophyaPI/PI/picons.cc

@@ -14 +14 @@
 static PIMenu* opmc=NULL;
 static int nb_opmc = 0;
+
+static void ActivatePIConsOptionMenu(PIConsole* par)
+{
+  if (opmc)  delete opmc;
+  opmc = NULL;
+
+  opmc = new PIMenu(par, "OptCons", k_PopupMenu);
+  opmc->AppendItem("SmallFont", 3101);
+  opmc->AppendItem("NormalFont", 3102);
+  opmc->AppendItem("LargeFont", 3103);
+  opmc->AppendItem("25L x 80C", 3301);
+  opmc->AppendItem("25L x 132C", 3302);
+  opmc->AppendItem("5L x 80C", 3303);
+  opmc->AppendItem("Bkg White", 3201);
+  opmc->AppendItem("Bkg Black", 3202);
+  
+  opmc->SetMsgParent((PIMsgHandler*)par);
+  opmc->Show(); 
+  
+}
 
 /*  --------------------------------------------------------------------------------- */
@@ -72 +92 @@
 mCurC = 0;
 
+
 // Pour ajouter un scroll-bar
 AssocScrollBar(par, nom, scb, sx, sy, px, py);
 
-// Pour le menu des options : Fontes, couleur, ...
-if (!opmc) {
-  opmc = new PIMenu(this, "OptCons", k_PopupMenu);
-  opmc->AppendItem("SmallFont", 3101);
-  opmc->AppendItem("NormalFont", 3102);
-  opmc->AppendItem("LargeFont", 3103);
-  opmc->AppendItem("25L x 80C", 3301);
-  opmc->AppendItem("25L x 132C", 3302);
-  opmc->AppendItem("5L x 80C", 3303);
-  opmc->AppendItem("Bkg White", 3201);
-  opmc->AppendItem("Bkg Black", 3202);
-  }
-nb_opmc++;
 
 ActivateKeyboard();  // Gestion de l'edition 
@@ -107 +115 @@
 delete[] mCmdStr;
 if (mScb) delete mScb;
-nb_opmc--;
-if (nb_opmc == 0) { delete opmc;  opmc=NULL; }
+if (opmc) { delete opmc;  opmc=NULL; }
 }
 
@@ -298 +305 @@
 if (kmod == PIKM_Alt) {
   if (key == 'O' || key == 'o') {   // Menu des options 
-    opmc->SetMsgParent((PIMsgHandler*)this);
-    opmc->Show(); 
+    ActivatePIConsOptionMenu(this);
     return;
     }
@@ -452 +458 @@
 void PIConsole::But3Press(int x, int y)
 {
-opmc->SetMsgParent((PIMsgHandler*)this);
-opmc->Show((PIWdg*)this, x, y);
+ActivatePIConsOptionMenu(this);
 }
 
@@ -862 +867 @@
     }
   if (fgr) Refresh();
+  delete opmc;  opmc = NULL;
   }
 // Le traitement du scroll-bar

trunk/SophyaPI/PI/pifontx.cc

@@ -230 +230 @@
     2*sizeof(String) , XtRString, "*-helvetica" } ,
   { "timesfontFamilyName", "TimesfontFamilyName", XtRString, sizeof(String),
-    2*sizeof(String) , XtRString, "*-times" } ,
+    3*sizeof(String) , XtRString, "*-times" } ,
   { "symbolfontFamilyName", "SymbolfontFamilyName", XtRString, sizeof(String),
     4*sizeof(String) , XtRString, "*-symbol" }
@@ -251 +251 @@
   char **list;
 
-  for (k=0; k<5; k++)    // Recherche de la fonte pour tailles croissantes
-    {
+  for (k=0; k<5; k++)  {  // Recherche de la fonte pour tailles croissantes
     sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbi[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
+      sprintf(buff,"-%s-%s-*-%d-*-*-*-*-*-*-*", apd.fntFam[kfn], fnbi[0], fntsz[isz]+k);
+      list = XListFonts(mdsp, buff, 10, &count);
+      XFreeFontNames(list);
+      if (count > 0)  break;
+      }
     }
   if (count > 0)