/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dcclient.cpp
+// Name: src/gtk1/dcclient.cpp
// 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__
-#pragma implementation "dcclient.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XCopyPlane XCOPYPLANE
#endif
-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
-#include "wx/image.h"
-#include "wx/module.h"
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/math.h" // for floating-point functions
+ #include "wx/image.h"
+ #include "wx/module.h"
+#endif
-#include "wx/gtk/win_gtk.h"
+#include "wx/fontutil.h"
-#include <math.h> // for floating-point functions
+#include "wx/gtk1/win_gtk.h"
+#include "wx/gtk1/dcclient.h"
+#include "wx/gtk1/dcmemory.h"
#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// local defines
//-----------------------------------------------------------------------------
-#define USE_PAINT_REGION 0
+#define USE_PAINT_REGION 1
//-----------------------------------------------------------------------------
// local data
#include "cross.xbm"
#define num_hatches 6
+#define IS_15_PIX_HATCH(s) ((s)==wxCROSSDIAG_HATCH || (s)==wxHORIZONTAL_HATCH || (s)==wxVERTICAL_HATCH)
+#define IS_16_PIX_HATCH(s) ((s)!=wxCROSSDIAG_HATCH && (s)!=wxHORIZONTAL_HATCH && (s)!=wxVERTICAL_HATCH)
+
+
static GdkPixmap *hatches[num_hatches];
static GdkPixmap **hatch_bitmap = (GdkPixmap **) NULL;
-extern GtkWidget *wxRootWindow;
+extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// constants
#include "gdk/gdkprivate.h"
-void gdk_draw_bitmap (GdkDrawable *drawable,
- GdkGC *gc,
- GdkDrawable *src,
- gint xsrc,
- gint ysrc,
- gint xdest,
- gint ydest,
- gint width,
- gint height)
+void gdk_wx_draw_bitmap(GdkDrawable *drawable,
+ GdkGC *gc,
+ GdkDrawable *src,
+ gint xsrc,
+ gint ysrc,
+ gint xdest,
+ gint ydest,
+ gint width,
+ gint height)
{
+ wxCHECK_RET( drawable, wxT("NULL drawable in gdk_wx_draw_bitmap") );
+ wxCHECK_RET( src, wxT("NULL src in gdk_wx_draw_bitmap") );
+ wxCHECK_RET( gc, wxT("NULL gc in gdk_wx_draw_bitmap") );
+
GdkWindowPrivate *drawable_private;
GdkWindowPrivate *src_private;
GdkGCPrivate *gc_private;
- g_return_if_fail (drawable != NULL);
- g_return_if_fail (src != NULL);
- g_return_if_fail (gc != NULL);
-
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_private->width;
- if (height == -1) height = src_private->height;
+ if (width == -1) width = src_width;
+ if (height == -1) height = src_height;
XCopyPlane( drawable_private->xdisplay,
src_private->xwindow,
wxTEXT_COLOUR,
wxBG_COLOUR,
wxPEN_COLOUR,
- wxBRUSH_COLOUR
+ wxBRUSH_COLOUR,
+ wxTEXT_SCREEN,
+ wxBG_SCREEN,
+ wxPEN_SCREEN,
+ wxBRUSH_SCREEN
};
struct wxGC
bool m_used;
};
-static wxGC wxGCPool[200];
+#define GC_POOL_ALLOC_SIZE 100
+
+static int wxGCPoolSize = 0;
+
+static wxGC *wxGCPool = NULL;
static void wxInitGCPool()
{
- memset( wxGCPool, 0, 200*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 < 200; 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 < 200; i++)
+ wxGC *pptr;
+
+ // Look for an available GC.
+ for (int i = 0; i < wxGCPoolSize; i++)
{
if (!wxGCPool[i].m_gc)
{
wxGCPool[i].m_gc = gdk_gc_new( window );
gdk_gc_set_exposures( wxGCPool[i].m_gc, FALSE );
- // This allows you to e.g. copy from the screen
- // without clipping the windows on it.
- gdk_gc_set_subwindow( wxGCPool[i].m_gc,
- GDK_INCLUDE_INFERIORS );
wxGCPool[i].m_type = type;
- wxGCPool[i].m_used = FALSE;
+ wxGCPool[i].m_used = false;
}
if ((!wxGCPool[i].m_used) && (wxGCPool[i].m_type == type))
{
- wxGCPool[i].m_used = TRUE;
+ wxGCPool[i].m_used = true;
return 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;
+
+ return NULL;
}
static void wxFreePoolGC( GdkGC *gc )
{
- for (int i = 0; i < 200; i++)
+ for (int i = 0; i < wxGCPoolSize; i++)
{
if (wxGCPool[i].m_gc == gc)
{
- wxGCPool[i].m_used = FALSE;
+ wxGCPool[i].m_used = false;
return;
}
}
-
+
wxFAIL_MSG( wxT("Wrong GC") );
}
//-----------------------------------------------------------------------------
-// wxWindowDC
+// wxWindowDCImpl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDC)
-wxWindowDC::wxWindowDC()
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner)
+ : wxGTKDCImpl(owner)
{
- m_penGC = (GdkGC *) NULL;
- m_brushGC = (GdkGC *) NULL;
- m_textGC = (GdkGC *) NULL;
- m_bgGC = (GdkGC *) NULL;
- m_cmap = (GdkColormap *) NULL;
- m_isMemDC = FALSE;
- m_owner = (wxWindow *)NULL;
+ m_penGC = NULL;
+ m_brushGC = NULL;
+ m_textGC = NULL;
+ m_bgGC = NULL;
+ m_cmap = NULL;
+ m_isMemDC = false;
+ m_isScreenDC = false;
+ m_owner = NULL;
}
-wxWindowDC::wxWindowDC( wxWindow *window )
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *window)
+ : wxGTKDCImpl(owner)
{
- m_penGC = (GdkGC *) NULL;
- m_brushGC = (GdkGC *) NULL;
- m_textGC = (GdkGC *) NULL;
- m_bgGC = (GdkGC *) NULL;
- m_cmap = (GdkColormap *) NULL;
- m_owner = (wxWindow *)NULL;
- m_isMemDC = FALSE;
- m_font = window->GetFont();
-
wxASSERT_MSG( window, wxT("DC needs a window") );
+ m_penGC = NULL;
+ m_brushGC = NULL;
+ m_textGC = NULL;
+ m_bgGC = NULL;
+ m_cmap = NULL;
+ m_owner = NULL;
+ m_isMemDC = false;
+ m_isScreenDC = false;
+ m_font = window->GetFont();
+
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();
GtkPizza *pizza = GTK_PIZZA( widget );
m_window = pizza->bin_window;
- /* not realized ? */
+ // Window not realized ?
if (!m_window)
{
- /* don't report problems */
- m_ok = TRUE;
+ // Don't report problems as per MSW.
+ m_ok = true;
return;
}
m_owner = window;
}
-wxWindowDC::~wxWindowDC()
+wxWindowDCImpl::~wxWindowDCImpl()
{
Destroy();
}
-void wxWindowDC::SetUpDC()
+void wxWindowDCImpl::SetUpDC()
{
- m_ok = TRUE;
-
+ m_ok = true;
+
wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
-
- if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1))
+
+ if (m_isScreenDC)
+ {
+ m_penGC = wxGetPoolGC( m_window, wxPEN_SCREEN );
+ m_brushGC = wxGetPoolGC( m_window, wxBRUSH_SCREEN );
+ m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
+ m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
+ }
+ else if (m_isMemDC && (((wxMemoryDCImpl*)this)->m_selected.GetDepth() == 1))
{
m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );
m_brushGC = wxGetPoolGC( m_window, wxBRUSH_MONO );
m_pen.GetColour().CalcPixel( m_cmap );
gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
gdk_gc_set_background( m_penGC, bg_col );
-
+
gdk_gc_set_line_attributes( m_penGC, 0, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_ROUND );
-
/* m_brushGC */
m_brush.GetColour().CalcPixel( m_cmap );
gdk_gc_set_foreground( m_brushGC, m_brush.GetColour().GetColor() );
gdk_gc_set_background( m_brushGC, bg_col );
-
+
gdk_gc_set_fill( m_brushGC, GDK_SOLID );
-
-
+
/* m_bgGC */
gdk_gc_set_background( m_bgGC, bg_col );
gdk_gc_set_foreground( m_bgGC, bg_col );
gdk_gc_set_fill( m_bgGC, GDK_SOLID );
-
+
/* ROPs */
gdk_gc_set_function( m_textGC, GDK_COPY );
gdk_gc_set_function( m_brushGC, GDK_COPY );
gdk_gc_set_function( m_penGC, GDK_COPY );
-
+
/* clipping */
- gdk_gc_set_clip_rectangle( m_penGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) NULL );
+ gdk_gc_set_clip_rectangle( m_penGC, NULL );
+ gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+ gdk_gc_set_clip_rectangle( m_textGC, NULL );
+ gdk_gc_set_clip_rectangle( m_bgGC, NULL );
if (!hatch_bitmap)
{
hatch_bitmap = hatches;
- hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
- hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
- hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
- hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
- hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
- hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
+ hatch_bitmap[0] = gdk_bitmap_create_from_data( NULL, bdiag_bits, bdiag_width, bdiag_height );
+ hatch_bitmap[1] = gdk_bitmap_create_from_data( NULL, cdiag_bits, cdiag_width, cdiag_height );
+ hatch_bitmap[2] = gdk_bitmap_create_from_data( NULL, fdiag_bits, fdiag_width, fdiag_height );
+ hatch_bitmap[3] = gdk_bitmap_create_from_data( NULL, cross_bits, cross_width, cross_height );
+ hatch_bitmap[4] = gdk_bitmap_create_from_data( NULL, horiz_bits, horiz_width, horiz_height );
+ hatch_bitmap[5] = gdk_bitmap_create_from_data( NULL, verti_bits, verti_width, verti_height );
}
}
-void wxWindowDC::DoFloodFill( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
- const wxColour &WXUNUSED(col), int WXUNUSED(style) )
+void wxWindowDCImpl::DoGetSize( int* width, int* height ) const
+{
+ wxCHECK_RET( m_owner, wxT("GetSize() doesn't work without window") );
+
+ m_owner->GetSize(width, height);
+}
+
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+ const wxColour & col, wxFloodFillStyle style);
+
+bool wxWindowDCImpl::DoFloodFill(wxCoord x, wxCoord y,
+ const wxColour& col, wxFloodFillStyle style)
{
- wxFAIL_MSG( wxT("wxWindowDC::DoFloodFill not implemented") );
+ return wxDoFloodFill(GetOwner(), x, y, col, style);
}
-bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
+bool wxWindowDCImpl::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
{
// Generic (and therefore rather inefficient) method.
// Could be improved.
wxMemoryDC memdc;
wxBitmap bitmap(1, 1);
memdc.SelectObject(bitmap);
- memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
+ memdc.Blit(0, 0, 1, 1, GetOwner(), 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;
+ return true;
}
-void wxWindowDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
+void wxWindowDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen.GetStyle() != wxTRANSPARENT)
{
}
}
-void wxWindowDC::DoCrossHair( wxCoord x, wxCoord y )
+void wxWindowDCImpl::DoCrossHair( wxCoord x, wxCoord y )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen.GetStyle() != wxTRANSPARENT)
{
}
}
-void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+void wxWindowDCImpl::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx1 = XLOG2DEV(x1);
wxCoord yy1 = YLOG2DEV(y1);
radius1 = 0.0;
radius2 = 360.0;
}
- else
- if (radius == 0.0)
+ else if ( wxIsNullDouble(radius) )
{
- radius1 = radius2 = 0.0;
+ radius1 =
+ radius2 = 0.0;
}
else
{
if (m_window)
{
if (m_brush.GetStyle() != wxTRANSPARENT)
- gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+ {
+ if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+ {
+ gdk_gc_set_ts_origin( m_textGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+ gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+ } else
+ if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (m_brush.GetStyle() == wxSTIPPLE)
+ {
+ gdk_gc_set_ts_origin( m_brushGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ }
+ else
+ {
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+ }
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
+ {
gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+
+ gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+ gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+ }
}
CalcBoundingBox (x1, y1);
CalcBoundingBox (x2, y2);
}
-void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )
+void wxWindowDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double sa, double ea )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
if (m_window)
{
wxCoord start = wxCoord(sa * 64.0);
- wxCoord end = wxCoord(ea * 64.0);
+ wxCoord end = wxCoord((ea-sa) * 64.0);
if (m_brush.GetStyle() != wxTRANSPARENT)
- gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+ {
+ if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+ {
+ gdk_gc_set_ts_origin( m_textGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy, ww, hh, start, end );
+ gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+ } else
+ if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (m_brush.GetStyle() == wxSTIPPLE)
+ {
+ gdk_gc_set_ts_origin( m_brushGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ }
+ else
+ {
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, start, end );
+ }
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, start, end );
CalcBoundingBox (x + width, y + height);
}
-void wxWindowDC::DoDrawPoint( wxCoord x, wxCoord y )
+void wxWindowDCImpl::DoDrawPoint( wxCoord x, wxCoord y )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
CalcBoundingBox (x, y);
}
-void wxWindowDC::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
+void wxWindowDCImpl::DoDrawLines( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen.GetStyle() == wxTRANSPARENT) return;
if (n <= 0) return;
- CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
- for (int i = 0; i < n-1; i++)
+ GdkPoint * const gpts = new GdkPoint[n];
+ if ( !gpts )
{
- 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);
+ wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
+ return;
+ }
- if (m_window)
- gdk_draw_line( m_window, m_penGC, x1, y1, x2, y2 );
+ for (int i = 0; i < n; i++)
+ {
+ wxCoord x = points[i].x + xoffset,
+ y = points[i].y + yoffset;
+
+ CalcBoundingBox(x + xoffset, y + yoffset);
- CalcBoundingBox( points[i+1].x + xoffset, points[i+1].y + yoffset );
+ gpts[i].x = XLOG2DEV(x);
+ gpts[i].y = YLOG2DEV(y);
}
+
+ 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) )
+void wxWindowDCImpl::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode WXUNUSED(fillStyle) )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (n <= 0) return;
- GdkPoint *gdkpoints = new GdkPoint[n+1];
- int i;
- for (i = 0 ; i < n ; i++)
+ GdkPoint * const gpts = new GdkPoint[n];
+
+ for (int i = 0 ; i < n ; i++)
{
- gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
- gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
+ wxCoord x = points[i].x + xoffset,
+ y = points[i].y + yoffset;
- CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset );
+ CalcBoundingBox(x + xoffset, y + yoffset);
+
+ gpts[i].x = XLOG2DEV(x);
+ gpts[i].y = YLOG2DEV(y);
}
- if (m_window)
+ if (m_brush.GetStyle() == wxSOLID)
+ {
+ gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+ }
+ else if (m_brush.GetStyle() != wxTRANSPARENT)
{
if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- gdk_draw_polygon (m_window, m_textGC, TRUE, gdkpoints, n);
+ {
+ gdk_gc_set_ts_origin( m_textGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_polygon( m_window, m_textGC, TRUE, gpts, n );
+ gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+ } else
+ if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+ gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+ gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (m_brush.GetStyle() == wxSTIPPLE)
+ {
+ gdk_gc_set_ts_origin( m_brushGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ }
else
{
- if ((m_brush.GetStyle() != wxTRANSPARENT))
- gdk_draw_polygon (m_window, m_brushGC, TRUE, gdkpoints, n);
+ gdk_draw_polygon( m_window, m_brushGC, TRUE, gpts, n );
}
}
- // To do: Fillstyle
-
- if ((m_pen.GetStyle() != wxTRANSPARENT) && m_window)
+ if (m_pen.GetStyle() != wxTRANSPARENT)
{
- for (i = 0 ; i < n ; i++)
- {
- gdk_draw_line( m_window, m_penGC,
- gdkpoints[i%n].x,
- gdkpoints[i%n].y,
- gdkpoints[(i+1)%n].x,
- gdkpoints[(i+1)%n].y);
- }
+ gdk_draw_polygon( m_window, m_penGC, FALSE, gpts, n );
+
}
- delete[] gdkpoints;
+ delete[] gpts;
}
-void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxWindowDCImpl::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
if (m_window)
{
- if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
- {
- gdk_draw_rectangle( m_window, m_textGC, TRUE, xx, yy, ww, hh );
- gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
- }
- else
+ if (m_brush.GetStyle() != wxTRANSPARENT)
{
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+ {
+ gdk_gc_set_ts_origin( m_textGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_rectangle( m_window, m_textGC, TRUE, xx, yy, ww, hh );
+ gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+ } else
+ if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
-
- if (m_pen.GetStyle() != wxTRANSPARENT)
- gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (m_brush.GetStyle() == wxSTIPPLE)
+ {
+ gdk_gc_set_ts_origin( m_brushGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ }
+ else
+ {
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy, ww, hh );
+ }
}
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
+ gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-1, hh-1 );
}
CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
-void wxWindowDC::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
+void wxWindowDCImpl::DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
// X drawing errors with small radii
if (rr == 0)
{
- DrawRectangle( x, y, width, height );
+ DoDrawRectangle( x, y, width, height );
return;
}
if (m_brush.GetStyle() != wxTRANSPARENT)
{
- gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
- gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
- gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
- gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
- gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
- gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+ if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+ {
+ gdk_gc_set_ts_origin( m_textGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_rectangle( m_window, m_textGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+ gdk_draw_rectangle( m_window, m_textGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+ gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+ } else
+ if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (m_brush.GetStyle() == wxSTIPPLE)
+ {
+ gdk_gc_set_ts_origin( m_brushGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ }
+ else
+ {
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx+rr, yy, ww-dd+1, hh );
+ gdk_draw_rectangle( m_window, m_brushGC, TRUE, xx, yy+rr, ww, hh-dd+1 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, dd, dd, 90*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy+hh-dd, dd, dd, 180*64, 90*64 );
+ }
}
if (m_pen.GetStyle() != wxTRANSPARENT)
{
- gdk_draw_line( m_window, m_penGC, xx+rr, yy, xx+ww-rr, yy );
- gdk_draw_line( m_window, m_penGC, xx+rr, yy+hh, xx+ww-rr, yy+hh );
- gdk_draw_line( m_window, m_penGC, xx, yy+rr, xx, yy+hh-rr );
- gdk_draw_line( m_window, m_penGC, xx+ww, yy+rr, xx+ww, yy+hh-rr );
+ gdk_draw_line( m_window, m_penGC, xx+rr+1, yy, xx+ww-rr, yy );
+ gdk_draw_line( m_window, m_penGC, xx+rr+1, yy+hh, xx+ww-rr, yy+hh );
+ gdk_draw_line( m_window, m_penGC, xx, yy+rr+1, xx, yy+hh-rr );
+ gdk_draw_line( m_window, m_penGC, xx+ww, yy+rr+1, xx+ww, yy+hh-rr );
gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, dd, dd, 90*64, 90*64 );
gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy, dd, dd, 0, 90*64 );
gdk_draw_arc( m_window, m_penGC, FALSE, xx+ww-dd, yy+hh-dd, dd, dd, 270*64, 90*64 );
CalcBoundingBox( x + width, y + height );
}
-void wxWindowDC::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
wxCoord xx = XLOG2DEV(x);
wxCoord yy = YLOG2DEV(y);
if (m_window)
{
if (m_brush.GetStyle() != wxTRANSPARENT)
- gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+ {
+ if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
+ {
+ gdk_gc_set_ts_origin( m_textGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_arc( m_window, m_textGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+ gdk_gc_set_ts_origin( m_textGC, 0, 0 );
+ } else
+ if (IS_15_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 15, m_deviceOriginY % 15 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (IS_16_PIX_HATCH(m_brush.GetStyle()))
+ {
+ gdk_gc_set_ts_origin( m_brushGC, m_deviceOriginX % 16, m_deviceOriginY % 16 );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ } else
+ if (m_brush.GetStyle() == wxSTIPPLE)
+ {
+ gdk_gc_set_ts_origin( m_brushGC,
+ m_deviceOriginX % m_brush.GetStipple()->GetWidth(),
+ m_deviceOriginY % m_brush.GetStipple()->GetHeight() );
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+ gdk_gc_set_ts_origin( m_brushGC, 0, 0 );
+ }
+ else
+ {
+ gdk_draw_arc( m_window, m_brushGC, TRUE, xx, yy, ww, hh, 0, 360*64 );
+ }
+ }
if (m_pen.GetStyle() != wxTRANSPARENT)
gdk_draw_arc( m_window, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 );
}
- CalcBoundingBox( x - width, y - height );
+ CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height );
}
-void wxWindowDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
+void wxWindowDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
{
// VZ: egcs 1.0.3 refuses to compile this without cast, no idea why
- DoDrawBitmap( (const wxBitmap&)icon, x, y, (bool)TRUE );
+ DoDrawBitmap( (const wxBitmap&)icon, x, y, true );
}
-void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
+void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
wxCoord x, wxCoord y,
bool useMask )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
+ wxCHECK_RET( bitmap.IsOk(), wxT("invalid bitmap") );
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 */
- if (!m_currentClippingRegion.IsEmpty())
+ // compare to current clipping region
+ if (!m_currentClippingRegion.IsNull())
{
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
if (tmp.IsEmpty())
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;
- }
+ use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
- /* apply mask if any */
- GdkBitmap *mask = (GdkBitmap *) NULL;
+ // NB: We can't render pixbufs with GTK+ < 2.2, we need to use pixmaps code.
+ // Pixbufs-based bitmaps with alpha channel don't have a mask, so we
+ // have to call GetPixmap() here -- it converts the pixbuf into pixmap
+ // and also creates the mask as a side-effect:
+ use_bitmap.GetPixmap();
+
+ // apply mask if any
+ GdkBitmap *mask = NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
- if (useMask && mask)
+ GdkBitmap *new_mask = NULL;
+
+ if (useMask && mask)
+ {
+ if (!m_currentClippingRegion.IsNull())
{
- GdkBitmap *new_mask = (GdkBitmap*) NULL;
- if (!m_currentClippingRegion.IsEmpty())
- {
- GdkColor col;
- new_mask = gdk_pixmap_new( wxRootWindow->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_set_clip_mask( m_brushGC, NULL );
- gdk_gc_set_clip_mask( m_textGC, NULL );
- SetBrush( *wxRED_BRUSH );
- DrawRectangle( 70, 0, 70, 1000 );
- gdk_draw_bitmap( m_window, m_textGC, new_mask, 0, 0, 100, 5, ww, hh );
- gdk_draw_bitmap( m_window, m_textGC, mask, 0, 0, 80, 5, 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)
- gdk_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );
+ {
+ gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );
+ }
else
- gdk_draw_pixmap( m_window, m_penGC, use_bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
+ {
+ 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_mask( m_textGC, (GdkBitmap *) NULL );
+ gdk_gc_set_clip_mask( m_textGC, NULL );
gdk_gc_set_clip_origin( m_textGC, 0, 0 );
- if (!m_currentClippingRegion.IsEmpty())
+ if (!m_currentClippingRegion.IsNull())
gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
}
else
{
- gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
+ gdk_gc_set_clip_mask( m_penGC, NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 );
- if (!m_currentClippingRegion.IsEmpty())
+ if (!m_currentClippingRegion.IsNull())
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, wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc,
- int logical_func, bool useMask )
+bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
+ wxCoord width, wxCoord height,
+ wxDC *source,
+ wxCoord xsrc, wxCoord ysrc,
+ wxRasterOperationMode logical_func,
+ 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( IsOk(), false, wxT("invalid window dc") );
+
+ wxCHECK_MSG( source, false, wxT("invalid source dc") );
+
+ if (!m_window) return false;
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid window dc") );
+ // transform the source DC coords to the device ones
+ xsrc = source->LogicalToDeviceX(xsrc);
+ ysrc = source->LogicalToDeviceY(ysrc);
- wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
+ wxWindowDCImpl *srcDC = wxDynamicCast(source->GetImpl(), wxWindowDCImpl);
+ wxCHECK_MSG( srcDC, false, "source must be a window DC" );
- if (!m_window) return FALSE;
+ // FIXME: this cast is not always valid, see the code using m_isMemDC
+ wxMemoryDCImpl *memDC = static_cast<wxMemoryDCImpl *>(srcDC);
- wxClientDC *srcDC = (wxClientDC*)source;
- wxMemoryDC *memDC = (wxMemoryDC*)source;
+ bool use_bitmap_method = false;
+ bool is_mono = false;
- bool use_bitmap_method = FALSE;
- bool is_mono = FALSE;
+ if (xsrcMask == -1 && ysrcMask == -1)
+ {
+ xsrcMask = xsrc;
+ ysrcMask = ysrc;
+ }
if (srcDC->m_isMemDC)
{
- if (!memDC->m_selected.Ok()) return FALSE;
+ if (!memDC->m_selected.IsOk()) 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 */
- use_bitmap_method = TRUE;
+ // 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;
- use_bitmap_method = 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 */
- use_bitmap_method = TRUE;
+ // 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
{
- use_bitmap_method = FALSE;
+ use_bitmap_method = false;
}
}
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 */
- if (!m_currentClippingRegion.IsEmpty())
+ // compare to current clipping region
+ if (!m_currentClippingRegion.IsNull())
{
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
if (tmp.IsEmpty())
- return TRUE;
+ return true;
}
- int old_logical_func = m_logicalFunction;
+ wxRasterOperationMode old_logical_func = m_logicalFunction;
SetLogicalFunction( logical_func );
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))
+ if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= 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 */
- GdkBitmap *mask = (GdkBitmap *) NULL;
+ // apply mask if any
+ GdkBitmap *mask = NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+ GdkBitmap *new_mask = NULL;
+
if (useMask && mask)
{
- GdkBitmap *new_mask = (GdkBitmap*) NULL;
- if (!m_currentClippingRegion.IsEmpty())
+ if (!m_currentClippingRegion.IsNull())
{
GdkColor col;
- new_mask = gdk_pixmap_new( wxRootWindow->window, bm_ww, bm_hh, 1 );
+ new_mask = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, 1 );
GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0;
gdk_gc_set_foreground( gc, &col );
+ gdk_gc_set_ts_origin( gc, -xsrcMask, -ysrcMask);
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_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 );
+ // 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_unref( gc );
}
-
+
if (is_mono)
{
if (new_mask)
+ {
gdk_gc_set_clip_mask( m_textGC, new_mask );
+ gdk_gc_set_clip_origin( m_textGC, cx, cy );
+ }
else
+ {
gdk_gc_set_clip_mask( m_textGC, mask );
- gdk_gc_set_clip_origin( m_textGC, xx, yy );
+ gdk_gc_set_clip_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
+ }
}
else
{
if (new_mask)
+ {
gdk_gc_set_clip_mask( m_penGC, new_mask );
+ gdk_gc_set_clip_origin( m_penGC, cx, cy );
+ }
else
+ {
gdk_gc_set_clip_mask( m_penGC, mask );
- gdk_gc_set_clip_origin( m_penGC, xx, yy );
+ gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
+ }
}
- 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_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, xx, yy, ww, hh );
+ {
+ // 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 );
+ }
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_mask( m_textGC, (GdkBitmap *) NULL );
+ gdk_gc_set_clip_mask( m_textGC, NULL );
gdk_gc_set_clip_origin( m_textGC, 0, 0 );
- if (!m_currentClippingRegion.IsEmpty())
+ if (!m_currentClippingRegion.IsNull())
gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
}
else
{
- gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
+ gdk_gc_set_clip_mask( m_penGC, NULL );
gdk_gc_set_clip_origin( m_penGC, 0, 0 );
- if (!m_currentClippingRegion.IsEmpty())
+ if (!m_currentClippingRegion.IsNull())
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 );
- gdk_window_copy_area( bitmap.GetPixmap(), m_penGC, 0, 0,
- srcDC->GetWindow(),
- xsrc, ysrc, width, height );
-
- /* 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
+ gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
gdk_window_copy_area( m_window, m_penGC, xx, yy,
srcDC->GetWindow(),
xsrc, ysrc, width, height );
+ gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
}
}
SetLogicalFunction( old_logical_func );
- return TRUE;
+
+ return true;
}
-void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
+void wxWindowDCImpl::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (!m_window) return;
+ if (text.empty()) return;
+
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_RET( font, wxT("invalid font") );
x = XLOG2DEV(x);
y = YLOG2DEV(y);
- /* CMB 21/5/98: draw text background if mode is wxSOLID */
- if (m_backgroundMode == wxSOLID)
+ wxCoord width = gdk_string_width( font, text.mbc_str() );
+ wxCoord height = font->ascent + font->descent;
+
+ if ( m_backgroundMode == wxSOLID )
{
- wxCoord width = gdk_string_width( font, text.mbc_str() );
- wxCoord height = font->ascent + font->descent;
gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
properties (see wxXt implementation) */
if (m_font.GetUnderlined())
{
- wxCoord width = gdk_string_width( font, text.mbc_str() );
wxCoord ul_y = y + font->ascent;
if (font->descent > 0) ul_y++;
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
}
- wxCoord w, h;
- GetTextExtent (text, &w, &h);
- CalcBoundingBox (x + w, y + h);
+ width = wxCoord(width / m_scaleX);
+ height = wxCoord(height / m_scaleY);
+ CalcBoundingBox (x + width, y + height);
CalcBoundingBox (x, y);
}
-void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
+
+// TODO: There is an example of rotating text with GTK2 that would probably be
+// a better approach here:
+// http://www.daa.com.au/pipermail/pygtk/2003-April/005052.html
+
+void wxWindowDCImpl::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
{
- if (angle == 0.0)
+ if ( wxIsNullDouble(angle) )
{
- DrawText(text, x, y);
+ DoDrawText(text, x, y);
return;
}
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (!m_window) return;
+ wxCoord w;
+ wxCoord h;
+
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_RET( font, wxT("invalid font") );
// the size of the text
- wxCoord w = gdk_string_width( font, text.mbc_str() );
- wxCoord h = font->ascent + font->descent;
+ w = gdk_string_width( font, text.mbc_str() );
+ h = font->ascent + font->descent;
// draw the string normally
wxBitmap src(w, h);
wxMemoryDC dc;
dc.SelectObject(src);
dc.SetFont(GetFont());
- dc.SetBackground(*wxWHITE_BRUSH);
+ dc.SetBackground(*wxBLACK_BRUSH);
dc.SetBrush(*wxBLACK_BRUSH);
dc.Clear();
+ dc.SetTextForeground( *wxWHITE );
dc.DrawText(text, 0, 0);
- dc.SetFont(wxNullFont);
dc.SelectObject(wxNullBitmap);
// Calculate the size of the rotated bounding box.
minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5),
minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
- // prepare to blit-with-rotate the bitmap to the DC
- wxImage image(src);
- GdkColor *colText = m_textForegroundColour.GetColor(),
- *colBack = m_textBackgroundColour.GetColor();
+ wxImage image = src.ConvertToImage();
- bool textColSet = TRUE;
+ image.ConvertColourToAlpha( m_textForegroundColour.Red(),
+ m_textForegroundColour.Green(),
+ m_textForegroundColour.Blue() );
+ image = image.Rotate( rad, wxPoint(0,0) );
- unsigned char *data = image.GetData();
+ int i_angle = (int) angle;
+ i_angle = i_angle % 360;
+ if (i_angle < 0)
+ i_angle += 360;
+ int xoffset = 0;
+ if ((i_angle >= 90.0) && (i_angle < 270.0))
+ xoffset = image.GetWidth();
+ int yoffset = 0;
+ if ((i_angle >= 0.0) && (i_angle < 180.0))
+ yoffset = image.GetHeight();
- // paint pixel by pixel
- for ( wxCoord srcX = 0; srcX < w; srcX++ )
- {
- for ( wxCoord srcY = 0; srcY < h; srcY++ )
- {
- // transform source coords to dest coords
- double r = sqrt(srcX*srcX + srcY*srcY);
- double angleOrig = atan2(srcY, srcX) - rad;
- wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
- dstY = (wxCoord)(r*sin(angleOrig) + 0.5);
-
- // black pixel?
- bool textPixel = data[(srcY*w + srcX)*3] == 0;
- if ( textPixel || (m_backgroundMode == wxSOLID) )
- {
- // change colour if needed
- if ( textPixel != textColSet )
- {
- gdk_gc_set_foreground( m_textGC, textPixel ? colText
- : colBack );
+ if ((i_angle >= 0) && (i_angle < 90))
+ yoffset -= (int)( cos(rad)*h );
+ if ((i_angle >= 90) && (i_angle < 180))
+ xoffset -= (int)( sin(rad)*h );
+ if ((i_angle >= 180) && (i_angle < 270))
+ yoffset -= (int)( cos(rad)*h );
+ if ((i_angle >= 270) && (i_angle < 360))
+ xoffset -= (int)( sin(rad)*h );
- textColSet = textPixel;
- }
+ int i_x = x - xoffset;
+ int i_y = y - yoffset;
+
+ src = image;
+ DoDrawBitmap( src, i_x, i_y, true );
- // 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) );
- }
- }
- }
// it would be better to draw with non underlined font and draw the line
// manually here (it would be more straight...)
}
#endif // 0
- // restore the font colour
- gdk_gc_set_foreground( m_textGC, colText );
-
// update the bounding box
CalcBoundingBox(x + minX, y + minY);
CalcBoundingBox(x + maxX, y + maxY);
}
-void wxWindowDC::DoGetTextExtent(const wxString &string,
+void wxWindowDCImpl::DoGetTextExtent(const wxString &string,
wxCoord *width, wxCoord *height,
wxCoord *descent, wxCoord *externalLeading,
- wxFont *theFont) const
+ const wxFont *theFont) const
{
+ if ( width )
+ *width = 0;
+ if ( height )
+ *height = 0;
+ if ( descent )
+ *descent = 0;
+ if ( externalLeading )
+ *externalLeading = 0;
+
+ if (string.empty())
+ {
+ return;
+ }
+
wxFont fontToUse = m_font;
- if (theFont) fontToUse = *theFont;
+ 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; // ??
+ if ( !font )
+ return;
+
+ 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);
}
-wxCoord wxWindowDC::GetCharWidth() const
+wxCoord wxWindowDCImpl::GetCharWidth() const
{
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_MSG( font, -1, wxT("invalid font") );
return wxCoord(gdk_string_width( font, "H" ) / m_scaleX);
}
-wxCoord wxWindowDC::GetCharHeight() const
+wxCoord wxWindowDCImpl::GetCharHeight() const
{
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_MSG( font, -1, wxT("invalid font") );
return wxCoord((font->ascent + font->descent) / m_scaleY);
}
-void wxWindowDC::Clear()
+void wxWindowDCImpl::Clear()
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
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 )
+void wxWindowDCImpl::SetFont( const wxFont &font )
{
m_font = font;
}
-void wxWindowDC::SetPen( const wxPen &pen )
+void wxWindowDCImpl::SetPen( const wxPen &pen )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_pen == pen) return;
m_pen = pen;
- if (!m_pen.Ok()) return;
+ if (!m_pen.IsOk()) return;
if (!m_window) return;
( 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 char dotted[] = {1, 1};
- static const char short_dashed[] = {2, 2};
- static const char wxCoord_dashed[] = {2, 4};
- static const char dotted_dashed[] = {3, 3, 1, 3};
+ static const wxGTKDash dotted[] = {1, 1};
+ static const wxGTKDash short_dashed[] = {2, 2};
+ static const wxGTKDash wxCoord_dashed[] = {2, 4};
+ static const wxGTKDash dotted_dashed[] = {3, 3, 1, 3};
// We express dash pattern in pen width unit, so we are
// independent of zoom factor and so on...
int req_nb_dash;
- const char *req_dash;
+ const wxGTKDash *req_dash;
GdkLineStyle lineStyle = GDK_LINE_SOLID;
switch (m_pen.GetStyle())
{
lineStyle = GDK_LINE_ON_OFF_DASH;
req_nb_dash = m_pen.GetDashCount();
- req_dash = m_pen.GetDash();
+ req_dash = (wxGTKDash*)m_pen.GetDash();
break;
}
case wxDOT:
default:
{
lineStyle = GDK_LINE_SOLID;
- req_dash = (wxDash*)NULL;
+ req_dash = NULL;
req_nb_dash = 0;
break;
}
}
-#if (GTK_MINOR_VERSION > 0)
if (req_dash && req_nb_dash)
{
- char *real_req_dash = new char[req_nb_dash];
+ wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash];
if (real_req_dash)
{
for (int i = 0; i < req_nb_dash; i++)
else
{
// No Memory. We use non-scaled dash pattern...
- gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash );
+ gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
}
}
-#endif
GdkCapStyle capStyle = GDK_CAP_ROUND;
switch (m_pen.GetCap())
gdk_gc_set_foreground( m_penGC, m_pen.GetColour().GetColor() );
}
-void wxWindowDC::SetBrush( const wxBrush &brush )
+void wxWindowDCImpl::SetBrush( const wxBrush &brush )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_brush == brush) return;
m_brush = brush;
- if (!m_brush.Ok()) return;
+ if (!m_brush.IsOk()) return;
if (!m_window) return;
gdk_gc_set_fill( m_brushGC, GDK_SOLID );
- if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
+ if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->IsOk()))
{
if (m_brush.GetStipple()->GetPixmap())
{
if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
{
- gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
- gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
+ gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
+ gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
}
- if (IS_HATCH(m_brush.GetStyle()))
+ if (m_brush.IsHatch())
{
gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
int num = m_brush.GetStyle() - wxBDIAGONAL_HATCH;
}
}
-void wxWindowDC::SetBackground( const wxBrush &brush )
+void wxWindowDCImpl::SetBackground( const wxBrush &brush )
{
/* CMB 21/7/98: Added SetBackground. Sets background brush
* for Clear() and bg colour for shapes filled with cross-hatch brush */
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_backgroundBrush == brush) return;
m_backgroundBrush = brush;
- if (!m_backgroundBrush.Ok()) return;
+ if (!m_backgroundBrush.IsOk()) return;
if (!m_window) return;
gdk_gc_set_fill( m_bgGC, GDK_SOLID );
- if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
+ if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->IsOk()))
{
if (m_backgroundBrush.GetStipple()->GetPixmap())
{
}
}
- if (IS_HATCH(m_backgroundBrush.GetStyle()))
+ if (m_backgroundBrush.IsHatch())
{
gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
int num = m_backgroundBrush.GetStyle() - wxBDIAGONAL_HATCH;
}
}
-void wxWindowDC::SetLogicalFunction( int function )
+void wxWindowDCImpl::SetLogicalFunction( wxRasterOperationMode function )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (m_logicalFunction == function)
return;
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)
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
default:
- {
wxFAIL_MSG( wxT("unsupported logical function") );
- break;
- }
+ mode = GDK_COPY;
}
m_logicalFunction = function;
gdk_gc_set_function( m_textGC, mode );
}
-void wxWindowDC::SetTextForeground( const wxColour &col )
+void wxWindowDCImpl::SetTextForeground( const wxColour &col )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- if (m_textForegroundColour == col) return;
+ // don't set m_textForegroundColour to an invalid colour as we'd crash
+ // later then (we use m_textForegroundColour.GetColor() without checking
+ // in a few places)
+ if ( !col.IsOk() || (m_textForegroundColour == col) )
+ return;
m_textForegroundColour = col;
- if (!m_textForegroundColour.Ok()) return;
- if (!m_window) return;
-
- m_textForegroundColour.CalcPixel( m_cmap );
- gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+ if ( m_window )
+ {
+ m_textForegroundColour.CalcPixel( m_cmap );
+ gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
+ }
}
-void wxWindowDC::SetTextBackground( const wxColour &col )
+void wxWindowDCImpl::SetTextBackground( const wxColour &col )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- if (m_textBackgroundColour == col) return;
+ // same as above
+ if ( !col.IsOk() || (m_textBackgroundColour == col) )
+ return;
m_textBackgroundColour = col;
- if (!m_textBackgroundColour.Ok()) return;
- if (!m_window) return;
-
- m_textBackgroundColour.CalcPixel( m_cmap );
- gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
+ if ( m_window )
+ {
+ m_textBackgroundColour.CalcPixel( m_cmap );
+ gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
+ }
}
-void wxWindowDC::SetBackgroundMode( int mode )
+void wxWindowDCImpl::SetBackgroundMode( int mode )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
m_backgroundMode = mode;
}
}
-void wxWindowDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
{
- wxFAIL_MSG( wxT("wxWindowDC::SetPalette not implemented") );
+ wxFAIL_MSG( wxT("wxWindowDCImpl::SetPalette not implemented") );
}
-void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxWindowDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
-
- wxDC::DoSetClippingRegion( x, y, width, height );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (!m_window) return;
rect.y = YLOG2DEV(y);
rect.width = XLOG2DEVREL(width);
rect.height = YLOG2DEVREL(height);
-
- m_currentClippingRegion.Clear();
- m_currentClippingRegion.Union( rect );
-#if USE_PAINT_REGION
- if (!m_paintClippingRegion.IsEmpty())
+
+ if (!m_currentClippingRegion.IsNull())
+ m_currentClippingRegion.Intersect( rect );
+ else
+ m_currentClippingRegion.Union( rect );
+
+#if USE_PAINT_REGION
+ if (!m_paintClippingRegion.IsNull())
m_currentClippingRegion.Intersect( m_paintClippingRegion );
#endif
+ wxCoord xx, yy, ww, hh;
+ m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+ wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
+
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
}
-void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion ®ion )
+void wxWindowDCImpl::DoSetDeviceClippingRegion( const wxRegion ®ion )
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
if (region.Empty())
{
return;
}
- wxCoord x,y,w,h;
- region.GetBox( x, y, w, h );
+ if (!m_window) return;
- wxDC::DoSetClippingRegion( x, y, w, h );
+ if (!m_currentClippingRegion.IsNull())
+ m_currentClippingRegion.Intersect( region );
+ else
+ m_currentClippingRegion.Union( region );
- if (!m_window) return;
-
- m_currentClippingRegion.Clear();
- m_currentClippingRegion.Union( region );
-#if USE_PAINT_REGION
- if (!m_paintClippingRegion.IsEmpty())
+#if USE_PAINT_REGION
+ if (!m_paintClippingRegion.IsNull())
m_currentClippingRegion.Intersect( m_paintClippingRegion );
#endif
+ wxCoord xx, yy, ww, hh;
+ m_currentClippingRegion.GetBox( xx, yy, ww, hh );
+ wxGTKDCImpl::DoSetClippingRegion( xx, yy, ww, hh );
+
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_brushGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_textGC, m_currentClippingRegion.GetRegion() );
gdk_gc_set_clip_region( m_bgGC, m_currentClippingRegion.GetRegion() );
}
-void wxWindowDC::DestroyClippingRegion()
+void wxWindowDCImpl::DestroyClippingRegion()
{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
+ wxCHECK_RET( IsOk(), wxT("invalid window dc") );
- wxDC::DestroyClippingRegion();
+ wxGTKDCImpl::DestroyClippingRegion();
m_currentClippingRegion.Clear();
-
+
+#if USE_PAINT_REGION
if (!m_paintClippingRegion.IsEmpty())
m_currentClippingRegion.Union( m_paintClippingRegion );
+#endif
if (!m_window) return;
if (m_currentClippingRegion.IsEmpty())
{
- gdk_gc_set_clip_rectangle( m_penGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_brushGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_textGC, (GdkRectangle *) NULL );
- gdk_gc_set_clip_rectangle( m_bgGC, (GdkRectangle *) NULL );
+ gdk_gc_set_clip_rectangle( m_penGC, NULL );
+ gdk_gc_set_clip_rectangle( m_brushGC, NULL );
+ gdk_gc_set_clip_rectangle( m_textGC, NULL );
+ gdk_gc_set_clip_rectangle( m_bgGC, NULL );
}
else
{
}
}
-void wxWindowDC::Destroy()
+void wxWindowDCImpl::Destroy()
{
if (m_penGC) wxFreePoolGC( m_penGC );
- m_penGC = (GdkGC*) NULL;
+ m_penGC = NULL;
if (m_brushGC) wxFreePoolGC( m_brushGC );
- m_brushGC = (GdkGC*) NULL;
+ m_brushGC = NULL;
if (m_textGC) wxFreePoolGC( m_textGC );
- m_textGC = (GdkGC*) NULL;
+ m_textGC = NULL;
if (m_bgGC) wxFreePoolGC( m_bgGC );
- m_bgGC = (GdkGC*) NULL;
+ m_bgGC = NULL;
}
-void wxWindowDC::ComputeScaleAndOrigin()
+void wxWindowDCImpl::ComputeScaleAndOrigin()
{
- /* CMB: copy scale to see if it changes */
- double origScaleX = m_scaleX;
- double origScaleY = m_scaleY;
-
- wxDC::ComputeScaleAndOrigin();
-
- /* CMB: if scale has changed call SetPen to recalulate the line width */
- if ((m_scaleX != origScaleX || m_scaleY != origScaleY) &&
- (m_pen.Ok()))
- {
- /* this is a bit artificial, but we need to force wxDC to think
- the pen has changed */
- wxPen pen = m_pen;
- m_pen = wxNullPen;
- SetPen( pen );
- }
+ const wxRealPoint origScale(m_scaleX, m_scaleY);
+
+ wxGTKDCImpl::ComputeScaleAndOrigin();
+
+ // if scale has changed call SetPen to recalulate the line width
+ if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
+ {
+ // this is a bit artificial, but we need to force wxDC to think the pen
+ // has changed
+ wxPen pen = m_pen;
+ m_pen = wxNullPen;
+ SetPen( pen );
+ }
}
// Resolution in pixels per logical inch
-wxSize wxWindowDC::GetPPI() const
+wxSize wxWindowDCImpl::GetPPI() const
{
- return wxSize(100, 100);
+ return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5));
}
-int wxWindowDC::GetDepth() const
+int wxWindowDCImpl::GetDepth() const
{
wxFAIL_MSG(wxT("not implemented"));
return -1;
}
-#if wxUSE_SPLINES
-// ----------------------------------- spline code ----------------------------------------
-
-void wx_quadratic_spline(double a1, double b1, double a2, double b2,
- double a3, double b3, double a4, double b4);
-void wx_clear_stack();
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
- double *y3, double *x4, double *y4);
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,
- double x4, double y4);
-static bool wx_spline_add_point(double x, double y);
-static void wx_spline_draw_point_array(wxDC *dc);
-wxList wx_spline_point_list;
-
-#define half(z1, z2) ((z1+z2)/2.0)
-#define THRESHOLD 5
+//-----------------------------------------------------------------------------
+// wxPaintDCImpl
+//-----------------------------------------------------------------------------
-/* iterative version */
+IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
- double b4)
+// 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)
{
- register double xmid, ymid;
- double x1, y1, x2, y2, x3, y3, x4, y4;
-
- wx_clear_stack();
- wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
-
- while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
- xmid = (double)half(x2, x3);
- ymid = (double)half(y2, y3);
- if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
- fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
- wx_spline_add_point( x1, y1 );
- wx_spline_add_point( xmid, ymid );
- } else {
- wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
- (double)half(x3, x4), (double)half(y3, y4), x4, y4);
- wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
- (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
- }
+ 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);
}
}
-/* utilities used by spline drawing routines */
-
-typedef struct wx_spline_stack_struct {
- double x1, y1, x2, y2, x3, y3, x4, y4;
-} Stack;
-
-#define SPLINE_STACK_DEPTH 20
-static Stack wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack *wx_stack_top;
-static int wx_stack_count;
-
-void wx_clear_stack()
-{
- wx_stack_top = wx_spline_stack;
- wx_stack_count = 0;
-}
-
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+wxPaintDCImpl::wxPaintDCImpl(wxDC *owner, wxWindow *win)
+ : wxClientDCImpl(owner, win)
{
- wx_stack_top->x1 = x1;
- wx_stack_top->y1 = y1;
- wx_stack_top->x2 = x2;
- wx_stack_top->y2 = y2;
- wx_stack_top->x3 = x3;
- wx_stack_top->y3 = y3;
- wx_stack_top->x4 = x4;
- wx_stack_top->y4 = y4;
- wx_stack_top++;
- wx_stack_count++;
-}
-
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
- double *x3, double *y3, double *x4, double *y4)
-{
- if (wx_stack_count == 0)
- return (0);
- wx_stack_top--;
- wx_stack_count--;
- *x1 = wx_stack_top->x1;
- *y1 = wx_stack_top->y1;
- *x2 = wx_stack_top->x2;
- *y2 = wx_stack_top->y2;
- *x3 = wx_stack_top->x3;
- *y3 = wx_stack_top->y3;
- *x4 = wx_stack_top->x4;
- *y4 = wx_stack_top->y4;
- return (1);
-}
-
-static bool wx_spline_add_point(double x, double y)
-{
- wxPoint *point = new wxPoint ;
- point->x = (int) x;
- point->y = (int) y;
- wx_spline_point_list.Append((wxObject*)point);
- return TRUE;
-}
-
-static void wx_spline_draw_point_array(wxDC *dc)
-{
- dc->DrawLines(&wx_spline_point_list, 0, 0 );
- wxNode *node = wx_spline_point_list.First();
- while (node)
- {
- wxPoint *point = (wxPoint *)node->Data();
- delete point;
- delete node;
- node = wx_spline_point_list.First();
- }
-}
-
-void wxWindowDC::DoDrawSpline( wxList *points )
-{
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
-
- wxPoint *p;
- double cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
- double x1, y1, x2, y2;
-
- wxNode *node = points->First();
- p = (wxPoint *)node->Data();
-
- x1 = p->x;
- y1 = p->y;
-
- node = node->Next();
- p = (wxPoint *)node->Data();
-
- x2 = p->x;
- y2 = p->y;
- cx1 = (double)((x1 + x2) / 2);
- cy1 = (double)((y1 + y2) / 2);
- cx2 = (double)((cx1 + x2) / 2);
- cy2 = (double)((cy1 + y2) / 2);
+#if USE_PAINT_REGION
+ if (!win->m_clipPaintRegion)
+ return;
- wx_spline_add_point(x1, y1);
+ wxSize sz = win->GetSize();
+ m_paintClippingRegion = win->GetUpdateRegion();
+ wxLimitRegionToSize(m_paintClippingRegion, sz);
- while ((node = node->Next()) != NULL)
+ GdkRegion *region = m_paintClippingRegion.GetRegion();
+ if ( region )
{
- p = (wxPoint *)node->Data();
- x1 = x2;
- y1 = y2;
- x2 = p->x;
- y2 = p->y;
- cx4 = (double)(x1 + x2) / 2;
- cy4 = (double)(y1 + y2) / 2;
- cx3 = (double)(x1 + cx4) / 2;
- cy3 = (double)(y1 + cy4) / 2;
+ m_currentClippingRegion.Union( m_paintClippingRegion );
+ wxLimitRegionToSize(m_currentClippingRegion, sz);
- wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
+ if (sz.x <= 0 || sz.y <= 0)
+ return ;
- cx1 = cx4;
- cy1 = cy4;
- cx2 = (double)(cx1 + x2) / 2;
- cy2 = (double)(cy1 + y2) / 2;
+ 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 );
}
-
- wx_spline_add_point( cx1, cy1 );
- wx_spline_add_point( x2, y2 );
-
- wx_spline_draw_point_array( this );
+#endif // USE_PAINT_REGION
}
-#endif // wxUSE_SPLINE
-
//-----------------------------------------------------------------------------
-// wxPaintDC
+// wxClientDCImpl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC,wxWindowDC)
-
-wxPaintDC::wxPaintDC()
- : wxWindowDC()
-{
-}
+IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
-wxPaintDC::wxPaintDC( wxWindow *win )
- : wxWindowDC( win )
+wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
+ : wxWindowDCImpl(owner, win)
{
-#if USE_PAINT_REGION
- if (!win->GetUpdateRegion().IsEmpty())
- {
- m_paintClippingRegion = win->GetUpdateRegion();
- m_currentClippingRegion.Union( m_paintClippingRegion );
-
- gdk_gc_set_clip_region( m_penGC, m_paintClippingRegion.GetRegion() );
- gdk_gc_set_clip_region( m_brushGC, m_paintClippingRegion.GetRegion() );
- gdk_gc_set_clip_region( m_textGC, m_paintClippingRegion.GetRegion() );
- gdk_gc_set_clip_region( m_bgGC, m_paintClippingRegion.GetRegion() );
- }
-#endif
+ wxCHECK_RET( win, wxT("NULL window in wxClientDCImpl::wxClientDCImpl") );
+
+#ifdef __WXUNIVERSAL__
+ wxPoint ptOrigin = win->GetClientAreaOrigin();
+ SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
+ wxSize size = win->GetClientSize();
+ SetClippingRegion(wxPoint(0, 0), size);
+#endif // __WXUNIVERSAL__
}
-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC)
-
-wxClientDC::wxClientDC()
- : wxWindowDC()
+void wxClientDCImpl::DoGetSize(int *width, int *height) const
{
-}
+ wxCHECK_RET( m_owner, wxT("GetSize() doesn't work without window") );
-wxClientDC::wxClientDC( wxWindow *win )
- : wxWindowDC( win )
-{
+ m_owner->GetClientSize( width, height );
}
// ----------------------------------------------------------------------------
bool wxDCModule::OnInit()
{
wxInitGCPool();
- return TRUE;
+ return true;
}
void wxDCModule::OnExit()
projects / wxWidgets.git / blobdiff