fixed wxBitmap<->wxImage conversion to not exchange red and blue components

[wxWidgets.git] / src / motif / dcclient.cpp

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 4bbab04ceac20b6ab37bc288ff216abf39a47f79..1a3ec55e8d7a8eb266ad6b0f45fbdf965d18f46a 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/motif/dcclient.cpp

 // Purpose:     wxClientDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxClientDC class
 // Author:      Julian Smart
 // Modified by:


@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*

-  About pens, brushes, and the autoSetting flag:
+  About pens, brushes, and the m_autoSetting flag:

 
   Under X, pens and brushes control some of the same X drawing
   parameters.  Therefore, it is impossible to independently maintain
 
   Under X, pens and brushes control some of the same X drawing
   parameters.  Therefore, it is impossible to independently maintain


@@ -18,9 +18,9 @@
   the current logical function. The m_currentFill, etc. instance
   variables remember state across the brush and pen.
 
   the current logical function. The m_currentFill, etc. instance
   variables remember state across the brush and pen.
 

-  Since pens are used more than brushes, the autoSetting flag is used to
+  Since pens are used more than brushes, the m_autoSetting flag is used to

   indicate that a brush was recently used, and SetPen must be called to
   indicate that a brush was recently used, and SetPen must be called to

-  reinstall the current pen's parameters. If autoSetting includes 0x2, then the
+  reinstall the current pen's parameters. If m_autoSetting includes 0x2, then the

   pens color may need to be set based on XOR.
 
   There is, unfortunately, some confusion between setting the current pen/brush
   pens color may need to be set based on XOR.
 
   There is, unfortunately, some confusion between setting the current pen/brush


@@ -36,21 +36,19 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dcclient.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"

-#include "wx/dcmemory.h"
-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/image.h"
-#include "wx/log.h"

 
 

-#include <math.h>
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/window.h"
+    #include "wx/dcmemory.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -86,9 +84,14 @@ static Pixmap bdiag, cdiag, fdiag, cross, horiz, verti;
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
-    IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+
+#define IS_HATCH(s)    ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH)
+
+// FIXME: left over after removal of wxDC::GetOptimization()
+#define GET_OPTIMIZATION false

 
 // ----------------------------------------------------------------------------
 // prototypes
 
 // ----------------------------------------------------------------------------
 // prototypes


@@ -145,7 +148,6 @@ void wxWindowDC::Init()
     m_display = (WXDisplay*) NULL;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;
     m_display = (WXDisplay*) NULL;
     m_pixmap = (WXPixmap) 0;
     m_autoSetting = 0;

-    m_oldFont = (WXFont) 0;

     m_ok = false;
     m_clipRegion = (WXRegion) 0;
 }
     m_ok = false;
     m_clipRegion = (WXRegion) 0;
 }


@@ -163,7 +165,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 
     m_window = window;
     m_font = window->GetFont();
 
     m_window = window;
     m_font = window->GetFont();

-    m_ok = TRUE;
+    m_ok = true;

 
     m_display = window->GetXDisplay();
     m_pixmap = window->GetXWindow();
 
     m_display = window->GetXDisplay();
     m_pixmap = window->GetXWindow();


@@ -189,26 +191,13 @@ wxWindowDC::wxWindowDC( wxWindow *window )
             &gcvalues);
     }
 
             &gcvalues);
     }
 

-    m_backgroundPixel = (int) gcvalues.background;
-
-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;
+    m_backgroundPixel = gcvalues.background;

 
     SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
 }
 
 wxWindowDC::~wxWindowDC()
 {
 
     SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
 }
 
 wxWindowDC::~wxWindowDC()
 {

-    if (m_gc && (m_oldFont != (WXFont) 0) && ((long) m_oldFont != -1))
-    {
-        XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
-
-        if (m_window && m_window->GetBackingPixmap())
-            XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
-    }
-

     if (m_gc)
         XFreeGC ((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) 0;
     if (m_gc)
         XFreeGC ((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) 0;


@@ -222,7 +211,7 @@ wxWindowDC::~wxWindowDC()
     m_clipRegion = (WXRegion) 0;
 }
 
     m_clipRegion = (WXRegion) 0;
 }
 

-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

                           const wxColour & col, int style);
 
 bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
                           const wxColour & col, int style);
 
 bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,


@@ -230,7 +219,7 @@ bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
 {
     return wxDoFloodFill(this, x, y, col, style);
 }
 {
     return wxDoFloodFill(this, x, y, col, style);
 }

