Update upstream source from tag 'upstream/5.3.0GA'

Update to upstream version '5.3.0GA'
with Debian dir dfd14d63b0238e276ade6f54dd9100325df5b2f9

1 files changed, 157 insertions, 142 deletions

diff --git a/app/wlib/gtklib/gtkint.h b/app/wlib/gtklib/gtkint.h
index 6d8a641..e3757a4 100644
--- a/app/wlib/gtklib/gtkint.h
+++ b/app/wlib/gtklib/gtkint.h
@@ -1,4 +1,4 @@
-/** \file gtkint.h 
+/** \file gtkint.h
  * Internal definitions for the gtk-library
  */
 
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef GTKINT_H
@@ -42,24 +42,16 @@
 
 extern wWin_p gtkMainW;
 
-#ifdef CURSOR_SURFACE
-typedef struct {
-		cairo_surface_t* surface;
-		wWinPix_t width;
-		wWinPix_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,
-		B_LIST, B_DROPLIST, B_COMBOLIST,
-		B_RADIO, B_TOGGLE,
-		B_DRAW, B_MENU, B_MULTITEXT, B_MESSAGE, B_LINES,
-		B_MENUITEM, B_BOX,
-		B_BITMAP, B_STATUS } wType_e;
+	W_MAIN, W_POPUP,
+	B_BUTTON, B_CANCEL, B_POPUP, B_TEXT, B_INTEGER, B_FLOAT,
+	B_LIST, B_DROPLIST, B_COMBOLIST,
+	B_RADIO, B_TOGGLE,
+	B_DRAW, B_MENU, B_MULTITEXT, B_MESSAGE, B_LINES,
+	B_MENUITEM, B_BOX,
+	B_BITMAP, B_STATUS
+} wType_e;
 
 typedef void (*repaintProcCallback_p)( wControl_p );
 typedef void (*doneProcCallback_p)( wControl_p b );
@@ -71,7 +63,6 @@ typedef void (*setTriggerCallback_p)( wControl_p b );
 		wWin_p parent; \
 		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; \
@@ -81,74 +72,73 @@ 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 {
-		WOBJ_COMMON
-		GtkWidget *gtkwin;             /**< GTK window */
-		wWinPix_t lastX, lastY;
-		wControl_p first, last;
-		wWinCallBack_p winProc;        /**< window procedure */
-		wBool_t shown;                 /**< visibility state */
-		const char * nameStr;          /**< window name (not title) */
-		GtkWidget * menubar;           /**< menubar handle (if exists) */
-		int menu_height;
-		GdkGC * gc;                    /**< graphics context */
-		int gc_linewidth;              /**< ??? */
-		wBool_t busy;
-		int resizeTimer;		       /** resizing **/
-		int resizeW,resizeH;
-		int timer_idle_count;
-		int timer_busy_count;
-		int modalLevel;
-		};
+	WOBJ_COMMON
+	GtkWidget *gtkwin;             /**< GTK window */
+	wWinPix_t lastX, lastY;
+	wControl_p first, last;
+	wWinCallBack_p winProc;        /**< window procedure */
+	wBool_t shown;                 /**< visibility state */
+	const char * nameStr;          /**< window name (not title) */
+	GtkWidget * menubar;           /**< menubar handle (if exists) */
+	int menu_height;
+	GdkGC * gc;                    /**< graphics context */
+	int gc_linewidth;              /**< ??? */
+	wBool_t busy;
+	int resizeTimer;		       /** resizing **/
+	int resizeW,resizeH;
+	int timer_idle_count;
+	int timer_busy_count;
+	int modalLevel;
+};
 
 struct wControl_t {
-		WOBJ_COMMON
-		};
-		
+	WOBJ_COMMON
+};
+
 typedef struct wListItem_t * wListItem_p;
 
 struct wList_t {
-		WOBJ_COMMON
+	WOBJ_COMMON
 //		GtkWidget *list;
-		int count;
-		int number;
-		int colCnt;
-		wWinPix_t *colWidths;
-		wBool_t *colRightJust;
-		GtkListStore *listStore;
-		GtkWidget  *treeView;
-		int last;
-		wWinPix_t listX;
-		long * valueP;
-		wListCallBack_p action;
-		int recursion;
-		int editted;
-		int editable;
-		};
+	int count;
+	int number;
+	int colCnt;
+	wWinPix_t *colWidths;
+	wBool_t *colRightJust;
+	GtkListStore *listStore;
+	GtkWidget  *treeView;
+	int last;
+	wWinPix_t listX;
+	long * valueP;
+	wListCallBack_p action;
+	int recursion;
+	int editted;
+	int editable;
+};
 
 
 struct wListItem_t {
-		wBool_t active;
-		void * itemData;
-		char * label;
-		GtkLabel * labelG;
-		wBool_t selected;
-		wList_p listP;
-		};		
+	wBool_t active;
+	void * itemData;
+	char * label;
+	GtkLabel * labelG;
+	wBool_t selected;
+	wList_p listP;
+};
 
 #define gtkIcon_bitmap (1)
 #define gtkIcon_pixmap (2)
 struct wIcon_t {
-		int gtkIconType;
-		wWinPix_t w;
-		wWinPix_t h;
-		wDrawColor color;
-		const void * bits;
-		};
+	int gtkIconType;
+	wWinPix_t w;
+	wWinPix_t h;
+	wDrawColor color;
+	const void * bits;
+};
 
 extern char wConfigName[];
 extern wDrawColor wDrawColorWhite;
