Browse Source

Pango ps (#148)

Use cairo-PostScript to output PostScript when pango is available.

This allows to draw in vectorial form any script.
Before, only the Latin script could be drawn to PostScript in vectorial form.
pull/150/head
ManoloFLTK 5 years ago committed by GitHub
parent
commit
8accc6e840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      CMake/options.cmake
  2. 271
      FL/Fl_PostScript.H
  3. 9
      configure.ac
  4. 8
      src/CMakeLists.txt
  5. 8
      src/Fl_Printer.cxx
  6. 10
      src/Fl_x.cxx
  7. 5
      src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
  8. 1010
      src/drivers/PostScript/Fl_PostScript.cxx
  9. 231
      src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
  10. 215
      src/drivers/PostScript/Fl_PostScript_image.cxx
  11. 5
      src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
  12. 9
      test/device.cxx

15
CMake/options.cmake

@ -463,18 +463,23 @@ endif (OPTION_USE_PANGO) @@ -463,18 +463,23 @@ endif (OPTION_USE_PANGO)
#######################################################################
if (X11_Xft_FOUND AND OPTION_USE_PANGO)
pkg_check_modules(PANGOXFT pangoxft)
pkg_check_modules(PANGOCAIRO pangocairo)
pkg_check_modules(CAIRO cairo)
# message (STATUS "PANGOXFT_FOUND=" ${PANGOXFT_FOUND})
if (PANGOXFT_FOUND)
include_directories (${PANGOXFT_INCLUDE_DIRS})
if (PANGOXFT_FOUND AND PANGOCAIRO_FOUND AND CAIRO_FOUND)
include_directories (${PANGOXFT_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS})
find_library(HAVE_LIB_PANGO pango-1.0 ${CMAKE_LIBRARY_PATH})
find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH})
find_library(HAVE_LIB_PANGOCAIRO pangocairo-1.0 ${CMAKE_LIBRARY_PATH})
find_library(HAVE_LIB_CAIRO cairo ${CMAKE_LIBRARY_PATH})
find_library(HAVE_LIB_GOBJECT gobject-2.0 ${CMAKE_LIBRARY_PATH})
set (USE_PANGO TRUE)
list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lpangocairo-1.0 -lcairo -lgobject-2.0)
if (APPLE)
get_filename_component(PANGO_L_PATH ${HAVE_LIB_PANGO} PATH)
set (LDFLAGS "${LDFLAGS} -L${PANGO_L_PATH}")
endif (APPLE)
else(PANGOXFT_FOUND)
else(PANGOXFT_FOUND AND PANGOCAIRO_FOUND AND CAIRO_FOUND)
# this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
if (APPLE AND OPTION_APPLE_X11)
@ -511,7 +516,7 @@ if (X11_Xft_FOUND AND OPTION_USE_PANGO) @@ -511,7 +516,7 @@ if (X11_Xft_FOUND AND OPTION_USE_PANGO)
include_directories (${PANGO_H_PREFIX}/pango-1.0 ${GLIB_H_PATH} ${PANGOLIB_DIR}/glib-2.0/include)
list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
endif (HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
endif (PANGOXFT_FOUND)
endif (PANGOXFT_FOUND AND PANGOCAIRO_FOUND AND CAIRO_FOUND)
endif (X11_Xft_FOUND AND OPTION_USE_PANGO)
if (OPTION_USE_XFT)

271
FL/Fl_PostScript.H

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
//
/** \file Fl_PostScript.H
\brief declaration of classes Fl_PostScript_Graphics_Driver, Fl_PostScript_File_Device.
\brief declaration of classes Fl_PostScript_File_Device and Fl_EPS_File_Surface.
*/
#ifndef Fl_PostScript_H
@ -25,204 +25,23 @@ @@ -25,204 +25,23 @@
#include <FL/fl_draw.H>
#include <stdarg.h>
/* Signature of Fl_PostScript::close_command() functions passed as parameters. */
/** Signature of Fl_PostScript::close_command() functions passed as parameters. */
extern "C" {
typedef int (Fl_PostScript_Close_Command)(FILE *);
typedef int (*Fl_PostScript_Close_Command)(FILE *);
}
/**
\cond DriverDev
\addtogroup DriverDeveloper
\{
*/
/**
PostScript graphical backend.
*/
class FL_EXPORT Fl_PostScript_Graphics_Driver : public Fl_Graphics_Driver {
private:
void transformed_draw_extra(const char* str, int n, double x, double y, int w, bool rtl);
void *prepare_rle85();
void write_rle85(uchar b, void *data);
void close_rle85(void *data);
void *prepare85();
void write85(void *data, const uchar *p, int len);
void close85(void *data);
int scale_for_image_(Fl_Image *img, int XP, int YP, int WP, int HP,int cx, int cy);
protected:
uchar **mask_bitmap() {return &mask;}
public:
Fl_PostScript_Graphics_Driver();
#ifndef FL_DOXYGEN
enum SHAPE{NONE=0, LINE, LOOP, POLYGON, POINTS};
class Clip {
public:
int x, y, w, h;
Clip *prev;
};
Clip * clip_;
int lang_level_;
int gap_;
int pages_;
double width_;
double height_;
int shape_;
int linewidth_;// need for clipping, lang level 1-2
int linestyle_;//
int interpolate_; //interpolation of images
unsigned char cr_,cg_,cb_;
char linedash_[256];//should be enough
void concat(); // transform ror scalable dradings...
void reconcat(); //invert
void recover(); //recovers the state after grestore (such as line styles...)
void reset();
uchar * mask;
int mx; // width of mask;
int my; // mask lines
//Fl_Color bg_;
Fl_PostScript_Close_Command* close_cmd_;
int page_policy_;
int nPages;
int orientation_;
float scale_x;
float scale_y;
float angle;
int left_margin;
int top_margin;
FILE *output;
double pw_, ph_;
uchar bg_r, bg_g, bg_b;
int start_postscript (int pagecount, enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout);
/* int alpha_mask(const uchar * data, int w, int h, int D, int LD=0);
*/
void transformed_draw(const char* s, int n, double x, double y); //precise text placing
void transformed_draw(const char* s, double x, double y);
int alpha_mask(const uchar * data, int w, int h, int D, int LD=0);
enum Fl_Paged_Device::Page_Format page_format_;
char *ps_filename_;
void page_policy(int p);
int page_policy(){return page_policy_;};
void close_command(Fl_PostScript_Close_Command* cmd){close_cmd_=cmd;};
FILE * file() {return output;};
//void orientation (int o);
//Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int pages = 0); // ps (also multi-page) constructor
//Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int x, int y, int w, int h); //eps constructor
void interpolate(int i){interpolate_=i;};
int interpolate(){return interpolate_;}
void page(double pw, double ph, int media = 0);
void page(int format);
#endif // FL_DOXYGEN
// implementation of drawing methods
void color(Fl_Color c);
void color(uchar r, uchar g, uchar b);
void push_clip(int x, int y, int w, int h);
int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H);
int not_clipped(int x, int y, int w, int h);
void push_no_clip();
void pop_clip();
void line_style(int style, int width=0, char* dashes=0);
void rect(int x, int y, int w, int h);
void rectf(int x, int y, int w, int h);
void xyline(int x, int y, int x1);
void xyline(int x, int y, int x1, int y2);
void xyline(int x, int y, int x1, int y2, int x3);
void yxline(int x, int y, int y1);
void yxline(int x, int y, int y1, int x2);
void yxline(int x, int y, int y1, int x2, int y3);
void line(int x1, int y1, int x2, int y2);
void line(int x1, int y1, int x2, int y2, int x3, int y3);
void loop(int x0, int y0, int x1, int y1, int x2, int y2);
void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
void polygon(int x0, int y0, int x1, int y1, int x2, int y2);
void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
void point(int x, int y);
void begin_points();
void begin_line();
void begin_loop();
void begin_polygon();
void vertex(double x, double y);
void curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3);
void circle(double x, double y, double r);
void arc(double x, double y, double r, double start, double a);
void arc(int x, int y, int w, int h, double a1, double a2);
void pie(int x, int y, int w, int h, double a1, double a2);
void end_points();
void end_line();
void end_loop();
void end_polygon();
void begin_complex_polygon(){begin_polygon();};
void gap(){gap_=1;};
void end_complex_polygon(){end_polygon();};
void transformed_vertex(double x, double y);
void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0);
void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0);
void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3);
void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1);
void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); };
void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); };
void draw(int angle, const char *str, int n, int x, int y);
void rtl_draw(const char* s, int n, int x, int y);
void font(int face, int size);
double width(const char *, int);
double width(unsigned int u);
void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h);
int height();
int descent();
void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy);
void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy);
void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy);
/** Shields output PostScript data from modifications of the current locale.
It typically avoids PostScript errors caused if the current locale uses comma instead of dot
as "decimal point".
\param format directives controlling output PostScript data
\return value returned by vfprintf() call
*/
int clocale_printf(const char *format, ...);
~Fl_PostScript_Graphics_Driver();
// ---
Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; }
virtual int has_feature(driver_feature feature_mask) { return feature_mask & PRINTER; }
int start_eps(int width, int height);
void ps_origin(int x, int y);
void ps_translate(int, int);
void ps_untranslate();
};
/**
\}
\endcond
*/
class Fl_PostScript_Graphics_Driver;
/**
To send graphical output to a PostScript file.
This class is used exactly as the Fl_Printer class except for the begin_job() call,
two variants of which are usable and allow to specify what page format and layout are desired.
PostScript text uses vectorial fonts when using the FLTK standard fonts
and the latin alphabet or a few other characters listed in the following table.
<b>Processing of text</b>: Text uses vectorial fonts under the X11 + pango platform.
With other platforms, only text restricted to the Latin alphabet (and a few other characters
listed in the table below) and to FLTK standard fonts is vectorized. All other unicode characters
or all other fonts (FL_FREE_FONT and above) are output as a bitmap.
FLTK standard fonts are output using the corresponding PostScript standard fonts.
The latin alphabet means all unicode characters between U+0020 and U+017F, or, in other words,
the ASCII, Latin-1 Supplement and Latin Extended-A charts.
<table>
@ -241,37 +60,31 @@ public: @@ -241,37 +60,31 @@ public:
<tr><td></td><td>U+2018</td><td>quoteleft</td><td>/</td><td>U+2044</td><td>fraction</td><td></td><td>U+FB02</td><td>fl</td></tr>
<tr><td></td><td>U+2019</td><td>quoteright</td><td></td><td>U+20AC</td><td>Euro</td><td></td><td>U+F8FF</td><td>apple (Mac OS only)</td></tr>
</table>
<br> All other unicode characters or all other fonts (FL_FREE_FONT and above) are output as a bitmap.
<br> FLTK standard fonts are output using the corresponding PostScript standard fonts.
*/
class FL_EXPORT Fl_PostScript_File_Device : public Fl_Paged_Device {
protected:
/**
\brief Returns the PostScript driver of this drawing surface.
*/
Fl_PostScript_Graphics_Driver *driver();
inline Fl_PostScript_Graphics_Driver *driver() { return (Fl_PostScript_Graphics_Driver*)Fl_Surface_Device::driver(); }
public:
/**
@brief The constructor.
*/
Fl_PostScript_File_Device();
/**
@brief The destructor.
*/
/** The constructor. */
Fl_PostScript_File_Device();
/** The destructor. */
~Fl_PostScript_File_Device();
/** Don't use with this class. */
int begin_job(int pagecount, int* from, int* to, char **perr_message);
/**
@brief Begins the session where all graphics requests will go to a local PostScript file.
*
Opens a file dialog entitled with Fl_PostScript_File_Device::file_chooser_title to select an output PostScript file.
/** Begins the session where all graphics requests will go to a local PostScript file.
Opens a file dialog to select an output PostScript file.
This member function makes end_job() close the resulting PostScript file and display an
alert message with fl_alert() in case of any output error.
@param pagecount The total number of pages to be created. Use 0 if this number is unknown when this function is called.
@param format Desired page format.
@param layout Desired page layout.
@return 0 if OK, 1 if user cancelled the file dialog, 2 if fopen failed on user-selected output file.
*/
int begin_job(int pagecount = 0, enum Fl_Paged_Device::Page_Format format = Fl_Paged_Device::A4,
int begin_job(int pagecount = 0, enum Fl_Paged_Device::Page_Format format = Fl_Paged_Device::A4,
enum Fl_Paged_Device::Page_Layout layout = Fl_Paged_Device::PORTRAIT);
/** Synonym of begin_job().
For API compatibility with FLTK 1.3.x */
@ -279,9 +92,9 @@ public: @@ -279,9 +92,9 @@ public:
enum Fl_Paged_Device::Page_Layout layout = Fl_Paged_Device::PORTRAIT) {
return begin_job(pagecount, format, layout);
}
/**
@brief Begins the session where all graphics requests will go to FILE pointer.
*
/** Begins the session where all graphics requests will go to FILE pointer.
This member function prevents end_job() from closing \p ps_output, so the user can check with \p ferror(ps_output)
for output errors.
@param ps_output A writable FILE pointer that will receive PostScript output and that should not be closed
until after end_job() has been called.
@param pagecount The total number of pages to be created. Use 0 if this number is unknown when this function is called.
@ -308,11 +121,14 @@ public: @@ -308,11 +121,14 @@ public:
void translate(int x, int y);
void untranslate(void);
int end_page (void);
/** Finishes all PostScript output.
This also closes the underlying \p fclose(file()) unless close_command() was used to set another function.
*/
void end_job(void);
/** \brief Label of the PostScript file chooser window */
/** Label of the PostScript file chooser window */
static const char *file_chooser_title;
/** Returns the underlying FILE* receiving all PostScript data */
FILE *file() { return driver()->file(); }
FILE *file();
};
/** Encapsulated PostScript drawing surface.
@ -329,13 +145,10 @@ public: @@ -329,13 +145,10 @@ public:
surface->draw_decorated_window(win);
Fl_Surface_Device::pop_current();
delete surface; // the .eps file is not complete until the destructor was run
fclose(eps);
}
\endcode
*/
class FL_EXPORT Fl_EPS_File_Surface : public Fl_Widget_Surface {
private:
void complete_();
protected:
/** Returns the PostScript driver of this drawing surface. */
inline Fl_PostScript_Graphics_Driver *driver() { return (Fl_PostScript_Graphics_Driver*)Fl_Surface_Device::driver(); }
@ -343,27 +156,37 @@ public: @@ -343,27 +156,37 @@ public:
/**
Constructor.
\param width,height Width and height of the EPS drawing area
\param eps A writable FILE pointer where the Encapsulated PostScript data will be sent
\param background Color expected to cover the background of the EPS drawing area.
This parameter affects only the drawing of transparent Fl_RGB_Image objects:
transparent areas of RGB images are blended with the \p background color.
\param eps_output A writable FILE pointer where the Encapsulated PostScript data will be sent
\param background Color expected to cover the background of the EPS drawing area.
This parameter affects only the drawing of transparent Fl_RGB_Image objects:
transparent areas of RGB images are blended with the \p background color.
Under the X11 + pango platform, transparent RGB images are correctly blended to their background,
thus this parameter has no effect.
\param closef If not NULL, the destructor or close() will call \p closef(eps_output) after all
EPS data has been sent. If NULL, \p fclose(eps_output) is called instead. This allows to close the FILE
pointer by, e.g., \p pclose, or, using a function such as \p "int keep_open(FILE*){return 0;}", to keep it open after
completion of all output to \p eps_output. Function \p closef should return non zero to indicate an error.
*/
Fl_EPS_File_Surface(int width, int height, FILE *eps, Fl_Color background = FL_WHITE);
Fl_EPS_File_Surface(int width, int height, FILE *eps_output,
Fl_Color background = FL_WHITE, Fl_PostScript_Close_Command closef = NULL);
/**
Destructor.
The underlying FILE pointer remains open after destruction of the Fl_EPS_File_Surface object
unless close() was called.
By default, the destructor closes with function \p fclose() the underlying FILE. See the constructor for how
to close it differently or to keep it open. Use close() before object destruction to receive the status code
of output operations. If close() is not used and if EPS output results in error, the destructor displays an alert message
with fl_alert().
*/
~Fl_EPS_File_Surface();
virtual int printable_rect(int *w, int *h);
/** Returns the underlying FILE pointer */
FILE *file() { return driver() ? driver()->output : NULL; }
FILE *file();
virtual void origin(int x, int y);
virtual void origin(int *px, int *py);
virtual void translate(int x, int y);
virtual void untranslate();
/** Closes using fclose() the underlying FILE pointer.
The only operation possible with the Fl_EPS_File_Surface object after calling close() is its destruction. */
/** Completes all EPS output.
The only operation possible with the Fl_EPS_File_Surface object after calling close() is its destruction.
\return The status code of output operations to the FILE object. 0 indicates success. */
int close();
};

