dwindows: win/dw.c comparison

comparison win/dw.c @ 1422:131bedf41332

Initial support for automatic redrawing on Windows and ranged/bitmap auto-calculation support. Also some code optimization and cleanup on the Mac gleaned from the Windows changes.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 03 Dec 2011 02:08:40 +0000
parents	ddf9cfb4a074
children	1628bf383893

comparison

equal deleted inserted replaced

-:63d253a2cdd9
+:131bedf41332
 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y);
 int _lookup_icon(HWND handle, HICON hicon, int type);
 HFONT _acquire_font(HWND handle, char *fontname);
 void _click_default(HWND handle);
 void _do_resize(Box *thisbox, int x, int y);
+/* Internal function to queue a window redraw */
+void _dw_redraw(HWND window, int skip)
+{
+static HWND lastwindow = 0;
+if(skip && !window)
+return;
+if(lastwindow != window && lastwindow)
+{
+dw_window_redraw(lastwindow);
+}
+lastwindow = window;
+}
 typedef struct _sighandler
 {
 struct _sighandler   *next;
 ULONG message;
 HWND box, lastbox = GetParent(handle);
 /* Find the toplevel window */
 while((box = GetParent(lastbox)))
 {
+if(box == DW_HWND_OBJECT)
+return 0;
 lastbox = box;
 }
 if(lastbox)
 return lastbox;
 return handle;
 }
 break;
 }
 if(result != -1)
+{
+/* Make sure any queued redraws are handled */
+_dw_redraw(0, FALSE);
+/* Then finally return */
 return result;
-else
+}
-{
+return DefWindowProc(hWnd, msg, mp1, mp2);
-return DefWindowProc(hWnd, msg, mp1, mp2);
-}
 }
 VOID CALLBACK _TimerProc(HWND hwnd, UINT msg, UINT_PTR idEvent, DWORD dwTime)
 {
 _wndproc(hwnd, msg, (WPARAM)idEvent, 0);
 *
 * Scrolled(Container,Tree,MLE)/Render/Unspecified: 1x1
 * Entryfield/Combobox/Spinbutton: 150x(maxfontheight)
 * Spinbutton: 50x(maxfontheight)
 * Text/Status: (textwidth)x(textheight)
+* Ranged: 100x14 or 14x100 for vertical.
+* 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);
 static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+HBITMAP hbm = 0;
 GetClassName(handle, tmpbuf, 99);
 /* If we have a string...
 * calculate the size with the current font.
 */
 if(buf)
 {
 if(*buf)
 dw_font_text_extents_get(handle, NULL, buf, &thiswidth, &thisheight);
 dw_free(buf);
 }
+/* Attempt to get bitmap from classes that can have them */
+if(strnicmp(tmpbuf, STATICCLASSNAME, strlen(STATICCLASSNAME)+1) == 0)
+hbm = (HBITMAP)SendMessage(handle, STM_GETIMAGE, IMAGE_BITMAP, 0);
+if(strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME)+1) == 0)
+hbm = (HBITMAP)SendMessage(handle, BM_GETIMAGE, IMAGE_BITMAP, 0);
+/* If we got an image... set the sizes appropriately */
+if(hbm)
+{
+BITMAP bmi;
+GetObject(hbm, sizeof(BITMAP), &bmi);
+thiswidth = bmi.bmWidth;
+thisheight = bmi.bmHeight;
+}
 /* Combobox */
 if(strnicmp(tmpbuf, COMBOBOXCLASSNAME, strlen(COMBOBOXCLASSNAME)+1) == 0)
 {
 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight);
 thiswidth = 150;
 extraheight = 4;
 if(thisheight < 18)
 thisheight = 18;
 }
