From b623f5953691b2a0614e6f1f4def86bdbb9a4113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Aug 2020 11:53:00 +0200 Subject: New upstream version 5.2.0Beta2.1 --- app/wlib/gtklib/gtkint.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'app/wlib/gtklib/gtkint.h') diff --git a/app/wlib/gtklib/gtkint.h b/app/wlib/gtklib/gtkint.h index 2e0511a..410fd7f 100644 --- a/app/wlib/gtklib/gtkint.h +++ b/app/wlib/gtklib/gtkint.h @@ -32,7 +32,9 @@ #define strcasecmp _stricmp #endif +#ifndef MISC_H #include "dynarr.h" +#endif #define BORDERSIZE (4) #define LABEL_OFFSET (3) @@ -40,6 +42,16 @@ extern wWin_p gtkMainW; +#ifdef CURSOR_SURFACE +typedef struct { + cairo_surface_t* surface; + wPos_t width; + wPos_t height; + wBool_t show; +} wCursorSurface_t, * wSurface_p; +#endif + + typedef enum { W_MAIN, W_POPUP, B_BUTTON, B_CANCEL, B_POPUP, B_TEXT, B_INTEGER, B_FLOAT, @@ -59,6 +71,7 @@ typedef void (*setTriggerCallback_p)( wControl_p b ); wWin_p parent; \ wPos_t origX, origY; \ wPos_t realX, realY; \ + wPos_t default_size_x, default_size_y; \ wPos_t labelW; \ wPos_t w, h; \ int maximize_initially; \ @@ -68,6 +81,8 @@ typedef void (*setTriggerCallback_p)( wControl_p b ); GtkWidget * widget; \ GtkWidget * label; \ doneProcCallback_p doneProc; \ + /* CURSOR_SURFACE wCursorSurface_t cursor_surface;*/ \ + wBool_t outline; \ void * data; struct wWin_t { @@ -171,6 +186,7 @@ typedef struct { GdkColor *wlibGetColor(wDrawColor color, wBool_t normal); /* control.c */ +wBool_t wControlExpose (GtkWidget * widget, GdkEventExpose * event, wControl_p b); /* droplist.c */ enum columns { @@ -191,7 +207,7 @@ wList_p wDropListCreate(wWin_p parent, wPos_t x, wPos_t y, const char *helpStr, /* filesel.c */ /* font.c */ -PangoLayout *wlibFontCreatePangoLayout(GtkWidget *widget, void *cairo, wFont_p fp, wFontSize_t fs, const char *s, int *width_p, int *height_p, int *ascent_p, int *descent_p); +PangoLayout *wlibFontCreatePangoLayout(GtkWidget *widget, void *cairo, wFont_p fp, wFontSize_t fs, const char *s, int *width_p, int *height_p, int *ascent_p, int *descent_p, int *baseline_p); void wlibFontDestroyPangoLayout(PangoLayout *layout); const char *wlibFontTranslate(wFont_p fp); @@ -255,6 +271,7 @@ struct wDraw_t { GdkPixmap * pixmap; GdkPixmap * pixmapBackup; + cairo_surface_t * temp_surface; double dpi; @@ -273,6 +290,9 @@ struct wDraw_t { wBool_t delayUpdate; cairo_t *printContext; cairo_surface_t *curPrintSurface; + GdkPixbuf * background; + + wBool_t bTempMode; }; void WlibApplySettings(GtkPrintOperation *op); @@ -280,7 +300,7 @@ void WlibSaveSettings(GtkPrintOperation *op); void psPrintLine(wPos_t x0, wPos_t y0, wPos_t x1, wPos_t y1, wDrawWidth width, wDrawLineType_e lineType, wDrawColor color, wDrawOpts opts); void psPrintArc(wPos_t x0, wPos_t y0, wPos_t r, double angle0, double angle1, wBool_t drawCenter, wDrawWidth width, wDrawLineType_e lineType, wDrawColor color, wDrawOpts opts); void psPrintFillRectangle(wPos_t x0, wPos_t y0, wPos_t x1, wPos_t y1, wDrawColor color, wDrawOpts opts); -void psPrintFillPolygon(wPos_t p[][2], int cnt, wDrawColor color, wDrawOpts opts); +void psPrintFillPolygon(wPos_t p[][2], wPolyLine_e type[], int cnt, wDrawColor color, wDrawOpts opts, int fill, int open); void psPrintFillCircle(wPos_t x0, wPos_t y0, wPos_t r, wDrawColor color, wDrawOpts opts); void psPrintString(wPos_t x, wPos_t y, double a, char *s, wFont_p fp, double fs, wDrawColor color, wDrawOpts opts); static void WlibGetPaperSize(void); -- cgit v1.2.3