9
configure.ac

@ -1108,7 +1108,14 @@ case $host_os_gui in @@ -1108,7 +1108,14 @@ case $host_os_gui in
if test x$PKGCONFIG != x; then
CXXFLAGS="`$PKGCONFIG --cflags pangoxft` $CXXFLAGS"
LIBS="`$PKGCONFIG --libs pangoxft` $LIBS"
else
CXXFLAGS="`$PKGCONFIG --cflags pangocairo` $CXXFLAGS"
LIBS="`$PKGCONFIG --libs pangocairo` $LIBS"
case $host_os in
darwin*)
LDFLAGS="-L/opt/sw/lib -L/sw/lib $LDFLAGS"
;;
esac
else
case $host_os in
linux*)
CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"

8
src/CMakeLists.txt

@ -529,10 +529,10 @@ if (HAVE_XRENDER) @@ -529,10 +529,10 @@ if (HAVE_XRENDER)
endif (HAVE_XRENDER)
if (USE_PANGO)
list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGO} ${HAVE_LIB_PANGOXFT})
if (NOT APPLE)
list (APPEND OPTIONAL_LIBS ${HAVE_LIB_GOBJECT} )
endif (NOT APPLE)
list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGO} ${HAVE_LIB_PANGOXFT} ${HAVE_LIB_PANGOCAIRO} ${HAVE_LIB_CAIRO} ${HAVE_LIB_GOBJECT})
#if (NOT APPLE)
# list (APPEND OPTIONAL_LIBS ${HAVE_LIB_GOBJECT} )
#endif (NOT APPLE)
endif (USE_PANGO)
if (USE_XFT)