+/* Ranged: Percent, Slider, Scrollbar */
+else if(strnicmp(tmpbuf, PROGRESS_CLASS, strlen(PROGRESS_CLASS)+1) == 0 ||
+strnicmp(tmpbuf, TRACKBAR_CLASS, strlen(TRACKBAR_CLASS)+1) == 0 ||
+strnicmp(tmpbuf, SCROLLBARCLASSNAME, strlen(SCROLLBARCLASSNAME)+1) == 0)
+{
+if(strnicmp(tmpbuf, SCROLLBARCLASSNAME, strlen(SCROLLBARCLASSNAME)+1) == 0 &&
+GetWindowLong(handle, GWL_STYLE) & SBS_VERT)
+{
+/* Vertical */
+thiswidth = 14;
+thisheight = 100;
+}
+else
+{
+/* Horizontal */
+thiswidth = 100;
+thisheight = 14;
+}
+}
+/* Spinbuttons */
 else if(strnicmp(tmpbuf, UPDOWN_CLASS, strlen(UPDOWN_CLASS)+1) == 0)
 {
 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight);
 thiswidth = 50;
 }
+/* Entryfields */
 else if(strnicmp(tmpbuf, EDITCLASSNAME, strlen(EDITCLASSNAME)+1) == 0 &&
 !(GetWindowLong(handle, GWL_STYLE) & ES_MULTILINE))
 {
 dw_font_text_extents_get(handle, NULL, testtext, NULL, &thisheight);
 thiswidth = 150;
 }
 else if(strnicmp(tmpbuf, BUTTONCLASSNAME, strlen(BUTTONCLASSNAME)+1) == 0)
 {
 ULONG style = GetWindowLong(handle, GWL_STYLE);
-if(style & BS_AUTOCHECKBOX || style & BS_AUTORADIOBUTTON)
+/* Bitmap buttons */
+if(hbm)
+{
+extrawidth = 2;
+extraheight = 2;
+}
+/* Checkbox or radio button */
+else if(style & BS_AUTOCHECKBOX || style & BS_AUTORADIOBUTTON)
 {
 extrawidth = 24;
 extraheight = 4;
 }
+/* Text buttons */
 else
 {
 extrawidth = 8;
 extraheight = 4;
 }
 else if(strnicmp(tmpbuf, StatusbarClassName, strlen(StatusbarClassName)+1) == 0)
 {
 extrawidth = 4;
 extraheight = 2;
 }
 /* Set the requested sizes */
 if(width)
 *width = thiswidth + extrawidth;
 if(height)
 if(oldfont)
 DeleteObject(oldfont);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
+{
 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+/* Queue a redraw on the top-level window */
+_dw_redraw(_toplevel_window(handle), TRUE);
+}
 return DW_ERROR_NONE;
 }
 return DW_ERROR_UNKNOWN;
 }
 if(hbitmap && oldbitmap)
 DeleteObject(oldbitmap);
 else if(icon && oldicon)
 DeleteObject(oldicon);
+/* If we changed the bitmap... */
+{
+Item *item = _box_item(handle);
+/* Check to see if any of the sizes need to be recalculated */
+if(item && (item->origwidth == -1 || item->origheight == -1))
+{
+_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+/* Queue a redraw on the top-level window */
+_dw_redraw(_toplevel_window(handle), TRUE);
+}
+}
 }
 /*
 * Sets the bitmap used for a given static window from data.
 * Parameters:
 {
 Item *item = _box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
+{
 _control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
+/* Queue a redraw on the top-level window */
+_dw_redraw(_toplevel_window(handle), TRUE);
+}
 }
 }
 /*
 * Sets the text used for a given window's floating bubble help.
 SetParent(cinfo->buddy, box);
 ShowWindow(cinfo->buddy, SW_SHOW);
 SendMessage(item, UDM_SETBUDDY, (WPARAM)cinfo->buddy, 0);
 }
 }
+/* Queue a redraw on the top-level window */
+_dw_redraw(_toplevel_window(item), TRUE);
 }
 }
 /*
 * Pack windows (widgets) into a box at an arbitrary location.

Mercurial > dwindows

comparison win/dw.c @ 1422:131bedf41332