Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted fragment

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-18 15:06:53 +00:00
parent 8bd2a80432
commit a47391f3f9
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/generic/dcpsg.cpp
View File

@@ -85,7 +85,7 @@ static const char *wxPostScriptHeaderConicTo = "\
p1_x p1_y p2_x p2_y to_x to_y curveto\n\ p1_x p1_y p2_x p2_y to_x to_y curveto\n\
} bind def\n\ } bind def\n\
"; ";
static const char *wxPostScriptHeaderEllipse = "\ static const char *wxPostScriptHeaderEllipse = "\
/ellipsedict 8 dict def\n\ /ellipsedict 8 dict def\n\
ellipsedict /mtrx matrix put\n\ ellipsedict /mtrx matrix put\n\
@@ -321,7 +321,7 @@ bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow
wxPrintData data; wxPrintData data;
data.SetFilename( output ); data.SetFilename( output );
data.SetPrintMode( wxPRINT_MODE_FILE ); data.SetPrintMode( wxPRINT_MODE_FILE );
if (interactive) if (interactive)
{ {
wxPrintDialogData ddata( data ); wxPrintDialogData ddata( data );
@@ -334,7 +334,7 @@ bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow
} }
data = dialog.GetPrintDialogData().GetPrintData(); data = dialog.GetPrintDialogData().GetPrintData();
} }
return TRUE; return TRUE;
} }
#endif #endif
@@ -1184,7 +1184,7 @@ static int paps_cubic_to( FT_Vector* control1,
OutlineInfo *outline_info = (OutlineInfo*)user_data; OutlineInfo *outline_info = (OutlineInfo*)user_data;
fprintf(outline_info->file, fprintf(outline_info->file,
"%d %d %d %d %d %d curveto\n", "%d %d %d %d %d %d curveto\n",
(int)control1->x , (int)control1->x ,
(int)control1->y , (int)control1->y ,
(int)control2->x , (int)control2->x ,
(int)control2->y , (int)control2->y ,
@@ -1204,20 +1204,20 @@ void draw_bezier_outline(FILE *file,
FT_Int load_flags = FT_LOAD_NO_BITMAP; FT_Int load_flags = FT_LOAD_NO_BITMAP;
FT_Glyph glyph; FT_Glyph glyph;
FT_Outline_Funcs outlinefunc = FT_Outline_Funcs outlinefunc =
{ {
paps_move_to, paps_move_to,
paps_line_to, paps_line_to,
paps_conic_to, paps_conic_to,
paps_cubic_to paps_cubic_to
}; };
OutlineInfo outline_info; OutlineInfo outline_info;
outline_info.file = file; outline_info.file = file;
fprintf(file, "gsave\n"); fprintf(file, "gsave\n");
fprintf(file, "%d %d translate\n", pos_x, pos_y ); fprintf(file, "%d %d translate\n", pos_x, pos_y );
// We have to replace the "," from the German // We have to replace the "," from the German
// locale with the Englich "." for PostScript // locale with the Englich "." for PostScript
char buf[100]; char buf[100];
@@ -1231,7 +1231,7 @@ void draw_bezier_outline(FILE *file,
FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline), FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline),
&outlinefunc, &outline_info); &outlinefunc, &outline_info);
fprintf(file, "closepath fill grestore\n"); fprintf(file, "closepath fill grestore\n");
FT_Done_Glyph (glyph); FT_Done_Glyph (glyph);
} }
@@ -1280,12 +1280,12 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
m_currentGreen = green; m_currentGreen = green;
} }
} }
#if wxUSE_PANGO #if wxUSE_PANGO
int ps_dpi = 72; int ps_dpi = 72;
int pango_dpi = 600; int pango_dpi = 600;
PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi ); PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
double scale = (double)pango_dpi / (double)ps_dpi; double scale = (double)pango_dpi / (double)ps_dpi;
scale /= m_userScaleY; scale /= m_userScaleY;
@@ -1301,15 +1301,15 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
wxCharBuffer buffer = wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ); wxCharBuffer buffer = wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) );
#endif #endif
pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) ); pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) );
fprintf( m_pstream, "%%%% %s\n", (const char*)buffer ); fprintf( m_pstream, "%%%% %s\n", (const char*)buffer );
PangoRectangle rect; PangoRectangle rect;
pango_layout_get_extents(layout, NULL, &rect); pango_layout_get_extents(layout, NULL, &rect);
int xx = LogicalToDeviceX( x ); int xx = LogicalToDeviceX( x );
int yy = LogicalToDeviceY( y ); int yy = LogicalToDeviceY( y );
int xxx = xx * PANGO_SCALE; int xxx = xx * PANGO_SCALE;
int yyy = yy * PANGO_SCALE - (int)(rect.height * 0.66 / scale); // Move down by estimated baseline. HACK. int yyy = yy * PANGO_SCALE - (int)(rect.height * 0.66 / scale); // Move down by estimated baseline. HACK.
@@ -1320,10 +1320,10 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
for (int i = 0; i < num_lines; i++) for (int i = 0; i < num_lines; i++)
{ {
PangoLayoutLine *line = pango_layout_get_line( layout, i ); PangoLayoutLine *line = pango_layout_get_line( layout, i );
// width of glyphs already printed // width of glyphs already printed
int all_width = 0; int all_width = 0;
// Loop over runs in line // Loop over runs in line
GSList *runs_list = line->runs; GSList *runs_list = line->runs;
while (runs_list) while (runs_list)
@@ -1334,7 +1334,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
PangoAnalysis *analysis = &item->analysis; PangoAnalysis *analysis = &item->analysis;
PangoFont *font = analysis->font; PangoFont *font = analysis->font;
FT_Face ft_face = pango_ft2_font_get_face(font); FT_Face ft_face = pango_ft2_font_get_face(font);
int num_glyphs = glyphs->num_glyphs; int num_glyphs = glyphs->num_glyphs;
for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++) for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++)
{ {
@@ -1342,12 +1342,12 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
int pos_x = xxx + (int)((double)(all_width+geometry.x_offset) / scale); int pos_x = xxx + (int)((double)(all_width+geometry.x_offset) / scale);
int pos_y = yyy + (int)((double)geometry.y_offset / scale ); int pos_y = yyy + (int)((double)geometry.y_offset / scale );
all_width += geometry.width; all_width += geometry.width;
draw_bezier_outline( m_pstream, ft_face, draw_bezier_outline( m_pstream, ft_face,
(FT_UInt)(glyphs->glyphs[glyph_idx].glyph), (FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
pos_x / PANGO_SCALE, pos_x / PANGO_SCALE,
pos_y / PANGO_SCALE, pos_y / PANGO_SCALE,
1.0/(ps_kludge_factor * scale * 26.6), 1.0/(ps_kludge_factor * scale * 26.6),
1.0/(ps_kludge_factor * scale * 26.6) ); 1.0/(ps_kludge_factor * scale * 26.6) );
} }
runs_list = runs_list->next; runs_list = runs_list->next;
@@ -1577,15 +1577,15 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
p = (wxPoint *)node->GetData(); p = (wxPoint *)node->GetData();
c = p->x; c = p->x;
d = p->y; d = p->y;
x3 = x3 =
#if 0 #if 0
a = a =
#endif #endif
(double)(x1 + c) / 2; (double)(x1 + c) / 2;
y3 = y3 =
#if 0 #if 0
b = b =
#endif #endif
(double)(y1 + d) / 2; (double)(y1 + d) / 2;
fprintf( m_pstream, fprintf( m_pstream,
@@ -1598,8 +1598,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
node = node->GetNext(); while ((node = node->GetNext()))
while (node)
{ {
q = (wxPoint *)node->GetData(); q = (wxPoint *)node->GetData();
@@ -1755,9 +1754,9 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
fprintf( m_pstream, "%%%%Orientation: Landscape\n" ); fprintf( m_pstream, "%%%%Orientation: Landscape\n" );
else else
fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); fprintf( m_pstream, "%%%%Orientation: Portrait\n" );
// fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) );
const char *paper; const char *paper;
switch (m_printData.GetPaperId()) switch (m_printData.GetPaperId())
{ {
@@ -1821,7 +1820,7 @@ void wxPostScriptDC::EndDoc ()
fclose( m_pstream ); fclose( m_pstream );
m_pstream = (FILE *) NULL; m_pstream = (FILE *) NULL;
#if 0 #if 0
// THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe <andy@hyperparallel.com> // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe <andy@hyperparallel.com>
wxCoord wx_printer_translate_x, wx_printer_translate_y; wxCoord wx_printer_translate_x, wx_printer_translate_y;
double wx_printer_scale_x, wx_printer_scale_y; double wx_printer_scale_x, wx_printer_scale_y;
@@ -1889,7 +1888,7 @@ void wxPostScriptDC::EndDoc ()
#endif #endif
#if defined(__X__) || defined(__WXGTK__) #if defined(__X__) || defined(__WXGTK__)
if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
{ {
wxString command; wxString command;
command += m_printData.GetPrinterCommand(); command += m_printData.GetPrinterCommand();
@@ -2007,20 +2006,20 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
if (externalLeading) (*externalLeading) = 0; if (externalLeading) (*externalLeading) = 0;
return; return;
} }
#if wxUSE_PANGO #if wxUSE_PANGO
int wx_dpi = GetResolution(); int wx_dpi = GetResolution();
int pango_dpi = 600; int pango_dpi = 600;
PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi ); PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
double scale = pango_dpi / wx_dpi; double scale = pango_dpi / wx_dpi;
scale /= m_userScaleY; scale /= m_userScaleY;
pango_context_set_language (context, pango_language_from_string ("en_US")); pango_context_set_language (context, pango_language_from_string ("en_US"));
pango_context_set_base_dir (context, PANGO_DIRECTION_LTR ); pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
PangoLayout *layout = pango_layout_new (context); PangoLayout *layout = pango_layout_new (context);
PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description; PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description;
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
#if wxUSE_UNICODE #if wxUSE_UNICODE
@@ -2031,10 +2030,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
#endif #endif
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect; PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect); pango_layout_line_get_extents(line, NULL, &rect);
if (x) (*x) = (wxCoord) ( rect.width / PANGO_SCALE / scale ); if (x) (*x) = (wxCoord) ( rect.width / PANGO_SCALE / scale );
if (y) (*y) = (wxCoord) ( rect.height / PANGO_SCALE / scale ); if (y) (*y) = (wxCoord) ( rect.height / PANGO_SCALE / scale );
if (descent) if (descent)
@@ -2043,7 +2042,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
(*descent) = 0; (*descent) = 0;
} }
if (externalLeading) (*externalLeading) = 0; // ?? if (externalLeading) (*externalLeading) = 0; // ??
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
#else #else
// GTK 2.0 // GTK 2.0
@@ -2171,7 +2170,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
} }
FILE *afmFile = NULL; FILE *afmFile = NULL;
// Get the directory of the AFM files // Get the directory of the AFM files
wxString afmName; wxString afmName;
if (!m_printData.GetFontMetricPath().IsEmpty()) if (!m_printData.GetFontMetricPath().IsEmpty())