#include "wx/math.h"
#include "wx/image.h"
#include "wx/module.h"
+#include "wx/crt.h"
#endif
#include "wx/fontutil.h"
class wxGtkPrintModule: public wxModule
{
public:
- wxGtkPrintModule()
+ wxGtkPrintModule()
{
#if wxUSE_LIBGNOMEPRINT
// This module must be initialized AFTER gnomeprint's one
gs_cairo = wxCairoLibrary::Get();
if (gs_cairo && gtk_check_version(2,10,0) == NULL)
wxPrintFactory::SetPrintFactory( new wxGtkPrintFactory );
-
return true;
}
void wxGtkPrintModule::OnExit()
{
- delete gs_cairo;
+ gs_cairo = NULL;
}
IMPLEMENT_DYNAMIC_CLASS(wxGtkPrintModule, wxModule)
return false;
}
-wxDialog *wxGtkPrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+wxDialog *
+wxGtkPrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
+ wxPrintData * WXUNUSED(data))
{
return NULL;
}
+#if wxUSE_NEW_DC
+
+wxImplDC* wxGtkPrintFactory::CreatePrinterImplDC( wxPrinterDC *owner, const wxPrintData& data )
+{
+ return new wxGtkPrinterImplDC( owner, data );
+}
+
+#else
+
wxDC* wxGtkPrintFactory::CreatePrinterDC( const wxPrintData& data )
{
- return new wxGtkPrintDC(data);
+ return new wxGtkPrinterDC(data);
}
+#endif
+
bool wxGtkPrintFactory::HasOwnPrintToFile()
{
return true;
// Callback functions for Gtk Printings.
//----------------------------------------------------------------------------
-// We use it to pass useful objets to gtk printing callback functions.
-typedef struct
+// We use it to pass useful objects to GTK printing callback functions.
+struct wxPrinterToGtkData
{
wxGtkPrinter * printer;
wxPrintout * printout;
-}
-wxPrinterToGtkData;
+};
extern "C"
{
data->printer->DrawPage(data->printout, operation, context, page_nr);
}
- static void gtk_end_print_callback (GtkPrintOperation *operation, GtkPrintContext *context, gpointer user_data)
+ static void gtk_end_print_callback(GtkPrintOperation * WXUNUSED(operation),
+ GtkPrintContext * WXUNUSED(context),
+ gpointer user_data)
{
wxPrintout *printout = (wxPrintout *) user_data;
printout->OnEndPrinting();
}
- static gboolean gtk_preview_print_callback (GtkPrintOperation *operation, GtkPrintOperationPreview *preview, GtkPrintContext *context, GtkWindow *parent, gpointer user_data)
+ static gboolean
+ gtk_preview_print_callback(GtkPrintOperation * WXUNUSED(operation),
+ GtkPrintOperationPreview * WXUNUSED(preview),
+ GtkPrintContext *context,
+ GtkWindow *parent,
+ gpointer user_data)
{
wxPrintout *printout = (wxPrintout *) user_data;
printout->SetIsPreview(true);
- /* We create a cairo context with 72dpi resolution. This resolution is only used for positionning. */
+ /* We create a Cairo context with 72dpi resolution. This resolution is
+ * only used for positioning. */
cairo_t *cairo = gdk_cairo_create(GTK_WIDGET(parent)->window);
gtk_print_context_set_cairo_context(context, cairo, 72, 72);
GtkPageSetup* wxGtkPrintNativeData::GetPageSetupFromSettings(GtkPrintSettings* settings)
{
GtkPageSetup* page_setup = gtk_page_setup_new();
- gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));
+ gtk_page_setup_set_orientation (page_setup, gtk_print_settings_get_orientation (settings));
- GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
- if (paper_size != NULL)
- gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
+ GtkPaperSize *paper_size = gtk_print_settings_get_paper_size (settings);
+ if (paper_size != NULL)
+ gtk_page_setup_set_paper_size_and_default_margins (page_setup, paper_size);
return page_setup;
}
void wxGtkPrintNativeData::SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup)
{
gtk_print_settings_set_orientation ( settings, gtk_page_setup_get_orientation (page_setup));
- gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));
+ gtk_print_settings_set_paper_size ( settings, gtk_page_setup_get_paper_size (page_setup));
}
//----------------------------------------------------------------------------
// If the settings are OK, we restore it.
if (settings != NULL)
gtk_print_operation_set_print_settings (native->GetPrintJob(), settings);
- gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings));
+ gtk_print_operation_set_default_page_setup (native->GetPrintJob(), native->GetPageSetupFromSettings(settings));
// Show the dialog if needed.
GError* gError = NULL;
if (GetShowDialog())
response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget) ), &gError);
else
- response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT, (GtkWindow *) m_parent, &gError);
+ response = gtk_print_operation_run (native->GetPrintJob(), GTK_PRINT_OPERATION_ACTION_PRINT, GTK_WINDOW(gtk_widget_get_toplevel(m_parent->m_widget)), &gError);
// Does everything went well?
if (response == GTK_PRINT_OPERATION_RESULT_CANCEL)
case GTK_PRINT_PAGES_CURRENT:
m_printDialogData.SetSelection( true );
break;
- case GTK_PRINT_PAGES_ALL:
- m_printDialogData.SetAllPages( true );
- m_printDialogData.SetFromPage( 0 );
- m_printDialogData.SetToPage( 9999 );
- break;
case GTK_PRINT_PAGES_RANGES:
- default:
- // wxWidgets doesn't support multiple ranges, so we can only save the first one even if the user wants to print others.
+ {// wxWidgets doesn't support multiple ranges, so we can only save the first one even if the user wants to print others.
// For example, the user enters "1-3;5-7" in the dialog: pages 1-3 and 5-7 will be correctly printed when the user
// will hit "OK" button. However we can only save 1-3 in the print data.
gint num_ranges = 0;
GtkPageRange* range;
range = gtk_print_settings_get_page_ranges (newSettings, &num_ranges);
- m_printDialogData.SetFromPage( range[0].start );
- m_printDialogData.SetToPage( range[0].end );
+ if (num_ranges >= 1)
+ {
+ m_printDialogData.SetFromPage( range[0].start );
+ m_printDialogData.SetToPage( range[0].end );
+ }
+ else {
+ m_printDialogData.SetAllPages( true );
+ m_printDialogData.SetFromPage( 0 );
+ m_printDialogData.SetToPage( 9999 );
+ }
+ break;}
+ case GTK_PRINT_PAGES_ALL:
+ default:
+ m_printDialogData.SetAllPages( true );
+ m_printDialogData.SetFromPage( 0 );
+ m_printDialogData.SetToPage( 9999 );
break;
}
dataToSend.printer = this;
dataToSend.printout = printout;
- // These Gtk signals are catched here.
+ // These Gtk signals are caught here.
g_signal_connect (printOp, "begin-print", G_CALLBACK (gtk_begin_print_callback), &dataToSend);
g_signal_connect (printOp, "draw-page", G_CALLBACK (gtk_draw_page_print_callback), &dataToSend);
g_signal_connect (printOp, "end-print", G_CALLBACK (gtk_end_print_callback), printout);
g_signal_connect (printOp, "preview", G_CALLBACK (gtk_preview_print_callback), printout);
- m_showDialog = true;
- if (!prompt)
- m_showDialog = false;
+ // This is used to setup the DC and
+ // show the dialog if desired
+ wxGtkPrintDialog dialog( parent, &m_printDialogData );
+ dialog.SetPrintDC(m_dc);
+ dialog.SetShowDialog(prompt);
- // PrintDialog returns a wxDC but we created it before so we don't need it anymore: we just delete it.
- wxDC* uselessdc = PrintDialog( parent );
- delete uselessdc;
+ // doesn't necessarily show
+ int ret = dialog.ShowModal();
+ if (ret == wxID_CANCEL)
+ {
+ sm_lastError = wxPRINTER_CANCELLED;
+ }
+ if (ret == wxID_NO)
+ {
+ sm_lastError = wxPRINTER_ERROR;
+ wxFAIL_MSG(_("The print dialog returned an error."));
+ }
g_object_unref (printOp);
SetPrintContext(context);
native->SetPrintContext( context );
- m_dc = new wxGtkPrintDC( printdata );
+#if wxUSE_NEW_DC
+ wxPrinterDC *printDC = new wxPrinterDC( printdata );
+#else
+ wxGtkPrinterDC *printDC = new wxGtkPrinterDC( printdata );
+#endif
+ m_dc = printDC;
if (!m_dc->IsOk())
{
if (sm_lastError != wxPRINTER_CANCELLED)
{
sm_lastError = wxPRINTER_ERROR;
- wxFAIL_MSG(_("The wxGtkPrintDC cannot be used."));
+ wxFAIL_MSG(_("The wxGtkPrinterDC cannot be used."));
}
return;
}
printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
- printout->SetPPIPrinter( wxGtkPrintDC::GetResolution(),
- wxGtkPrintDC::GetResolution() );
+ printout->SetPPIPrinter( printDC->GetResolution(),
+ printDC->GetResolution() );
printout->SetDC(m_dc);
gtk_print_operation_set_n_pages(operation, numPages);
}
-void wxGtkPrinter::DrawPage(wxPrintout *printout, GtkPrintOperation *operation, GtkPrintContext *context, int page_nr)
+void wxGtkPrinter::DrawPage(wxPrintout *printout,
+ GtkPrintOperation *operation,
+ GtkPrintContext * WXUNUSED(context),
+ int page_nr)
{
int fromPage, toPage, minPage, maxPage, startPage, endPage;
printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
GtkPageRange* range;
range = gtk_print_settings_get_page_ranges (settings, &num_ranges);
// We don't need to verify these values as it has already been done in wxGtkPrinter::BeginPrint.
- startPage = range[0].start + 1;
- endPage = range[0].end + 1;
+ if (num_ranges >= 1)
+ {
+ startPage = range[0].start + 1;
+ endPage = range[0].end + 1;
+ }
+ else {
+ startPage = minPage;
+ endPage = maxPage;
+ }
break;}
case GTK_PRINT_PAGES_ALL:
default:
wxDC* wxGtkPrinter::PrintDialog( wxWindow *parent )
{
wxGtkPrintDialog dialog( parent, &m_printDialogData );
- int ret;
dialog.SetPrintDC(m_dc);
+ dialog.SetShowDialog(true);
- dialog.SetShowDialog(m_showDialog);
-
- ret = dialog.ShowModal();
+ int ret = dialog.ShowModal();
if (ret == wxID_CANCEL)
{
}
m_printDialogData = dialog.GetPrintDialogData();
- return new wxGtkPrintDC( m_printDialogData.GetPrintData() );
+
+#if wxUSE_NEW_DC
+ return new wxPrinterDC( m_printDialogData.GetPrintData() );
+#else
+ return new wxGtkPrinterDC( m_printDialogData.GetPrintData() );
+#endif
}
-bool wxGtkPrinter::Setup( wxWindow *parent )
+bool wxGtkPrinter::Setup( wxWindow * WXUNUSED(parent) )
{
// Obsolete, for backward compatibility.
return false;
}
//-----------------------------------------------------------------------------
-// wxGtkPrintDC
+// wxGtkPrinterDC
//-----------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxGtkPrintDC, wxDC)
+#define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * m_DEV2PS)
+#define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * m_DEV2PS)
+#define YLOG2DEV(x) ((double)(LogicalToDeviceY(x)) * m_DEV2PS)
+#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * m_DEV2PS)
-// Define the default resolution for this DC. This resolution is just used for positioning as the cairo context is scalable.
-int wxGtkPrintDC::ms_resolution = 72;
-wxGtkPrintDC::wxGtkPrintDC( const wxPrintData& data )
+#if wxUSE_NEW_DC
+IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterImplDC, wxImplDC)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxGtkPrinterDC, wxDC)
+#endif
+
+#if wxUSE_NEW_DC
+wxGtkPrinterImplDC::wxGtkPrinterImplDC( wxPrinterDC *owner, const wxPrintData& data ) :
+ wxImplDC( owner )
+#else
+wxGtkPrinterDC::wxGtkPrinterDC( const wxPrintData& data )
+#endif
{
m_printData = data;
m_gpc = native->GetPrintContext();
- ms_resolution = (int) gtk_print_context_get_dpi_x(m_gpc);
+ // Match print quality to resolution (high = 1200dpi)
+ m_resolution = m_printData.GetQuality(); // (int) gtk_print_context_get_dpi_x( m_gpc );
+ if (m_resolution < 0)
+ m_resolution = (1 << (m_resolution+4)) *150;
+
+ m_PS2DEV = (double)m_resolution / 72.0;
+ m_DEV2PS = 72.0 / (double)m_resolution;
+
m_context = gtk_print_context_create_pango_context( m_gpc );
m_layout = gtk_print_context_create_pango_layout ( m_gpc );
m_fontdesc = pango_font_description_from_string( "Sans 12" );
m_currentBlue = 0;
m_currentGreen = 0;
- m_signX = 1; // default x-axis left to right.
+ m_signX = 1; // default x-axis left to right.
m_signY = 1; // default y-axis bottom up -> top down.
- GetSize( &m_deviceOffsetX, &m_deviceOffsetY );
+ // By default the origin of the Cairo context is in the upper left
+ // corner of the printable area. We need to translate it so that it
+ // is in the upper left corner of the paper (without margins)
+ GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
+ gdouble ml, mt;
+ ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
+ mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
+ gs_cairo->cairo_translate(m_cairo, -ml, -mt);
}
-wxGtkPrintDC::~wxGtkPrintDC()
+wxGtkPrinterImplDC::~wxGtkPrinterImplDC()
{
g_object_unref(m_context);
g_object_unref(m_layout);
}
-bool wxGtkPrintDC::IsOk() const
+bool wxGtkPrinterImplDC::IsOk() const
{
- return true;
+ return m_gpc != NULL;
}
-void wxGtkPrintDC::ComputeScaleAndOrigin()
+bool wxGtkPrinterImplDC::DoFloodFill(wxCoord WXUNUSED(x1),
+ wxCoord WXUNUSED(y1),
+ const wxColour& WXUNUSED(col),
+ int WXUNUSED(style))
{
- // Called when the scale and/or origin of the context has to be changed.
- m_scaleX = m_logicalScaleX * m_userScaleX;
- m_scaleY = m_logicalScaleY * m_userScaleY;
-
- gs_cairo->cairo_translate(m_cairo, m_deviceOriginX, m_deviceOriginY);
- gs_cairo->cairo_scale(m_cairo, m_scaleX, m_scaleY );
-}
-
-bool wxGtkPrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style )
-{
- // We can't access the given coord as a cairo context is scalable, ie a coord doesn't mean anything in this context.
+ // We can't access the given coord as a Cairo context is scalable, ie a
+ // coord doesn't mean anything in this context.
wxFAIL_MSG(_("not implemented"));
return false;
}
-void wxGtkPrintDC::DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter)
+void wxGtkPrinterImplDC::DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter)
{
wxCoord xC = circleCenter.x;
wxCoord yC = circleCenter.y;
// Create a pattern with the gradient.
cairo_pattern_t* gradient;
- gradient = gs_cairo->cairo_pattern_create_radial (LogicalToDeviceX(xC+xR), LogicalToDeviceY(yC+yR), 0, LogicalToDeviceX(xC+xR), LogicalToDeviceY(yC+yR), radius);
+ gradient = gs_cairo->cairo_pattern_create_radial (XLOG2DEV(xC+xR), YLOG2DEV(yC+yR), 0, XLOG2DEV(xC+xR), YLOG2DEV(yC+yR), radius * m_DEV2PS );
gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 0.0, redIPS, greenIPS, blueIPS, alphaIPS);
gs_cairo->cairo_pattern_add_color_stop_rgba (gradient, 1.0, redDPS, greenDPS, blueDPS, alphaDPS);
// Fill the rectangle with this pattern.
gs_cairo->cairo_set_source(m_cairo, gradient);
- gs_cairo->cairo_rectangle (m_cairo, LogicalToDeviceX(xR), LogicalToDeviceY(yR), LogicalToDeviceXRel(w), LogicalToDeviceYRel(h) );
+ gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(xR), YLOG2DEV(yR), XLOG2DEVREL(w), YLOG2DEVREL(h) );
gs_cairo->cairo_fill(m_cairo);
gs_cairo->cairo_pattern_destroy(gradient);
CalcBoundingBox(xR+w, yR+h);
}
-void wxGtkPrintDC::DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection)
+void wxGtkPrinterImplDC::DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection)
{
wxCoord x = rect.x;
wxCoord y = rect.y;
// Create a pattern with the gradient.
cairo_pattern_t* gradient;
- gradient = gs_cairo->cairo_pattern_create_linear (LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceX(x+w), LogicalToDeviceY(y));
+ gradient = gs_cairo->cairo_pattern_create_linear (XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x+w), YLOG2DEV(y));
if (nDirection == wxWEST)
{
// Fill the rectangle with this pattern.
gs_cairo->cairo_set_source(m_cairo, gradient);
- gs_cairo->cairo_rectangle (m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceXRel(w), LogicalToDeviceYRel(h) );
+ gs_cairo->cairo_rectangle (m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(w), YLOG2DEVREL(h) );
gs_cairo->cairo_fill(m_cairo);
gs_cairo->cairo_pattern_destroy(gradient);
CalcBoundingBox(x+w, y+h);
}
-bool wxGtkPrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const
+bool wxGtkPrinterImplDC::DoGetPixel(wxCoord WXUNUSED(x1),
+ wxCoord WXUNUSED(y1),
+ wxColour * WXUNUSED(col)) const
{
- // We can't access the given coord as a cairo context is scalable, ie a coord doesn't mean anything in this context.
wxFAIL_MSG(_("not implemented"));
return false;
}
-void wxGtkPrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxGtkPrinterImplDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{
if (m_pen.GetStyle() == wxTRANSPARENT) return;
SetPen( m_pen );
- gs_cairo->cairo_move_to ( m_cairo, LogicalToDeviceX(x1), LogicalToDeviceY(y1) );
- gs_cairo->cairo_line_to ( m_cairo, LogicalToDeviceX(x2), LogicalToDeviceY(y2) );
+ gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x1), YLOG2DEV(y1) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(x2), YLOG2DEV(y2) );
gs_cairo->cairo_stroke ( m_cairo );
CalcBoundingBox( x1, y1 );
CalcBoundingBox( x2, y2 );
}
-void wxGtkPrintDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxGtkPrinterImplDC::DoCrossHair(wxCoord x, wxCoord y)
{
- int *w, *h;
- w = new int;
- h = new int;
- DoGetSize(w, h);
+ int w, h;
+ DoGetSize(&w, &h);
SetPen(m_pen);
- gs_cairo->cairo_move_to (m_cairo, LogicalToDeviceX(x), 0);
- gs_cairo->cairo_line_to (m_cairo, LogicalToDeviceX(x), *h);
- gs_cairo->cairo_move_to (m_cairo, 0, LogicalToDeviceY(y));
- gs_cairo->cairo_line_to (m_cairo, *w, LogicalToDeviceY(y));
+ gs_cairo->cairo_move_to (m_cairo, XLOG2DEV(x), 0);
+ gs_cairo->cairo_line_to (m_cairo, XLOG2DEV(x), YLOG2DEVREL(h));
+ gs_cairo->cairo_move_to (m_cairo, 0, YLOG2DEV(y));
+ gs_cairo->cairo_line_to (m_cairo, XLOG2DEVREL(w), YLOG2DEV(y));
gs_cairo->cairo_stroke (m_cairo);
CalcBoundingBox( 0, 0 );
- CalcBoundingBox( *w, *h );
-
- delete w;
- delete h;
+ CalcBoundingBox( w, h );
}
-void wxGtkPrintDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
+void wxGtkPrinterImplDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc)
{
double dx = x1 - xc;
double dy = y1 - yc;
alpha1 *= DEG2RAD;
alpha2 *= DEG2RAD;
- gs_cairo->cairo_arc_negative ( m_cairo, LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel((int)radius), alpha1, alpha2);
- gs_cairo->cairo_line_to(m_cairo, LogicalToDeviceX(xc), LogicalToDeviceY(yc));
+ gs_cairo->cairo_new_path(m_cairo);
+
+ gs_cairo->cairo_arc_negative ( m_cairo, XLOG2DEV(xc), YLOG2DEV(yc), XLOG2DEVREL((int)radius), alpha1, alpha2);
+ gs_cairo->cairo_line_to(m_cairo, XLOG2DEV(xc), YLOG2DEV(yc));
gs_cairo->cairo_close_path (m_cairo);
SetBrush( m_brush );
CalcBoundingBox (x2, y2);
}
-void wxGtkPrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxGtkPrinterImplDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
{
gs_cairo->cairo_save( m_cairo );
- gs_cairo->cairo_translate( m_cairo, LogicalToDeviceX((wxCoord) (x + w / 2.)), LogicalToDeviceX((wxCoord) (y + h / 2.)) );
- double scale = (double)LogicalToDeviceYRel(h) / (double) LogicalToDeviceXRel(w);
+ gs_cairo->cairo_new_path(m_cairo);
+
+ gs_cairo->cairo_translate( m_cairo, XLOG2DEV((wxCoord) (x + w / 2.)), XLOG2DEV((wxCoord) (y + h / 2.)) );
+ double scale = (double)YLOG2DEVREL(h) / (double) XLOG2DEVREL(w);
gs_cairo->cairo_scale( m_cairo, 1.0, scale );
- gs_cairo->cairo_arc_negative ( m_cairo, 0, 0, LogicalToDeviceXRel(w/2), -sa*DEG2RAD, -ea*DEG2RAD);
+ gs_cairo->cairo_arc_negative ( m_cairo, 0, 0, XLOG2DEVREL(w/2), -sa*DEG2RAD, -ea*DEG2RAD);
SetPen (m_pen);
gs_cairo->cairo_stroke_preserve( m_cairo );
CalcBoundingBox( x+w, y+h );
}
-void wxGtkPrintDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxGtkPrinterImplDC::DoDrawPoint(wxCoord x, wxCoord y)
{
if (m_pen.GetStyle() == wxTRANSPARENT) return;
SetPen( m_pen );
- gs_cairo->cairo_move_to ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
- gs_cairo->cairo_line_to ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
+ gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
gs_cairo->cairo_stroke ( m_cairo );
CalcBoundingBox( x, y );
}
-void wxGtkPrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxGtkPrinterImplDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
{
if (m_pen.GetStyle() == wxTRANSPARENT) return;
for ( i =0; i<n ; i++ )
CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset);
- gs_cairo->cairo_move_to ( m_cairo, LogicalToDeviceX(points[0].x+xoffset), LogicalToDeviceY(points[0].y+yoffset) );
+ gs_cairo->cairo_move_to ( m_cairo, XLOG2DEV(points[0].x+xoffset), YLOG2DEV(points[0].y+yoffset) );
for (i = 1; i < n; i++)
- gs_cairo->cairo_line_to ( m_cairo, LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV(points[i].x+xoffset), YLOG2DEV(points[i].y+yoffset) );
gs_cairo->cairo_stroke ( m_cairo);
}
-void wxGtkPrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGtkPrinterImplDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
{
if (n==0) return;
int x = points[0].x + xoffset;
int y = points[0].y + yoffset;
gs_cairo->cairo_new_path(m_cairo);
- gs_cairo->cairo_move_to( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
+ gs_cairo->cairo_move_to( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
int i;
for (i = 1; i < n; i++)
{
int x = points[i].x + xoffset;
int y = points[i].y + yoffset;
- gs_cairo->cairo_line_to( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y) );
+ gs_cairo->cairo_line_to( m_cairo, XLOG2DEV(x), YLOG2DEV(y) );
}
gs_cairo->cairo_close_path(m_cairo);
gs_cairo->cairo_restore(m_cairo);
}
-void wxGtkPrintDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGtkPrinterImplDC::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
{
+#if wxUSE_NEW_DC
+ wxImplDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#else
wxDC::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
+#endif
}
-void wxGtkPrintDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGtkPrinterImplDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- gs_cairo->cairo_rectangle ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceXRel(width), LogicalToDeviceYRel(height));
+ width--;
+ height--;
+
+ gs_cairo->cairo_new_path(m_cairo);
+ gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
SetBrush( m_brush );
gs_cairo->cairo_fill_preserve( m_cairo );
CalcBoundingBox( x + width, y + height );
}
-void wxGtkPrintDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxGtkPrinterImplDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
+ width--;
+ height--;
+
if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
wxCoord dd = 2 * (wxCoord) radius;
wxCoord rad = (wxCoord) radius;
gs_cairo->cairo_new_path(m_cairo);
- gs_cairo->cairo_move_to(m_cairo,LogicalToDeviceX(x + rad),LogicalToDeviceY(y));
+ gs_cairo->cairo_move_to(m_cairo,XLOG2DEV(x + rad),YLOG2DEV(y));
gs_cairo->cairo_curve_to(m_cairo,
- LogicalToDeviceX(x + rad),LogicalToDeviceY(y),
- LogicalToDeviceX(x),LogicalToDeviceY(y),
- LogicalToDeviceX(x),LogicalToDeviceY(y + rad));
- gs_cairo->cairo_line_to(m_cairo,LogicalToDeviceX(x),LogicalToDeviceY(y + height - rad));
+ XLOG2DEV(x + rad),YLOG2DEV(y),
+ XLOG2DEV(x),YLOG2DEV(y),
+ XLOG2DEV(x),YLOG2DEV(y + rad));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x),YLOG2DEV(y + height - rad));
gs_cairo->cairo_curve_to(m_cairo,
- LogicalToDeviceX(x),LogicalToDeviceY(y + height - rad),
- LogicalToDeviceX(x),LogicalToDeviceY(y + height),
- LogicalToDeviceX(x + rad),LogicalToDeviceY(y + height));
- gs_cairo->cairo_line_to(m_cairo,LogicalToDeviceX(x + width - rad),LogicalToDeviceY(y + height));
+ XLOG2DEV(x),YLOG2DEV(y + height - rad),
+ XLOG2DEV(x),YLOG2DEV(y + height),
+ XLOG2DEV(x + rad),YLOG2DEV(y + height));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + width - rad),YLOG2DEV(y + height));
gs_cairo->cairo_curve_to(m_cairo,
- LogicalToDeviceX(x + width - rad),LogicalToDeviceY(y + height),
- LogicalToDeviceX(x + width),LogicalToDeviceY(y + height),
- LogicalToDeviceX(x + width),LogicalToDeviceY(y + height - rad));
- gs_cairo->cairo_line_to(m_cairo,LogicalToDeviceX(x + width),LogicalToDeviceY(y + rad));
+ XLOG2DEV(x + width - rad),YLOG2DEV(y + height),
+ XLOG2DEV(x + width),YLOG2DEV(y + height),
+ XLOG2DEV(x + width),YLOG2DEV(y + height - rad));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + width),YLOG2DEV(y + rad));
gs_cairo->cairo_curve_to(m_cairo,
- LogicalToDeviceX(x + width),LogicalToDeviceY(y + rad),
- LogicalToDeviceX(x + width),LogicalToDeviceY(y),
- LogicalToDeviceX(x + width - rad),LogicalToDeviceY(y));
- gs_cairo->cairo_line_to(m_cairo,LogicalToDeviceX(x + rad),LogicalToDeviceY(y));
+ XLOG2DEV(x + width),YLOG2DEV(y + rad),
+ XLOG2DEV(x + width),YLOG2DEV(y),
+ XLOG2DEV(x + width - rad),YLOG2DEV(y));
+ gs_cairo->cairo_line_to(m_cairo,XLOG2DEV(x + rad),YLOG2DEV(y));
gs_cairo->cairo_close_path(m_cairo);
SetBrush(m_brush);
CalcBoundingBox(x+width,y+height);
}
-void wxGtkPrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGtkPrinterImplDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
+ width--;
+ height--;
+
gs_cairo->cairo_save (m_cairo);
- gs_cairo->cairo_translate (m_cairo, LogicalToDeviceX((wxCoord) (x + width / 2.)), LogicalToDeviceY((wxCoord) (y + height / 2.)));
- gs_cairo->cairo_scale(m_cairo, 1, (double)LogicalToDeviceYRel(height)/(double)LogicalToDeviceXRel(width));
- gs_cairo->cairo_arc ( m_cairo, 0, 0, LogicalToDeviceXRel(width/2), 0, 2 * M_PI);
+ gs_cairo->cairo_new_path(m_cairo);
+
+ gs_cairo->cairo_translate (m_cairo, XLOG2DEV((wxCoord) (x + width / 2.)), YLOG2DEV((wxCoord) (y + height / 2.)));
+ gs_cairo->cairo_scale(m_cairo, 1, (double)YLOG2DEVREL(height)/(double)XLOG2DEVREL(width));
+ gs_cairo->cairo_arc ( m_cairo, 0, 0, XLOG2DEVREL(width/2), 0, 2 * M_PI);
SetBrush( m_brush );
gs_cairo->cairo_fill_preserve( m_cairo );
}
#if wxUSE_SPLINES
-void wxGtkPrintDC::DoDrawSpline(wxList *points)
+void wxGtkPrinterImplDC::DoDrawSpline(const wxPointList *points)
{
SetPen (m_pen);
double c, d, x1, y1, x2, y2, x3, y3;
wxPoint *p, *q;
- wxList::compatibility_iterator node = points->GetFirst();
- p = (wxPoint *)node->GetData();
+ wxPointList::compatibility_iterator node = points->GetFirst();
+ p = node->GetData();
x1 = p->x;
y1 = p->y;
node = node->GetNext();
- p = (wxPoint *)node->GetData();
+ p = node->GetData();
c = p->x;
d = p->y;
x3 =
(double)(y1 + d) / 2;
gs_cairo->cairo_new_path( m_cairo );
- gs_cairo->cairo_move_to( m_cairo, LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1) );
- gs_cairo->cairo_line_to( m_cairo, LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
+ gs_cairo->cairo_move_to( m_cairo, XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1) );
+ gs_cairo->cairo_line_to( m_cairo, XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
node = node->GetNext();
while (node)
{
- q = (wxPoint *)node->GetData();
+ q = node->GetData();
x1 = x3;
y1 = y3;
y3 = (double)(y2 + d) / 2;
gs_cairo->cairo_curve_to(m_cairo,
- LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
- LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2),
- LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
+ XLOG2DEV((wxCoord)x1), YLOG2DEV((wxCoord)y1),
+ XLOG2DEV((wxCoord)x2), YLOG2DEV((wxCoord)y2),
+ XLOG2DEV((wxCoord)x3), YLOG2DEV((wxCoord)y3) );
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
node = node->GetNext();
}
- gs_cairo->cairo_line_to ( m_cairo, LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
+ gs_cairo->cairo_line_to ( m_cairo, XLOG2DEV((wxCoord)c), YLOG2DEV((wxCoord)d) );
gs_cairo->cairo_stroke( m_cairo );
}
#endif // wxUSE_SPLINES
-bool wxGtkPrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
- wxCoord xsrcMask, wxCoord ysrcMask)
+bool wxGtkPrinterImplDC::DoBlit(wxCoord xdest, wxCoord ydest,
+ wxCoord width, wxCoord height,
+ wxDC *source, wxCoord xsrc, wxCoord ysrc,
+ int rop, bool useMask,
+ wxCoord WXUNUSED_UNLESS_DEBUG(xsrcMask),
+ wxCoord WXUNUSED_UNLESS_DEBUG(ysrcMask))
{
+ wxASSERT_MSG( xsrcMask == wxDefaultCoord && ysrcMask == wxDefaultCoord,
+ wxT("mask coordinates are not supported") );
+
wxCHECK_MSG( source, false, wxT("invalid source dc") );
// Blit into a bitmap.
memDC.SelectObject(wxNullBitmap);
// Draw bitmap. scaling and positioning is done there.
- DrawBitmap( bitmap, xdest, ydest, useMask );
+ GetOwner()->DrawBitmap( bitmap, xdest, ydest, useMask );
return true;
}
-void wxGtkPrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void wxGtkPrinterImplDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
{
DoDrawBitmap( icon, x, y, true );
}
-void wxGtkPrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
+void wxGtkPrinterImplDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
{
- wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrintDC::DoDrawBitmap"));
+ wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrinterImplDC::DoDrawBitmap"));
cairo_surface_t* surface;
- x = LogicalToDeviceX(x);
- y = LogicalToDeviceY(y);
+ x = wxCoord(XLOG2DEV(x));
+ y = wxCoord(YLOG2DEV(y));
int bw = bitmap.GetWidth();
int bh = bitmap.GetHeight();
wxBitmap bmpSource = bitmap; // we need a non-const instance.
// blue. The 32-bit quantities are stored native-endian.
// Pre-multiplied alpha is used.
unsigned char alpha = p.Alpha();
- if (alpha == 0)
- *data = 0;
- else
- *data = ( alpha/255 << 24
- | (p.Red() * alpha/255) << 16
- | (p.Green() * alpha/255) << 8
- | (p.Blue() * alpha/255) );
- ++data;
- ++p;
- }
- p = rowStart;
- p.OffsetY(pixData, 1);
- }
- }
- else // no alpha
- {
- surface = gs_cairo->cairo_image_surface_create_for_data(
- buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
- wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
- wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
-
- wxNativePixelData::Iterator p(pixData);
- int y, x;
- for (y=0; y<bh; y++)
- {
- wxNativePixelData::Iterator rowStart = p;
- for (x=0; x<bw; x++)
- {
- // Each pixel in CAIRO_FORMAT_RGB24 is a 32-bit quantity, with
- // the upper 8 bits unused. Red, Green, and Blue are stored in
- // the remaining 24 bits in that order. The 32-bit quantities
- // are stored native-endian.
- *data = ( p.Red() << 16 | p.Green() << 8 | p.Blue() );
- ++data;
- ++p;
- }
- p = rowStart;
- p.OffsetY(pixData, 1);
- }
- }
-
-
- gs_cairo->cairo_save(m_cairo);
- // In case we're scaling the image by using a width and height different
- // than the bitmap's size create a pattern transformation on the surface and
- // draw the transformed pattern.
- cairo_pattern_t* pattern = gs_cairo->cairo_pattern_create_for_surface(surface);
-
- // Prepare to draw the image.
- gs_cairo->cairo_translate(m_cairo, x, y);
- gs_cairo->cairo_set_source(m_cairo, pattern);
- // Use the original size here since the context is scaled already.
- gs_cairo->cairo_rectangle(m_cairo, 0, 0, bw, bh);
- // Fill the rectangle using the pattern.
- gs_cairo->cairo_fill(m_cairo);
-
- // Clean up.
- gs_cairo->cairo_pattern_destroy(pattern);
- gs_cairo->cairo_surface_destroy(surface);
- delete [] buffer;
-
- CalcBoundingBox(0,0);
- CalcBoundingBox(bw,bh);
-
- gs_cairo->cairo_restore(m_cairo);
-}
-// wxGtkPrintDC has a constant resolution of 72dpi. If we want an higher resolution for printing
-// an image, the scaling has to be done by cairo.
-void wxGtkPrintDC::DoDrawScaledBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, wxCoord w, wxCoord h, bool useMask, int quality )
-{
- wxCHECK_RET( bitmap.IsOk(), wxT("Invalid bitmap in wxGtkPrintDC::DoDrawBitmap"));
+ if (!bmpSource.HasAlpha() && mask)
+ alpha = 255;
- cairo_surface_t* surface;
- int bw = bitmap.GetWidth();
- int bh = bitmap.GetHeight();
- x = LogicalToDeviceX(x);
- y = LogicalToDeviceY(y);
- w = LogicalToDeviceXRel(w);
- h = LogicalToDeviceYRel(h);
- wxBitmap bmpSource = bitmap; // we need a non-const instance.
- unsigned char* buffer = new unsigned char[bw*bh*4];
- wxUint32* data = (wxUint32*)buffer;
-
- // Create a surface object and copy the bitmap pixel data to it. If the image has alpha (or a mask represented as alpha)
- // then we'll use a different format and iterator than if it doesn't.
- if (bmpSource.HasAlpha() || bmpSource.GetMask())
- {
- surface = gs_cairo->cairo_image_surface_create_for_data(
- buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4);
- wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
- wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
-
- wxAlphaPixelData::Iterator p(pixData);
- int y, x;
- for (y=0; y<bh; y++)
- {
- wxAlphaPixelData::Iterator rowStart = p;
- for (x=0; x<bw; x++)
- {
- // Each pixel in CAIRO_FORMAT_ARGB32 is a 32-bit quantity,
- // with alpha in the upper 8 bits, then red, then green, then
- // blue. The 32-bit quantities are stored native-endian.
- // Pre-multiplied alpha is used.
- unsigned char alpha = p.Alpha();
if (alpha == 0)
*data = 0;
else
// Prepare to draw the image.
gs_cairo->cairo_translate(m_cairo, x, y);
- // In case we're scaling the image by using a width and height different
- // than the bitmap's size create a pattern transformation on the surface and
- // draw the transformed pattern.
- cairo_filter_t filter;
- if (quality == wxIMAGE_QUALITY_HIGH) filter = CAIRO_FILTER_BILINEAR;
- else filter = CAIRO_FILTER_GOOD;
- cairo_pattern_t* pattern = gs_cairo->cairo_pattern_create_for_surface(surface);
- gs_cairo->cairo_pattern_set_filter(pattern,filter);
- wxDouble scaleX = (wxDouble) w / (wxDouble) bw;
- wxDouble scaleY = (wxDouble) h / (wxDouble) bh;
- gs_cairo->cairo_scale(m_cairo, scaleX, scaleY);
+ // Scale the image
+ cairo_filter_t filter = CAIRO_FILTER_BILINEAR;
+ cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+ cairo_pattern_set_filter(pattern,filter);
+ wxDouble scaleX = (wxDouble) XLOG2DEVREL(bw) / (wxDouble) bw;
+ wxDouble scaleY = (wxDouble) YLOG2DEVREL(bh) / (wxDouble) bh;
+ cairo_scale(m_cairo, scaleX, scaleY);
gs_cairo->cairo_set_source(m_cairo, pattern);
// Use the original size here since the context is scaled already.
gs_cairo->cairo_restore(m_cairo);
}
-void wxGtkPrintDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
+void wxGtkPrinterImplDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y )
{
DoDrawRotatedText( text, x, y, 0.0 );
}
-void wxGtkPrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+void wxGtkPrinterImplDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
{
- x = LogicalToDeviceX(x);
- y = LogicalToDeviceY(y);
+ double xx = XLOG2DEV(x);
+ double yy = YLOG2DEV(y);
angle = -angle;
bool underlined = m_font.Ok() && m_font.GetUnderlined();
-// FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
-#if wxUSE_UNICODE_UTF8
- const char *data = text.utf8_str();
-#else
- const wxCharBuffer data = text.utf8_str();
-#endif
+ const wxUTF8Buf data = text.utf8_str();
size_t datalen = strlen(data);
pango_layout_set_text( m_layout, data, datalen);
int w,h;
- if (fabs(m_scaleY - 1.0) > 0.00001)
- {
- // 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 );
+ // Scale font description.
+ gint oldSize = pango_font_description_get_size( m_fontdesc );
+ double size = oldSize;
+ size = size * m_scaleX;
+ pango_font_description_set_size( m_fontdesc, (gint)size );
- // Actually apply scaled font.
- pango_layout_set_font_description( m_layout, m_fontdesc );
+ // Actually apply scaled font.
+ pango_layout_set_font_description( m_layout, m_fontdesc );
- pango_layout_get_pixel_size( m_layout, &w, &h );
- w = LogicalToDeviceXRel(w);
- h = LogicalToDeviceYRel(h);
+ pango_layout_get_pixel_size( m_layout, &w, &h );
if ( m_backgroundMode == wxSOLID )
{
double alphaPS = (double)(alpha) / 255.0;
gs_cairo->cairo_save(m_cairo);
- gs_cairo->cairo_translate(m_cairo, x, y);
+ gs_cairo->cairo_translate(m_cairo, xx, yy);
gs_cairo->cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
gs_cairo->cairo_rotate(m_cairo,angle*DEG2RAD);
- gs_cairo->cairo_rectangle(m_cairo, 0, 0, w, h);
+ gs_cairo->cairo_rectangle(m_cairo, 0, 0, w, h); // still in cairo units
gs_cairo->cairo_fill(m_cairo);
gs_cairo->cairo_restore(m_cairo);
}
- // Draw layout.
- gs_cairo->cairo_move_to (m_cairo, x, y);
- if (fabs(angle) > 0.00001)
- {
- gs_cairo->cairo_save( m_cairo );
- gs_cairo->cairo_rotate( m_cairo, angle*DEG2RAD );
- // pango_cairo_update_layout (m_cairo, m_layout);
- // pango_cairo_show_layout (m_cairo, m_layout);
- gs_cairo->cairo_restore( m_cairo );
- }
- else
- {
- // pango_cairo_update_layout (m_cairo, m_layout);
- // pango_cairo_show_layout (m_cairo, m_layout);
- }
+ // Draw layout.
+ gs_cairo->cairo_move_to (m_cairo, xx, yy);
- // Reset unscaled size.
- pango_font_description_set_size( m_fontdesc, oldSize );
+ gs_cairo->cairo_save( m_cairo );
- // Actually apply unscaled font.
- pango_layout_set_font_description( m_layout, m_fontdesc );
- }
- else
- {
- pango_layout_get_pixel_size( m_layout, &w, &h );
+ if (fabs(angle) > 0.00001)
+ gs_cairo->cairo_rotate( m_cairo, angle*DEG2RAD );
- if ( m_backgroundMode == wxSOLID )
- {
- unsigned char red = m_textBackgroundColour.Red();
- unsigned char blue = m_textBackgroundColour.Blue();
- unsigned char green = m_textBackgroundColour.Green();
- unsigned char alpha = m_textBackgroundColour.Alpha();
+ gs_cairo->pango_cairo_update_layout (m_cairo, m_layout);
+ gs_cairo->pango_cairo_show_layout (m_cairo, m_layout);
- double redPS = (double)(red) / 255.0;
- double bluePS = (double)(blue) / 255.0;
- double greenPS = (double)(green) / 255.0;
- double alphaPS = (double)(alpha) / 255.0;
-
- gs_cairo->cairo_save(m_cairo);
- gs_cairo->cairo_translate(m_cairo, x, y);
- gs_cairo->cairo_set_source_rgba( m_cairo, redPS, greenPS, bluePS, alphaPS );
- gs_cairo->cairo_rotate(m_cairo,angle*DEG2RAD);
- gs_cairo->cairo_rectangle(m_cairo, 0, 0, w, h);
- gs_cairo->cairo_fill(m_cairo);
- gs_cairo->cairo_restore(m_cairo);
- }
-
- // Draw layout.
- gs_cairo->cairo_move_to (m_cairo, x, y);
- if (fabs(angle) > 0.00001)
- {
- gs_cairo->cairo_save( m_cairo );
- gs_cairo->cairo_rotate( m_cairo, angle*DEG2RAD );
- // pango_cairo_update_layout (m_cairo, m_layout);
- // pango_cairo_show_layout (m_cairo, m_layout);
- gs_cairo->cairo_restore( m_cairo );
- }
- else
- {
- // pango_cairo_update_layout (m_cairo, m_layout);
- // pango_cairo_show_layout (m_cairo, m_layout);
- }
- }
+ gs_cairo->cairo_restore( m_cairo );
if (underlined)
{
pango_layout_set_attributes(m_layout, NULL);
}
- CalcBoundingBox (x,y);
+ // Reset unscaled size.
+ pango_font_description_set_size( m_fontdesc, oldSize );
+
+ // Actually apply unscaled font.
+ pango_layout_set_font_description( m_layout, m_fontdesc );
+
+ // Back to device units:
+ CalcBoundingBox (x, y);
CalcBoundingBox (x + w, y + h);
}
-void wxGtkPrintDC::Clear()
+void wxGtkPrinterImplDC::Clear()
{
+// Clear does nothing for printing, but keep the code
+// for later reuse
+/*
gs_cairo->cairo_save(m_cairo);
gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE);
SetBrush(m_backgroundBrush);
gs_cairo->cairo_paint(m_cairo);
gs_cairo->cairo_restore(m_cairo);
+*/
}
-void wxGtkPrintDC::SetFont( const wxFont& font )
+void wxGtkPrinterImplDC::SetFont( const wxFont& font )
{
m_font = font;
if (m_fontdesc)
pango_font_description_free( m_fontdesc );
- m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+ m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description ); // m_fontdesc is now set to device units
+
+ // Scale font description from device units to pango units
+ gint oldSize = pango_font_description_get_size( m_fontdesc );
+ double size = oldSize *m_DEV2PS; // scale to cairo units
+ pango_font_description_set_size( m_fontdesc, (gint)size ); // apply to description
+ // Actually apply scaled font.
pango_layout_set_font_description( m_layout, m_fontdesc );
}
}
-void wxGtkPrintDC::SetPen( const wxPen& pen )
+void wxGtkPrinterImplDC::SetPen( const wxPen& pen )
{
if (!pen.Ok()) return;
m_pen = pen;
- double width = (double) m_pen.GetWidth();
- if (width == 0) width = 0.1;
+ double width;
+
+ if (m_pen.GetWidth() <= 0)
+ width = 0.1;
+ else
+ width = (double) m_pen.GetWidth();
- gs_cairo->cairo_set_line_width( m_cairo, LogicalToDeviceXRel( (wxCoord) (1000 * width )) / 1000.0f );
+ gs_cairo->cairo_set_line_width( m_cairo, width * m_DEV2PS * m_scaleX );
static const double dotted[] = {2.0, 5.0};
static const double short_dashed[] = {4.0, 4.0};
static const double long_dashed[] = {4.0, 8.0};
switch (m_pen.GetStyle())
{
- case wxDOT: gs_cairo->cairo_set_dash( m_cairo, dotted, 1, 0 ); break;
- case wxSHORT_DASH: gs_cairo->cairo_set_dash( m_cairo, short_dashed, 1, 0 ); break;
- case wxLONG_DASH: gs_cairo->cairo_set_dash( m_cairo, long_dashed, 1, 0 ); break;
- case wxDOT_DASH: gs_cairo->cairo_set_dash( m_cairo, dotted_dashed, 3, 0 ); break;
+ case wxDOT: gs_cairo->cairo_set_dash( m_cairo, dotted, 2, 0 ); break;
+ case wxSHORT_DASH: gs_cairo->cairo_set_dash( m_cairo, short_dashed, 2, 0 ); break;
+ case wxLONG_DASH: gs_cairo->cairo_set_dash( m_cairo, long_dashed, 2, 0 ); break;
+ case wxDOT_DASH: gs_cairo->cairo_set_dash( m_cairo, dotted_dashed, 4, 0 ); break;
case wxUSER_DASH:
{
wxDash *wx_dashes;
- int num = m_pen.GetDashes (&wx_dashes) - 1;
+ int num = m_pen.GetDashes (&wx_dashes);
gdouble *g_dashes = g_new( gdouble, num );
int i;
for (i = 0; i < num; ++i)
}
}
-void wxGtkPrintDC::SetBrush( const wxBrush& brush )
+void wxGtkPrinterImplDC::SetBrush( const wxBrush& brush )
{
if (!brush.Ok()) return;
m_brush = brush;
+ if (m_brush.GetStyle() == wxTRANSPARENT)
+ {
+ gs_cairo->cairo_set_source_rgba( m_cairo, 0, 0, 0, 0 );
+ m_currentRed = 0;
+ m_currentBlue = 0;
+ m_currentGreen = 0;
+ m_currentAlpha = 0;
+ return;
+ }
+
// Brush colour.
unsigned char red = m_brush.GetColour().Red();
unsigned char blue = m_brush.GetColour().Blue();
}
}
-void wxGtkPrintDC::SetLogicalFunction( int function )
+void wxGtkPrinterImplDC::SetLogicalFunction( int function )
{
if (function == wxCLEAR)
gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR);
gs_cairo->cairo_set_operator (m_cairo, CAIRO_OPERATOR_SOURCE);
}
-void wxGtkPrintDC::SetBackground( const wxBrush& brush )
+void wxGtkPrinterImplDC::SetBackground( const wxBrush& brush )
{
m_backgroundBrush = brush;
gs_cairo->cairo_save(m_cairo);
gs_cairo->cairo_restore(m_cairo);
}
-void wxGtkPrintDC::SetBackgroundMode(int mode)
+void wxGtkPrinterImplDC::SetBackgroundMode(int mode)
{
- if (mode == wxSOLID) m_backgroundMode = wxSOLID;
- else m_backgroundMode = wxTRANSPARENT;
+ if (mode == wxSOLID)
+ m_backgroundMode = wxSOLID;
+ else
+ m_backgroundMode = wxTRANSPARENT;
}
-void wxGtkPrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxGtkPrinterImplDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- gs_cairo->cairo_rectangle ( m_cairo, LogicalToDeviceX(x), LogicalToDeviceY(y), LogicalToDeviceXRel(width), LogicalToDeviceYRel(height));
+ gs_cairo->cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
gs_cairo->cairo_clip(m_cairo);
}
-void wxGtkPrintDC::DestroyClippingRegion()
+void wxGtkPrinterImplDC::DestroyClippingRegion()
{
gs_cairo->cairo_reset_clip(m_cairo);
}
-bool wxGtkPrintDC::StartDoc(const wxString& message)
+bool wxGtkPrinterImplDC::StartDoc(const wxString& WXUNUSED(message))
{
return true;
}
-void wxGtkPrintDC::EndDoc()
+void wxGtkPrinterImplDC::EndDoc()
{
return;
}
-void wxGtkPrintDC::StartPage()
+void wxGtkPrinterImplDC::StartPage()
{
return;
}
-void wxGtkPrintDC::EndPage()
+void wxGtkPrinterImplDC::EndPage()
{
return;
}
-wxCoord wxGtkPrintDC::GetCharHeight() const
+wxCoord wxGtkPrinterImplDC::GetCharHeight() const
{
pango_layout_set_text( m_layout, "H", 1 );
int w,h;
pango_layout_get_pixel_size( m_layout, &w, &h );
- return DeviceToLogicalYRel(h);
+ return wxRound( h * m_PS2DEV );
}
-wxCoord wxGtkPrintDC::GetCharWidth() const
+wxCoord wxGtkPrinterImplDC::GetCharWidth() const
{
pango_layout_set_text( m_layout, "H", 1 );
int w,h;
pango_layout_get_pixel_size( m_layout, &w, &h );
- return DeviceToLogicalXRel(w);
+ return wxRound( w * m_PS2DEV );
}
-void wxGtkPrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
+void wxGtkPrinterImplDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxCoord *height,
wxCoord *descent,
wxCoord *externalLeading,
const wxFont *theFont ) const
}
// Set layout's text
- // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
-#if wxUSE_UNICODE_UTF8
- const char *dataUTF8 = string.utf8_str();
-#else
- const wxCharBuffer dataUTF8 = string.utf8_str();
-#endif
+ const wxUTF8Buf dataUTF8 = string.utf8_str();
PangoFontDescription *desc = m_fontdesc;
if (theFont) desc = theFont->GetNativeFontInfo()->description;
pango_layout_get_pixel_size( m_layout, &w, &h );
if (width)
- *width = (wxCoord)(w / m_scaleX);
+ *width = wxRound( (double)w / m_scaleX * m_PS2DEV );
if (height)
- *height = (wxCoord)(h / m_scaleY);
+ *height = wxRound( (double)h / m_scaleY * m_PS2DEV );
+
if (descent)
{
PangoLayoutIter *iter = pango_layout_get_iter(m_layout);
int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter);
- *descent = h - PANGO_PIXELS(baseline);
+ *descent = wxRound( (h - PANGO_PIXELS(baseline)) * m_PS2DEV );
}
// Reset unscaled size.
pango_layout_set_font_description( m_layout, m_fontdesc );
}
-void wxGtkPrintDC::DoGetSize(int* width, int* height) const
+void wxGtkPrinterImplDC::DoGetSize(int* width, int* height) const
{
+ GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
+
if (width)
- *width = (int) (gtk_print_context_get_width( m_gpc ) + 0.5);
+ *width = wxRound( gtk_page_setup_get_paper_width( setup, GTK_UNIT_POINTS ) * m_PS2DEV );
if (height)
- *height = (int) (gtk_print_context_get_height( m_gpc ) + 0.5);
+ *height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_POINTS ) * m_PS2DEV );
}
-void wxGtkPrintDC::DoGetSizeMM(int *width, int *height) const
+void wxGtkPrinterImplDC::DoGetSizeMM(int *width, int *height) const
{
- // This function takes margins into consideration.
- gdouble w = gtk_page_setup_get_page_width( gtk_print_context_get_page_setup( m_gpc ), GTK_UNIT_MM);
- gdouble h = gtk_page_setup_get_page_height( gtk_print_context_get_page_setup( m_gpc ), GTK_UNIT_MM);
+ GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
if (width)
- *width = (int) (w + 0.5);
+ *width = wxRound( gtk_page_setup_get_paper_width( setup, GTK_UNIT_MM ) );
if (height)
- *height = (int) (h + 0.5);
-}
-
-wxSize wxGtkPrintDC::GetPPI() const
-{
- gdouble xDpi = gtk_print_context_get_dpi_x( m_gpc );
- gdouble yDpi = gtk_print_context_get_dpi_y( m_gpc );
- return wxSize((int) xDpi,(int) yDpi);
-}
-
-void wxGtkPrintDC::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
- wxDC::SetLogicalOrigin( x, y );
+ *height = wxRound( gtk_page_setup_get_paper_height( setup, GTK_UNIT_MM ) );
}
-void wxGtkPrintDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+wxSize wxGtkPrinterImplDC::GetPPI() const
{
- wxDC::SetDeviceOrigin( x, y );
+ return wxSize( (int)m_resolution, (int)m_resolution );
}
-void wxGtkPrintDC::SetPrintData(const wxPrintData& data)
+void wxGtkPrinterImplDC::SetPrintData(const wxPrintData& data)
{
m_printData = data;
-
- if (m_printData.GetOrientation() == wxPORTRAIT)
- GetSize( &m_deviceOffsetX, &m_deviceOffsetY );
- else
- GetSize( &m_deviceOffsetY, &m_deviceOffsetX );
}
-void wxGtkPrintDC::SetResolution(int ppi)
+// overriden for wxPrinterDC Impl
+
+wxRect wxGtkPrinterImplDC::GetPaperRect()
{
- // We can't change ppi of the GtkPrintContext.
- ms_resolution = ppi;
+ // Does GtkPrint support printer margins?
+ int w = 0;
+ int h = 0;
+ DoGetSize( &w, &h );
+ return wxRect( 0,0,w,h );
}
-int wxGtkPrintDC::GetResolution()
+int wxGtkPrinterImplDC::GetResolution()
{
- return ms_resolution;
+ return m_resolution;
}
// ----------------------------------------------------------------------------
m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
(int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
- m_previewPrintout->SetPPIPrinter(wxGtkPrintDC::GetResolution(), wxGtkPrintDC::GetResolution());
+
+ // TODO !!!!!!!!!!!!!!!
+ int resolution = 600;
+ m_previewPrintout->SetPPIPrinter( resolution, resolution );
+
// Get width and height in points (1/72th of an inch)
wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
- sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxGtkPrintDC::GetResolution() / 72.0);
- sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxGtkPrintDC::GetResolution() / 72.0);
+ sizeDevUnits.x = wxRound((double)sizeDevUnits.x * (double)resolution / 72.0);
+ sizeDevUnits.y = wxRound((double)sizeDevUnits.y * (double)resolution / 72.0);
wxSize sizeTenthsMM(paper->GetSize());
wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
// At 100%, the page should look about page-size on the screen.
- m_previewScaleX = (float)0.8 * 72.0 / (float)wxGtkPrintDC::GetResolution();
+ m_previewScaleX = 0.8 * 72.0 / (double)resolution;
m_previewScaleY = m_previewScaleX;
}
}
projects / wxWidgets.git / blobdiff