8
src/Fl_Printer.cxx

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
// Encompasses platform-specific printing-support code and
// PostScript output code for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010-2016 by Bill Spitzak and others.
// Copyright 2010-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -80,15 +80,19 @@ void Fl_PostScript_File_Device::translate(int x, int y) {} @@ -80,15 +80,19 @@ void Fl_PostScript_File_Device::translate(int x, int y) {}
void Fl_PostScript_File_Device::untranslate(void) {}
int Fl_PostScript_File_Device::end_page (void) {return 1;}
void Fl_PostScript_File_Device::end_job(void) {}
FILE* Fl_PostScript_File_Device::file() {return NULL;}
Fl_PostScript_File_Device::~Fl_PostScript_File_Device(void) {}
Fl_EPS_File_Surface::Fl_EPS_File_Surface(int width, int height, FILE *eps, Fl_Color background) : Fl_Widget_Surface(NULL) {}
Fl_EPS_File_Surface::Fl_EPS_File_Surface(int width, int height, FILE *eps_output,
Fl_Color background, Fl_PostScript_Close_Command closef) : Fl_Widget_Surface(NULL) {}
Fl_EPS_File_Surface::~Fl_EPS_File_Surface() {}
void Fl_EPS_File_Surface::origin(int, int) {}
void Fl_EPS_File_Surface::origin(int*, int*) {}
int Fl_EPS_File_Surface::printable_rect(int*, int*) {return 1;}
void Fl_EPS_File_Surface::translate(int, int) {}
void Fl_EPS_File_Surface::untranslate() {}
FILE* Fl_EPS_File_Surface::file() {return NULL;}
int Fl_EPS_File_Surface::close() {return 1;}
#else

