New upstream version 5.2.2GAupstream/5.2.2GA

1 files changed, 31 insertions, 27 deletions

diff --git a/app/wlib/gtklib/gtkint.h b/app/wlib/gtklib/gtkint.h
index 410fd7f..6d8a641 100644
--- a/app/wlib/gtklib/gtkint.h
+++ b/app/wlib/gtklib/gtkint.h
@@ -45,8 +45,8 @@ extern wWin_p gtkMainW;
 #ifdef CURSOR_SURFACE
 typedef struct {
 		cairo_surface_t* surface;
-		wPos_t width;
-		wPos_t height;
+		wWinPix_t width;
+		wWinPix_t height;
 		wBool_t show;
 } wCursorSurface_t, * wSurface_p;
 #endif
@@ -69,11 +69,11 @@ typedef void (*setTriggerCallback_p)( wControl_p b );
 		wControl_p next; \
 		wControl_p synonym; \
 		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; \
+		wWinPix_t origX, origY; \
+		wWinPix_t realX, realY; \
+		wWinPix_t default_size_x, default_size_y; \
+		wWinPix_t labelW; \
+		wWinPix_t w, h; \
 		int maximize_initially; \
 		long option; \
 		const char * labelStr; \
@@ -88,7 +88,7 @@ typedef void (*setTriggerCallback_p)( wControl_p b );
 struct wWin_t {
 		WOBJ_COMMON
 		GtkWidget *gtkwin;             /**< GTK window */
-		wPos_t lastX, lastY;
+		wWinPix_t lastX, lastY;
 		wControl_p first, last;
 		wWinCallBack_p winProc;        /**< window procedure */
 		wBool_t shown;                 /**< visibility state */
@@ -117,12 +117,12 @@ struct wList_t {
 		int count;
 		int number;
 		int colCnt;
-		wPos_t *colWidths;
+		wWinPix_t *colWidths;
 		wBool_t *colRightJust;
 		GtkListStore *listStore;
 		GtkWidget  *treeView;
 		int last;
-		wPos_t listX;
+		wWinPix_t listX;
 		long * valueP;
 		wListCallBack_p action;
 		int recursion;
@@ -144,8 +144,8 @@ struct wListItem_t {
 #define gtkIcon_pixmap (2)
 struct wIcon_t {
 		int gtkIconType;
-		wPos_t w;
-		wPos_t h;
+		wWinPix_t w;
+		wWinPix_t h;
 		wDrawColor color;
 		const void * bits;
 		};
@@ -157,7 +157,7 @@ extern wDrawColor wDrawColorBlack;
 
 
 /* boxes.c */
-void wlibDrawBox(wWin_p win, wBoxType_e style, wPos_t x, wPos_t y, wPos_t w, wPos_t h);
+void wlibDrawBox(wWin_p win, wBoxType_e style, wWinPix_t x, wWinPix_t y, wWinPix_t w, wWinPix_t h);
 
 /* button.c */
 void wlibSetLabel(GtkWidget *widget, long option, const char *labelStr, GtkLabel **labelG, GtkWidget **imageG);
@@ -170,6 +170,9 @@ struct wButton_t {
     wButtonCallBack_p action;
     int busy;
     int recursion;
+    long timer_id;
+    int timer_count;
+    int timer_state;
 };
 
 /* color.c */
@@ -202,12 +205,12 @@ void *wDropListGetItemContext(wList_p b, wIndex_t inx);
 void wDropListAddValue(wList_p b, char *text, wListItem_p data);
 void wDropListSetIndex(wList_p b, int val);
 wBool_t wDropListSetValues(wList_p b, wIndex_t row, const char *labelStr, wIcon_p bm, void *itemData);
-wList_p wDropListCreate(wWin_p parent, wPos_t x, wPos_t y, const char *helpStr, const char *labelStr, long option, long number, wPos_t width, long *valueP, wListCallBack_p action, void *data);
+wList_p wDropListCreate(wWin_p parent, wWinPix_t x, wWinPix_t y, const char *helpStr, const char *labelStr, long option, long number, wWinPix_t width, long *valueP, wListCallBack_p action, void *data);
 
 /* 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, int *baseline_p);
+PangoLayout *wlibFontCreatePangoLayout(GtkWidget *widget, void *cairo, wFont_p fp, wFontSize_t fs, const char *s, wDrawPix_t *width_p, wDrawPix_t *height_p, wDrawPix_t *ascent_p, wDrawPix_t *descent_p, wDrawPix_t *baseline_p);
 void wlibFontDestroyPangoLayout(PangoLayout *layout);
 const char *wlibFontTranslate(wFont_p fp);
 
@@ -245,11 +248,11 @@ typedef struct accelData_t {
 
 GdkPixbuf* wlibPixbufFromXBM(wIcon_p ip);
 int wlibAddLabel(wControl_p b, const char *labelStr);
-void *wlibAlloc(wWin_p parent, wType_e type, wPos_t origX, wPos_t origY, const char *labelStr, int size, void *data);
+void *wlibAlloc(wWin_p parent, wType_e type, wWinPix_t origX, wWinPix_t origY, const char *labelStr, int size, void *data);
 void wlibComputePos(wControl_p b);
 void wlibControlGetSize(wControl_p b);
 void wlibAddButton(wControl_p b);
-wControl_p wlibGetControlFromPos(wWin_p win, wPos_t x, wPos_t y);
+wControl_p wlibGetControlFromPos(wWin_p win, wWinPix_t x, wWinPix_t y);
 char *wlibConvertInput(const char *inString);
 char *wlibConvertOutput(const char *inString);
 struct accelData_t *wlibFindAccelKey(GdkEventKey *event);
@@ -278,14 +281,14 @@ struct wDraw_t {
 		GdkGC * gc;
 		wDrawWidth lineWidth;
 		wDrawOpts opts;
-		wPos_t maxW;
-		wPos_t maxH;
+		wWinPix_t maxW;
+		wWinPix_t maxH;
 		unsigned long lastColor;
 		wBool_t lastColorInverted;
 		const char * helpStr;
 
-		wPos_t lastX;
-		wPos_t lastY;
+		wWinPix_t lastX;
+		wWinPix_t lastY;
 
 		wBool_t delayUpdate;
 		cairo_t *printContext;
@@ -297,15 +300,16 @@ struct wDraw_t {
 
 void WlibApplySettings(GtkPrintOperation *op);
 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], 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);
+void psPrintLine(wDrawPix_t x0, wDrawPix_t y0, wDrawPix_t x1, wDrawPix_t y1, wDrawWidth width, wDrawLineType_e lineType, wDrawColor color, wDrawOpts opts);
+void psPrintArc(wDrawPix_t x0, wDrawPix_t y0, wDrawPix_t r, double angle0, double angle1, wBool_t drawCenter, wDrawWidth width, wDrawLineType_e lineType, wDrawColor color, wDrawOpts opts);
+void psPrintFillRectangle(wDrawPix_t x0, wDrawPix_t y0, wDrawPix_t x1, wDrawPix_t y1, wDrawColor color, wDrawOpts opts);
+void psPrintFillPolygon(wDrawPix_t p[][2], wPolyLine_e type[], int cnt, wDrawColor color, wDrawOpts opts, int fill, int open);
+void psPrintFillCircle(wDrawPix_t x0, wDrawPix_t y0, wDrawPix_t r, wDrawColor color, wDrawOpts opts);
+void psPrintString(wDrawPix_t x, wDrawPix_t y, double a, char *s, wFont_p fp, double fs, wDrawColor color, wDrawOpts opts);
 static void WlibGetPaperSize(void);
 
 /* single.c */
+void wlibStringUpdate();
 
 /* splash.c */