-  
+

 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 {
     // Generic (and therefore rather inefficient) method.
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 {
     // Generic (and therefore rather inefficient) method.


@@ -242,7 +231,7 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     memdc.SelectObject(wxNullBitmap);
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     memdc.SelectObject(wxNullBitmap);
     wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));

-    return TRUE;
+    return true;

 }
 
 void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
 }
 
 void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )


@@ -402,7 +391,7 @@ void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord
 
     if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
     {
 
     if (m_brush.Ok() && m_brush.GetStyle () != wxTRANSPARENT)
     {

-        m_autoSetting = TRUE;    // must be reset
+        m_autoSetting = true;    // must be reset

 
         SetBrush (m_brush);
         XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end);
 
         SetBrush (m_brush);
         XFillArc ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xd, yd, wd, hd, start, end);


@@ -453,8 +442,8 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
 
         for (i = 0; i < n; i++)
         {
 
         for (i = 0; i < n; i++)
         {

-            xpoints[i].x = XLOG2DEV (points[i].x + xoffset);
-            xpoints[i].y = YLOG2DEV (points[i].y + yoffset);
+            xpoints[i].x = (short)XLOG2DEV (points[i].x + xoffset);
+            xpoints[i].y = (short)YLOG2DEV (points[i].y + yoffset);

         }
         XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints, n, 0);
 
         }
         XDrawLines ((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, xpoints, n, 0);
 


@@ -462,8 +451,8 @@ void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord
         {
             for (i = 0; i < n; i++)
             {
         {
             for (i = 0; i < n; i++)
             {

-                xpoints[i].x = XLOG2DEV_2 (points[i].x + xoffset);
-                xpoints[i].y = YLOG2DEV_2 (points[i].y + yoffset);
+                xpoints[i].x = (short)XLOG2DEV_2 (points[i].x + xoffset);
+                xpoints[i].y = (short)YLOG2DEV_2 (points[i].y + yoffset);

             }
             XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints, n, 0);
         }
             }
             XDrawLines ((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(),(GC) m_gcBacking, xpoints, n, 0);
         }


@@ -481,10 +470,10 @@ void wxWindowDC::DoDrawPolygon( int n, wxPoint points[],
     int i;
     for (i = 0; i < n; i++)
     {
     int i;
     for (i = 0; i < n; i++)
     {

-        xpoints1[i].x = XLOG2DEV (points[i].x + xoffset);
-        xpoints1[i].y = YLOG2DEV (points[i].y + yoffset);
-        xpoints2[i].x = XLOG2DEV_2 (points[i].x + xoffset);
-        xpoints2[i].y = YLOG2DEV_2 (points[i].y + yoffset);
+        xpoints1[i].x = (short)XLOG2DEV (points[i].x + xoffset);
+        xpoints1[i].y = (short)YLOG2DEV (points[i].y + yoffset);
+        xpoints2[i].x = (short)XLOG2DEV_2 (points[i].x + xoffset);
+        xpoints2[i].y = (short)YLOG2DEV_2 (points[i].y + yoffset);

         CalcBoundingBox (points[i].x + xoffset, points[i].y + yoffset);
     }
 
         CalcBoundingBox (points[i].x + xoffset, points[i].y + yoffset);
     }
 


@@ -781,12 +770,12 @@ void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 
 bool wxWindowDC::CanDrawBitmap() const
 {
 
 bool wxWindowDC::CanDrawBitmap() const
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid dc" );
+    wxCHECK_MSG( Ok(), false, "invalid dc" );

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-// TODO: use scaled Blit e.g. as per John Price's implementation 
+// TODO: use scaled Blit e.g. as per John Price's implementation

 // in Contrib/Utilities
 bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
 // in Contrib/Utilities
 bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,


@@ -794,7 +783,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                          int rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {
                          int rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask )
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid dc" );
+    wxCHECK_MSG( Ok(), false, "invalid dc" );

 
     wxWindowDC* sourceDC = wxDynamicCast(source, wxWindowDC);
 
 
     wxWindowDC* sourceDC = wxDynamicCast(source, wxWindowDC);
 


@@ -804,13 +793,13 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     // foreground colour. [m_textForegroundColour] Background pixels (0)
     // will be painted with backgound colour (m_textBackgroundColour)
     // Using ::SetPen is horribly slow, so avoid doing it
     // foreground colour. [m_textForegroundColour] Background pixels (0)
     // will be painted with backgound colour (m_textBackgroundColour)
     // Using ::SetPen is horribly slow, so avoid doing it

-    int oldBackgroundPixel = -1;
-    int oldForegroundPixel = -1;
+    WXPixel oldBackgroundPixel = -1;
+    WXPixel oldForegroundPixel = -1;

 
     if (m_textBackgroundColour.Ok())
     {
         oldBackgroundPixel = m_backgroundPixel;
 
     if (m_textBackgroundColour.Ok())
     {
         oldBackgroundPixel = m_backgroundPixel;

-        int pixel = m_textBackgroundColour.AllocColour(m_display);
+        WXPixel pixel = m_textBackgroundColour.AllocColour(m_display);

 
         XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
         if (m_window && m_window->GetBackingPixmap())
 
         XSetBackground ((Display*) m_display, (GC) m_gc, pixel);
         if (m_window && m_window->GetBackingPixmap())


@@ -823,9 +812,9 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,

-                            m_textForegroundColour, TRUE);
- 
-        int pixel = m_textForegroundColour.GetPixel();
+                            m_textForegroundColour, true);
+
+        WXPixel pixel = m_textForegroundColour.GetPixel();

         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
     }
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
     }


@@ -836,7 +825,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     Pixmap sourcePixmap = (Pixmap) NULL;
     double scaleX, scaleY;
     GetUserScale(& scaleX, & scaleY);
     Pixmap sourcePixmap = (Pixmap) NULL;
     double scaleX, scaleY;
     GetUserScale(& scaleX, & scaleY);

-    bool retVal = FALSE;
+    bool retVal = false;

 
     /* TODO: use the mask origin when drawing transparently */
     if (xsrcMask == -1 && ysrcMask == -1)
 
     /* TODO: use the mask origin when drawing transparently */
     if (xsrcMask == -1 && ysrcMask == -1)


@@ -890,7 +879,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest),
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV_2 (xdest), YLOG2DEV_2 (ydest),

