Mercurial > dwindows
changeset 2225:1ec6300a627b
Updated the platform template for the new 3.1 APIs.
Removed lingering Photon support, replace it with __TEMPLATE__.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Sat, 26 Dec 2020 03:42:38 +0000 |
| parents | d3974aa8ad64 |
| children | 2de088fb5dd4 |
| files | dw.h template/dw.c |
| diffstat | 2 files changed, 340 insertions(+), 205 deletions(-) [+] |
line wrap: on
line diff
--- a/dw.h Thu Dec 24 09:42:52 2020 +0000 +++ b/dw.h Sat Dec 26 03:42:38 2020 +0000 @@ -59,7 +59,6 @@ #define DW_UNUSED(x) x #endif -#if !defined(__PHOTON__) /* These corespond to the entries in the color * arrays in the Win32 dw.c, they are also the * same as DOS ANSI colors. @@ -81,7 +80,6 @@ #define DW_CLR_CYAN 14 #define DW_CLR_WHITE 15 #define DW_CLR_DEFAULT 16 -#endif /* Signal handler defines */ #define DW_SIGNAL_CONFIGURE "configure_event" @@ -125,7 +123,7 @@ # endif #endif -#if defined(__OS2__) || (defined(__WIN32__) && !defined(GDK_WINDOWING_WIN32)) || defined(__MAC__) || (defined(WINNT) && !defined(GDK_WINDOWING_WIN32)) || defined(__EMX__) +#if defined(__OS2__) || (defined(__WIN32__) && !defined(GDK_WINDOWING_WIN32)) || defined(__MAC__) || defined(__EMX__) || defined(__TEMPLATE__) /* OS/2, Windows or MacOS */ #ifdef __OS2__ @@ -573,7 +571,7 @@ #endif /* Windows specific section */ -#if defined(__WIN32__) || defined(WINNT) +#if defined(__WIN32__) #include <winsock2.h> #include <windows.h> #include <commctrl.h> @@ -720,72 +718,22 @@ typedef HWND HMENUI; #endif -typedef struct _item { - /* Item type - Box or Item */ - int type; - /* Handle to Frame or Window */ - HWND hwnd; - /* Width and Height of static size */ - int width, height, origwidth, origheight; - /* Size Type - Static or Expand */ - int hsize, vsize; - /* Padding */ - int pad; -} Item; - -typedef struct _box { -#if defined(__WIN32__) || defined(WINNT) - ColorInfo cinfo; - int fullscreen; -#elif defined(__OS2__) || defined(__EMX__) - PFNWP oldproc; - UserData *root; - HWND hwndtitle, hwnd; - int titlebar; -#endif - /* Number of items in the box */ - int count; - /* Box type - horizontal or vertical */ - int type; - /* Keep track of how box is packed */ - int hsize, vsize; - /* Padding */ - int pad, grouppadx, grouppady; - /* Groupbox */ - HWND grouphwnd; - /* Default item */ - HWND defaultitem; - /* Used as temporary storage in the calculation stage */ - int usedpadx, usedpady, minheight, minwidth; - /* Used for calculating individual item ratios */ - int width, height; - /* Any combinations of flags describing the box */ - unsigned long flags; - /* Array of item structures */ - struct _item *items; -} Box; - -#elif defined(__PHOTON__) +/* Template section, framework for new platform ports */ +#if defined(__TEMPLATE__) #include <stdio.h> #include <stdlib.h> -#include <unistd.h> -#include <sys/utsname.h> -/* Photon specific section */ -#include <Pt.h> -#include <Ph.h> -/* which image formats supported */ -#define PX_IMAGE_MODULES -#define PX_GIF_SUPPORT -#define PX_JPG_SUPPORT -#define PX_BMP_SUPPORT -#define PX_PND_SUPPORT -#include <photon/PxImage.h> +#include <stdarg.h> +#include <limits.h> + +/* Can remove this for your port when you know where MAX_PATH is */ +#ifndef MAX_PATH +#define MAX_PATH 260 +#endif #define TRUE 1 #define FALSE 0 -typedef PtWidget_t *pPtWidget_t; -typedef pPtWidget_t HWND; +typedef void *HWND; typedef unsigned long ULONG; typedef long LONG; @@ -801,18 +749,11 @@ typedef void *HEV; typedef void *HSHM; typedef void *HMOD; -typedef PtTreeItem_t *HTREEITEM; +typedef void *HTREEITEM; typedef HWND HMENUI; typedef int DWTID; typedef unsigned long HICN; -typedef struct _user_data -{ - struct _user_data *next; - void *data; - char *varname; -} UserData; - typedef struct _window_data { UserData *root; HWND clickdefault; @@ -826,36 +767,6 @@ HWND handle; } *HPIXMAP; -/* colors matching Photon Graphics colors */ -#define DW_CLR_BLACK Pg_BLACK -#define DW_CLR_DARKRED Pg_DRED -#define DW_CLR_DARKGREEN Pg_DGREEN -#define DW_CLR_BROWN Pg_BROWN -#define DW_CLR_DARKBLUE Pg_DBLUE -#define DW_CLR_DARKPINK Pg_PURPLE -#define DW_CLR_DARKCYAN Pg_DCYAN -#define DW_CLR_PALEGRAY Pg_GRAY -#define DW_CLR_DARKGRAY Pg_MGRAY -#define DW_CLR_RED Pg_RED -#define DW_CLR_GREEN Pg_GREEN -#define DW_CLR_YELLOW Pg_YELLOW -#define DW_CLR_BLUE Pg_BLUE -#define DW_CLR_PINK Pg_MAGENTA -#define DW_CLR_CYAN Pg_CYAN -#define DW_CLR_WHITE Pg_WHITE -#define DW_CLR_DEFAULT Pg_GRAY -/* color manipulation macros */ -#define DW_RGB_COLOR (0xF0000000) -#define DW_RGB_TRANSPARENT (0x0F000000) -#define DW_RGB_MASK (0x00FFFFFF) -#define DW_RED_MASK (0x00FF0000) -#define DW_GREEN_MASK (0x0000FF00) -#define DW_BLUE_MASK (0x000000FF) -#define DW_RED_VALUE(a) PgRedValue(a) -#define DW_GREEN_VALUE(a) PgGreenValue(a) -#define DW_BLUE_VALUE(a) PgBluValue(a) -#define DW_RGB(a, b, c) PgRGB( a, b, c ) - #define DW_DT_LEFT 0 #define DW_DT_QUERYEXTENT 0 #define DW_DT_UNDERSCORE 0 @@ -872,22 +783,22 @@ #define DW_DT_WORDBREAK 0 #define DW_DT_ERASERECT 0 -#define DW_FCF_CLOSEBUTTON Ph_WM_RENDER_CLOSE -#define DW_FCF_TITLEBAR Ph_WM_RENDER_TITLE +#define DW_FCF_CLOSEBUTTON 0 +#define DW_FCF_TITLEBAR 0 #define DW_FCF_SYSMENU 0 -#define DW_FCF_MENU Ph_WM_RENDER_MENU -#define DW_FCF_SIZEBORDER Ph_WM_RENDER_RESIZE -#define DW_FCF_MINBUTTON Ph_WM_RENDER_MIN -#define DW_FCF_MAXBUTTON Ph_WM_RENDER_MAX -#define DW_FCF_MINMAX (Ph_WM_RENDER_MIN|Ph_WM_RENDER_MAX) +#define DW_FCF_MENU 0 +#define DW_FCF_SIZEBORDER 0 +#define DW_FCF_MINBUTTON 0 +#define DW_FCF_MAXBUTTON 0 +#define DW_FCF_MINMAX (DW_FCF_MINBUTTON|DW_FCF_MAXBUTTON) #define DW_FCF_DLGBORDER 0 -#define DW_FCF_BORDER Ph_WM_RENDER_BORDER +#define DW_FCF_BORDER 0 #define DW_FCF_TASKLIST 0 #define DW_FCF_NOMOVEWITHOWNER 0 #define DW_FCF_SYSMODAL 0 #define DW_FCF_HIDEBUTTON 0 #define DW_FCF_HIDEMAX 0 -#define DW_FCF_AUTOICON (Ph_WM_RENDER_ASICON | ~Ph_WM_RENDER_ASAPP) +#define DW_FCF_AUTOICON 0 #define DW_FCF_MAXIMIZE 0 #define DW_FCF_MINIMIZE 0 #define DW_FCF_TEXTURED 0 @@ -914,13 +825,9 @@ #define DW_LIT_NONE -1 -#ifdef MLFSEARCH_CASESENSITIVE -# define DW_MLE_CASESENSITIVE MLFSEARCH_CASESENSITIVE -#else -# define DW_MLE_CASESENSITIVE 0 -#endif +#define DW_MLE_CASESENSITIVE 0 -#define DW_BS_NOBORDER 1 +#define DW_BS_NOBORDER 0 #define DW_POINTER_DEFAULT 0 #define DW_POINTER_ARROW 0 @@ -1024,6 +931,52 @@ #define KC_CTRL (1) #define KC_SHIFT (1 << 1) #define KC_ALT (1 << 2) +#endif + +typedef struct _item { + /* Item type - Box or Item */ + int type; + /* Handle to Frame or Window */ + HWND hwnd; + /* Width and Height of static size */ + int width, height, origwidth, origheight; + /* Size Type - Static or Expand */ + int hsize, vsize; + /* Padding */ + int pad; +} Item; + +typedef struct _box { +#if defined(__WIN32__) + ColorInfo cinfo; + int fullscreen; +#elif defined(__OS2__) || defined(__EMX__) + PFNWP oldproc; + UserData *root; + HWND hwndtitle, hwnd; + int titlebar; +#endif + /* Number of items in the box */ + int count; + /* Box type - horizontal or vertical */ + int type; + /* Keep track of how box is packed */ + int hsize, vsize; + /* Padding */ + int pad, grouppadx, grouppady; + /* Groupbox */ + HWND grouphwnd; + /* Default item */ + HWND defaultitem; + /* Used as temporary storage in the calculation stage */ + int usedpadx, usedpady, minheight, minwidth; + /* Used for calculating individual item ratios */ + int width, height; + /* Any combinations of flags describing the box */ + unsigned long flags; + /* Array of item structures */ + struct _item *items; +} Box; #else /* GTK Specific section */ @@ -1475,7 +1428,6 @@ #define DW_PIXMAP_WIDTH(x) (x ? x->width : 0) #define DW_PIXMAP_HEIGHT(x) (x ? x->height : 0) -#if !defined(__PHOTON__) #define DW_RGB_COLOR (0xF0000000) #define DW_RGB_TRANSPARENT (0x0F000000) #define DW_RGB_MASK (0x00FFFFFF) @@ -1486,7 +1438,6 @@ #define DW_GREEN_VALUE(a) ((a & DW_GREEN_MASK) >> 8) #define DW_BLUE_VALUE(a) ((a & DW_BLUE_MASK) >> 16) #define DW_RGB(a, b, c) (0xF0000000 | (a) | (b) << 8 | (c) << 16) -#endif /* Menu convenience paramaters */ #define DW_MENU_SEPARATOR ""
--- a/template/dw.c Thu Dec 24 09:42:52 2020 +0000 +++ b/template/dw.c Sat Dec 26 03:42:38 2020 +0000 @@ -2,8 +2,10 @@ * Dynamic Windows: * A GTK like GUI implementation template. * - * (C) 2011-2012 Brian Smith <brian@dbsoft.org> - * (C) 2011-2012 Mark Hessling <mark@rexx.org> + * (C) 2011-2021 Brian Smith <brian@dbsoft.org> + * (C) 2011-2021 Mark Hessling <mark@rexx.org> + * + * Compile with $CC -I. -D__TEMPLATE__ template/dw.c * */ @@ -291,30 +293,55 @@ * current user directory. Or the root directory if it could * not be determined. */ -char * API dw_app_dir(void) +char * API dw_user_dir(void) { - static char _user_dir[1024] = ""; - - if(!_user_dir[0]) - { - char *home = getenv("HOME"); - - if(home) - strcpy(_user_dir, home); - else - strcpy(_user_dir, "/"); - } - return _user_dir; + static char _dw_user_dir[MAX_PATH+1] = {0}; + + if(!_dw_user_dir[0]) + { + char *home = getenv("HOME"); + + if(home) + strcpy(_dw_user_dir, home); + else + strcpy(_dw_user_dir, "/"); + } + return _dw_user_dir; } /* * Returns a pointer to a static buffer which containes the - * private application data directory. + * private application data directory. */ -char *dw_app_dir(void) +char * API dw_app_dir(void) { - static _dw_app_dir[MAX_PATH+1] = "/"; - return _dw_app_dir; + static char _dw_exec_dir[MAX_PATH+1] = {0}; + /* Code to determine the execution directory here, + * some implementations make this variable global + * and determin the location in dw_init(). + */ + return _dw_exec_dir; +} + +/* + * Sets the application ID used by this Dynamic Windows application instance. + * Parameters: + * appid: A string typically in the form: com.company.division.application + * appname: The application name used on Windows or NULL. + * Returns: + * DW_ERROR_NONE after successfully setting the application ID. + * DW_ERROR_UNKNOWN if unsupported on this system. + * DW_ERROR_GENERAL if the application ID is not allowed. + * Remarks: + * This must be called before dw_init(). If dw_init() is called first + * it will create a unique ID in the form: org.dbsoft.dwindows.application + * or if the application name cannot be detected: org.dbsoft.dwindows.pid.# + * The appname is only required on Windows. If NULL is passed the detected + * application name will be used, but a prettier name may be desired. + */ +int API dw_app_id_set(const char * DW_UNUSED(appid), const char * DW_UNUSED(appname)) +{ + return DW_ERROR_UNKNOWN; } /* @@ -323,7 +350,7 @@ * format: printf style format string. * ...: Additional variables for use in the format. */ -void API dw_debug(char *format, ...) +void API dw_debug(const char *format, ...) { va_list args; char outbuf[1025] = {0}; @@ -331,7 +358,10 @@ va_start(args, format); vsnprintf(outbuf, 1024, format, args); va_end(args); - + + /* Output to stderr, if there is another way to send it + * on the implementation platform, change this. + */ fprintf(stderr, "%s", outbuf); } @@ -346,7 +376,7 @@ * DW_MB_RETURN_YES, DW_MB_RETURN_NO, DW_MB_RETURN_OK, * or DW_MB_RETURN_CANCEL based on flags and user response. */ -int API dw_messagebox(char *title, int flags, char *format, ...) +int API dw_messagebox(const char *title, int flags, const char *format, ...) { return 0; } @@ -363,7 +393,7 @@ * the file path on success. * */ -char * API dw_file_browse(char *title, char *defpath, char *ext, int flags) +char * API dw_file_browse(const char *title, const char *defpath, const char *ext, int flags) { return NULL; } @@ -387,7 +417,7 @@ * str: Text to put on the clipboard. * len: Length of the text. */ -void dw_clipboard_set_text(char *str, int len) +void dw_clipboard_set_text(const char *str, int len) { } @@ -482,7 +512,7 @@ * Returns: * A handle to a groupbox window or NULL on failure. */ -HWND API dw_groupbox_new(int type, int pad, char *title) +HWND API dw_groupbox_new(int type, int pad, const char *title) { return 0; } @@ -680,7 +710,7 @@ * Returns: * A handle to a button window or NULL on failure. */ -HWND API dw_button_new(char *text, ULONG cid) +HWND API dw_button_new(const char *text, ULONG cid) { return 0; } @@ -693,7 +723,7 @@ * Returns: * A handle to an entryfield window or NULL on failure. */ -HWND API dw_entryfield_new(char *text, ULONG cid) +HWND API dw_entryfield_new(const char *text, ULONG cid) { return 0; } @@ -706,7 +736,7 @@ * Returns: * A handle to an entryfield password window or NULL on failure. */ -HWND API dw_entryfield_password_new(char *text, ULONG cid) +HWND API dw_entryfield_password_new(const char *text, ULONG cid) { return 0; } @@ -729,7 +759,7 @@ * Returns: * A handle to a bitmap button window or NULL on failure. */ -HWND API dw_bitmapbutton_new(char *text, ULONG resid) +HWND API dw_bitmapbutton_new(const char *text, ULONG resid) { return 0; } @@ -745,7 +775,7 @@ * Returns: * A handle to a bitmap button window or NULL on failure. */ -HWND API dw_bitmapbutton_new_from_file(char *text, unsigned long cid, char *filename) +HWND API dw_bitmapbutton_new_from_file(const char *text, unsigned long cid, const char *filename) { return 0; } @@ -761,7 +791,7 @@ * Returns: * A handle to a bitmap button window or NULL on failure. */ -HWND API dw_bitmapbutton_new_from_data(char *text, unsigned long cid, char *data, int len) +HWND API dw_bitmapbutton_new_from_data(const char *text, unsigned long cid, const char *data, int len) { return 0; } @@ -774,7 +804,7 @@ * Returns: * A handle to a spinbutton window or NULL on failure. */ -HWND API dw_spinbutton_new(char *text, ULONG cid) +HWND API dw_spinbutton_new(const char *text, ULONG cid) { return 0; } @@ -820,7 +850,7 @@ * Returns: * A handle to a radio button window or NULL on failure. */ -HWND API dw_radiobutton_new(char *text, ULONG cid) +HWND API dw_radiobutton_new(const char *text, ULONG cid) { return 0; } @@ -937,7 +967,7 @@ * Returns: * A handle to a checkbox window or NULL on failure. */ -HWND API dw_checkbox_new(char *text, ULONG cid) +HWND API dw_checkbox_new(const char *text, ULONG cid) { return 0; } @@ -983,7 +1013,7 @@ * handle: Handle to the listbox to be appended to. * text: Text to append into listbox. */ -void API dw_listbox_append(HWND handle, char *text) +void API dw_listbox_append(HWND handle, const char *text) { } @@ -994,7 +1024,7 @@ * text: Text to insert into listbox. * pos: 0-based position to insert text */ -void API dw_listbox_insert(HWND handle, char *text, int pos) +void API dw_listbox_insert(HWND handle, const char *text, int pos) { } @@ -1059,7 +1089,7 @@ * index: Index into the list to be queried. * buffer: Buffer where text will be copied. */ -void API dw_listbox_set_text(HWND handle, unsigned int index, char *buffer) +void API dw_listbox_set_text(HWND handle, unsigned int index, const char *buffer) { } @@ -1117,7 +1147,7 @@ * Returns: * A handle to a combobox window or NULL on failure. */ -HWND API dw_combobox_new(char *text, ULONG cid) +HWND API dw_combobox_new(const char *text, ULONG cid) { return 0; } @@ -1143,7 +1173,7 @@ * Returns: * Current position in the buffer. */ -unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint) +unsigned int API dw_mle_import(HWND handle, const char *buffer, int startpoint) { return 0; } @@ -1234,6 +1264,16 @@ } /* + * Sets the word auto complete state of an MLE box. + * Parameters: + * handle: Handle to the MLE. + * state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE + */ +void API dw_mle_set_auto_complete(HWND handle, int state) +{ +} + +/* * Finds text in an MLE box. * Parameters: * handle: Handle to the MLE to be cleared. @@ -1243,7 +1283,7 @@ * Returns: * Position in buffer or DW_ERROR_UNKNOWN (-1) on error. */ -int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags) +int API dw_mle_search(HWND handle, const char *text, int point, unsigned long flags) { return DW_ERROR_UNKNOWN; } @@ -1274,7 +1314,7 @@ * Returns: * A handle to a status text window or NULL on failure. */ -HWND API dw_status_text_new(char *text, ULONG cid) +HWND API dw_status_text_new(const char *text, ULONG cid) { return 0; } @@ -1287,7 +1327,7 @@ * Returns: * A handle to a text window or NULL on failure. */ -HWND API dw_text_new(char *text, ULONG cid) +HWND API dw_text_new(const char *text, ULONG cid) { return 0; } @@ -1367,7 +1407,7 @@ * y: Y coordinate. * text: Text to be displayed. */ -void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, char *text) +void API dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, const char *text) { } @@ -1379,7 +1419,7 @@ * width: Pointer to a variable to be filled in with the width. * height: Pointer to a variable to be filled in with the height. */ -void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height) +void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, const char *text, int *width, int *height) { } @@ -1452,7 +1492,7 @@ * Returns: * A handle to a tree item or NULL on failure. */ -HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, HICN icon, HTREEITEM parent, void *itemdata) +HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, const char *title, HICN icon, HTREEITEM parent, void *itemdata) { return 0; } @@ -1468,7 +1508,7 @@ * Returns: * A handle to a tree item or NULL on failure. */ -HTREEITEM API dw_tree_insert(HWND handle, char *title, HICN icon, HTREEITEM parent, void *itemdata) +HTREEITEM API dw_tree_insert(HWND handle, const char *title, HICN icon, HTREEITEM parent, void *itemdata) { return 0; } @@ -1507,7 +1547,7 @@ * title: The text title of the entry. * icon: Handle to coresponding icon. */ -void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, HICN icon) +void API dw_tree_item_change(HWND handle, HTREEITEM item, const char *title, HICN icon) { } @@ -1620,7 +1660,7 @@ * handle: Handle to the container to be configured. * title: The title to be displayed in the main column. */ -void API dw_filesystem_set_column_title(HWND handle, char *title) +void API dw_filesystem_set_column_title(HWND handle, const char *title) { } @@ -1698,7 +1738,7 @@ * row: Zero based row of data being set. * data: Pointer to the data to be added. */ -void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon) +void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon) { } @@ -1711,7 +1751,7 @@ * row: Zero based row of data being set. * data: Pointer to the data to be added. */ -void API dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon) +void API dw_filesystem_set_file(HWND handle, void *pointer, int row, const char *filename, HICN icon) { } @@ -1785,7 +1825,7 @@ * row: Zero based row of data being set. * title: String title of the item. */ -void API dw_container_set_row_title(void *pointer, int row, char *title) +void API dw_container_set_row_title(void *pointer, int row, const char *title) { } @@ -1797,7 +1837,7 @@ * row: Zero based row of data being set. * title: String title of the item. */ -void API dw_container_change_row_title(HWND handle, int row, char *title) +void API dw_container_change_row_title(HWND handle, int row, const char *title) { } @@ -1880,7 +1920,7 @@ * handle: Handle to the window (widget) to be queried. * text: Text usually returned by dw_container_query(). */ -void API dw_container_cursor(HWND handle, char *text) +void API dw_container_cursor(HWND handle, const char *text) { } @@ -1890,7 +1930,7 @@ * handle: Handle to the window (widget). * text: Text usually returned by dw_container_query(). */ -void API dw_container_delete_row(HWND handle, char *text) +void API dw_container_delete_row(HWND handle, const char *text) { } @@ -1910,7 +1950,7 @@ * icon: Icon handle to display in the taskbar. * bubbletext: Text to show when the mouse is above the icon. */ -void API dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext) +void API dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext) { } @@ -1948,7 +1988,7 @@ * Returns: * Handle to the created icon or NULL on error. */ -HICN API dw_icon_load_from_file(char *filename) +HICN API dw_icon_load_from_file(const char *filename) { return 0; } @@ -1961,7 +2001,7 @@ * Returns: * Handle to the created icon or NULL on error. */ -HICN API dw_icon_load_from_data(char *data, int len) +HICN API dw_icon_load_from_data(const char *data, int len) { return 0; } @@ -2060,7 +2100,7 @@ * Returns: * A handle to a pixmap or NULL on failure. */ -HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename) +HPIXMAP API dw_pixmap_new_from_file(HWND handle, const char *filename) { return 0; } @@ -2075,7 +2115,7 @@ * Returns: * A handle to a pixmap or NULL on failure. */ -HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len) +HPIXMAP API dw_pixmap_new_from_data(HWND handle, const char *data, int len) { return 0; } @@ -2117,7 +2157,7 @@ * Returns: * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure. */ -int API dw_pixmap_set_font(HPIXMAP pixmap, char *fontname) +int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname) { return DW_ERROR_GENERAL; } @@ -2203,7 +2243,7 @@ * Returns: * DW_ERROR_NONE (0) on success. */ -int API dw_html_raw(HWND handle, char *string) +int API dw_html_raw(HWND handle, const char *string) { return DW_ERROR_GENERAL; } @@ -2217,12 +2257,27 @@ * Returns: * DW_ERROR_NONE (0) on success. */ -int API dw_html_url(HWND handle, char *url) +int API dw_html_url(HWND handle, const char *url) { return DW_ERROR_GENERAL; } /* + * Executes the javascript contained in "script" in the HTML window. + * Parameters: + * handle: Handle to the HTML window. + * script: Javascript code to execute. + * scriptdata: Data passed to the signal handler. + * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata. + * Returns: + * DW_ERROR_NONE (0) on success. + */ +int dw_html_javascript_run(HWND handle, const char *script, void *scriptdata) +{ + return DW_ERROR_UNKNOWN; +} + +/* * Create a new HTML window (widget) to be packed. * Parameters: * id: An ID to be used with dw_window_from_id() or 0L. @@ -2325,7 +2380,7 @@ * Returns: * Handle to the created menu item or NULL on error. */ -HWND API dw_menu_append_item(HMENUI menux, char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux) +HWND API dw_menu_append_item(HMENUI menux, const char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux) { return 0; } @@ -2420,7 +2475,7 @@ * pageid: Page ID of the tab to set. * text: Pointer to the text to set. */ -void API dw_notebook_page_set_text(HWND handle, ULONG pageid, char *text) +void API dw_notebook_page_set_text(HWND handle, ULONG pageid, const char *text) { } @@ -2431,7 +2486,7 @@ * pageid: Page ID of the tab to set. * text: Pointer to the text to set. */ -void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, char *text) +void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, const char *text) { } @@ -2455,7 +2510,7 @@ * Returns: * Handle to the created window or NULL on error. */ -HWND API dw_window_new(HWND hwndOwner, char *title, ULONG flStyle) +HWND API dw_window_new(HWND hwndOwner, const char *title, ULONG flStyle) { return 0; } @@ -2611,7 +2666,7 @@ * Returns: * DW_ERROR_NONE (0) on success. */ -int API dw_window_set_font(HWND handle, char *fontname) +int API dw_window_set_font(HWND handle, const char *fontname) { return DW_ERROR_GENERAL; } @@ -2634,7 +2689,7 @@ * Returns: * A malloced buffer with the selected font or NULL on error. */ -char * API dw_font_choose(char *currfont) +char * API dw_font_choose(const char *currfont) { return NULL; } @@ -2644,7 +2699,7 @@ * Parameters: * fontname: Font name in Dynamic Windows format. */ -void API dw_font_set_default(char *fontname) +void API dw_font_set_default(const char *fontname) { } @@ -2678,7 +2733,7 @@ * handle: Handle to the window. * text: The text associsated with a given window. */ -void API dw_window_set_text(HWND handle, char *text) +void API dw_window_set_text(HWND handle, const char *text) { } @@ -2688,7 +2743,7 @@ * handle: Handle to the window (widget). * bubbletext: The text in the floating bubble tooltip. */ -void API dw_window_set_tooltip(HWND handle, char *bubbletext) +void API dw_window_set_tooltip(HWND handle, const char *bubbletext) { } @@ -2721,7 +2776,7 @@ * NULL if you use the id param) * len: Length of data passed */ -void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, char *data, int len) +void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, const char *data, int len) { } @@ -2735,7 +2790,7 @@ * Windows and a pixmap on Unix, pass * NULL if you use the id param) */ -void API dw_window_set_bitmap(HWND handle, unsigned long resid, char *filename) +void API dw_window_set_bitmap(HWND handle, unsigned long resid, const char *filename) { } @@ -2944,7 +2999,7 @@ * dataname: A string pointer identifying which data to be saved. * data: User data to be saved to the window handle. */ -void dw_window_set_data(HWND window, char *dataname, void *data) +void dw_window_set_data(HWND window, const char *dataname, void *data) { } @@ -2956,7 +3011,7 @@ * Returns: * Pointer to data or NULL if no data is available. */ -void *dw_window_get_data(HWND window, char *dataname) +void *dw_window_get_data(HWND window, const char *dataname) { return NULL; } @@ -2992,7 +3047,7 @@ * sigfunc: The pointer to the function to be used as the callback. * data: User data to be passed to the handler function. */ -void API dw_signal_connect(HWND window, char *signame, void *sigfunc, void *data) +void API dw_signal_connect(HWND window, const char *signame, void *sigfunc, void *data) { } @@ -3002,7 +3057,7 @@ * window: Window handle of callback to be removed. * signame: Signal name to be matched on window. */ -void API dw_signal_disconnect_by_name(HWND window, char *signame) +void API dw_signal_disconnect_by_name(HWND window, const char *signame) { } @@ -3033,7 +3088,7 @@ * Returns: * DW_ERROR_NONE (0) on success. */ -int dw_module_load(char *name, HMOD *handle) +int dw_module_load(const char *name, HMOD *handle) { return DW_ERROR_UNKNOWN; } @@ -3047,7 +3102,7 @@ * Returns: * DW_ERROR_NONE (0) on success. */ -int dw_module_symbol(HMOD handle, char *name, void**func) +int dw_module_symbol(HMOD handle, const char *name, void**func) { return DW_ERROR_UNKNOWN; } @@ -3202,7 +3257,7 @@ * Returns: * Handle to event semaphore or NULL on error. */ -HEV dw_named_event_new(char *name) +HEV dw_named_event_new(const char *name) { return NULL; } @@ -3214,7 +3269,7 @@ * Returns: * Handle to event semaphore or NULL on error. */ -HEV dw_named_event_get(char *name) +HEV dw_named_event_get(const char *name) { return NULL; } @@ -3297,7 +3352,7 @@ * Returns: * Handle to shared memory or NULL on error. */ -HSHM dw_named_memory_new(void **dest, int size, char *name) +HSHM dw_named_memory_new(void **dest, int size, const char *name) { return NULL; } @@ -3311,7 +3366,7 @@ * Returns: * Handle to shared memory or NULL on error. */ -HSHM dw_named_memory_get(void **dest, int size, char *name) +HSHM dw_named_memory_get(void **dest, int size, const char *name) { return NULL; } @@ -3369,7 +3424,7 @@ * Returns: * Process ID on success or DW_ERROR_UNKNOWN (-1) on error. */ -int dw_exec(char *program, int type, char **params) +int dw_exec(const char *program, int type, char **params) { int ret = DW_ERROR_UNKNOWN; @@ -3383,7 +3438,7 @@ * Returns: * DW_ERROR_UNKNOWN (-1) on error; DW_ERROR_NONE (0) or a positive Process ID on success. */ -int dw_browse(char *url) +int dw_browse(const char *url) { return DW_ERROR_UNKNOWN; } @@ -3399,7 +3454,7 @@ * Returns: * A handle to the print object or NULL on failure. */ -HPRINT API dw_print_new(char *jobname, unsigned long flags, unsigned int pages, void *drawfunc, void *drawdata) +HPRINT API dw_print_new(const char *jobname, unsigned long flags, unsigned int pages, void *drawfunc, void *drawdata) { return NULL; } @@ -3426,3 +3481,132 @@ { } +/* + * Creates a new system notification if possible. + * Parameters: + * title: The short title of the notification. + * imagepath: Path to an image to display or NULL if none. + * description: A longer description of the notification, + * or NULL if none is necessary. + * Returns: + * A handle to the notification which can be used to attach a "clicked" event if desired, + * or NULL if it fails or notifications are not supported by the system. + * Remarks: + * This will create a system notification that will show in the notifaction panel + * on supported systems, which may be clicked to perform another task. + */ +HWND API dw_notification_new(const char * DW_UNUSED(title), const char * DW_UNUSED(imagepath), const char * DW_UNUSED(description), ...) +{ + return 0; +} + +/* + * Sends a notification created by dw_notification_new() after attaching signal handler. + * Parameters: + * notification: The handle to the notification returned by dw_notification_new(). + * Returns: + * DW_ERROR_NONE on success, DW_ERROR_UNKNOWN on error or not supported. + */ +int API dw_notification_send(HWND DW_UNUSED(notification)) +{ + return DW_ERROR_UNKNOWN; +} + +/* + * Converts a UTF-8 encoded string into a wide string. + * Parameters: + * utf8string: UTF-8 encoded source string. + * Returns: + * Wide string that needs to be freed with dw_free() + * or NULL on failure. + */ +wchar_t * API dw_utf8_to_wchar(const char *utf8string) +{ + return NULL; +} + +/* + * Converts a wide string into a UTF-8 encoded string. + * Parameters: + * wstring: Wide source string. + * Returns: + * UTF-8 encoded string that needs to be freed with dw_free() + * or NULL on failure. + */ +char * API dw_wchar_to_utf8(const wchar_t *wstring) +{ + return NULL; +} + +/* + * Gets the state of the requested library feature. + * Parameters: + * feature: The requested feature for example DW_FEATURE_DARK_MODE + * Returns: + * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature. + * DW_FEATURE_DISABLED if the feature is supported but disabled. + * DW_FEATURE_ENABLED if the feature is supported and enabled. + * Other value greater than 1, same as enabled but with extra info. + */ +int API dw_feature_get(DWFEATURE feature) +{ + switch(feature) + { +#if 0 + case DW_FEATURE_HTML: /* Supports the HTML Widget */ + case DW_FEATURE_HTML_RESULT: /* Supports the DW_SIGNAL_HTML_RESULT callback */ + case DW_FEATURE_WINDOW_BORDER: /* Supports custom window border sizes */ + case DW_FEATURE_WINDOW_TRANSPARENCY: /* Supports window frame transparency */ + case DW_FEATURE_DARK_MODE: /* Supports Dark Mode user interface */ + case DW_FEATURE_MLE_AUTO_COMPLETE: /* Supports auto completion in Multi-line Edit boxes */ + case DW_FEATURE_MLE_WORD_WRAP: /* Supports word wrapping in Multi-line Edit boxes */ + case DW_FEATURE_CONTAINER_STRIPE: /* Supports striped line display in container widgets */ + case DW_FEATURE_MDI: /* Supports Multiple Document Interface window frame */ + case DW_FEATURE_NOTEBOOK_STATUS_TEXT: /* Supports status text area on notebook/tabbed controls */ + case DW_FEATURE_NOTIFICATION: /* Supports sending system notifications */ + case DW_FEATURE_UTF8_UNICODE: /* Supports UTF8 encoded Unicode text */ + return DW_FEATURE_ENABLED; +#endif + default: + return DW_FEATURE_UNSUPPORTED; + } +} + +/* + * Sets the state of the requested library feature. + * Parameters: + * feature: The requested feature for example DW_FEATURE_DARK_MODE + * state: DW_FEATURE_DISABLED, DW_FEATURE_ENABLED or any value greater than 1. + * Returns: + * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature. + * DW_ERROR_NONE if the feature is supported and successfully configured. + * DW_ERROR_GENERAL if the feature is supported but could not be configured. + * Remarks: + * These settings are typically used during dw_init() so issue before + * setting up the library with dw_init(). + */ +int API dw_feature_set(DWFEATURE feature, int state) +{ + switch(feature) + { + /* These features are supported but not configurable */ +#if 0 + case DW_FEATURE_HTML: /* Supports the HTML Widget */ + case DW_FEATURE_HTML_RESULT: /* Supports the DW_SIGNAL_HTML_RESULT callback */ + case DW_FEATURE_WINDOW_BORDER: /* Supports custom window border sizes */ + case DW_FEATURE_WINDOW_TRANSPARENCY: /* Supports window frame transparency */ + case DW_FEATURE_DARK_MODE: /* Supports Dark Mode user interface */ + case DW_FEATURE_MLE_AUTO_COMPLETE: /* Supports auto completion in Multi-line Edit boxes */ + case DW_FEATURE_MLE_WORD_WRAP: /* Supports word wrapping in Multi-line Edit boxes */ + case DW_FEATURE_CONTAINER_STRIPE: /* Supports striped line display in container widgets */ + case DW_FEATURE_MDI: /* Supports Multiple Document Interface window frame */ + case DW_FEATURE_NOTEBOOK_STATUS_TEXT: /* Supports status text area on notebook/tabbed controls */ + case DW_FEATURE_NOTIFICATION: /* Supports sending system notifications */ + case DW_FEATURE_UTF8_UNICODE: /* Supports UTF8 encoded Unicode text */ + return DW_ERROR_GENERAL; +#endif + /* These features are supported and configurable */ + default: + return DW_FEATURE_UNSUPPORTED; + } +}