@@ -157,39 +147,42 @@ extern wDrawColor wDrawColorBlack;
 
 
 /* boxes.c */
-void wlibDrawBox(wWin_p win, wBoxType_e style, wWinPix_t x, wWinPix_t y, wWinPix_t w, wWinPix_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);
+void wlibSetLabel(GtkWidget *widget, long option, const char *labelStr,
+                  GtkLabel **labelG, GtkWidget **imageG);
 void wlibButtonDoAction(wButton_p bb);
 
 struct wButton_t {
-    WOBJ_COMMON
-    GtkLabel * labelG;
-    GtkWidget * imageG;
-    wButtonCallBack_p action;
-    int busy;
-    int recursion;
-    long timer_id;
-    int timer_count;
-    int timer_state;
+	WOBJ_COMMON
+	GtkLabel * labelG;
+	GtkWidget * imageG;
+	wButtonCallBack_p action;
+	int busy;
+	int recursion;
+	long timer_id;
+	int timer_count;
+	int timer_state;
 };
 
 /* color.c */
 typedef struct {
-    unsigned char red;
-    unsigned char green;
-    unsigned char blue;
-    GdkColor normalColor;
-    GdkColor invertColor;
-    long rgb;
-    int colorChar;
+	unsigned char red;
+	unsigned char green;
+	unsigned char blue;
+	GdkColor normalColor;
+	GdkColor invertColor;
+	long rgb;
+	int colorChar;
 } colorMap_t;
 
 GdkColor *wlibGetColor(wDrawColor color, wBool_t normal);
 
 /* control.c */
-wBool_t wControlExpose (GtkWidget * widget, GdkEventExpose * event, wControl_p b);
+wBool_t wControlExpose (GtkWidget * widget, GdkEventExpose * event,
+                        wControl_p b);
 
 /* droplist.c */
 enum columns {
@@ -204,13 +197,19 @@ void wDropListClear(wList_p b);
 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, 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);
+wBool_t wDropListSetValues(wList_p b, wIndex_t row, const char *labelStr,
+                           wIcon_p bm, void *itemData);
+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, wDrawPix_t *width_p, wDrawPix_t *height_p, wDrawPix_t *ascent_p, wDrawPix_t *descent_p, wDrawPix_t *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);
 
@@ -220,16 +219,20 @@ const char *wlibFontTranslate(wFont_p fp);
 void wlibLineShow(wLine_p bl, wBool_t visible);
 
 /* list.c */