-                TRUE, &cache);
+                True, &cache);

 
             if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
             {
 
             if ( useMask && source->IsKindOf(CLASSINFO(wxMemoryDC)) )
             {


@@ -909,7 +898,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV (xdest), YLOG2DEV (ydest),
                 source->LogicalToDeviceXRel(width),
                 source->LogicalToDeviceYRel(height),
                 XLOG2DEV (xdest), YLOG2DEV (ydest),

-                FALSE, &cache);
+                False, &cache);

 
             if ( useMask )
             {
 
             if ( useMask )
             {


@@ -924,7 +913,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         } else
         {        //XGCValues values;
 
         } else
         {        //XGCValues values;

-        //XGetGCValues((Display*)m_display, (GC)m_gc, GCForeground, &values);   
+        //XGetGCValues((Display*)m_display, (GC)m_gc, GCForeground, &values);

 
             if (m_window && m_window->GetBackingPixmap())
             {
 
             if (m_window && m_window->GetBackingPixmap())
             {


@@ -997,7 +986,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         SetLogicalFunction(orig);
 
 
         SetLogicalFunction(orig);
 

-        retVal = TRUE;
+        retVal = true;

   }
   if (scaledBitmap) delete scaledBitmap;
 
   }
   if (scaledBitmap) delete scaledBitmap;
 


@@ -1027,7 +1016,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
     int cx = 0;
     int cy = 0;
     int ascent = 0;
     int cx = 0;
     int cy = 0;
     int ascent = 0;

-    int slen;
+    int slen = text.length();

 
     // Set FillStyle, otherwise X will use current stipple!
     XGCValues gcV, gcBackingV;
 
     // Set FillStyle, otherwise X will use current stipple!
     XGCValues gcV, gcBackingV;


@@ -1041,27 +1030,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         XSetFillStyle ((Display*) m_display, (GC) m_gcBacking, FillSolid);
     }
 
         XSetFillStyle ((Display*) m_display, (GC) m_gcBacking, FillSolid);
     }
 

-    slen = strlen(text);
-

     if (m_font.Ok())
     if (m_font.Ok())

-    {
-        WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
-        int direction, descent;
-        XCharStruct overall_return;
-#if 0
-        if (use16)
-            (void)XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *)(const char*) text, slen, &direction,
-            &ascent, &descent, &overall_return);
-        else
-#endif // 0
-            (void)XTextExtents((XFontStruct*) pFontStruct,
-                               wxConstCast(text.c_str(), char),
-                               slen, &direction,
-                               &ascent, &descent, &overall_return);
-
-        cx = overall_return.width;
-        cy = ascent + descent;
-    }
+        wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                         text, &cx, &cy, &ascent, NULL);

 
     // First draw a rectangle representing the text background, if a text
     // background is specified
 
     // First draw a rectangle representing the text background, if a text
     // background is specified


