// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
-// Copyright: (c) 1998 Robert Roebling, Markus Holzem, Chris Breeze
+// Copyright: (c) 1998 Robert Roebling, Chris Breeze
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dcclient.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#ifdef __VMS
#define XCopyPlane XCOPYPLANE
#endif
#include "wx/dcmemory.h"
#include "wx/image.h"
#include "wx/module.h"
+#include "wx/log.h"
+#include "wx/fontutil.h"
#include "wx/gtk/win_gtk.h"
gint width,
gint height)
{
- gint src_width, src_height;
-#ifndef __WXGTK20__
- GdkWindowPrivate *drawable_private;
- GdkWindowPrivate *src_private;
- GdkGCPrivate *gc_private;
-#endif
-
g_return_if_fail (drawable != NULL);
g_return_if_fail (src != NULL);
g_return_if_fail (gc != NULL);
-
+
#ifdef __WXGTK20__
- if (GDK_WINDOW_DESTROYED(drawable) || GDK_WINDOW_DESTROYED(src))
- return;
-
+ gint src_width, src_height;
gdk_drawable_get_size(src, &src_width, &src_height);
-#else
- drawable_private = (GdkWindowPrivate*) drawable;
- src_private = (GdkWindowPrivate*) src;
- if (drawable_private->destroyed || src_private->destroyed)
- return;
-
- src_width = src_private->width;
- src_height = src_private->height;
-
- gc_private = (GdkGCPrivate*) gc;
-#endif
-
if (width == -1) width = src_width;
if (height == -1) height = src_height;
-#ifdef __WXGTK20__
XCopyPlane( GDK_WINDOW_XDISPLAY(drawable),
GDK_WINDOW_XID(src),
GDK_WINDOW_XID(drawable),
GDK_GC_XGC(gc),
xsrc, ysrc,
width, height,
- xdest, ydest,
+ 0, 0,
1 );
#else
+ GdkWindowPrivate *drawable_private;
+ GdkWindowPrivate *src_private;
+ GdkGCPrivate *gc_private;
+
+ drawable_private = (GdkWindowPrivate*) drawable;
+ src_private = (GdkWindowPrivate*) src;
+ if (drawable_private->destroyed || src_private->destroyed)
+ return;
+
+ gint src_width = src_private->width;
+ gint src_height = src_private->height;
+
+ gc_private = (GdkGCPrivate*) gc;
+
+ if (width == -1) width = src_width;
+ if (height == -1) height = src_height;
+
XCopyPlane( drawable_private->xdisplay,
src_private->xwindow,
drawable_private->xwindow,
bool m_used;
};
-static wxGC wxGCPool[GC_POOL_SIZE];
+#define GC_POOL_ALLOC_SIZE 100
+
+static int wxGCPoolSize = 0;
+
+static wxGC *wxGCPool = NULL;
static void wxInitGCPool()
{
- memset( wxGCPool, 0, GC_POOL_SIZE*sizeof(wxGC) );
+ // This really could wait until the first call to
+ // wxGetPoolGC, but we will make the first allocation
+ // now when other initialization is being performed.
+
+ // Set initial pool size.
+ wxGCPoolSize = GC_POOL_ALLOC_SIZE;
+
+ // Allocate initial pool.
+ wxGCPool = (wxGC *)malloc(wxGCPoolSize * sizeof(wxGC));
+ if (wxGCPool == NULL)
+ {
+ // If we cannot malloc, then fail with error
+ // when debug is enabled. If debug is not enabled,
+ // the problem will eventually get caught
+ // in wxGetPoolGC.
+ wxFAIL_MSG( wxT("Cannot allocate GC pool") );
+ return;
+ }
+
+ // Zero initial pool.
+ memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC));
}
static void wxCleanUpGCPool()
{
- for (int i = 0; i < GC_POOL_SIZE; i++)
+ for (int i = 0; i < wxGCPoolSize; i++)
{
if (wxGCPool[i].m_gc)
gdk_gc_unref( wxGCPool[i].m_gc );
}
+
+ free(wxGCPool);
+ wxGCPool = NULL;
+ wxGCPoolSize = 0;
}
static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
{
- for (int i = 0; i < GC_POOL_SIZE; i++)
+ wxGC *pptr;
+
+ // Look for an available GC.
+ for (int i = 0; i < wxGCPoolSize; i++)
{
if (!wxGCPool[i].m_gc)
{
}
}
+ // We did not find an available GC.
+ // We need to grow the GC pool.
+ pptr = (wxGC *)realloc(wxGCPool,
+ (wxGCPoolSize + GC_POOL_ALLOC_SIZE)*sizeof(wxGC));
+ if (pptr != NULL)
+ {
+ // Initialize newly allocated pool.
+ wxGCPool = pptr;
+ memset(&wxGCPool[wxGCPoolSize], 0,
+ GC_POOL_ALLOC_SIZE*sizeof(wxGC));
+
+ // Initialize entry we will return.
+ wxGCPool[wxGCPoolSize].m_gc = gdk_gc_new( window );
+ gdk_gc_set_exposures( wxGCPool[wxGCPoolSize].m_gc, FALSE );
+ wxGCPool[wxGCPoolSize].m_type = type;
+ wxGCPool[wxGCPoolSize].m_used = TRUE;
+
+ // Set new value of pool size.
+ wxGCPoolSize += GC_POOL_ALLOC_SIZE;
+
+ // Return newly allocated entry.
+ return wxGCPool[wxGCPoolSize-GC_POOL_ALLOC_SIZE].m_gc;
+ }
+
+ // The realloc failed. Fall through to error.
wxFAIL_MSG( wxT("No GC available") );
return (GdkGC*) NULL;
static void wxFreePoolGC( GdkGC *gc )
{
- for (int i = 0; i < GC_POOL_SIZE; i++)
+ for (int i = 0; i < wxGCPoolSize; i++)
{
if (wxGCPool[i].m_gc == gc)
{
m_owner = (wxWindow *)NULL;
#ifdef __WXGTK20__
m_context = (PangoContext *)NULL;
+ m_layout = (PangoLayout *)NULL;
m_fontdesc = (PangoFontDescription *)NULL;
#endif
}
wxWindowDC::wxWindowDC( wxWindow *window )
{
+ wxASSERT_MSG( window, wxT("DC needs a window") );
+
m_penGC = (GdkGC *) NULL;
m_brushGC = (GdkGC *) NULL;
m_textGC = (GdkGC *) NULL;
m_isScreenDC = FALSE;
m_font = window->GetFont();
- wxASSERT_MSG( window, wxT("DC needs a window") );
-
GtkWidget *widget = window->m_wxwindow;
- // some controls don't have m_wxwindow - like wxStaticBox, but the user
+ // Some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them, so we will
- // use the parent window here then
+ // use the parent window here then.
if ( !widget )
{
window = window->GetParent();
wxASSERT_MSG( widget, wxT("DC needs a widget") );
#ifdef __WXGTK20__
- m_context = gtk_widget_get_pango_context( widget );
- m_fontdesc = widget->style->font_desc;
+ m_context = window->GtkGetPangoDefaultContext();
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( widget->style->font_desc );
#endif
GtkPizza *pizza = GTK_PIZZA( widget );
m_window = pizza->bin_window;
- /* not realized ? */
+ // Window not realized ?
if (!m_window)
{
- /* don't report problems */
+ // Don't report problems as per MSW.
m_ok = TRUE;
return;
wxWindowDC::~wxWindowDC()
{
Destroy();
+
+#ifdef __WXGTK20__
+ if (m_layout)
+ g_object_unref( G_OBJECT( m_layout ) );
+ if (m_fontdesc)
+ pango_font_description_free( m_fontdesc );
+#endif
}
void wxWindowDC::SetUpDC()
m_owner->GetSize(width, height);
}
-void wxWindowDC::DoFloodFill( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
- const wxColour &WXUNUSED(col), int WXUNUSED(style) )
+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)
{
- wxFAIL_MSG( wxT("wxWindowDC::DoFloodFill not implemented") );
+ return wxDoFloodFill(this, x, y, col, style);
}
bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
memdc.SelectObject(wxNullBitmap);
- wxImage image(bitmap);
+ wxImage image = bitmap.ConvertToImage();
col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
return TRUE;
}
if (m_pen.GetStyle() == wxTRANSPARENT) return;
if (n <= 0) return;
- CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
+ GdkPoint *gpts = new GdkPoint[n];
+ if (! gpts)
+ {
+ wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
+ return;
+ }
- for (int i = 0; i < n-1; i++)
+ for (int i = 0; i < n; i++)
{
wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
- wxCoord x2 = XLOG2DEV(points[i+1].x + xoffset);
- wxCoord y1 = YLOG2DEV(points[i].y + yoffset); // oh, what a waste
- wxCoord y2 = YLOG2DEV(points[i+1].y + yoffset);
+ wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
- if (m_window)
- gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
+ CalcBoundingBox( x1 + xoffset, y1 + yoffset );
- CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset );
+ gpts[i].x = x1;
+ gpts[i].y = y1;
}
+
+ if (m_window)
+ gdk_draw_lines( m_window, m_penGC, gpts, n);
+
+ delete[] gpts;
}
void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
if (m_pen.GetStyle() != wxTRANSPARENT)
{
+/*
for (i = 0 ; i < n ; i++)
{
gdk_draw_line( m_window, m_penGC,
gdkpoints[(i+1)%n].x,
gdkpoints[(i+1)%n].y);
}
+*/
+ gdk_draw_polygon( m_window, m_penGC, FALSE, gdkpoints, n );
+
}
}
bool is_mono = (bitmap.GetBitmap() != NULL);
- /* scale/translate size and position */
+ // scale/translate size and position
int xx = XLOG2DEV(x);
int yy = YLOG2DEV(y);
int ww = XLOG2DEVREL(w);
int hh = YLOG2DEVREL(h);
- /* compare to current clipping region */
+ // compare to current clipping region
if (!m_currentClippingRegion.IsNull())
{
wxRegion tmp( xx,yy,ww,hh );
return;
}
- /* scale bitmap if required */
- wxBitmap use_bitmap;
+ // scale bitmap if required
+ wxBitmap use_bitmap = bitmap;
if ((w != ww) || (h != hh))
- {
- wxImage image( bitmap );
- image.Rescale( ww, hh );
- if (is_mono)
- use_bitmap = image.ConvertToMonoBitmap(255,255,255);
- else
- use_bitmap = image.ConvertToBitmap();
- }
- else
- {
- use_bitmap = bitmap;
- }
-
- /* apply mask if any */
+ use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
+
+ // apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
- if (useMask && mask)
+ GdkBitmap *new_mask = (GdkBitmap*) NULL;
+
+ if (useMask && mask)
+ {
+ if (!m_currentClippingRegion.IsNull())
{
- GdkBitmap *new_mask = (GdkBitmap*) NULL;
- if (!m_currentClippingRegion.IsNull())
- {
- GdkColor col;
- new_mask = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, 1 );
- GdkGC *gc = gdk_gc_new( new_mask );
- col.pixel = 0;
- gdk_gc_set_foreground( gc, &col );
- gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
- col.pixel = 0;
- gdk_gc_set_background( gc, &col );
- col.pixel = 1;
- gdk_gc_set_foreground( gc, &col );
- gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
- gdk_gc_set_clip_origin( gc, -xx, -yy );
- gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
- gdk_gc_set_stipple( gc, mask );
- gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
- gdk_gc_unref( gc );
- }
-
- if (is_mono)
- {
- if (new_mask)
- gdk_gc_set_clip_mask( m_textGC, new_mask );
- else
- gdk_gc_set_clip_mask( m_textGC, mask );
- gdk_gc_set_clip_origin( m_textGC, xx, yy );
- }
+ GdkColor col;
+ new_mask = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, 1 );
+ GdkGC *gc = gdk_gc_new( new_mask );
+ col.pixel = 0;
+ gdk_gc_set_foreground( gc, &col );
+ gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
+ col.pixel = 0;
+ gdk_gc_set_background( gc, &col );
+ col.pixel = 1;
+ gdk_gc_set_foreground( gc, &col );
+ gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
+ gdk_gc_set_clip_origin( gc, -xx, -yy );
+ gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
+ gdk_gc_set_stipple( gc, mask );
+ gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
+ gdk_gc_unref( gc );
+ }
+
+ if (is_mono)
+ {
+ if (new_mask)
+ gdk_gc_set_clip_mask( m_textGC, new_mask );
else
- {
- if (new_mask)
- gdk_gc_set_clip_mask( m_penGC, new_mask );
- else
- gdk_gc_set_clip_mask( m_penGC, mask );
- gdk_gc_set_clip_origin( m_penGC, xx, yy );
- }
+ gdk_gc_set_clip_mask( m_textGC, mask );
+ gdk_gc_set_clip_origin( m_textGC, xx, yy );
+ }
+ else
+ {
if (new_mask)
- gdk_bitmap_unref( new_mask );
+ gdk_gc_set_clip_mask( m_penGC, new_mask );
+ else
+ gdk_gc_set_clip_mask( m_penGC, mask );
+ gdk_gc_set_clip_origin( m_penGC, xx, yy );
}
+ }
- /* Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
- drawing a mono-bitmap (XBitmap) we use the current text GC */
+ // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
+ // drawing a mono-bitmap (XBitmap) we use the current text GC
if (is_mono)
+ {
+#ifdef __WXGTK20__
+ GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, -1 );
+ GdkGC *gc = gdk_gc_new( bitmap );
+ gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
+ gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
+ gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
+
+ gdk_draw_drawable( m_window, m_textGC, bitmap, 0, 0, xx, yy, -1, -1 );
+
+ gdk_bitmap_unref( bitmap );
+ gdk_gc_unref( gc );
+#else
gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );
+#endif
+ }
else
+ {
gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
+ }
- /* remove mask again if any */
+ // remove mask again if any
if (useMask && mask)
{
if (is_mono)
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
}
}
+
+ if (new_mask)
+ gdk_bitmap_unref( new_mask );
}
bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask )
{
- /* this is the nth try to get this utterly useless function to
- work. it now completely ignores the scaling or translation
- of the source dc, but scales correctly on the target dc and
- knows about possible mask information in a memory dc. */
-
wxCHECK_MSG( Ok(), FALSE, wxT("invalid window dc") );
wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
if (!m_window) return FALSE;
-#if 0
// transform the source DC coords to the device ones
- xsrc = XLOG2DEV(xsrc);
- ysrc = YLOG2DEV(ysrc);
-#endif
+ xsrc = source->XLOG2DEV(xsrc);
+ ysrc = source->YLOG2DEV(ysrc);
wxClientDC *srcDC = (wxClientDC*)source;
wxMemoryDC *memDC = (wxMemoryDC*)source;
bool use_bitmap_method = FALSE;
bool is_mono = FALSE;
- /* TODO: use the mask origin when drawing transparently */
+ // TODO: use the mask origin when drawing transparently
if (xsrcMask == -1 && ysrcMask == -1)
{
- xsrcMask = xsrc; ysrcMask = ysrc;
+ xsrcMask = xsrc;
+ ysrcMask = ysrc;
}
if (srcDC->m_isMemDC)
{
if (!memDC->m_selected.Ok()) return FALSE;
- /* we use the "XCopyArea" way to copy a memory dc into
- y different window if the memory dc BOTH
- a) doesn't have any mask or its mask isn't used
- b) it is clipped
- c) is not 1-bit */
+ is_mono = (memDC->m_selected.GetDepth() == 1);
+
+ // we use the "XCopyArea" way to copy a memory dc into
+ // a different window if the memory dc BOTH
+ // a) doesn't have any mask or its mask isn't used
+ // b) it is clipped
+ // c) is not 1-bit
if (useMask && (memDC->m_selected.GetMask()))
{
- /* we HAVE TO use the direct way for memory dcs
- that have mask since the XCopyArea doesn't know
- about masks */
+ // we HAVE TO use the direct way for memory dcs
+ // that have mask since the XCopyArea doesn't know
+ // about masks
use_bitmap_method = TRUE;
}
- else if (memDC->m_selected.GetDepth() == 1)
+ else if (is_mono)
{
- /* we HAVE TO use the direct way for memory dcs
- that are bitmaps because XCopyArea doesn't cope
- with different bit depths */
- is_mono = TRUE;
+ // we HAVE TO use the direct way for memory dcs
+ // that are bitmaps because XCopyArea doesn't cope
+ // with different bit depths
use_bitmap_method = TRUE;
}
else if ((xsrc == 0) && (ysrc == 0) &&
(width == memDC->m_selected.GetWidth()) &&
(height == memDC->m_selected.GetHeight()))
{
- /* we SHOULD use the direct way if all of the bitmap
- in the memory dc is copied in which case XCopyArea
- wouldn't be able able to boost performace by reducing
- the area to be scaled */
+ // we SHOULD use the direct way if all of the bitmap
+ // in the memory dc is copied in which case XCopyArea
+ // wouldn't be able able to boost performace by reducing
+ // the area to be scaled
use_bitmap_method = TRUE;
}
else
CalcBoundingBox( xdest, ydest );
CalcBoundingBox( xdest + width, ydest + height );
- /* scale/translate size and position */
+ // scale/translate size and position
wxCoord xx = XLOG2DEV(xdest);
wxCoord yy = YLOG2DEV(ydest);
wxCoord ww = XLOG2DEVREL(width);
wxCoord hh = YLOG2DEVREL(height);
- /* compare to current clipping region */
+ // compare to current clipping region
if (!m_currentClippingRegion.IsNull())
{
wxRegion tmp( xx,yy,ww,hh );
if (use_bitmap_method)
{
- /* scale/translate bitmap size */
+ // scale/translate bitmap size
wxCoord bm_width = memDC->m_selected.GetWidth();
wxCoord bm_height = memDC->m_selected.GetHeight();
+ // Get clip coords for the bitmap. If we don't
+ // use wxBitmap::Rescale(), which can clip the
+ // bitmap, these are the same as the original
+ // coordinates
+ wxCoord cx = xx;
+ wxCoord cy = yy;
+ wxCoord cw = ww;
+ wxCoord ch = hh;
+
+ // interpret userscale of src too
+ double xsc,ysc;
+ memDC->GetUserScale(&xsc,&ysc);
+ bm_width = (int) (bm_width / xsc);
+ bm_height = (int) (bm_height / ysc);
+
wxCoord bm_ww = XLOG2DEVREL( bm_width );
wxCoord bm_hh = YLOG2DEVREL( bm_height );
- /* scale bitmap if required */
+ // Scale bitmap if required
wxBitmap use_bitmap;
-
if ((bm_width != bm_ww) || (bm_height != bm_hh))
{
- wxImage image( memDC->m_selected );
- image = image.Scale( bm_ww, bm_hh );
-
- if (is_mono)
- use_bitmap = image.ConvertToMonoBitmap(255,255,255);
- else
- use_bitmap = image.ConvertToBitmap();
+ // This indicates that the blitting code below will get
+ // a clipped bitmap and therefore needs to move the origin
+ // accordingly
+ wxRegion tmp( xx,yy,ww,hh );
+ tmp.Intersect( m_currentClippingRegion );
+ tmp.GetBox(cx,cy,cw,ch);
+
+ // Scale and clipped bitmap
+ use_bitmap = memDC->m_selected.Rescale(cx-xx,cy-yy,cw,ch,bm_ww,bm_hh);
}
else
{
+ // Don't scale bitmap
use_bitmap = memDC->m_selected;
}
- /* apply mask if any */
+ // apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+ GdkBitmap *new_mask = (GdkBitmap*) NULL;
+
if (useMask && mask)
{
- GdkBitmap *new_mask = (GdkBitmap*) NULL;
if (!m_currentClippingRegion.IsNull())
{
GdkColor col;
col.pixel = 1;
gdk_gc_set_foreground( gc, &col );
gdk_gc_set_clip_region( gc, m_currentClippingRegion.GetRegion() );
- gdk_gc_set_clip_origin( gc, -xx, -yy );
+ // was: gdk_gc_set_clip_origin( gc, -xx, -yy );
+ gdk_gc_set_clip_origin( gc, -cx, -cy );
gdk_gc_set_fill( gc, GDK_OPAQUE_STIPPLED );
gdk_gc_set_stipple( gc, mask );
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
gdk_gc_set_clip_mask( m_textGC, new_mask );
else
gdk_gc_set_clip_mask( m_textGC, mask );
- gdk_gc_set_clip_origin( m_textGC, xx, yy );
+ // was: gdk_gc_set_clip_origin( m_textGC, xx, yy );
+ gdk_gc_set_clip_origin( m_textGC, cx, cy );
}
else
{
gdk_gc_set_clip_mask( m_penGC, new_mask );
else
gdk_gc_set_clip_mask( m_penGC, mask );
- gdk_gc_set_clip_origin( m_penGC, xx, yy );
+ // was: gdk_gc_set_clip_origin( m_penGC, xx, yy );
+ gdk_gc_set_clip_origin( m_penGC, cx, cy );
}
- if (new_mask)
- gdk_bitmap_unref( new_mask );
}
- /* Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
- drawing a mono-bitmap (XBitmap) we use the current text GC */
+ // Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
+ // drawing a mono-bitmap (XBitmap) we use the current text GC
if (is_mono)
- gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, xx, yy, ww, hh );
+ {
+#ifdef __WXGTK20__
+ GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, -1 );
+ GdkGC *gc = gdk_gc_new( bitmap );
+ gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
+ gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
+ gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
+
+ gdk_draw_drawable( m_window, m_textGC, bitmap, xsrc, ysrc, cx, cy, cw, ch );
+
+ gdk_bitmap_unref( bitmap );
+ gdk_gc_unref( gc );
+#else
+ // was: gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, xx, yy, ww, hh );
+ gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, cx, cy, cw, ch );
+#endif
+ }
else
- gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
+ {
+ // was: gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
+ gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch );
+ }
- /* remove mask again if any */
+ // remove mask again if any
if (useMask && mask)
{
if (is_mono)
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
}
}
+
+ if (new_mask)
+ gdk_bitmap_unref( new_mask );
}
- else /* use_bitmap_method */
+ else // use_bitmap_method
{
if ((width != ww) || (height != hh))
{
- /* draw source window into a bitmap as we cannot scale
- a window in contrast to a bitmap. this would actually
- work with memory dcs as well, but we'd lose the mask
- information and waste one step in this process since
- a memory already has a bitmap. all this is slightly
- inefficient as we could take an XImage directly from
- an X window, but we'd then also have to care that
- the window is not outside the screen (in which case
- we'd get a BadMatch or what not).
- Is a double XGetImage and combined XGetPixel and
- XPutPixel really faster? I'm not sure. look at wxXt
- for a different implementation of the same problem. */
-
- wxBitmap bitmap( width, height );
-
- /* copy including child window contents */
- gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
- gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0,
- srcDC->GetWindow(),
- xsrc, ysrc, width, height );
- gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
-
- /* scale image */
- wxImage image( bitmap );
- image = image.Scale( ww, hh );
-
- /* convert to bitmap */
- bitmap = image.ConvertToBitmap();
-
- /* draw scaled bitmap */
- gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
-
+ // get clip coords
+ wxRegion tmp( xx,yy,ww,hh );
+ tmp.Intersect( m_currentClippingRegion );
+ wxCoord cx,cy,cw,ch;
+ tmp.GetBox(cx,cy,cw,ch);
+
+ // rescale bitmap
+ wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
+
+ // draw scaled bitmap
+ // was: gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
+ gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, cx, cy, -1, -1 );
}
else
{
- /* No scaling and not a memory dc with a mask either */
+ // No scaling and not a memory dc with a mask either
- /* copy including child window contents */
+ // copy including child window contents
gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
gdk_window_copy_area( m_window, m_penGC, xx, yy,
srcDC->GetWindow(),
}
SetLogicalFunction( old_logical_func );
+
return TRUE;
}
wxCHECK_RET( Ok(), wxT("invalid window dc") );
if (!m_window) return;
+
+ if (text.empty()) return;
+#ifndef __WXGTK20__
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_RET( font, wxT("invalid font") );
-
-#if defined(__WXGTK20__)
- wxCHECK_RET( m_context, wxT("no Pango context") );
#endif
x = XLOG2DEV(x);
y = YLOG2DEV(y);
-#if defined(__WXGTK20__) && wxUSE_WCHAR_T
- /* FIXME: the layout engine should probably be abstracted at a higher level in wxDC... */
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
+#ifdef __WXGTK20__
+ wxCHECK_RET( m_context, wxT("no Pango context") );
+ wxCHECK_RET( m_layout, wxT("no Pango layout") );
+ wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
+
+ bool underlined = m_font.Ok() && m_font.GetUnderlined();
+
+#if wxUSE_UNICODE
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
+#else
+ const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
+#endif
+ size_t datalen = strlen((const char*)data);
+ pango_layout_set_text( m_layout, (const char*) data, datalen);
+
+ if (underlined)
+ {
+ PangoAttrList *attrs = pango_attr_list_new();
+ PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
+ a->start_index = 0;
+ a->end_index = datalen;
+ pango_attr_list_insert(attrs, a);
+ pango_layout_set_attributes(m_layout, attrs);
+ pango_attr_list_unref(attrs);
+ }
+
+ int w,h;
+
+ if (fabs(m_scaleY - 1.0) < 0.00001)
{
- wxWX2MBbuf data = text.mb_str(wxConvUTF8);
- pango_layout_set_text(layout, data, strlen(data));
+ // If there is a user or actually any scale applied to
+ // the device context, scale the font.
+
+ // scale font description
+ gint oldSize = pango_font_description_get_size( m_fontdesc );
+ double size = oldSize;
+ size = size * m_scaleY;
+ pango_font_description_set_size( m_fontdesc, (gint)size );
+
+ // actually apply scaled font
+ pango_layout_set_font_description( m_layout, m_fontdesc );
+
+ pango_layout_get_pixel_size( m_layout, &w, &h );
+ if ( m_backgroundMode == wxSOLID )
+ {
+ gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
+ gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
+ gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
+ }
+
+ // Draw layout.
+ gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
+
+ // reset unscaled size
+ pango_font_description_set_size( m_fontdesc, oldSize );
+
+ // actually apply unscaled font
+ pango_layout_set_font_description( m_layout, m_fontdesc );
}
- PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
- PangoRectangle rect;
- pango_layout_line_get_extents(line, NULL, &rect);
- wxCoord width = rect.width;
- wxCoord height = rect.height;
- gdk_draw_layout( m_window, m_textGC, x, y, layout );
-#else
+ else
+ {
+ pango_layout_get_pixel_size( m_layout, &w, &h );
+ if ( m_backgroundMode == wxSOLID )
+ {
+ gdk_gc_set_foreground(m_textGC, m_textBackgroundColour.GetColor());
+ gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
+ gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
+ }
+ // Draw layout.
+ gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
+ }
+
+ if (underlined)
+ {
+ // undo underline attributes setting:
+ pango_layout_set_attributes(m_layout, NULL);
+ }
+
+ wxCoord width = w;
+ wxCoord height = h;
+
+#else // GTK+ 1.x
wxCoord width = gdk_string_width( font, text.mbc_str() );
wxCoord height = font->ascent + font->descent;
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
-#endif
/* CMB 17/7/98: simple underline: ignores scaling and underlying
X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
if (font->descent > 0) ul_y++;
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
}
-
-#if defined(__WXGTK20__) && wxUSE_WCHAR_T
- g_object_unref( G_OBJECT( layout ) );
-#endif
+#endif // GTK+ 2.0/1.x
width = wxCoord(width / m_scaleX);
height = wxCoord(height / m_scaleY);
if (!m_window) return;
+#ifdef __WXGTK20__
+ // implement later without GdkFont for GTK 2.0
+ return;
+#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_RET( font, wxT("invalid font") );
dc.SetBrush(*wxBLACK_BRUSH);
dc.Clear();
dc.DrawText(text, 0, 0);
- dc.SetFont(wxNullFont);
dc.SelectObject(wxNullBitmap);
// Calculate the size of the rotated bounding box.
minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
// prepare to blit-with-rotate the bitmap to the DC
- wxImage image(src);
+ wxImage image = src.ConvertToImage();
GdkColor *colText = m_textForegroundColour.GetColor(),
*colBack = m_textBackgroundColour.GetColor();
// don't use DrawPoint() because it uses the current pen
// colour, and we don't need it here
gdk_draw_point( m_window, m_textGC,
- XLOG2DEV(x + dstX), YLOG2DEV(y + dstY) );
+ XLOG2DEV(x) + dstX, YLOG2DEV(y) + dstY );
}
}
}
// update the bounding box
CalcBoundingBox(x + minX, y + minY);
CalcBoundingBox(x + maxX, y + maxY);
+#endif
}
void wxWindowDC::DoGetTextExtent(const wxString &string,
wxCoord *descent, wxCoord *externalLeading,
wxFont *theFont) const
{
+ if (string.IsEmpty())
+ {
+ if (width) (*width) = 0;
+ if (height) (*height) = 0;
+ return;
+ }
+
+#ifdef __WXGTK20__
+ // Set new font description
+ if (theFont)
+ pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
+
+ // Set layout's text
+#if wxUSE_UNICODE
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
+ const char *dataUTF8 = (const char *)data;
+#else
+ const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
+ if ( !wdata )
+ return;
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
+ const char *dataUTF8 = (const char *)data;
+#endif
+
+ if ( !dataUTF8 )
+ {
+ // hardly ideal, but what else can we do if conversion failed?
+ return;
+ }
+
+ pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
+
+ int w,h;
+ pango_layout_get_pixel_size( m_layout, &w, &h );
+
+ if (width)
+ *width = (wxCoord) w;
+ if (height)
+ *height = (wxCoord) h;
+ if (descent)
+ {
+ PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
+ int baseline = pango_layout_iter_get_baseline(iter);
+ pango_layout_iter_free(iter);
+ *descent = h - PANGO_PIXELS(baseline);
+ }
+ if (externalLeading)
+ *externalLeading = 0; // ??
+
+ // Reset old font description
+ if (theFont)
+ pango_layout_set_font_description( m_layout, m_fontdesc );
+#else // GTK+ 1.x
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
-
+
GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
if (width) (*width) = wxCoord(gdk_string_width( font, string.mbc_str() ) / m_scaleX);
if (height) (*height) = wxCoord((font->ascent + font->descent) / m_scaleY);
if (descent) (*descent) = wxCoord(font->descent / m_scaleY);
if (externalLeading) (*externalLeading) = 0; // ??
+#endif // GTK+ 2/1
}
wxCoord wxWindowDC::GetCharWidth() const
{
+#ifdef __WXGTK20__
+ pango_layout_set_text( m_layout, "H", 1 );
+ int w,h;
+ pango_layout_get_pixel_size( m_layout, &w, &h );
+ return w;
+#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_MSG( font, -1, wxT("invalid font") );
return wxCoord(gdk_string_width( font, "H" ) / m_scaleX);
+#endif
}
wxCoord wxWindowDC::GetCharHeight() const
{
+#ifdef __WXGTK20__
+ pango_layout_set_text( m_layout, "H", 1 );
+ int w,h;
+ pango_layout_get_pixel_size( m_layout, &w, &h );
+ return h;
+#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_MSG( font, -1, wxT("invalid font") );
return wxCoord((font->ascent + font->descent) / m_scaleY);
+#endif
}
void wxWindowDC::Clear()
if (!m_window) return;
+ // VZ: the code below results in infinite recursion and crashes when
+ // dc.Clear() is done from OnPaint() so I disable it for now.
+ // I don't know what the correct fix is but Clear() surely should not
+ // reenter OnPaint()!
+#if 0
/* - we either are a memory dc or have a window as the
owner. anything else shouldn't happen.
- we don't use gdk_window_clear() as we don't set
if (m_owner)
{
- int width,height;
- m_owner->GetSize( &width, &height );
- gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+ m_owner->Clear();
return;
}
gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
return;
}
+#else // 1
+ int width,height;
+ GetSize( &width, &height );
+ gdk_draw_rectangle( m_window, m_bgGC, TRUE, 0, 0, width, height );
+#endif // 0/1
}
void wxWindowDC::SetFont( const wxFont &font )
{
m_font = font;
+
#ifdef __WXGTK20__
- // fix fontdesc?
+ if (m_font.Ok())
+ {
+ if (m_fontdesc)
+ pango_font_description_free( m_fontdesc );
+
+ m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+
+
+ if (m_owner)
+ {
+ PangoContext *oldContext = m_context;
+
+ // We might want to use the X11 context for faster
+ // rendering on screen
+ if (m_font.GetNoAntiAliasing())
+ m_context = m_owner->GtkGetPangoX11Context();
+ else
+ m_context = m_owner->GtkGetPangoDefaultContext();
+
+ // If we switch back/forth between different contexts
+ // we also have to create a new layout. I think so,
+ // at least, and it doesn't hurt to do it.
+ if (oldContext != m_context)
+ {
+ if (m_layout)
+ g_object_unref( G_OBJECT( m_layout ) );
+
+ m_layout = pango_layout_new( m_context );
+ }
+ }
+
+ pango_layout_set_font_description( m_layout, m_fontdesc );
+ }
#endif
}
( fabs((double) XLOG2DEVREL(width)) +
fabs((double) YLOG2DEVREL(width)) ) / 2.0;
width = (int)w;
+ if ( !width )
+ {
+ // width can't be 0 or an internal GTK error occurs inside
+ // gdk_gc_set_dashes() below
+ width = 1;
+ }
}
static const wxGTKDash dotted[] = {1, 1};
gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
}
}
-#endif
+#endif // GTK+ > 1.0
GdkCapStyle capStyle = GDK_CAP_ROUND;
switch (m_pen.GetCap())
if (!m_window)
return;
- GdkFunction mode = GDK_COPY;
+ GdkFunction mode;
switch (function)
{
case wxXOR: mode = GDK_XOR; break;
case wxINVERT: mode = GDK_INVERT; break;
-#if (GTK_MINOR_VERSION > 0)
+#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)
case wxOR_REVERSE: mode = GDK_OR_REVERSE; break;
case wxAND_REVERSE: mode = GDK_AND_REVERSE; break;
case wxCLEAR: mode = GDK_CLEAR; break;
// unsupported by GTK
case wxNOR: mode = GDK_COPY; break;
-#endif
+#endif // GTK+ > 1.0
default:
- {
wxFAIL_MSG( wxT("unsupported logical function") );
- break;
- }
+ mode = GDK_COPY;
}
m_logicalFunction = function;
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+// Limit the paint region to the window size. Sometimes
+// the paint region is too big, and this risks X11 errors
+static void wxLimitRegionToSize(wxRegion& region, const wxSize& sz)
+{
+ wxRect originalRect = region.GetBox();
+ wxRect rect(originalRect);
+ if (rect.width + rect.x > sz.x)
+ rect.width = sz.x - rect.x;
+ if (rect.height + rect.y > sz.y)
+ rect.height = sz.y - rect.y;
+ if (rect != originalRect)
+ {
+ region = wxRegion(rect);
+ wxLogTrace(wxT("painting"), wxT("Limiting region from %d, %d, %d, %d to %d, %d, %d, %d\n"),
+ originalRect.x, originalRect.y, originalRect.width, originalRect.height,
+ rect.x, rect.y, rect.width, rect.height);
+ }
+}
+
wxPaintDC::wxPaintDC( wxWindow *win )
: wxClientDC( win )
{
if (!win->m_clipPaintRegion)
return;
+ wxSize sz = win->GetSize();
m_paintClippingRegion = win->GetUpdateRegion();
+ wxLimitRegionToSize(m_paintClippingRegion, sz);
+
GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region )
{
- m_paintClippingRegion = win->GetUpdateRegion();
- GdkRegion *region = m_paintClippingRegion.GetRegion();
- if ( region )
- {
- m_currentClippingRegion.Union( m_paintClippingRegion );
+ m_currentClippingRegion.Union( m_paintClippingRegion );
+ wxLimitRegionToSize(m_currentClippingRegion, sz);
- gdk_gc_set_clip_region( m_penGC, region );
- gdk_gc_set_clip_region( m_brushGC, region );
- gdk_gc_set_clip_region( m_textGC, region );
- gdk_gc_set_clip_region( m_bgGC, region );
- }
+ if (sz.x <= 0 || sz.y <= 0)
+ return ;
+
+ gdk_gc_set_clip_region( m_penGC, region );
+ gdk_gc_set_clip_region( m_brushGC, region );
+ gdk_gc_set_clip_region( m_textGC, region );
+ gdk_gc_set_clip_region( m_bgGC, region );
}
#endif // USE_PAINT_REGION
}
projects / wxWidgets.git / blobdiff