/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dcclient.cpp
+// Name: src/gtk/dcclient.cpp
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
#endif
#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
-#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/window.h"
+ #include "wx/log.h"
+ #include "wx/dcmemory.h"
+ #include "wx/math.h" // for floating-point functions
+ #include "wx/image.h"
+#endif
+
#include "wx/module.h"
-#include "wx/log.h"
#include "wx/fontutil.h"
#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
-#include "wx/math.h" // for floating-point functions
-
-#include <gdk/gdk.h>
#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// local defines
#include "gdk/gdkprivate.h"
+static
void gdk_wx_draw_bitmap(GdkDrawable *drawable,
GdkGC *gc,
GdkDrawable *src,
for (int i = 0; i < wxGCPoolSize; i++)
{
if (wxGCPool[i].m_gc)
- gdk_gc_unref( wxGCPool[i].m_gc );
+ g_object_unref (wxGCPool[i].m_gc);
}
free(wxGCPool);
Destroy();
if (m_layout)
- g_object_unref( G_OBJECT( m_layout ) );
+ g_object_unref (m_layout);
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
}
/* background colour */
m_backgroundBrush = *wxWHITE_BRUSH;
m_backgroundBrush.GetColour().CalcPixel( m_cmap );
- GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+#ifdef __WXGTK24__
+ const GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+#else
+ GdkColor *bg_col = m_backgroundBrush.GetColour().GetColor();
+#endif
/* m_textGC */
m_textForegroundColour.CalcPixel( m_cmap );
if (n <= 0) return;
//Check, if scaling is necessary
- bool doScale(true);
- long val(10);
- if (!xoffset)
- if (!yoffset)
- if (XLOG2DEV(val)==val)
- if (YLOG2DEV(val)==val)
- doScale = false;
+ const bool doScale =
+ xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;
- GdkPoint *gpts = NULL;
+ // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other
+ GdkPoint* gpts = reinterpret_cast<GdkPoint*>(points);
- if (doScale){
+ if (doScale)
gpts = new GdkPoint[n];
- if (! gpts)
- {
- wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
- return;
- }
for (int i = 0; i < n; i++)
{
- wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
- wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
-
- CalcBoundingBox( x1 + xoffset, y1 + yoffset );
-
- gpts[i].x = x1;
- gpts[i].y = y1;
- }
- }
- else {
- for (int i = 0; i < n; i++) {
- CalcBoundingBox( points[i].x, points[i].y );
+ if (doScale)
+ {
+ gpts[i].x = XLOG2DEV(points[i].x + xoffset);
+ gpts[i].y = YLOG2DEV(points[i].y + yoffset);
}
-
- //GdkPoint and wxPoint have the same memory allignment, so we can cast one into another
- gpts = reinterpret_cast<GdkPoint*>(points);
+ CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);
}
if (m_window)
gdk_draw_lines( m_window, m_penGC, gpts, n);
if (doScale)
- delete[] gpts;
+ delete[] gpts;
}
void wxWindowDC::DoDrawPolygon( int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle) )
if (n <= 0) return;
//Check, if scaling is necessary
- bool doScale(true);
- long val(10);
- if (!xoffset)
- if (!yoffset)
- if (XLOG2DEV(val)==val)
- if (YLOG2DEV(val)==val){
- doScale = false;
- }
+ const bool doScale =
+ xoffset != 0 || yoffset != 0 || XLOG2DEV(10) != 10 || YLOG2DEV(10) != 10;
- GdkPoint *gdkpoints = NULL;
+ // GdkPoint and wxPoint have the same memory layout, so we can cast one to the other
+ GdkPoint* gdkpoints = reinterpret_cast<GdkPoint*>(points);
- if (doScale){
- gdkpoints = new GdkPoint[n+1]; //FIXME: Why the "+1"
+ if (doScale)
+ gdkpoints = new GdkPoint[n];
int i;
for (i = 0 ; i < n ; i++)
{
- gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
- gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
-
- CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset );
- }
- }
- else {
- int i(0);
- for (; i < n ; ++i) {
- CalcBoundingBox( points[i].x, points[i].y );
+ if (doScale)
+ {
+ gdkpoints[i].x = XLOG2DEV(points[i].x + xoffset);
+ gdkpoints[i].y = YLOG2DEV(points[i].y + yoffset);
}
- //GdkPoint and wxPoint have the same memory allignment, so we can cast one into another
- gdkpoints = reinterpret_cast<GdkPoint*> (points);
+ CalcBoundingBox(points[i].x + xoffset, points[i].y + yoffset);
}
if (m_window)
{
- //I think wxSOLID is the most often used style (it is for me),
- //so I put it in front of the if ... ifelse's
- if (m_brush.GetStyle() == wxSOLID)
- {
- gdk_draw_polygon( m_window, m_brushGC, TRUE, gdkpoints, n );
- }else
if (m_brush.GetStyle() != wxTRANSPARENT)
{
if ((m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
}
if (doScale)
- delete[] gdkpoints;
+ delete[] gdkpoints;
}
void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
wxCHECK_RET( bitmap.Ok(), wxT("invalid bitmap") );
- bool is_mono = (bitmap.GetBitmap() != NULL);
+ bool is_mono = bitmap.GetDepth() == 1;
// scale/translate size and position
int xx = XLOG2DEV(x);
// apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL;
- if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+ if (useMask && use_bitmap.GetMask())
+ mask = use_bitmap.GetMask()->GetBitmap();
+
+ GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
GdkBitmap *new_mask = (GdkBitmap*) NULL;
- if (useMask && mask)
+ if (mask != NULL)
{
if (!m_currentClippingRegion.IsNull())
{
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 );
+ mask = new_mask;
+ g_object_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 );
- }
- 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(use_gc, mask);
+ gdk_gc_set_clip_origin(use_gc, xx, yy);
}
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
GdkGC *gc = gdk_gc_new( bitmap2 );
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
- gdk_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
+ gdk_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );
- gdk_draw_drawable( m_window, m_textGC, bitmap2, 0, 0, xx, yy, -1, -1 );
+ gdk_draw_drawable(m_window, use_gc, bitmap2, 0, 0, xx, yy, -1, -1);
- g_object_unref (G_OBJECT (bitmap2));
- gdk_gc_unref( gc );
+ g_object_unref (bitmap2);
+ g_object_unref (gc);
}
else
{
#if GTK_CHECK_VERSION(2,2,0)
if (!gtk_check_version(2,2,0) && use_bitmap.HasPixbuf())
{
- gdk_draw_pixbuf(m_window, m_penGC,
+ gdk_draw_pixbuf(m_window, use_gc,
use_bitmap.GetPixbuf(),
0, 0, xx, yy, -1, -1,
GDK_RGB_DITHER_NORMAL, xx, yy);
else
#endif
{
- gdk_draw_drawable(m_window, m_penGC,
+ gdk_draw_drawable(m_window, use_gc,
use_bitmap.GetPixmap(),
0, 0, xx, yy, -1, -1);
}
}
// remove mask again if any
- if (useMask && mask)
+ if (mask != NULL)
{
- if (is_mono)
- {
- gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
- gdk_gc_set_clip_origin( m_textGC, 0, 0 );
- 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_origin( m_penGC, 0, 0 );
- if (!m_currentClippingRegion.IsNull())
- gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
- }
+ gdk_gc_set_clip_mask(use_gc, NULL);
+ gdk_gc_set_clip_origin(use_gc, 0, 0);
+ if (!m_currentClippingRegion.IsNull())
+ gdk_gc_set_clip_region(use_gc, m_currentClippingRegion.GetRegion());
+ if (new_mask != NULL)
+ g_object_unref(new_mask);
}
-
- if (new_mask)
- g_object_unref (G_OBJECT (new_mask));
}
bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
if (!m_window) return false;
// transform the source DC coords to the device ones
- xsrc = source->XLOG2DEV(xsrc);
- ysrc = source->YLOG2DEV(ysrc);
+ xsrc = source->LogicalToDeviceX(xsrc);
+ ysrc = source->LogicalToDeviceY(ysrc);
wxClientDC *srcDC = (wxClientDC*)source;
wxMemoryDC *memDC = (wxMemoryDC*)source;
// the area to be scaled
use_bitmap_method = true;
}
- else
- {
- use_bitmap_method = false;
- }
}
CalcBoundingBox( xdest, ydest );
wxCoord bm_hh = YLOG2DEVREL( bm_height );
// Scale bitmap if required
- wxBitmap use_bitmap;
+ wxBitmap use_bitmap = memDC->m_selected;
if ((memDC->m_selected.GetWidth()!= bm_ww) || ( memDC->m_selected.GetHeight()!= bm_hh))
{
// This indicates that the blitting code below will get
// 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;
- if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
+ if (useMask && use_bitmap.GetMask())
+ mask = use_bitmap.GetMask()->GetBitmap();
+
+ GdkGC* use_gc = is_mono ? m_textGC : m_penGC;
GdkBitmap *new_mask = (GdkBitmap*) NULL;
- if (useMask && mask)
+ if (mask != NULL)
{
if (!m_currentClippingRegion.IsNull())
{
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 );
+ mask = new_mask;
+ g_object_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, cx-xsrcMask, cy-ysrcMask );
- }
- }
+ gdk_gc_set_clip_mask(use_gc, mask);
+ if (new_mask != NULL)
+ gdk_gc_set_clip_origin(use_gc, cx, cy);
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, cx-xsrcMask, cy-ysrcMask );
- }
- }
+ gdk_gc_set_clip_origin(use_gc, cx - xsrcMask, cy - ysrcMask);
}
// Draw XPixmap or XBitmap, depending on what the wxBitmap contains. For
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_wx_draw_bitmap( bitmap, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 );
- gdk_draw_drawable( m_window, m_textGC, bitmap, xsrc, ysrc, cx, cy, cw, ch );
+ gdk_draw_drawable(m_window, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch);
- g_object_unref (G_OBJECT (bitmap));
- gdk_gc_unref( gc );
+ g_object_unref (bitmap);
+ g_object_unref (gc);
}
else
{
// was: gdk_draw_drawable( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, xx, yy, ww, hh );
- gdk_draw_drawable( m_window, m_penGC, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch );
+ gdk_draw_drawable(m_window, use_gc, use_bitmap.GetPixmap(), xsrc, ysrc, cx, cy, cw, ch);
}
// remove mask again if any
- if (useMask && mask)
+ if (mask != NULL)
{
- if (is_mono)
- {
- gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
- gdk_gc_set_clip_origin( m_textGC, 0, 0 );
- 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_origin( m_penGC, 0, 0 );
- if (!m_currentClippingRegion.IsNull())
- gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
- }
+ gdk_gc_set_clip_mask(use_gc, NULL);
+ gdk_gc_set_clip_origin(use_gc, 0, 0);
+ if (!m_currentClippingRegion.IsNull())
+ gdk_gc_set_clip_region(use_gc, m_currentClippingRegion.GetRegion());
}
if (new_mask)
- g_object_unref (G_OBJECT (new_mask));
+ g_object_unref (new_mask);
}
else // use_bitmap_method
{
bool underlined = m_font.Ok() && m_font.GetUnderlined();
-#if wxUSE_UNICODE
- const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
-#else
- const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
- if ( !wdata )
+ const wxCharBuffer data = wxGTK_CONV( text );
+ if ( !data )
return;
- const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
-#endif
- size_t datalen = strlen((const char*)data);
- pango_layout_set_text( m_layout, (const char*) data, datalen);
+ const size_t datalen = strlen(data);
+ pango_layout_set_text( m_layout, data, datalen);
if (underlined)
{
void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
{
+ if (!m_window || text.empty())
+ return;
+
+ wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
if ( wxIsNullDouble(angle) )
{
DrawText(text, x, y);
return;
}
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
-
- if (!m_window) return;
-
wxCoord w;
wxCoord h;
*externalLeading = 0;
if (string.empty())
- {
return;
- }
- // 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;
+ // ensure that theFont is always non-NULL
+ if ( !theFont || !theFont->Ok() )
+ theFont = wx_const_cast(wxFont *, &m_font);
- const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
- const char *dataUTF8 = (const char *)data;
-#endif
+ // and use it if it's valid
+ if ( theFont->Ok() )
+ {
+ pango_layout_set_font_description
+ (
+ m_layout,
+ theFont->GetNativeFontInfo()->description
+ );
+ }
+ // Set layout's text
+ const wxCharBuffer dataUTF8 = wxGTK_CONV_FONT(string, *theFont);
if ( !dataUTF8 )
{
// hardly ideal, but what else can we do if conversion failed?
wxCoord wxWindowDC::GetCharHeight() const
{
- pango_layout_set_text( m_layout, "H", 1 );
- int h;
- pango_layout_get_pixel_size( m_layout, NULL, &h );
- return h;
+ PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, NULL);
+ return PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + pango_font_metrics_get_ascent (metrics));
}
void wxWindowDC::Clear()
if (oldContext != m_context)
{
if (m_layout)
- g_object_unref( G_OBJECT( m_layout ) );
+ g_object_unref (m_layout);
m_layout = pango_layout_new( m_context );
}
if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
{
- if (m_brush.GetStipple()->GetPixmap())
+ if (m_brush.GetStipple()->GetDepth() != 1)
{
gdk_gc_set_fill( m_brushGC, GDK_TILED );
gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );
else
{
gdk_gc_set_fill( m_brushGC, GDK_STIPPLED );
- gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
+ gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
}
}
if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
{
- if (m_backgroundBrush.GetStipple()->GetPixmap())
+ if (m_backgroundBrush.GetStipple()->GetDepth() != 1)
{
gdk_gc_set_fill( m_bgGC, GDK_TILED );
gdk_gc_set_tile( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
else
{
gdk_gc_set_fill( m_bgGC, GDK_STIPPLED );
- gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetBitmap() );
+ gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
}
}
projects / wxWidgets.git / blobdiff