@@ -1079,9 +1050,9 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         sameColour = (sameColour &&
             (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
 
         sameColour = (sameColour &&
             (oldPenColour.GetPixel() == m_textBackgroundColour.GetPixel()));
 

-        if (!sameColour || !GetOptimization())
+        if (!sameColour || !GET_OPTIMIZATION)

         {
         {

-            int pixel = m_textBackgroundColour.AllocColour(m_display);
+            WXPixel pixel = m_textBackgroundColour.AllocColour(m_display);

             m_currentColour = m_textBackgroundColour;
 
             // Set the GC to the required colour
             m_currentColour = m_textBackgroundColour;
 
             // Set the GC to the required colour


@@ -1112,10 +1083,10 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
             (oldPenColour.Green () == m_currentColour.Green ()) &&
             (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 
             (oldPenColour.Green () == m_currentColour.Green ()) &&
             (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 

-        if (!sameColour || !GetOptimization())
+        if (!sameColour || !GET_OPTIMIZATION)

         {
         {

-            int pixel = CalculatePixel(m_textForegroundColour,
-                                       m_currentColour, FALSE);
+            WXPixel pixel = CalculatePixel(m_textForegroundColour,
+                                           m_currentColour, false);

 
             // Set the GC to the required colour
             if (pixel > -1)
 
             // Set the GC to the required colour
             if (pixel > -1)


@@ -1137,7 +1108,12 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         (XChar2b *)(char*) (const char*) text, slen);
     else
 #endif // 0
         (XChar2b *)(char*) (const char*) text, slen);
     else
 #endif // 0

+#if wxMOTIF_NEW_FONT_HANDLING
+        XFontSet fset = (XFontSet) m_font.GetFontSet (m_userScaleY * m_logicalScaleY, m_display);
+        XmbDrawString((Display*) m_display, (Pixmap) m_pixmap, fset, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);
+#else

         XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);
         XDrawString((Display*) m_display, (Pixmap) m_pixmap, (GC) m_gc, XLOG2DEV (x), YLOG2DEV (y) + ascent, text, slen);

+#endif

 
     if (m_window && m_window->GetBackingPixmap()) {
 #if 0
 
     if (m_window && m_window->GetBackingPixmap()) {
 #if 0


@@ -1147,9 +1123,15 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
             (XChar2b *)(char*) (const char*) text, slen);
         else
 #endif // 0
             (XChar2b *)(char*) (const char*) text, slen);
         else
 #endif // 0

+#if wxMOTIF_NEW_FONT_HANDLING
+            XmbDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), fset, (GC) m_gcBacking,
+            XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
+                        wxConstCast(text.mb_str(), char), slen);
+#else

             XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
             XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,
             XDrawString((Display*) m_display, (Pixmap) m_window->GetBackingPixmap(), (GC) m_gcBacking,
             XLOG2DEV_2 (x), YLOG2DEV_2 (y) + ascent,

-                        wxConstCast(text.c_str(), char), slen);
+                        wxConstCast(text.mb_str(), char), slen);
+#endif

     }
 
     // restore fill style
     }
 
     // restore fill style


@@ -1175,10 +1157,10 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
     wxCHECK_RET( Ok(), "invalid dc" );
 
 
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    int oldBackgroundPixel = -1;
-    int oldForegroundPixel = -1;
-    int foregroundPixel = -1;
-    int backgroundPixel = -1;
+    WXPixel oldBackgroundPixel = -1;
+    WXPixel oldForegroundPixel = -1;
+    WXPixel foregroundPixel = -1;
+    WXPixel backgroundPixel = -1;

 
     if (m_textBackgroundColour.Ok())
     {
 
     if (m_textBackgroundColour.Ok())
     {


@@ -1191,8 +1173,8 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,
 
         if( m_textForegroundColour.GetPixel() <= -1 )
             CalculatePixel( m_textForegroundColour,

-                            m_textForegroundColour, TRUE);
- 
+                            m_textForegroundColour, true);
+

         foregroundPixel = m_textForegroundColour.GetPixel();
     }
 
         foregroundPixel = m_textForegroundColour.GetPixel();
     }
 


@@ -1200,31 +1182,10 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
     int cx = 0;
     int cy = 0;
     int ascent = 0;
     int cx = 0;
     int cy = 0;
     int ascent = 0;

-    int slen = text.length();

 
     if (m_font.Ok())
 
     if (m_font.Ok())