10
src/Fl_x.cxx

@ -3087,7 +3087,7 @@ void Fl_X11_Window_Driver::show() { @@ -3087,7 +3087,7 @@ void Fl_X11_Window_Driver::show() {
}
//#define USE_PRINT_BUTTON 1
#define USE_PRINT_BUTTON 1
#ifdef USE_PRINT_BUTTON
// to test the Fl_Printer class creating a "Print front window" button in a separate window
@ -3112,6 +3112,7 @@ void printFront(Fl_Widget *o, void *data) @@ -3112,6 +3112,7 @@ void printFront(Fl_Widget *o, void *data)
scale = (float)w/ww;
if ((float)h/wh < scale) scale = (float)h/wh;
printer.scale(scale, scale);
printer.printable_rect(&w, &h);
}
// #define ROTATE 20.0
@ -3120,11 +3121,12 @@ void printFront(Fl_Widget *o, void *data) @@ -3120,11 +3121,12 @@ void printFront(Fl_Widget *o, void *data)
printer.printable_rect(&w, &h);
printer.origin(w/2, h/2 );
printer.rotate(ROTATE);
printer.print_widget( win, - win->w()/2, - win->h()/2 );
printer.print_window( win, - win->w()/2, - win->h()/2);
//printer.print_window_part( win, 0,0, win->w(), win->h(), - win->w()/2, - win->h()/2 );
#else
printer.print_window(win);
//printer.print_window_part( win, 0,0, win->w(), win->h(), 0,0 );
printer.origin(w/2, h/2 );
printer.print_window(win, -ww/2, -wh/2);
//printer.print_window_part( win, 0,0, win->w(), win->h(), -ww/2, -wh/2 );
#endif
printer.end_page();

