Changeset 2491 for trunk/MagicSoft/Mars/mmain

Timestamp:

11/10/03 11:25:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MStatusDisplay.cc (modified) (12 diffs)
• MStatusDisplay.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -107 +107 @@
 
 // ------------ Workaround for a non working TGTextView::Search -------------
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,05)
 class MGTextView : public TGTextView
 {
@@ -165 +166 @@
     }
 };
+#else
+#define MGTextView TGTextView
+#endif
 // --------------------------------------------------------------------------
 
@@ -566 +570 @@
 
     fFont = gVirtualX->LoadQueryFont("7x13bold");
+    fMutex = new TMutex;
 
     //
@@ -666 +671 @@
     if (fFont)
         gVirtualX->DeleteFont(fFont);
+
+    //
+    // Delete mutex
+    //
+    delete fMutex;
 }
 
@@ -820 +830 @@
 
     // layout and map new tab
-    Layout();
-    MapSubwindows();
-    Layout();
+    Layout();          // seems to layout the TGCompositeFrame
+    MapSubwindows();   // maps the TGCompositeFrame
+    Layout();          // layout the embedded canvas in the frame
 
     // display new tab in the main frame
@@ -864 +874 @@
     // the main thread.
     //
-    // NOTE: Maybe there is still need to make sure, that only
-    //       one thread can update the canvas by calling UpdateTab
-    //       at the same time. Could be done by a TMutex.
-    //
     if (gThreadXAR)
     {
@@ -881 +887 @@
     }
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,10,01)
+    //
+    // Secure calls to update the tabs against itself, at least
+    // c->Paint() or c->Flush() may crash X (bad drawable).
+    // This makes sure, that a X call is not interuppted by
+    // another X-call which was started from an gui interrrupt
+    // in the same thread
+    //
+    if (mutex->TryLock()==13)
+        return;
+
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,10,02)
     TPad *padsav = (TPad*)gPad;
     if (!gPad)
@@ -897 +913 @@
     c->Flush();                   // Copy all pad pixmaps to the screen
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,10,01)
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,10,02)
     if (padsav)
         padsav->cd();
@@ -903 +919 @@
         gPad=NULL;
 #endif
+
     //c->SetCursor(kCross);
 
@@ -909 +926 @@
     //c->Update();
     //c->Paint();
+
+    mutex->UnLock();
 }
 
@@ -979 +998 @@
 
     fTab->RemoveTab(i);
+    fTab->SetTab(0);
+
+    // Looks strange...
+    // const Int_t n = fTab->GetNumberOfTabs();
+    // fTab->SetTab(i<=n-1 ? i : i-1);
 
     // layout and map new tab
-#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
-    MapSubwindows();
-    Layout();
-#else
-    Layout();
-    MapSubwindows();
-#endif
+    Layout();          // seems to layout the TGCompositeFrame
+    MapSubwindows();   // maps the TGCompositeFrame
+    Layout();          // layout the embedded canvas in the frame
 
     // display new tab in the main frame
@@ -1858 +1878 @@
 
     ps.Close();
-
-    if (num<0)
-        *fLog << inf << " - ";
-
-    SetStatusLine2("Updating Postscript header...");
-    *fLog << inf << "Updating Postscript header..." << flush;
     UpdatePSHeader(name);
-    *fLog << inf << "done." << endl;
-
 
     gVirtualPS = psave;

trunk/MagicSoft/Mars/mmain/MStatusDisplay.h

@@ -20 +20 @@
 class TPad;
 class TTimer;
+class TMutex;
 class TCanvas;
 
@@ -64 +65 @@
     TGLayoutHints    *fLayCanvas;
 
-    TTimer fTimer;
+    TTimer  fTimer;
+    TMutex *fMutex;
 
     TGStatusBar *fStatusBar;
@@ -122 +124 @@
 
      void StartUpdate(Int_t millisec=-1);
-     void StopUpdate();                  
-     void SetUpdateTime(Long_t t);       
+     void StopUpdate();
+     void SetUpdateTime(Long_t t);
 
      void SetProgressBarPosition(Float_t p);