-    {
-        // Calculate text extent.
-        WXFontStructPtr pFontStruct =
-            m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
-        int direction, descent;
-        XCharStruct overall_return;
-#if 0
-        if (use16)
-            (void)XTextExtents16((XFontStruct*) pFontStruct,
-                                 (XChar2b *)(const char*) text,
-                                 slen, &direction,
-            &ascent, &descent, &overall_return);
-        else
-#endif // 0
-            (void)XTextExtents((XFontStruct*) pFontStruct,
-                               wxConstCast(text.c_str(), char),
-                               slen, &direction,
-                               &ascent, &descent, &overall_return);
-
-        cx = overall_return.width;
-        cy = ascent + descent;
-    }
+        wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                         text, &cx, &cy, &ascent, NULL);

 
     wxBitmap src(cx, cy);
     wxMemoryDC dc;
 
     wxBitmap src(cx, cy);
     wxMemoryDC dc;


@@ -1323,7 +1284,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
 bool wxWindowDC::CanGetTextExtent() const
 {
 
 bool wxWindowDC::CanGetTextExtent() const
 {

-    return TRUE;
+    return true;

 }
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
 }
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,


@@ -1332,9 +1293,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    wxFont* theFont = font;
-    if (!theFont)
-        theFont = (wxFont *)&m_font; // const_cast
+    const wxFont* theFont = font ? font : &m_font;

 
     if (!theFont->Ok())
     {
 
     if (!theFont->Ok())
     {


@@ -1346,33 +1305,11 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
         return;
     }
 
         return;
     }
 

-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
-
-    int direction, ascent, descent2;
-    XCharStruct overall;
-    int slen;
+    wxGetTextExtent(m_display, *theFont, m_userScaleY * m_logicalScaleY,
+                    string, width, height, NULL, descent);

 
 

-#if 0
-    if (use16)
-        slen = str16len(string);
-    else
-#endif // 0
-        slen = strlen(string);
-
-#if 0
-    if (use16)
-        XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
-        &ascent, &descent2, &overall);
-    else
-#endif // 0
-        XTextExtents((XFontStruct*) pFontStruct,
-                     wxConstCast(string.c_str(), char), slen, &direction,
-        &ascent, &descent2, &overall);
-
-    if (width) *width = XDEV2LOGREL (overall.width);
-    if (height) *height = YDEV2LOGREL (ascent + descent2);
-    if (descent)
-        *descent = descent2;
+    if (width) *width = XDEV2LOGREL (*width);
+    if (height) *height = YDEV2LOGREL (*height);

     if (externalLeading)
         *externalLeading = 0;
 }
     if (externalLeading)
         *externalLeading = 0;
 }


@@ -1382,13 +1319,12 @@ wxCoord wxWindowDC::GetCharWidth() const
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY * m_logicalScaleY, m_display);
+    int width;

 
 

-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-    return XDEV2LOGREL(overall.width);
+    wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                     "x", &width, NULL, NULL, NULL);
+
+    return XDEV2LOGREL(width);

 }
 
 wxCoord wxWindowDC::GetCharHeight() const
 }
 
 wxCoord wxWindowDC::GetCharHeight() const


@@ -1396,14 +1332,12 @@ wxCoord wxWindowDC::GetCharHeight() const
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 
     wxCHECK_MSG( Ok(), 0, "invalid dc" );
     wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
 

-    WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
+    int height;

 
 

-    int direction, ascent, descent;
-    XCharStruct overall;
-    XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent,
-        &descent, &overall);
-    //  return XDEV2LOGREL(overall.ascent + overall.descent);
-    return XDEV2LOGREL(ascent + descent);
+    wxGetTextExtent (m_display, m_font, m_userScaleY * m_logicalScaleY,
+                     "x", NULL, &height, NULL, NULL);
+
+    return XDEV2LOGREL(height);

 }
 
 void wxWindowDC::DoGetSize( int *width, int *height ) const
 }
 
 void wxWindowDC::DoGetSize( int *width, int *height ) const


@@ -1429,7 +1363,7 @@ void wxWindowDC::Clear()
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 
 {
     wxCHECK_RET( Ok(), "invalid dc" );
 

-    wxRect rect( wxPoint( 0, 0 ), GetSize() );
+    wxRect rect( GetSize() );

     Clear( rect );
 }
 
     Clear( rect );
 }
 


@@ -1462,16 +1396,10 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     if (!m_font.Ok())
     {
 
     if (!m_font.Ok())
     {

-        if ((m_oldFont != (WXFont) 0) && ((wxCoord) m_oldFont != -1))
-        {
-            XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
-
-            if (m_window && m_window->GetBackingPixmap())
-                XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
-        }

         return;
     }
 
         return;
     }
 

+#if !wxMOTIF_NEW_FONT_HANDLING

     WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
 
     Font fontId = ((XFontStruct*)pFontStruct)->fid;
     WXFontStructPtr pFontStruct = m_font.GetFontStruct(m_userScaleY*m_logicalScaleY, m_display);
 
     Font fontId = ((XFontStruct*)pFontStruct)->fid;