5
src/drivers/Posix/Fl_Posix_Printer_Driver.cxx

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
//
// PostScript priting support for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010-2016 by Bill Spitzak and others.
// Copyright 2010-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#if defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT)
#include <FL/Fl_PostScript.H>
#include "../PostScript/Fl_PostScript_Graphics_Driver.H"
#include <FL/Fl_Printer.H>
#include <FL/fl_ask.H>
@ -326,7 +327,7 @@ int Fl_Posix_Printer_Driver::begin_job(int pages, int *firstpage, int *lastpage, @@ -326,7 +327,7 @@ int Fl_Posix_Printer_Driver::begin_job(int pages, int *firstpage, int *lastpage,
return 2;
}
ps->close_command(pclose);
this->set_current();
Fl_Surface_Device::push_current(this);
return ps->start_postscript(pages, format, layout); // start printing
}

1010
src/drivers/PostScript/Fl_PostScript.cxx

File diff suppressed because it is too large Load Diff

231
src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H

@ -0,0 +1,231 @@ @@ -0,0 +1,231 @@
//
// Support for graphics output to PostScript file for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
// file is missing or damaged, see the license at:
//
// https://www.fltk.org/COPYING.php
//
// Please see the following page on how to report bugs and issues:
//
// https://www.fltk.org/bugs.php
//
/** \file Fl_Pango_PostScript_Graphics_Driver.H
Declaration of class Fl_PostScript_Graphics_Driver.
*/
#ifndef FL_POSTSCRIPT_GRAPHICS_DRIVER_H
#define FL_POSTSCRIPT_GRAPHICS_DRIVER_H
#include "../../config_lib.h"
#include <FL/Fl_PostScript.H>
#ifndef USE_PANGO
#define USE_PANGO 0
#endif
#if USE_PANGO
typedef struct _cairo_surface cairo_surface_t;
typedef struct _cairo cairo_t;
typedef struct _PangoLayout PangoLayout;
#endif
/**
\cond DriverDev
\addtogroup DriverDeveloper
\{
*/
/**
PostScript graphical backend.
*/
class FL_EXPORT Fl_PostScript_Graphics_Driver : public Fl_Graphics_Driver {
private:
#if USE_PANGO
cairo_t *cairo_;
PangoLayout *pango_layout_;
void draw_rgb_bitmap_(Fl_Image *img,int XP, int YP, int WP, int HP, int cx, int cy);
#else
void transformed_draw_extra(const char* str, int n, double x, double y, int w, bool rtl);
void *prepare_rle85();
void write_rle85(uchar b, void *data);
void close_rle85(void *data);
void *prepare85();
void write85(void *data, const uchar *p, int len);
void close85(void *data);
int scale_for_image_(Fl_Image *img, int XP, int YP, int WP, int HP,int cx, int cy);
#endif
protected:
uchar **mask_bitmap() {return &mask;}
public:
Fl_PostScript_Graphics_Driver();
#ifndef FL_DOXYGEN
enum SHAPE{NONE=0, LINE, LOOP, POLYGON, POINTS};
class Clip {
public:
int x, y, w, h;
Clip *prev;
};
Clip * clip_;
int lang_level_;
int gap_;
int pages_;
int shape_;
int linewidth_;// need for clipping, lang level 1-2
int linestyle_;//
int interpolate_; //interpolation of images
unsigned char cr_,cg_,cb_;
char linedash_[256];//should be enough
void concat(); // transform ror scalable dradings...
void reconcat(); //invert
void recover(); //recovers the state after grestore (such as line styles...)
void reset();
uchar * mask;
int mx; // width of mask;
int my; // mask lines
Fl_PostScript_Close_Command close_cmd_;
int page_policy_;
int nPages;
int orientation_;
float scale_x;
float scale_y;
float angle;
int left_margin;
int top_margin;
FILE *output;
double pw_, ph_;
uchar bg_r, bg_g, bg_b;
int start_postscript (int pagecount, enum Fl_Paged_Device::Page_Format format, enum Fl_Paged_Device::Page_Layout layout);
int start_eps(int width, int height);
/* int alpha_mask(const uchar * data, int w, int h, int D, int LD=0);
*/
void transformed_draw(const char* s, int n, double x, double y); //precise text placing
void transformed_draw(const char* s, double x, double y);
int alpha_mask(const uchar * data, int w, int h, int D, int LD=0);
enum Fl_Paged_Device::Page_Format page_format_;
char *ps_filename_;
void page_policy(int p);
int page_policy(){return page_policy_;};
void close_command(Fl_PostScript_Close_Command cmd){close_cmd_=cmd;};
FILE * file() {return output;};
//void orientation (int o);
//Fl_PostScript_Graphics_Driver(FILE *o, int lang_level, int pages = 0); // ps (also multi-page) constructor
void interpolate(int i){interpolate_=i;};
int interpolate(){return interpolate_;}
void page(double pw, double ph, int media = 0);
void page(int format);
#endif // FL_DOXYGEN
// implementation of drawing methods
void color(Fl_Color c);
void color(uchar r, uchar g, uchar b);
void push_clip(int x, int y, int w, int h);
int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H);
int not_clipped(int x, int y, int w, int h);
void push_no_clip();
void pop_clip();
void line_style(int style, int width=0, char* dashes=0);
void rect(int x, int y, int w, int h);
void rectf(int x, int y, int w, int h);
void xyline(int x, int y, int x1);
void xyline(int x, int y, int x1, int y2);
void xyline(int x, int y, int x1, int y2, int x3);
void yxline(int x, int y, int y1);
void yxline(int x, int y, int y1, int x2);
void yxline(int x, int y, int y1, int x2, int y3);
void line(int x1, int y1, int x2, int y2);
void line(int x1, int y1, int x2, int y2, int x3, int y3);
void loop(int x0, int y0, int x1, int y1, int x2, int y2);
void loop(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
void polygon(int x0, int y0, int x1, int y1, int x2, int y2);
void polygon(int x0, int y0, int x1, int y1, int x2, int y2, int x3, int y3);
void point(int x, int y);
void begin_points();
void begin_line();
void begin_loop();
void begin_polygon();
void vertex(double x, double y);
void curve(double x, double y, double x1, double y1, double x2, double y2, double x3, double y3);
void circle(double x, double y, double r);
void arc(double x, double y, double r, double start, double a);
void arc(int x, int y, int w, int h, double a1, double a2);
void pie(int x, int y, int w, int h, double a1, double a2);
void end_points();
void end_line();
void end_loop();
void end_polygon();
void begin_complex_polygon(){begin_polygon();};
void gap(){gap_=1;};
void end_complex_polygon(){end_polygon();};
void transformed_vertex(double x, double y);
void draw_image(const uchar* d, int x,int y,int w,int h, int delta=3, int ldelta=0);
void draw_image_mono(const uchar* d, int x,int y,int w,int h, int delta=1, int ld=0);
void draw_image(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=3);
void draw_image_mono(Fl_Draw_Image_Cb call, void* data, int x,int y, int w, int h, int delta=1);
void draw(const char* s, int nBytes, int x, int y) {transformed_draw(s,nBytes,x,y); };
void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); };
void draw(int angle, const char *str, int n, int x, int y);
void rtl_draw(const char* s, int n, int x, int y);
void font(int face, int size);
double width(const char *, int);
double width(unsigned int u);
void text_extents(const char *c, int n, int &dx, int &dy, int &w, int &h);
int height();
int descent();
void draw_pixmap(Fl_Pixmap * pxm,int XP, int YP, int WP, int HP, int cx, int cy);
void draw_bitmap(Fl_Bitmap * bitmap,int XP, int YP, int WP, int HP, int cx, int cy);
void draw_rgb(Fl_RGB_Image * rgb,int XP, int YP, int WP, int HP, int cx, int cy);
#if USE_PANGO
cairo_t *cr() { return cairo_; }
PangoLayout *pango_layout() {return pango_layout_;};
void check_status(void);
#else
/** Shields output PostScript data from modifications of the current locale.
It typically avoids PostScript errors caused if the current locale uses comma instead of dot
as "decimal point".
\param format directives controlling output PostScript data
\return value returned by vfprintf() call
*/
int clocale_printf(const char *format, ...);
#endif
~Fl_PostScript_Graphics_Driver();
// ---
Fl_Bitmask create_bitmask(int w, int h, const uchar *array) { return 0L; }
virtual int has_feature(driver_feature feature_mask) { return feature_mask & PRINTER; }
void ps_origin(int x, int y);
void ps_translate(int, int);
void ps_untranslate();
};
/**
\}
\endcond
*/
#endif // FL_POSTSCRIPT_GRAPHICS_DRIVER_H

