// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcclient.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/gtk/win_gtk.h"
-#include <math.h> // for floating-point functions
+#include "wx/math.h" // for floating-point functions
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
gint width,
gint height)
{
- g_return_if_fail (drawable != NULL);
- g_return_if_fail (src != NULL);
- g_return_if_fail (gc != NULL);
-
-#ifdef __WXGTK20__
+ wxCHECK_RET( drawable, _T("NULL drawable in gdk_wx_draw_bitmap") );
+ wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") );
+ wxCHECK_RET( gc, _T("NULL gc in gdk_wx_draw_bitmap") );
+
gint src_width, src_height;
gdk_drawable_get_size(src, &src_width, &src_height);
if (width == -1) width = src_width;
width, height,
0, 0,
1 );
-#else
- GdkWindowPrivate *drawable_private;
- GdkWindowPrivate *src_private;
- GdkGCPrivate *gc_private;
-
- drawable_private = (GdkWindowPrivate*) drawable;
- src_private = (GdkWindowPrivate*) src;
- if (drawable_private->destroyed || src_private->destroyed)
- return;
-
- gint src_width = src_private->width;
- gint src_height = src_private->height;
-
- gc_private = (GdkGCPrivate*) gc;
-
- if (width == -1) width = src_width;
- if (height == -1) height = src_height;
-
- XCopyPlane( drawable_private->xdisplay,
- src_private->xwindow,
- drawable_private->xwindow,
- gc_private->xgc,
- xsrc, ysrc,
- width, height,
- xdest, ydest,
- 1 );
-#endif
}
//-----------------------------------------------------------------------------
// Implement Pool of Graphic contexts. Creating them takes too much time.
//-----------------------------------------------------------------------------
-#define GC_POOL_SIZE 200
-
enum wxPoolGCType
{
wxGC_ERROR = 0,
// 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)
wxFAIL_MSG( wxT("Cannot allocate GC pool") );
return;
}
-
+
// Zero initial pool.
memset(wxGCPool, 0, wxGCPoolSize * sizeof(wxGC));
}
static GdkGC* wxGetPoolGC( GdkWindow *window, wxPoolGCType type )
{
wxGC *pptr;
-
+
// Look for an available GC.
for (int i = 0; i < wxGCPoolSize; i++)
{
wxGCPool[i].m_gc = gdk_gc_new( window );
gdk_gc_set_exposures( wxGCPool[i].m_gc, FALSE );
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;
}
}
wxGCPool = pptr;
memset(&wxGCPool[wxGCPoolSize], 0,
GC_POOL_ALLOC_SIZE*sizeof(wxGC));
-
- // Initialize entry we will return.
+
+ // 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;
-
+ 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") );
{
if (wxGCPool[i].m_gc == gc)
{
- wxGCPool[i].m_used = FALSE;
+ wxGCPool[i].m_used = false;
return;
}
}
m_textGC = (GdkGC *) NULL;
m_bgGC = (GdkGC *) NULL;
m_cmap = (GdkColormap *) NULL;
- m_isMemDC = FALSE;
- m_isScreenDC = FALSE;
+ m_isMemDC = false;
+ m_isScreenDC = false;
m_owner = (wxWindow *)NULL;
-#ifdef __WXGTK20__
m_context = (PangoContext *)NULL;
m_layout = (PangoLayout *)NULL;
m_fontdesc = (PangoFontDescription *)NULL;
-#endif
}
wxWindowDC::wxWindowDC( wxWindow *window )
m_bgGC = (GdkGC *) NULL;
m_cmap = (GdkColormap *) NULL;
m_owner = (wxWindow *)NULL;
- m_isMemDC = FALSE;
- m_isScreenDC = FALSE;
+ m_isMemDC = false;
+ m_isScreenDC = false;
m_font = window->GetFont();
GtkWidget *widget = window->m_wxwindow;
wxASSERT_MSG( widget, wxT("DC needs a widget") );
-#ifdef __WXGTK20__
m_context = window->GtkGetPangoDefaultContext();
m_layout = pango_layout_new( m_context );
m_fontdesc = pango_font_description_copy( widget->style->font_desc );
-#endif
GtkPizza *pizza = GTK_PIZZA( widget );
m_window = pizza->bin_window;
if (!m_window)
{
// Don't report problems as per MSW.
- m_ok = TRUE;
+ m_ok = true;
return;
}
wxWindowDC::~wxWindowDC()
{
Destroy();
-
-#ifdef __WXGTK20__
+
if (m_layout)
g_object_unref( G_OBJECT( m_layout ) );
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
-#endif
}
void wxWindowDC::SetUpDC()
{
- m_ok = TRUE;
+ m_ok = true;
wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
m_owner->GetSize(width, height);
}
-extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
const wxColour & col, int style);
bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
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 )
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_pen.GetStyle() == wxTRANSPARENT) return;
if (n <= 0) return;
- GdkPoint *gpts = new GdkPoint[n];
+ //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;
+
+ GdkPoint *gpts = NULL;
+
+ if (doScale){
+ gpts = new GdkPoint[n];
if (! gpts)
{
wxFAIL_MSG( wxT("Cannot allocate PolyLine") );
return;
}
- for (int i = 0; i < n; i++)
+ for (int i = 0; i < n; i++)
{
wxCoord x1 = XLOG2DEV(points[i].x + xoffset);
wxCoord y1 = YLOG2DEV(points[i].y + yoffset);
gpts[i].x = x1;
gpts[i].y = y1;
}
+ }
+ else {
+ for (int i = 0; i < n; i++) {
+ CalcBoundingBox( points[i].x, points[i].y );
+ }
+
+ //GdkPoint and wxPoint have the same memory allignment, so we can cast one into another
+ gpts = reinterpret_cast<GdkPoint*>(points);
+ }
if (m_window)
gdk_draw_lines( m_window, m_penGC, gpts, n);
+ if (doScale)
delete[] gpts;
}
if (n <= 0) return;
- GdkPoint *gdkpoints = new GdkPoint[n+1];
+ //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;
+ }
+
+ GdkPoint *gdkpoints = NULL;
+
+ if (doScale){
+ gdkpoints = new GdkPoint[n+1]; //FIXME: Why the "+1"
+
int i;
for (i = 0 ; i < n ; i++)
{
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset );
}
+ }
+ else {
+ int i(0);
+ for (; i < n ; ++i) {
+ CalcBoundingBox( points[i].x, points[i].y );
+ }
+ //GdkPoint and wxPoint have the same memory allignment, so we can cast one into another
+ gdkpoints = reinterpret_cast<GdkPoint*> (points);
+ }
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()))
}
*/
gdk_draw_polygon( m_window, m_penGC, FALSE, gdkpoints, n );
-
+
}
}
+ if (doScale)
delete[] gdkpoints;
}
void wxWindowDC::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,
return;
}
- // scale bitmap if required
+ // scale bitmap if required
wxBitmap use_bitmap = bitmap;
if ((w != ww) || (h != hh))
use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
-
+
#if !GTK_CHECK_VERSION(2,2,0)
// 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
// and also creates the mask as a side-effect:
use_bitmap.GetPixmap();
#endif
-
+
// apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
GdkBitmap *new_mask = (GdkBitmap*) NULL;
-
+
if (useMask && mask)
{
if (!m_currentClippingRegion.IsNull())
gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
gdk_gc_unref( gc );
}
-
+
if (is_mono)
{
if (new_mask)
// drawing a mono-bitmap (XBitmap) we use the current text GC
if (is_mono)
{
-#ifdef __WXGTK20__
- GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, -1 );
- GdkGC *gc = gdk_gc_new( bitmap );
+ GdkPixmap *bitmap2 = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, -1 );
+ 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( bitmap, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
-
- gdk_draw_drawable( m_window, m_textGC, bitmap, 0, 0, xx, yy, -1, -1 );
-
- gdk_bitmap_unref( bitmap );
+ gdk_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
+
+ gdk_draw_drawable( m_window, m_textGC, bitmap2, 0, 0, xx, yy, -1, -1 );
+
+ gdk_bitmap_unref( bitmap2 );
gdk_gc_unref( gc );
-#else
- gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), 0, 0, xx, yy, -1, -1 );
-#endif
}
else
{
#if GTK_CHECK_VERSION(2,2,0)
- if (use_bitmap.HasPixbuf())
+ if (!gtk_check_version(2,2,0) && use_bitmap.HasPixbuf())
{
gdk_draw_pixbuf(m_window, m_penGC,
use_bitmap.GetPixbuf(),
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
}
}
-
+
if (new_mask)
gdk_bitmap_unref( new_mask );
}
bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask )
{
- wxCHECK_MSG( Ok(), FALSE, wxT("invalid window dc") );
+ wxCHECK_MSG( Ok(), false, wxT("invalid window dc") );
- wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
+ wxCHECK_MSG( source, false, wxT("invalid source dc") );
- if (!m_window) return FALSE;
+ if (!m_window) return false;
// transform the source DC coords to the device ones
xsrc = source->XLOG2DEV(xsrc);
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;
- // TODO: use the mask origin when drawing transparently
if (xsrcMask == -1 && ysrcMask == -1)
{
xsrcMask = xsrc;
if (srcDC->m_isMemDC)
{
- if (!memDC->m_selected.Ok()) return FALSE;
+ if (!memDC->m_selected.Ok()) return false;
is_mono = (memDC->m_selected.GetDepth() == 1);
// 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;
+ use_bitmap_method = true;
}
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
- use_bitmap_method = TRUE;
+ use_bitmap_method = true;
}
else if ((xsrc == 0) && (ysrc == 0) &&
(width == memDC->m_selected.GetWidth()) &&
// 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;
+ use_bitmap_method = true;
}
else
{
- use_bitmap_method = FALSE;
+ use_bitmap_method = false;
}
}
wxRegion tmp( xx,yy,ww,hh );
tmp.Intersect( m_currentClippingRegion );
if (tmp.IsEmpty())
- return TRUE;
+ return true;
}
int old_logical_func = m_logicalFunction;
wxCoord cy = yy;
wxCoord cw = ww;
wxCoord ch = hh;
-
+
// interpret userscale of src too
double xsc,ysc;
memDC->GetUserScale(&xsc,&ysc);
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);
}
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
GdkBitmap *new_mask = (GdkBitmap*) NULL;
-
+
if (useMask && mask)
{
if (!m_currentClippingRegion.IsNull())
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 );
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 );
- // was: gdk_gc_set_clip_origin( m_textGC, xx, yy );
- gdk_gc_set_clip_origin( m_textGC, cx, cy );
+ 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 );
- // was: gdk_gc_set_clip_origin( m_penGC, xx, yy );
- gdk_gc_set_clip_origin( m_penGC, cx, cy );
+ gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
+ }
}
}
if (is_mono)
{
-#ifdef __WXGTK20__
GdkPixmap *bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, -1 );
GdkGC *gc = gdk_gc_new( bitmap );
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetBitmap(), 0, 0, 0, 0, -1, -1 );
-
+
gdk_draw_drawable( m_window, m_textGC, bitmap, xsrc, ysrc, cx, cy, cw, ch );
-
+
gdk_bitmap_unref( bitmap );
gdk_gc_unref( gc );
-#else
- // was: gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, xx, yy, ww, hh );
- gdk_wx_draw_bitmap( m_window, m_textGC, use_bitmap.GetBitmap(), xsrc, ysrc, cx, cy, cw, ch );
-#endif
}
else
{
gdk_gc_set_clip_region( m_penGC, m_currentClippingRegion.GetRegion() );
}
}
-
+
if (new_mask)
gdk_bitmap_unref( new_mask );
}
tmp.Intersect( m_currentClippingRegion );
wxCoord cx,cy,cw,ch;
tmp.GetBox(cx,cy,cw,ch);
-
- // rescale bitmap
+
+ // rescale bitmap
wxBitmap bitmap = memDC->m_selected.Rescale( cx-xx, cy-yy, cw, ch, ww, hh );
// draw scaled bitmap
}
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 );
}
SetLogicalFunction( old_logical_func );
-
- return TRUE;
+
+ return true;
}
void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
wxCHECK_RET( Ok(), wxT("invalid window dc") );
if (!m_window) return;
-
- if (text.empty()) return;
-#ifndef __WXGTK20__
- GdkFont *font = m_font.GetInternalFont( m_scaleY );
-
- wxCHECK_RET( font, wxT("invalid font") );
-#endif
+ if (text.empty()) return;
x = XLOG2DEV(x);
y = YLOG2DEV(y);
-#ifdef __WXGTK20__
wxCHECK_RET( m_context, wxT("no Pango context") );
wxCHECK_RET( m_layout, wxT("no Pango layout") );
wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
#endif
size_t datalen = strlen((const char*)data);
pango_layout_set_text( m_layout, (const char*) data, datalen);
-
+
if (underlined)
{
PangoAttrList *attrs = pango_attr_list_new();
{
// If there is a user or actually any scale applied to
// the device context, scale the font.
-
+
// scale font description
gint oldSize = pango_font_description_get_size( m_fontdesc );
double size = oldSize;
size = size * m_scaleY;
pango_font_description_set_size( m_fontdesc, (gint)size );
-
+
// actually apply scaled font
pango_layout_set_font_description( m_layout, m_fontdesc );
-
+
pango_layout_get_pixel_size( m_layout, &w, &h );
if ( m_backgroundMode == wxSOLID )
{
gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
}
-
+
// Draw layout.
gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
-
+
// reset unscaled size
pango_font_description_set_size( m_fontdesc, oldSize );
-
+
// actually apply unscaled font
pango_layout_set_font_description( m_layout, m_fontdesc );
}
// undo underline attributes setting:
pango_layout_set_attributes(m_layout, NULL);
}
-
+
wxCoord width = w;
wxCoord height = h;
-
-#else // GTK+ 1.x
- wxCoord width = gdk_string_width( font, text.mbc_str() );
- wxCoord height = font->ascent + font->descent;
-
- if ( m_backgroundMode == wxSOLID )
- {
- 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() );
- }
- gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
-
- /* CMB 17/7/98: simple underline: ignores scaling and underlying
- X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
- properties (see wxXt implementation) */
- if (m_font.GetUnderlined())
- {
- 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);
- }
-#endif // GTK+ 2.0/1.x
width = wxCoord(width / m_scaleX);
height = wxCoord(height / m_scaleY);
void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
{
- if (angle == 0.0)
+ if ( wxIsNullDouble(angle) )
{
DrawText(text, x, y);
return;
if (!m_window) return;
-#if GTK_CHECK_VERSION(2,4,0)
-
- // This code only rotates each individual glyph. Someone
- // will have to look up the right way to do this... RR
-
- PangoMatrix matrix = PANGO_MATRIX_INIT;
- pango_matrix_rotate( &matrix, angle );
-
- pango_context_set_matrix( m_context, &matrix );
-
- DoDrawText( text, x, y );
-
- pango_context_set_matrix( m_context, NULL );
-
-#else
-
wxCoord w;
wxCoord h;
-#ifdef __WXGTK20__
- // implement later without GdkFont for GTK 2.0
+ // TODO: implement later without GdkFont for GTK 2.0
GetTextExtent(text, &w, &h, NULL,NULL, &m_font);
-
-#else
- GdkFont *font = m_font.GetInternalFont( m_scaleY );
-
- wxCHECK_RET( font, wxT("invalid font") );
- // the size of the text
- w = gdk_string_width( font, text.mbc_str() );
- h = font->ascent + font->descent;
-#endif
// 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.SelectObject(wxNullBitmap);
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.ConvertToImage();
-
- GdkColor *colText = m_textForegroundColour.GetColor(),
- *colBack = m_textBackgroundColour.GetColor();
- bool textColSet = TRUE;
-
- unsigned char *data = image.GetData();
-
- // 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((double)srcX*srcX + srcY*srcY);
- double angleOrig = atan2((double)srcY, (double)srcX) - rad;
- wxCoord dstX = (wxCoord)(r*cos(angleOrig) + 0.5),
- dstY = (wxCoord)(r*sin(angleOrig) + 0.5);
-
- // non-white pixel?
- bool textPixel = data[(srcY*w + srcX)*3] != 0xff;
- if ( textPixel || (m_backgroundMode == wxSOLID) )
- {
- // change colour if needed
- if ( textPixel != textColSet )
- {
- gdk_gc_set_foreground( m_textGC, textPixel ? colText
- : colBack );
+ wxImage image = src.ConvertToImage();
- textColSet = textPixel;
- }
+ image.ConvertColourToAlpha( m_textForegroundColour.Red(),
+ m_textForegroundColour.Green(),
+ m_textForegroundColour.Blue() );
+ image = image.Rotate( rad, wxPoint(0,0) );
+
+ 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();
+
+ 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 );
+
+ 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);
-#endif // GTK24
}
void wxWindowDC::DoGetTextExtent(const wxString &string,
if ( externalLeading )
*externalLeading = 0;
- if (string.IsEmpty())
+ if (string.empty())
{
return;
}
-
-#ifdef __WXGTK20__
+
// Set new font description
if (theFont)
pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
-
+
// Set layout's text
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
#else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
if ( !wdata )
- {
- if (width) (*width) = 0;
- if (height) (*height) = 0;
return;
- }
+
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
const char *dataUTF8 = (const char *)data;
#endif
}
pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
-
- int w,h;
- pango_layout_get_pixel_size( m_layout, &w, &h );
-
- if (width)
- *width = (wxCoord) w;
- if (height)
- *height = (wxCoord) h;
+
if (descent)
{
+ int h;
+ pango_layout_get_pixel_size( m_layout, width, &h );
PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
*descent = h - PANGO_PIXELS(baseline);
+
+ if (height)
+ *height = (wxCoord) h;
+ }
+ else
+ {
+ pango_layout_get_pixel_size( m_layout, width, height );
}
-
+
// Reset old font description
if (theFont)
pango_layout_set_font_description( m_layout, m_fontdesc );
-#else // GTK+ 1.x
- wxFont fontToUse = m_font;
- if (theFont)
- fontToUse = *theFont;
-
- GdkFont *font = fontToUse.GetInternalFont( m_scaleY );
- if ( !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);
-#endif // GTK+ 2/1
}
wxCoord wxWindowDC::GetCharWidth() const
{
-#ifdef __WXGTK20__
pango_layout_set_text( m_layout, "H", 1 );
- int w,h;
- pango_layout_get_pixel_size( m_layout, &w, &h );
+ int w;
+ pango_layout_get_pixel_size( m_layout, &w, NULL );
return w;
-#else
- GdkFont *font = m_font.GetInternalFont( m_scaleY );
- wxCHECK_MSG( font, -1, wxT("invalid font") );
-
- return wxCoord(gdk_string_width( font, "H" ) / m_scaleX);
-#endif
}
wxCoord wxWindowDC::GetCharHeight() const
{
-#ifdef __WXGTK20__
pango_layout_set_text( m_layout, "H", 1 );
- int w,h;
- pango_layout_get_pixel_size( m_layout, &w, &h );
+ int h;
+ pango_layout_get_pixel_size( m_layout, NULL, &h );
return h;
-#else
- GdkFont *font = m_font.GetInternalFont( m_scaleY );
- wxCHECK_MSG( font, -1, wxT("invalid font") );
-
- return wxCoord((font->ascent + font->descent) / m_scaleY);
-#endif
}
void wxWindowDC::Clear()
void wxWindowDC::SetFont( const wxFont &font )
{
m_font = font;
-
-#ifdef __WXGTK20__
+
if (m_font.Ok())
{
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
-
+
m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
-
-
+
+
if (m_owner)
{
PangoContext *oldContext = m_context;
-
- // We might want to use the X11 context for faster
- // rendering on screen
- if (m_font.GetNoAntiAliasing())
- m_context = m_owner->GtkGetPangoX11Context();
- else
- m_context = m_owner->GtkGetPangoDefaultContext();
-
+
+ m_context = m_owner->GtkGetPangoDefaultContext();
+
// If we switch back/forth between different contexts
// we also have to create a new layout. I think so,
- // at least, and it doesn't hurt to do it.
+ // at least, and it doesn't hurt to do it.
if (oldContext != m_context)
{
if (m_layout)
g_object_unref( G_OBJECT( m_layout ) );
-
+
m_layout = pango_layout_new( m_context );
}
}
-
+
pango_layout_set_font_description( m_layout, m_fontdesc );
}
-#endif
}
void wxWindowDC::SetPen( const wxPen &pen )
}
}
-#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)
if (req_dash && req_nb_dash)
{
wxGTKDash *real_req_dash = new wxGTKDash[req_nb_dash];
gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
}
}
-#endif // GTK+ > 1.0
GdkCapStyle capStyle = GDK_CAP_ROUND;
switch (m_pen.GetCap())
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;
}
}
- 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;
{
case wxXOR: mode = GDK_XOR; break;
case wxINVERT: mode = GDK_INVERT; break;
-#if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)
case wxOR_REVERSE: mode = GDK_OR_REVERSE; break;
case wxAND_REVERSE: mode = GDK_AND_REVERSE; break;
case wxCLEAR: mode = GDK_CLEAR; break;
// unsupported by GTK
case wxNOR: mode = GDK_COPY; break;
-#endif // GTK+ > 1.0
default:
wxFAIL_MSG( wxT("unsupported logical function") );
mode = GDK_COPY;
void wxWindowDC::ComputeScaleAndOrigin()
{
- /* CMB: copy scale to see if it changes */
- double origScaleX = m_scaleX;
- double origScaleY = m_scaleY;
+ const wxRealPoint origScale(m_scaleX, 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()))
+ // if scale has changed call SetPen to recalulate the line width
+ if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && 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 );
- }
+ // 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
int wxWindowDC::GetDepth() const
{
- wxFAIL_MSG(wxT("not implemented"));
-
- return -1;
+ return gdk_drawable_get_depth(m_window);
}
wxSize sz = win->GetSize();
m_paintClippingRegion = win->GetUpdateRegion();
wxLimitRegionToSize(m_paintClippingRegion, sz);
-
+
GdkRegion *region = m_paintClippingRegion.GetRegion();
if ( region )
{
bool wxDCModule::OnInit()
{
wxInitGCPool();
- return TRUE;
+ return true;
}
void wxDCModule::OnExit()
projects / wxWidgets.git / blobdiff