Changeset 2518 for trunk/MagicSoft/Cosy/gui/MGImage.cc

Timestamp:

11/17/03 13:50:48 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGImage.cc (modified) (11 diffs)

trunk/MagicSoft/Cosy/gui/MGImage.cc

@@ -9 +9 @@
 #include "MGImage.h"
 
-#include <iostream.h>
-#include <pthread.h>
-
-#include <X11/Xlib.h>
-
-#include <TTimer.h>
-#include <TSystem.h>
-#include <TVirtualX.h>
+#include <iostream>
+
 #include <TGX11.h>
+#include <TMutex.h>
 
 ClassImp(MGImage);
+
+using namespace std;
 /*
 class MyX11 : public TGX11
@@ -41 +38 @@
     // Creat drawing semaphore
     //
-    fMuxPixmap = new pthread_mutex_t;
-    pthread_mutex_init((pthread_mutex_t*)fMuxPixmap, NULL);
+    fMuxPixmap = new TMutex;
 
     Resize(w, h);
@@ -58 +54 @@
 MGImage::~MGImage()
 {
-    pthread_mutex_lock((pthread_mutex_t*)fMuxPixmap);
+    fMuxPixmap->Lock();
 
     cout << "Deleting MGImage..." << endl;
@@ -66 +62 @@
     gVirtualX->DeleteImage((Drawable_t)fImage);
 
-    pthread_mutex_destroy((pthread_mutex_t*)fMuxPixmap);
+    delete fMuxPixmap;
 
     cout << "MGImage destroyed." << endl;
@@ -73 +69 @@
 void MGImage::DoRedraw()
 {
-    pthread_mutex_lock((pthread_mutex_t*)fMuxPixmap);
+    fMuxPixmap->Lock();
 
     if (TestBit(kNeedRedraw))
@@ -81 +77 @@
     }
 
-    pthread_mutex_unlock((pthread_mutex_t*)fMuxPixmap);
+    fMuxPixmap->UnLock();
 }
 
@@ -91 +87 @@
     while (s<e)
     {
+        //      11111100    11111000      11111100
         *d++ = (*s&0xfc) | (*s&0xf8)<<5 | (*s&0xfc)<<11;
         s++;
@@ -107 +104 @@
         *d++ = *s++;
         d++;
+    }
+}
+
+void MGImage::DrawImg(const byte *buffer)
+{
+    if (fMuxPixmap->TryLock()==13)
+        return;
+
+    switch (gVirtualX->GetDepth())
+    {
+    case 8:
+        memcpy(fImage->data, buffer, fWidth*fHeight);
+        break;
+    case 16:
+        DrawImg16((unsigned short*)fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
+        break;
+    case 24:
+        DrawImg24(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
+        break;
+    default:
+        cout << "Sorry, " << gVirtualX->GetDepth() << "bit color depth not yet implemented." << endl;
+    }
+
+    SetBit(kNeedRedraw);
+
+    fMuxPixmap->UnLock();
+}
+
+void MGImage::DrawColImg16(unsigned short *d, char *s1, char *s2, char *e)
+{
+    // d=destination, s1=source1, s2=source2, e=end
+    // d:  rrrrrggg gggbbbbb
+    // s2:          00rrggbb
+    //
+    while (s1<e)
+    {
+        if (*s2)
+        {    
+            //      00000011   00001100        00110000
+            *d++ = (*s2&0x3) | (*s2&0xb)<<3 | (*s2&0x30)<<7;
+            s1++;
+        }
+        else
+        {
+            //      11111100     11111000        11111100
+            *d++ = (*s1&0xfc) | (*s1&0xf8)<<5 | (*s1&0xfc)<<11;
+            s2++;
+        }
     }
 }
@@ -134 +179 @@
 }
 
-void MGImage::DrawImg(const byte *buffer)
-{
-    if (pthread_mutex_trylock((pthread_mutex_t*)fMuxPixmap))
-        return;
-
-    switch (gVirtualX->GetDepth())
-    {
-    case 8:
-        memcpy(fImage->data, buffer, fWidth*fHeight);
-        break;
-    case 16:
-        DrawImg16((unsigned short*)fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
-        break;
-    case 24:
-        DrawImg24(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
-        break;
-    default:
-        cout << "Sorry, " << gVirtualX->GetDepth() << "bit color depth not yet implemented." << endl;
-    }
-
-    SetBit(kNeedRedraw);
-
-    pthread_mutex_unlock((pthread_mutex_t*)fMuxPixmap);
-}
-
 void MGImage::DrawColImg(const byte *gbuf, const byte *cbuf)
 {
-    if (pthread_mutex_trylock((pthread_mutex_t*)fMuxPixmap))
+    if (fMuxPixmap->TryLock()==13)
         return;
 
@@ -179 +199 @@
     switch (gVirtualX->GetDepth())
     {
+    case 16:
+        DrawColImg16((unsigned short*)fImage->data, (char*)gbuf, (char*)cbuf, (char*)(gbuf+fWidth*fHeight));
+        break;
     case 24:
-        DrawColImg32(fImage->data, (char*)gbuf, (char*)cbuf, (char*)(gbuf+fWidth*fHeight));
+        DrawColImg24(fImage->data, (char*)gbuf, (char*)cbuf, (char*)(gbuf+fWidth*fHeight));
         break;
     default:
@@ -188 +211 @@
     SetBit(kNeedRedraw);
 
-    pthread_mutex_unlock((pthread_mutex_t*)fMuxPixmap);
-}
+    fMuxPixmap->UnLock();
+}