215
src/drivers/PostScript/Fl_PostScript_image.cxx

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
//
// Postscript image drawing implementation for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2015 by Bill Spitzak and others.
// Copyright 1998-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -22,10 +22,48 @@ @@ -22,10 +22,48 @@
#include <string.h>
#include <FL/Fl_PostScript.H>
#include "Fl_PostScript_Graphics_Driver.H"
#include <FL/Fl.H>
#include <FL/Fl_Pixmap.H>
#include <FL/Fl_Bitmap.H>
#if USE_PANGO
#include <cairo/cairo.h>
#endif
struct callback_data {
const uchar *data;
int D, LD;
};
static void draw_image_cb(void *data, int x, int y, int w, uchar *buf) {
struct callback_data *cb_data;
const uchar *curdata;
cb_data = (struct callback_data*)data;
curdata = cb_data->data + x*cb_data->D + y*cb_data->LD;
memcpy(buf, curdata, w*cb_data->D);
}
void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) {
if (D<3){ //mono
draw_image_mono(data, ix, iy, iw, ih, D, LD);
return;
}
struct callback_data cb_data;
if (!LD) LD = iw*D;
cb_data.data = data;
cb_data.D = D;
cb_data.LD = LD;
draw_image(draw_image_cb, &cb_data, ix, iy, iw, ih, D);
}
#if ! USE_PANGO
//
// Implementation of the /ASCII85Encode PostScript filter
@ -345,41 +383,6 @@ static inline uchar swap_byte(const uchar b) { @@ -345,41 +383,6 @@ static inline uchar swap_byte(const uchar b) {
return (swapped[b & 0xF] << 4) | swapped[b >> 4];
}
struct callback_data {
const uchar *data;
int D, LD;
};
static void draw_image_cb(void *data, int x, int y, int w, uchar *buf) {
struct callback_data *cb_data;
const uchar *curdata;
cb_data = (struct callback_data*)data;
curdata = cb_data->data + x*cb_data->D + y*cb_data->LD;
memcpy(buf, curdata, w*cb_data->D);
}
void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) {
if (D<3){ //mono
draw_image_mono(data, ix, iy, iw, ih, D, LD);
return;
}
struct callback_data cb_data;
if (!LD) LD = iw*D;
cb_data.data = data;
cb_data.D = D;
cb_data.LD = LD;
draw_image(draw_image_cb, &cb_data, ix, iy, iw, ih, D);
}
void Fl_PostScript_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) {
double x = ix, y = iy, w = iw, h = ih;
@ -628,4 +631,144 @@ int Fl_PostScript_Graphics_Driver::scale_for_image_(Fl_Image *img, int XP, int Y @@ -628,4 +631,144 @@ int Fl_PostScript_Graphics_Driver::scale_for_image_(Fl_Image *img, int XP, int Y
return 0;
}
#else
void Fl_PostScript_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D)
{
uchar *array = new uchar[iw * D * ih];
for (int l = 0; l < ih; l++) {
call(data, 0, l, iw, array + l*D*iw);
if (D%2 == 0) for (int i = 0; i < iw; i++) {
*(array + l*D*iw + i*D + D-1) = 0xff;
}
}
Fl_RGB_Image *rgb = new Fl_RGB_Image(array, iw, ih, D);
rgb->alloc_array = 1;
draw_rgb(rgb, ix, iy, iw, ih, 0, 0);
delete rgb;
}
void Fl_PostScript_Graphics_Driver::draw_image_mono(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD)
{
struct callback_data cb_data;
if (!LD) LD = iw*D;
cb_data.data = data;
cb_data.D = D;
cb_data.LD = LD;
draw_image(draw_image_cb, &cb_data, ix, iy, iw, ih, D);
}
void Fl_PostScript_Graphics_Driver::draw_image_mono(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D)
{
draw_image(call, data, ix, iy, iw, ih, D);
}
static void destroy_BGRA(void *data) {
delete[] (uchar*)data;
}
void Fl_PostScript_Graphics_Driver::draw_pixmap(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, int cx, int cy) {
Fl_RGB_Image *rgb = new Fl_RGB_Image(pxm);
draw_rgb_bitmap_(rgb, XP, YP, WP, HP, cx, cy);
delete rgb;
}
void Fl_PostScript_Graphics_Driver::draw_rgb(Fl_RGB_Image *rgb,int XP, int YP, int WP, int HP, int cx, int cy) {
draw_rgb_bitmap_(rgb, XP, YP, WP, HP, cx, cy);
}
void Fl_PostScript_Graphics_Driver::draw_bitmap(Fl_Bitmap *bitmap,int XP, int YP, int WP, int HP, int cx, int cy) {
draw_rgb_bitmap_(bitmap, XP, YP, WP, HP, cx, cy);
}
void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int YP, int WP, int HP, int cx, int cy)
{
cairo_surface_t *surf;
cairo_format_t format = (img->d() >= 1 ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_A1);
int stride = cairo_format_stride_for_width(format, img->data_w());
uchar *BGRA = new uchar[stride * img->data_h()];
memset(BGRA, 0, stride * img->data_h());
if (img->d() >= 1) { // process Fl_RGB_Image of all depths
Fl_RGB_Image *rgb = (Fl_RGB_Image*)img;
int lrgb = rgb->ld() ? rgb->ld() : rgb->data_w() * rgb->d();
uchar A = 0xff, R,G,B, *q;
const uchar *r;
float f = 1;
if (rgb->d() >= 3) { // color images
for (int j = 0; j < rgb->data_h(); j++) {
r = rgb->array + j * lrgb;
q = BGRA + j * stride;
for (int i = 0; i < rgb->data_w(); i++) {
R = *r;
G = *(r+1);
B = *(r+2);
if (rgb->d() == 4) {
A = *(r+3);
f = float(A)/0xff;
}
*q = B * f;
*(q+1) = G * f;
*(q+2) = R * f;
*(q+3) = A;
r += rgb->d(); q += 4;
}
}
} else if (rgb->d() == 1 || rgb->d() == 2) { // B&W
for (int j = 0; j < rgb->data_h(); j++) {
r = rgb->array + j * lrgb;
q = BGRA + j * stride;
for (int i = 0; i < rgb->data_w(); i++) {
G = *r;
if (rgb->d() == 2) {
A = *(r+1);
f = float(A)/0xff;
}
*(q) = G * f;
*(q+1) = G * f;
*(q+2) = G * f;
*(q+3) = A;
r += rgb->d(); q += 4;
}
}
}
} else {
Fl_Bitmap *bm = (Fl_Bitmap*)img;
uchar *r, p;
unsigned *q;
for (int j = 0; j < bm->data_h(); j++) {
r = (uchar*)bm->array + j * ((bm->data_w() + 7)/8);
q = (unsigned*)(BGRA + j * stride);
unsigned k = 0, mask32 = 1;
p = *r;
for (int i = 0; i < bm->data_w(); i++) {
if (p&1) (*q) |= mask32;
k++;
if (k % 8 != 0) p >>= 1; else p = *(++r);
if (k % 32 != 0) mask32 <<= 1; else {q++; mask32 = 1;}
}
}
}
surf = cairo_image_surface_create_for_data(BGRA, format, img->data_w(), img->data_h(), stride);
if (cairo_surface_status(surf) == CAIRO_STATUS_SUCCESS) {
static cairo_user_data_key_t key = {};
(void)cairo_surface_set_user_data(surf, &key, BGRA, destroy_BGRA);
cairo_pattern_t *pat = cairo_pattern_create_for_surface(surf);
cairo_save(cairo_);
cairo_rectangle(cairo_, XP-0.5, YP-0.5, WP+1, HP+1);
cairo_clip(cairo_); // still to be tested
if (img->d() >= 1) cairo_set_source(cairo_, pat);
cairo_matrix_t matrix;
cairo_matrix_init_scale(&matrix, double(img->data_w())/img->w(), double(img->data_h())/img->h());
cairo_matrix_translate(&matrix, -XP+cx, -YP+cy);
cairo_pattern_set_matrix(pat, &matrix);
cairo_mask(cairo_, pat);
cairo_pattern_destroy(pat);
cairo_surface_destroy(surf);
cairo_restore(cairo_);
check_status();
}
}
#endif // USE_PANGO
#endif // !defined(FL_DOXYGEN) && !defined(FL_NO_PRINT_SUPPORT)

