Changeset 3575 in Sophya

Timestamp:

Feb 12, 2009, 4:12:56 PM (17 years ago)

Author:

ansari

Message:

Ajout handler visibility-change event pour contourner le probleme de PIBaseWdgX non rafraichi avec certains serveurs X11 (X.org) - Reza 12/02/2009

Location:

trunk/SophyaPI/PI

Files:

• piwindowx.cc (modified) (1 diff)
• pixtbase.cc (modified) (3 diffs)
• pixtbaseP.h (modified) (1 diff)

trunk/SophyaPI/PI/piwindowx.cc

@@ -152 +152 @@
 //if (mWtyp == PIWK_transient)  
   XRaiseWindow(mdsp, XtWindow(pwm->XtWdg()));
+  // cmv+rz Fevrier 2009 (retour Moriond) - Suppression de XFlush() / usleep  
+  // Probleme regle par gestion VisibilityChange event ds pixtbase.cc
   // cmv+rz 09/08/2007 Ajout XFlush() + usleep 
   // pour regler le probleme de  perte d'evenement expose a la creation
-  XFlush(mdsp);   usleep(5000);
+  //  XFlush(mdsp);   usleep(5000);
 return;
 }

trunk/SophyaPI/PI/pixtbase.cc

@@ -143 +143 @@
 }
 
+// Pour traiter les etats de changements de visibilite de la fenetre
+/* Nouvelle-Fonction */
+void visibchange_handler_pixtbase (Widget wdgp, XtPointer /*closure*/, 
+                             XEvent* evt, Boolean* cont)
+{
+#ifdef DEBUG_PIXTB
+printf("Debug_visibchange_handler_pixtbase: Wdg= %lx Object= %lx  fgvis_expose= %d (EvtType=%d VisSt=%d)\n", 
+  (long)wdgp, (long)(((PIXtBaseWidget)wdgp)->pixtbase.objet),
+  ((PIXtBaseWidget)wdgp)->pixtbase.vis_expose_fg, (int)evt->type,(int)evt->xvisibility.state);
+#endif
+PIXtBaseWidget bwdg = (PIXtBaseWidget)wdgp;
+if (bwdg->pixtbase.vis_expose_fg != 1) return;
+if (evt->xvisibility.state == VisibilityFullyObscured)  return;
+int x0, y0, dx, dy;
+x0 = y0 = 0;
+dx = wdgp->core.width;  dy = wdgp->core.height;
+(bwdg->pixtbase.objet)->eXposeProcess(x0, y0, dx, dy);
+bwdg->pixtbase.vis_expose_fg = 0;
+}
+
 /* Nouvelle-Fonction */
 static void init_pixtbase (Widget request, Widget wdg,
@@ -154 +174 @@
 // get_GCs (wdgp);
 #ifdef DEBUG_PIXTB
-printf("Debug_init_pixtbase: Wdg=%lx Object= %lx  narg=%d \n", 
-(long)wdgp, (long)(wdgp->pixtbase.objet), (int)(*narg));
-#endif
-return;
-}
-
-/* Nouvelle-Fonction */
-static void destroy_pixtbase (Widget /*wdgp*/)
+printf("Debug_init_pixtbase: Wdg=%lx Object= %lx  \n", 
+(long)wdgp, (long)(wdgp->pixtbase.objet));
+#endif
+
+// Pour gerer les exposes event avec fenetre non visible ...
+wdgp->pixtbase.vis_expose_fg = 0;
+XtAddEventHandler(wdg, VisibilityChangeMask, FALSE, visibchange_handler_pixtbase, NULL);
+return;
+}
+
+/* Nouvelle-Fonction */
+static void destroy_pixtbase (Widget wdgp)
 {
 #ifdef DEBUG_PIXTB
@@ -194 +218 @@
 (long)(((PIXtBaseWidget)wdgp)->pixtbase.objet) );
 #endif
-if (!(wdgp->core.visible))  return;
-if ( ((PIXtBaseWidget)wdgp)->pixtbase.objet ) 
-  {
+if (!(wdgp->core.visible))  { 
+  ((PIXtBaseWidget)wdgp)->pixtbase.vis_expose_fg = 1;
+  return;
+}
+if ( ((PIXtBaseWidget)wdgp)->pixtbase.objet ) {
   XRectangle  xrec;
   int x0, y0, dx, dy;
-  XClipBox(region, &xrec);
-  x0 = xrec.x;  y0 = xrec.y;
-  dx = xrec.width;  dy = xrec.height;
+  if (region) {
+    XClipBox(region, &xrec);
+    x0 = xrec.x;  y0 = xrec.y;
+    dx = xrec.width;  dy = xrec.height;
+  }
+  else {
+    x0 = y0 = 0;
+    dx = wdgp->core.width;  dy = wdgp->core.height;
+  }
   (((PIXtBaseWidget)wdgp)->pixtbase.objet)->eXposeProcess(x0, y0, dx, dy);
-  }
+  ((PIXtBaseWidget)wdgp)->pixtbase.vis_expose_fg = 0;
+}
 return;
 }

trunk/SophyaPI/PI/pixtbaseP.h

@@ -24 +24 @@
 PIBaseWdgX  * objet; 
 unsigned long myeventmask;
+unsigned int vis_expose_fg;   // Gestion des expose_event avec fenetre non visible
 } PIXtBasePart;