dwindows: win/dw.c comparison

comparison win/dw.c @ 1531:783a464afab2

Added window and box support to dw_window_get_preferred_size() on OS/2 and Windows. Fixed a number of potentially dangerous code segments on OS/2 and Windows. Updated inaccurate comments due to cut and paste and code changes and the readme.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 07 Jan 2012 13:59:58 +0000
parents	5facb5380944
children	6c55d68fd08a

comparison

equal deleted inserted replaced

-:eecfceaf581f
+:783a464afab2
 BOOL CALLBACK _free_window_memory(HWND handle, LPARAM lParam)
 {
 ColorInfo *thiscinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 HFONT oldfont = (HFONT)SendMessage(handle, WM_GETFONT, 0, 0);
 HICON oldicon = (HICON)SendMessage(handle, WM_GETICON, 0, 0);
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 /* Don't try to free memory from an OLE embedded IE */
 if(strncmp(tmpbuf, "Internet Explorer_Server", 25) == 0)
 /* This function returns 1 if the window (widget) handle
 * passed to it is a valid window that can gain input focus.
 */
 int _validate_focus(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 if(!handle)
 return 0;
 if(!IsWindowEnabled(handle))
 return 0;
 }
 HWND _normalize_handle(HWND handle)
 {
-char tmpbuf[100] = "";
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS))==0) /* Spinner */
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 lasthwnd = _normalize_handle(box->items[z].hwnd);
 }
 else
 {
-char tmpbuf[100] = "";
+char tmpbuf[100] = {0};
 GetClassName(box->items[z].hwnd, tmpbuf, 99);
 if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
 {
 lasthwnd = _normalize_handle(box->items[z].hwnd);
 }
 else
 {
-char tmpbuf[100] = "";
+char tmpbuf[100] = {0};
 GetClassName(box->items[z].hwnd, tmpbuf, 99);
 if(strncmp(tmpbuf, SplitbarClassName, strlen(SplitbarClassName)+1)==0)
 {
 * layout and moves the current focus to it.
 */
 void _initial_focus(HWND handle)
 {
 Box *thisbox;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 if(!handle)
 return;
 GetClassName(handle, tmpbuf, 99);
 return 0;
 lastbox = box;
 }
 if(lastbox)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(lastbox, tmpbuf, 99);
 if(strncmp(tmpbuf, ClassName, strlen(ClassName)+1)==0)
 return lastbox;
 /* If the calculated size is valid... */
 if(width > 0 && height > 0)
 {
 int pad = thisbox->items[z].pad;
 HWND handle = thisbox->items[z].hwnd;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 {
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 if(cinfo && cinfo->vcenter)
 {
 /* We are centered so calculate a new position */
-char tmpbuf[1024];
+char tmpbuf[1024] = {0};
 int textheight, diff, total = height;
 GetWindowText(handle, tmpbuf, 1023);
 /* Figure out how big the text is */
 tmp->message == NM_RCLICK ||
 tmp->message == TVN_ITEMEXPANDED)
 {
 NMTREEVIEW FAR *tem=(NMTREEVIEW FAR *)mp2;
 NMLISTVIEW FAR *lem=(NMLISTVIEW FAR *)mp2;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(tem->hdr.hwndFrom, tmpbuf, 99);
 if(strnicmp(tmpbuf, WC_TREEVIEW, strlen(WC_TREEVIEW))==0)
 {
 }
 break;
 case WM_HSCROLL:
 case WM_VSCROLL:
 {
-char tmpbuf[100] = "";
+char tmpbuf[100] = {0};
 HWND handle = (HWND)mp2;
 int (*valuechangefunc)(HWND, int, void *) = tmp->signalfunction;
 if(!GetClassName(handle, tmpbuf, 99))
 {
 break;
 case WM_HSCROLL:
 case WM_VSCROLL:
 {
 HWND handle = (HWND)mp2;
-char tmpbuf[100];
 int bar = (origmsg == WM_HSCROLL) ? SB_HORZ : SB_VERT;
 if(dw_window_get_data(handle, "_dw_scrollbar"))
 {
 int value = _HandleScroller(handle, bar, (int)HIWORD(mp1), (int)LOWORD(mp1));
 if(value > -1)
 dw_scrollbar_set_pos(handle, value);
 }
 else
 {
+char tmpbuf[100] = {0};
 GetClassName( hWnd, tmpbuf, 99 );
 if ( strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1 ) == 0 )
 {
 _HandleScroller(hWnd, bar, (int)HIWORD(mp1), (int)LOWORD(mp1));
 }
 return CallWindowProc(cinfo->pOldProc, hWnd, msg, mp1, mp2);
 }
 void _click_default(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 /* These are the window classes which can
 * obtain input focus.
 /* Subclass function that will handle setting colors on controls */
 BOOL CALLBACK _colorwndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
 {
 ColorInfo *cinfo;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 WNDPROC pOldProc = 0;
 int ret = -1;
 cinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 * Buttons/Bitmaps: Size of text or image and border.
 */
 void _control_size(HWND handle, int *width, int *height)
 {
 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
-char tmpbuf[100], *buf = dw_window_get_text(handle);
+char tmpbuf[100] = {0}, *buf = dw_window_get_text(handle);
 static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 HBITMAP hbm = 0;
 GetClassName(handle, tmpbuf, 99);
 */
 int API dw_window_set_font(HWND handle, char *fontname)
 {
 HFONT hfont, oldfont;
 ColorInfo *cinfo;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 GetClassName(handle, tmpbuf, 99);
 if ( strnicmp( tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1) == 0 )
 char *str = NULL;
 char *bold = "";
 char *italic = "";
 LOGFONT lf = { 0 };
 Box *thisbox;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if ( strnicmp( tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1) == 0 )
 {
 /* groupbox */
 */
 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
 {
 ColorInfo *cinfo;
 Box *thisbox;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
 GetClassName(handle, tmpbuf, 99);
 *       text: The text associsated with a given window.
 */
 void API dw_window_set_text(HWND handle, char *text)
 {
 Box *thisbox;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 SetWindowText(handle, text);
 * Returns:
 *       text: The text associsated with a given window.
 */
 char * API dw_window_get_text(HWND handle)
 {
-char tmpbuf[100], *tempbuf;
+char tmpbuf[100] = {0}, *tempbuf;
 int len;
 GetClassName(handle, tmpbuf, 99);
 if ( strnicmp( tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1) == 0 )
 /* Internal box packing function called by the other 3 functions */
 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
 {
 Box *thisbox = NULL;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 /*
 * If you try and pack an item into itself VERY bad things can happen; like at least an
 * infinite loop on GTK! Lets be safe!
 */
 *       width: Width in pixels of the item or NULL if not needed.
 *       height: Height in pixels of the item or NULL if not needed.
 */
 void API dw_window_get_preferred_size(HWND handle, int *width, int *height)
 {
-_control_size(handle, width, height);
+char tmpbuf[100] = {0};
+GetClassName(handle, tmpbuf, 99);
+if(strnicmp(tmpbuf, ClassName, strlen(ClassName)+1) == 0)
+{
+unsigned long thiswidth = 0, thisheight = 0;
+/* Get the size with the border */
+_get_window_for_size(handle, &thiswidth, &thisheight);
+/* Return what was requested */
+if(width) *width = (int)thiswidth;
+if(height) *height = (int)thisheight;
+}
+else if(strnicmp(tmpbuf, FRAMECLASSNAME, strlen(FRAMECLASSNAME)+1) == 0)
+{
+Box *thisbox = (Box *)GetWindowLongPtr(handle, GWLP_USERDATA);
+if(thisbox)
+{
+int depth = 0;
+/* Calculate space requirements */
+_resize_box(thisbox, &depth, 0, 0, 1);
+/* Return what was requested */
+if(width) *width = thisbox->minwidth;
+if(height) *height = thisbox->minheight;
+}
+}
+else
+_control_size(handle, width, height);
 }
 /*
 * Returns the width of the screen.
 */
 *          handle: Handle to the listbox to be appended to.
 *          text: Text to append into listbox.
 */
 void API dw_listbox_append(HWND handle, char *text)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 SendMessage(handle,
 *          text: Text strings to append into listbox.
 *          count: Number of text strings to append
 */
 void API dw_listbox_list_append(HWND handle, char **text, int count)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 int listbox_type;
 int i;
 GetClassName(handle, tmpbuf, 99);
 *          text: Text to append into listbox.
 *          pos: 0 based position to insert text
 */
 void API dw_listbox_insert(HWND handle, char *text, int pos)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 SendMessage(handle,
 * Parameters:
 *          handle: Handle to the listbox to be cleared.
 */
 void API dw_listbox_clear(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 {
 *          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)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 {
 *          buffer: Buffer where text will be copied.
 *          length: Length of the buffer (including NULL).
 */
 void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 int len;
 if(!buffer || !length)
 return;
 * Parameters:
 *          handle: Handle to the listbox to be queried.
 */
 int API dw_listbox_selected(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 return (unsigned int)SendMessage(handle,
 *          where: Either the previous return or -1 to restart.
 */
 int API dw_listbox_selected_multi(HWND handle, int where)
 {
 int *array, count, z;
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 /* This doesn't work on comboboxes */
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 *          index: Item index.
 *          state: TRUE if selected FALSE if unselected.
 */
 void API dw_listbox_select(HWND handle, int index, int state)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 SendMessage(handle, CB_SETCURSEL, (WPARAM)index, 0);
 *          handle: Handle to the listbox to be set.
 *          index: Item index.
 */
 void API dw_listbox_delete(HWND handle, int index)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 SendMessage(handle, CB_DELETESTRING, (WPARAM)index, 0);
 * Parameters:
 *          handle: Handle to the listbox to be cleared.
 */
 int API dw_listbox_count(HWND handle)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 return (int)SendMessage(handle,
 *          handle: Handle to the listbox to be cleared.
 *          top: Index to the top item.
 */
 void API dw_listbox_set_top(HWND handle, int top)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 /* This doesn't work on comboboxes */
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1)==0)
 }
 /* This function unchecks all radiobuttons on a box */
 BOOL CALLBACK _uncheck_radios(HWND handle, LPARAM lParam)
 {
-char tmpbuf[100];
+char tmpbuf[100] = {0};
 GetClassName(handle, tmpbuf, 99);
 if(strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME)+1)==0)
 {

Mercurial > dwindows

comparison win/dw.c @ 1531:783a464afab2