@@ -1479,9 +1407,10 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     if (m_window && m_window->GetBackingPixmap())
         XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);
 
     if (m_window && m_window->GetBackingPixmap())
         XSetFont ((Display*) m_display,(GC) m_gcBacking, fontId);

+#endif

 }
 
 }
 

-void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)
+void wxWindowDC::SetForegroundPixelWithLogicalFunction(WXPixel pixel)

 {
     if (m_logicalFunction == wxXOR)
     {
 {
     if (m_logicalFunction == wxXOR)
     {


@@ -1501,12 +1430,12 @@ void wxWindowDC::SetForegroundPixelWithLogicalFunction(int pixel)
     }
 }
 
     }
 }
 

-int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
+WXPixel wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,

                                bool roundToWhite) const
 {
     const unsigned char wp = (unsigned char)255;
                                bool roundToWhite) const
 {
     const unsigned char wp = (unsigned char)255;

-        
-    int pixel = -1;
+
+    WXPixel pixel = -1;

     if(!m_colour) // Mono display
     {
         unsigned char red = colour.Red ();
     if(!m_colour) // Mono display
     {
         unsigned char red = colour.Red ();


@@ -1518,16 +1447,16 @@ int wxWindowDC::CalculatePixel(wxColour& colour, wxColour& curCol,
            ((red != 0 || blue != 0 || green != 0) && roundToWhite))
         {
             curCol = *wxWHITE;
            ((red != 0 || blue != 0 || green != 0) && roundToWhite))
         {
             curCol = *wxWHITE;

-            pixel = (int)WhitePixel((Display*) m_display,
-                                    DefaultScreen((Display*) m_display));
+            pixel = WhitePixel((Display*) m_display,
+                               DefaultScreen((Display*) m_display));

             curCol.SetPixel(pixel);
             colour.SetPixel(pixel);
         }
         else
         {
             curCol = *wxBLACK;
             curCol.SetPixel(pixel);
             colour.SetPixel(pixel);
         }
         else
         {
             curCol = *wxBLACK;

-            pixel = (int)BlackPixel((Display*) m_display,
-                                    DefaultScreen((Display*) m_display));
+            pixel = BlackPixel((Display*) m_display,
+                               DefaultScreen((Display*) m_display));

             curCol.SetPixel(pixel);
             colour.SetPixel(pixel);
         }
             curCol.SetPixel(pixel);
             colour.SetPixel(pixel);
         }


@@ -1586,7 +1515,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
         (oldPenColour.Green () == m_currentColour.Green ()) &&
         (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 
         (oldPenColour.Green () == m_currentColour.Green ()) &&
         (oldPenColour.GetPixel() == m_currentColour.GetPixel()));
 

-    if (!sameStyle || !GetOptimization())
+    if (!sameStyle || !GET_OPTIMIZATION)

     {
         int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ());
         if (scaled_width < 0)
     {
         int scaled_width = (int) XLOG2DEVREL (m_pen.GetWidth ());
         if (scaled_width < 0)


@@ -1648,7 +1577,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             {
                 int factor = scaled_width == 0 ? 1 : scaled_width;
                 for (int i = 0; i < req_nb_dash; i++)
             {
                 int factor = scaled_width == 0 ? 1 : scaled_width;
                 for (int i = 0; i < req_nb_dash; i++)

-                    real_req_dash[i] = req_dash[i] * factor;
+                    real_req_dash[i] = (wxX11Dash)(req_dash[i] * factor);

                 XSetDashes ((Display*) m_display, (GC) m_gc, 0, real_req_dash, req_nb_dash);
 
                 if (m_window && m_window->GetBackingPixmap())
                 XSetDashes ((Display*) m_display, (GC) m_gc, 0, real_req_dash, req_nb_dash);
 
                 if (m_window && m_window->GetBackingPixmap())


@@ -1699,7 +1628,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join);
     }
 
             XSetLineAttributes ((Display*) m_display,(GC) m_gcBacking, scaled_width, style, cap, join);
     }
 

-    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
+    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GET_OPTIMIZATION))

     {
         Pixmap myStipple;
 
     {
         Pixmap myStipple;
 


@@ -1757,7 +1686,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
     }
     else if (m_currentStipple.Ok()
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, myStipple);
     }
     else if (m_currentStipple.Ok()

-        && ((m_currentStipple != oldStipple) || !GetOptimization()))
+        && ((!m_currentStipple.IsSameAs(oldStipple)) || !GET_OPTIMIZATION))

     {
         XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
 
     {
         XSetStipple ((Display*) m_display, (GC) m_gc, (Pixmap) m_currentStipple.GetDrawable());
 


@@ -1765,7 +1694,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetDrawable());
     }
 
             XSetStipple ((Display*) m_display,(GC) m_gcBacking, (Pixmap) m_currentStipple.GetDrawable());
     }
 

