diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:25:00 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:25:00 +0100 |
| commit | db0fcf9142f9ee7035370f832036c873d4c87168 (patch) | |
| tree | a4062cdf2158362a0a431eb1806719e9f0975cb1 /app/wlib/gtklib/gtkint.h | |
| parent | ee016bcb70b5c380e03b5fd2c12b1baa504c3cc8 (diff) | |
| parent | 09795a01ef859f072920de9df974d1b03b9ab9a4 (diff) | |
Merge tag 'upstream/4.2.4a'
Upstream version 4.2.4a
Diffstat (limited to 'app/wlib/gtklib/gtkint.h')
| -rw-r--r-- | app/wlib/gtklib/gtkint.h | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/app/wlib/gtklib/gtkint.h b/app/wlib/gtklib/gtkint.h index 4cbeace..c27c70b 100644 --- a/app/wlib/gtklib/gtkint.h +++ b/app/wlib/gtklib/gtkint.h @@ -68,7 +68,7 @@ typedef void (*setTriggerCallback_p)( wControl_p b ); struct wWin_t { WOBJ_COMMON - GtkWidget *gtkwin; /**< GTK window */ + GtkWidget *gtkwin; /**< GTK window */ wPos_t lastX, lastY; wControl_p first, last; wWinCallBack_p winProc; /**< window procedure */ @@ -157,15 +157,10 @@ void gtkPrintColorMap( FILE *, int, int ); int gtkMapPixel( long ); /* psprint.c */ -typedef struct { - wIndex_t cmdOrFile; - FILE * f; - } wPrinterStream_t; -typedef wPrinterStream_t * wPrinterStream_p; - -wPrinterStream_p wPrinterOpen( void ); -void wPrinterWrite( wPrinterStream_p p, char * buff, int siz ); -void wPrinterClose( wPrinterStream_p ); + +void WlibApplySettings( GtkPrintOperation *op ); +void WlibSaveSettings( GtkPrintOperation *op ); + void psPrintLine( wPos_t, wPos_t, wPos_t, wPos_t, wDrawWidth, wDrawLineType_e, wDrawColor, wDrawOpts ); void psPrintArc( wPos_t, wPos_t, wPos_t, double, double, int, @@ -177,4 +172,31 @@ void psPrintFillRectangle( wPos_t, wPos_t, wPos_t, wPos_t, wDrawColor, wDrawOpts void psPrintFillPolygon( wPos_t [][2], int, wDrawColor, wDrawOpts ); void psPrintFillCircle( wPos_t, wPos_t, wPos_t, wDrawColor, wDrawOpts ); +struct wDraw_t { + WOBJ_COMMON + void * context; + wDrawActionCallBack_p action; + wDrawRedrawCallBack_p redraw; + + GdkPixmap * pixmap; + GdkPixmap * pixmapBackup; + + double dpi; + + GdkGC * gc; + wDrawWidth lineWidth; + wDrawOpts opts; + wPos_t maxW; + wPos_t maxH; + unsigned long lastColor; + wBool_t lastColorInverted; + const char * helpStr; + + wPos_t lastX; + wPos_t lastY; + + wBool_t delayUpdate; + cairo_t *printContext; + cairo_surface_t *curPrintSurface; + }; #endif |