-int CompareListData(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
+int CompareListData(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
+                    gpointer data);
 
 /* liststore.c */
 wListItem_p wlibListItemGet(GtkListStore *ls, wIndex_t inx, GList **childR);
 void *wlibListStoreGetContext(GtkListStore *ls, int inx);
 void wlibListStoreClear(GtkListStore *listStore);
 GtkListStore *wlibNewListStore(int colCnt);
-void wlibListStoreSetPixbuf(GtkListStore *ls, GtkTreeIter *iter, GdkPixbuf *pixbuf);
-int wlibListStoreAddData(GtkListStore *ls, GdkPixbuf *pixbuf, int cols, wListItem_p id);
-int wlibListStoreUpdateValues(GtkListStore *ls, int row, int cols, char *labels, wIcon_p bm);
+void wlibListStoreSetPixbuf(GtkListStore *ls, GtkTreeIter *iter,
+                            GdkPixbuf *pixbuf);
+int wlibListStoreAddData(GtkListStore *ls, GdkPixbuf *pixbuf, int cols,
+                         wListItem_p id);
+int wlibListStoreUpdateValues(GtkListStore *ls, int row, int cols, char *labels,
+                              wIcon_p bm);
 
 /* main.c */
 char *wlibGetAppName(void);
@@ -239,16 +242,17 @@ int getMlistOrigin(wMenuList_p ml, GList **pChildren);
 
 /* misc.c */
 typedef struct accelData_t {
-    wAccelKey_e key;
-    int modifier;
-    wAccelKeyCallBack_p action;
-    void * data;
+	wAccelKey_e key;
+	int modifier;
+	wAccelKeyCallBack_p action;
+	void * data;
 } accelData_t;
 
 
 GdkPixbuf* wlibPixbufFromXBM(wIcon_p ip);
 int wlibAddLabel(wControl_p b, const char *labelStr);
-void *wlibAlloc(wWin_p parent, wType_e type, wWinPix_t origX, wWinPix_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);
@@ -267,46 +271,53 @@ GdkPixbuf *wlibMakePixbuf(wIcon_p ip);
 
 /* print.c */
 struct wDraw_t {
-		WOBJ_COMMON
-		void * context;
-		wDrawActionCallBack_p action;
-		wDrawRedrawCallBack_p redraw;
-
-		GdkPixmap * pixmap;
-		GdkPixmap * pixmapBackup;
-		cairo_surface_t * temp_surface;
-
-		double dpi;
-
-		GdkGC * gc;
-		wDrawWidth lineWidth;
-		wDrawOpts opts;
-		wWinPix_t maxW;
-		wWinPix_t maxH;
-		unsigned long lastColor;
-		wBool_t lastColorInverted;
-		const char * helpStr;
-
-		wWinPix_t lastX;
-		wWinPix_t lastY;
-
-		wBool_t delayUpdate;
-		cairo_t *printContext;
-		cairo_surface_t *curPrintSurface;
-		GdkPixbuf * background;
-
-		wBool_t bTempMode;
-		};
+	WOBJ_COMMON
+	void * context;
+	wDrawActionCallBack_p action;
+	wDrawRedrawCallBack_p redraw;
+
+	GdkPixmap * pixmap;
+	GdkPixmap * pixmapBackup;
+	cairo_surface_t * temp_surface;
+
+	double dpi;
+
+	GdkGC * gc;
+	wDrawWidth lineWidth;
+	wDrawOpts opts;
+	wWinPix_t maxW;
+	wWinPix_t maxH;
+	unsigned long lastColor;
+	wBool_t lastColorInverted;
+	const char * helpStr;
+
+	wWinPix_t lastX;
+	wWinPix_t lastY;
+
+	wBool_t delayUpdate;
+	cairo_t *printContext;
+	cairo_surface_t *curPrintSurface;
+	GdkPixbuf * background;
+
+	wBool_t bTempMode;
+};
 
 void WlibApplySettings(GtkPrintOperation *op);
 void WlibSaveSettings(GtkPrintOperation *op);
-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);
+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();
@@ -325,12 +336,15 @@ void wlibHelpHideBalloon();
 
 /* treeview.c */
 void wlibTreeViewSetSelected(wList_p b, int index);
-GtkWidget *wlibNewTreeView(GtkListStore *ls, int showTitles, int multiSelection);
+GtkWidget *wlibNewTreeView(GtkListStore *ls, int showTitles,
+                           int multiSelection);
 int wlibTreeViewAddColumns(GtkWidget *tv, int count);
 int wlibAddColumnTitles(GtkWidget *tv, const char **titles);
-int wlibTreeViewAddData(GtkWidget *tv, int cols, char *label, GdkPixbuf *pixbuf, wListItem_p userData);
+int wlibTreeViewAddData(GtkWidget *tv, int cols, char *label, GdkPixbuf *pixbuf,
+                        wListItem_p userData);
 void wlibTreeViewAddRow(wList_p b, char *label, wIcon_p bm, wListItem_p id_p);
-gboolean changeSelection(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data);
+gboolean changeSelection(GtkTreeSelection *selection, GtkTreeModel *model,
+                         GtkTreePath *path, gboolean path_currently_selected, gpointer data);
 
 int wTreeViewGetCount(wList_p b);
 void wTreeViewClear(wList_p b);
@@ -338,7 +352,8 @@ void *wTreeViewGetItemContext(wList_p b, int row);
 
 /* window.c */
 void wlibDoModal(wWin_p win0, wBool_t modal);
-wBool_t catch_shift_ctrl_alt_keys(GtkWidget *widget, GdkEventKey *event, void *data);
+wBool_t catch_shift_ctrl_alt_keys(GtkWidget *widget, GdkEventKey *event,
+                                  void *data);
 
 /* wpref.c */