-    if ((m_currentFill != oldFill) || !GetOptimization())
+    if ((m_currentFill != oldFill) || !GET_OPTIMIZATION)

     {
         int fill_style;
 
     {
         int fill_style;
 


@@ -1781,15 +1710,15 @@ void wxWindowDC::SetPen( const wxPen &pen )
     }
 
     // must test m_logicalFunction, because it involves background!
     }
 
     // must test m_logicalFunction, because it involves background!

-    if (!sameColour || !GetOptimization()
+    if (!sameColour || !GET_OPTIMIZATION

         || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))
     {
         || ((m_logicalFunction == wxXOR) || (m_autoSetting & 0x2)))
     {

-        int pixel = -1;
+        WXPixel pixel = -1;

         if (m_pen.GetStyle () == wxTRANSPARENT)
             pixel = m_backgroundPixel;
         else
         {
         if (m_pen.GetStyle () == wxTRANSPARENT)
             pixel = m_backgroundPixel;
         else
         {

-            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, FALSE);
+            pixel = CalculatePixel(m_pen.GetColour(), m_currentColour, false);

         }
 
         // Finally, set the GC to the required colour
         }
 
         // Finally, set the GC to the required colour


@@ -1831,7 +1760,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
 
     int stippleDepth = -1;
 
 
     int stippleDepth = -1;
 

-    if ((oldFill != m_brush.GetStyle ()) || !GetOptimization())
+    if ((oldFill != m_brush.GetStyle ()) || !GET_OPTIMIZATION)

     {
         switch (brush.GetStyle ())
         {
     {
         switch (brush.GetStyle ())
         {


@@ -1853,7 +1782,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
                 // determine whether fill style should be solid or
                 // transparent
                 int style = stippleDepth == 1 ?
                 // determine whether fill style should be solid or
                 // transparent
                 int style = stippleDepth == 1 ?

-                    (m_backgroundMode == wxSOLID ? 
+                    (m_backgroundMode == wxSOLID ?

                      FillOpaqueStippled : FillStippled) :
                     FillTiled;
                 XSetFillStyle ((Display*) m_display, (GC) m_gc, style);
                      FillOpaqueStippled : FillStippled) :
                     FillTiled;
                 XSetFillStyle ((Display*) m_display, (GC) m_gc, style);


@@ -1870,7 +1799,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
         }
     }
 
         }
     }
 

-    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GetOptimization()))
+    if (IS_HATCH(m_currentFill) && ((m_currentFill != oldFill) || !GET_OPTIMIZATION))

     {
         Pixmap myStipple;
 
     {
         Pixmap myStipple;
 


@@ -1949,10 +1878,10 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
     }
 
     // must test m_logicalFunction, because it involves background!
     }
 
     // must test m_logicalFunction, because it involves background!

-    if (!sameColour || !GetOptimization() || m_logicalFunction == wxXOR)
+    if (!sameColour || !GET_OPTIMIZATION || m_logicalFunction == wxXOR)

     {
     {

-        int pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, TRUE);
- 
+        WXPixel pixel = CalculatePixel(m_brush.GetColour(), m_currentColour, true);
+

         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
     }
         if (pixel > -1)
             SetForegroundPixelWithLogicalFunction(pixel);
     }