5
src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
//
// Definition of class Fl_Xlib_Graphics_Driver for the Fast Light Tool Kit (FLTK).
//
// Copyright 2010-2018 by Bill Spitzak and others.
// Copyright 2010-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -82,6 +82,9 @@ protected: @@ -82,6 +82,9 @@ protected:
static PangoContext *pctxt_;
static PangoFontMap *pfmap_;
static PangoLayout *playout_;
public:
static PangoFontDescription* pango_font_description(Fl_Font fnum) { return pfd_array[fnum]; }
private:
static PangoFontDescription **pfd_array; // one array element for each Fl_Font
static int pfd_array_length;
void do_draw(int from_right, const char *str, int n, int x, int y);

9
test/device.cxx

@ -617,7 +617,12 @@ void copy(Fl_Widget *, void *data) { @@ -617,7 +617,12 @@ void copy(Fl_Widget *, void *data) {
}
if (!err) {
p->begin_page();
if (target->as_window()) p->print_window(target->as_window());
if (target->as_window()) {
int w, h;
p->printable_rect(&w, &h);
p->origin(w/2, h/2);
p->print_window(target->as_window(), -target->w()/2, -target->h()/2);
}
else p->print_widget(target);
p->end_page();
p->end_job();
@ -646,10 +651,8 @@ void copy(Fl_Widget *, void *data) { @@ -646,10 +651,8 @@ void copy(Fl_Widget *, void *data) {
if (p.file()) {
if (target->as_window()) p.draw_decorated_window(target->as_window());
else p.draw(target);
//p.close();
}
}
fclose(eps);
}
}

Loading…
Cancel
Save