@@ -2133,7 +2062,8 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y,
 {
     wxDC::DoSetClippingRegion( x, y, width, height );
 
 {
     wxDC::DoSetClippingRegion( x, y, width, height );
 

-    wxRegion temp(x, y, width, height);
+    wxRegion temp(XLOG2DEV(x), YLOG2DEV(y),
+                  XLOG2DEVREL(width), YLOG2DEVREL(height));

 
     SetDCClipping(temp.GetX11Region());
 
 
     SetDCClipping(temp.GetX11Region());
 


@@ -2142,10 +2072,10 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y,
     if (m_window && m_window->GetBackingPixmap())
     {
         XRectangle rects[1];
     if (m_window && m_window->GetBackingPixmap())
     {
         XRectangle rects[1];

-        rects[0].x = XLOG2DEV_2(x);
-        rects[0].y = YLOG2DEV_2(y);
-        rects[0].width = XLOG2DEVREL(width);
-        rects[0].height = YLOG2DEVREL(height);
+        rects[0].x = (short)XLOG2DEV_2(x);
+        rects[0].y = (short)YLOG2DEV_2(y);
+        rects[0].width = (unsigned short)XLOG2DEVREL(width);
+        rects[0].height = (unsigned short)YLOG2DEVREL(height);

         XSetClipRectangles((Display*) m_display, (GC) m_gcBacking,
                            0, 0, rects, 1, Unsorted);
     }
         XSetClipRectangles((Display*) m_display, (GC) m_gcBacking,
                            0, 0, rects, 1, Unsorted);
     }


@@ -2153,21 +2083,19 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y,
 
 void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
 {
 
 void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
 {

-    wxRect box = region.GetBox();
-
-    wxDC::DoSetClippingRegion( box.x, box.y, box.width, box.height );
-

     SetDCClipping(region.GetX11Region());
 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94
     if (m_window && m_window->GetBackingPixmap())
     {
     SetDCClipping(region.GetX11Region());
 
     // Needs to work differently for Pixmap: without this,
     // there's a nasty (Display*) m_display bug. 8/12/94
     if (m_window && m_window->GetBackingPixmap())
     {

+        wxRect box = region.GetBox();
+

         XRectangle rects[1];
         XRectangle rects[1];

-        rects[0].x = XLOG2DEV_2(box.x);
-        rects[0].y = YLOG2DEV_2(box.y);
-        rects[0].width = XLOG2DEVREL(box.width);
-        rects[0].height = YLOG2DEVREL(box.height);
+        rects[0].x = (short)XLOG2DEV_2(box.x);
+        rects[0].y = (short)YLOG2DEV_2(box.y);
+        rects[0].width = (unsigned short)XLOG2DEVREL(box.width);
+        rects[0].height = (unsigned short)YLOG2DEVREL(box.height);

         XSetClipRectangles((Display*) m_display, (GC) m_gcBacking,
                            0, 0, rects, 1, Unsorted);
     }
         XSetClipRectangles((Display*) m_display, (GC) m_gcBacking,
                            0, 0, rects, 1, Unsorted);
     }


@@ -2207,7 +2135,7 @@ int wxWindowDC::GetDepth() const
 wxPaintDC::wxPaintDC(wxWindow* win) : wxWindowDC(win)
 {
     // Set the clipping region.to the update region
 wxPaintDC::wxPaintDC(wxWindow* win) : wxWindowDC(win)
 {
     // Set the clipping region.to the update region

-    SetDCClipping((WXRegion)NULL);   
+    SetDCClipping((WXRegion)NULL);

 }
 
 wxPaintDC::~wxPaintDC()
 }
 
 wxPaintDC::~wxPaintDC()


@@ -2239,7 +2167,7 @@ static void XCopyRemote(Display *src_display, Display *dest_display,
     static const int CACHE_SIZE = 256;
 
     unsigned int i, j;
     static const int CACHE_SIZE = 256;
 
     unsigned int i, j;

-    unsigned long cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE];
+    Pixel cachesrc[CACHE_SIZE], cachedest[CACHE_SIZE];

     int k, cache_pos, all_cache;
 
     if (!cache || !*cache)
     int k, cache_pos, all_cache;
 
     if (!cache || !*cache)


@@ -2253,11 +2181,11 @@ static void XCopyRemote(Display *src_display, Display *dest_display,
     destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display);
 
     cache_pos = 0;
     destcm = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dest_display);
 
     cache_pos = 0;

-    all_cache = FALSE;
+    all_cache = False;

 
     for (i = 0; i < w; i++)
         for (j = 0; j < h; j++) {
 
     for (i = 0; i < w; i++)
         for (j = 0; j < h; j++) {

-            unsigned long pixel;
+            Pixel pixel;

             XColor xcol;
 
             pixel = XGetPixel(image, i, j);
             XColor xcol;
 
             pixel = XGetPixel(image, i, j);


@@ -2281,7 +2209,7 @@ static void XCopyRemote(Display *src_display, Display *dest_display,
 
                         if (++cache_pos >= CACHE_SIZE) {
                             cache_pos = 0;
 
                         if (++cache_pos >= CACHE_SIZE) {
                             cache_pos = 0;

-                            all_cache = TRUE;
+                            all_cache = true;

                         }
 
 install:
                         }
 
 install:


@@ -2291,7 +2219,7 @@ install:
         XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h);
         XDestroyImage(destimage);
 
         XPutImage(dest_display, dest, destgc, destimage, 0, 0, destx, desty, w, h);
         XDestroyImage(destimage);
 

-        if (more)
+        if (more && cache)

             *cache = image;
         else
             XDestroyImage(image);
             *cache = image;
         else
             XDestroyImage(image);