dwindows: os2/dw.c comparison

comparison os2/dw.c @ 1824:213420512084

Changes on OS/2 to allow dw_window_set_bitmap() to work on bitmap buttons... also rewrote and optimized some of the code.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 26 Oct 2012 08:37:45 +0000
parents	09a7202edb53
children	04c74cd0fb35

comparison

equal deleted inserted replaced

-:9c77567c5b2d
+:213420512084
 }
 dw_window_set_data(tmp, "_dw_bitmapbutton", DW_INT_TO_POINTER(1));
 return tmp;
 }
+/* Internal function to create a disabled version of a pixmap */
+HPIXMAP _create_disabled(HWND handle, HPIXMAP pixmap)
+{
+/* Create a disabled style pixmap */
+HPIXMAP disabled = dw_pixmap_new(handle, pixmap->width, pixmap->height, dw_color_depth_get());
+LONG fore = _foreground;
+int z, j, lim;
+dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
+dw_color_foreground_set(DW_CLR_PALEGRAY);
+lim = pixmap->width/2;
+for(j=0;j<pixmap->height;j++)
+{
+int mod = j%2;
+for(z=0;z<lim;z++)
+dw_draw_point(0, disabled, (z*2)+mod, j);
+}
+_foreground = fore;
+return disabled;
+}
 /*
 * Create a new bitmap button window (widget) to be packed from a file.
 * Parameters:
 *       text: Bubble help text to be displayed.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 HPIXMAP pixmap = NULL, disabled = NULL;
 HPOINTER icon = 0;
 if(file && (pixmap = calloc(1,sizeof(struct _hpixmap))))
 {
-int z, j, lim, len;
+int z, len;
-LONG fore;
 strcpy(file, filename);
 /* check if we can read from this file (it exists and read permission) */
 if(access(file, 04) == 0)
 free(pixmap);
 pixmap = NULL;
 }
 else
 {
-/* Create a disabled style pixmap */
+disabled = _create_disabled(tmp, pixmap);
-disabled = dw_pixmap_new(tmp, pixmap->width, pixmap->height, dw_color_depth_get());
-dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
-fore = _foreground;
-dw_color_foreground_set(DW_CLR_PALEGRAY);
-lim = pixmap->width/2;
-for(j=0;j<pixmap->height;j++)
-{
-int mod = j%2;
-for(z=0;z<lim;z++)
-dw_draw_point(0, disabled, (z*2)+mod, j);
-}
-_foreground = fore;
 }
 }
 if(text)
 strncpy(blah->bubbletext, text, BUBBLE_HELP_MAX - 1);
 HPIXMAP pixmap = NULL, disabled = NULL;
 HPOINTER icon = 0;
 if((pixmap = calloc(1, sizeof(struct _hpixmap))) != NULL)
 {
-int z, j, lim;
-LONG fore;
 file = tmpnam( NULL );
 if ( file != NULL )
 {
 fp = fopen( file, "wb" );
 if ( fp != NULL )
 free(pixmap);
 pixmap = NULL;
 }
 else
 {
-/* Create a disabled style pixmap */
+disabled = _create_disabled(tmp, pixmap);
-disabled = dw_pixmap_new(tmp, pixmap->width, pixmap->height, dw_color_depth_get());
-dw_pixmap_bitblt(0, disabled, 0, 0, pixmap->width, pixmap->height, 0, pixmap, 0, 0);
-fore = _foreground;
-dw_color_foreground_set(DW_CLR_PALEGRAY);
-lim = pixmap->width/2;
-for(j=0;j<pixmap->height;j++)
-{
-int mod = j%2;
-for(z=0;z<lim;z++)
-dw_draw_point(0, disabled, (z*2)+mod, j);
-}
-_foreground = fore;
 }
 }
 if(text)
 strncpy(blah->bubbletext, text, BUBBLE_HELP_MAX - 1);
 if(BitmapFileBegin)
 DosFreeMem(BitmapFileBegin);
 return 1;
 }
+/* Internal function to change the button bitmap */
+void _dw_window_set_bitmap(HWND handle, HBITMAP hbm, HDC hdc, HPS hps, unsigned long width, unsigned long height, int depth, HPOINTER icon)
+{
+char tmpbuf[100] = {0};
+WinQueryClassName(handle, 99, (PCH)tmpbuf);
+/* Button */
+if(strncmp(tmpbuf, "#3", 3)==0)
+{
+WNDPARAMS   wp = {0};
+BTNCDATA    bcd = {0};
+RECTL       rect;
+wp.fsStatus = WPM_CTLDATA;
+wp.pCtlData = &bcd;
+wp.cbCtlData = bcd.cb = sizeof(BTNCDATA);
+/* Clear any existing icon */
+WinSendMsg(handle, WM_SETWINDOWPARAMS, (MPARAM)&wp, NULL);
+if(icon)
+{
+dw_window_set_data(handle, "_dw_button_icon", DW_POINTER(icon));
+}
+else
+{
+HPIXMAP pixmap = (HPIXMAP)dw_window_get_data(handle, "_dw_hpixmap");
+HPIXMAP disabled = (HPIXMAP)dw_window_get_data(handle, "_dw_hpixmap_disabled");
+if(pixmap)
+dw_pixmap_destroy(pixmap);
+if(disabled)
+dw_pixmap_destroy(disabled);
+pixmap = calloc(1,sizeof(struct _hpixmap));
+pixmap->hbm = hbm;
+pixmap->hdc = hdc;
+pixmap->hps = hps;
+pixmap->width = width;
+pixmap->height = height;
+disabled = _create_disabled(handle, pixmap);
+dw_window_set_data(handle, "_dw_hpixmap", DW_POINTER(pixmap));
+dw_window_set_data(handle, "_dw_hpixmap_disabled", DW_POINTER(disabled));
+}
+dw_window_set_data(handle, "_dw_bitmapbutton", DW_POINTER(1));
+/* Make sure we invalidate the button so it redraws */
+WinQueryWindowRect(handle, &rect);
+WinInvalidateRect(handle, &rect, TRUE);
+}
+/* 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.
 * Parameters:
 *       handle: Handle to the window.
 *       id: An ID to be used to specify the icon,
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
 */
 void API dw_window_set_bitmap(HWND handle, unsigned long id, char *filename)
 {
-HBITMAP hbm;
+HBITMAP hbm = 0;
-HPS     hps;
+HPS     hps = 0;
+HDC     hdc = 0;
+HPOINTER icon = 0;
+unsigned long width = 0, height = 0;
+int depth = 0;
 /* Destroy any old bitmap data */
 _free_bitmap(handle);
 /* If id is non-zero use the resource */
 if ( id )
 {
 hps = WinGetPS( handle );
 hbm = GpiLoadBitmap( hps, NULLHANDLE, id, 0, 0 );
+WinReleasePS(hps);
 }
 else if ( filename )
 {
-HDC hdc = 0;
-unsigned long width, height;
 char *file = alloca(strlen(filename) + 6);
-int depth;
 if(!file)
 return;
 strcpy(file, filename);
 /* check if we can read from this file (it exists and read permission) */
 if(access(file, 04) != 0)
 {
-int z;
+/* Try with .ico extension first...*/
+strcat(file, ".ico");
-/* Try with supported extensions */
+if(access(file, 04) == 0)
-for(z=0;z<(_gbm_init?NUM_EXTS:1);z++)
+icon = WinLoadFileIcon((PSZ)file, FALSE);
-{
+else
-strcpy(file, filename);
+{
-strcat(file, image_exts[z]);
+int z;
-if(access(file, 04) == 0 &&
-_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth))
+/* Try with supported extensions */
-break;
+for(z=0;z<(_gbm_init?NUM_EXTS:1);z++)
-}
+{
+strcpy(file, filename);
+strcat(file, image_exts[z]);
+if(access(file, 04) == 0 &&
+_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth))
+break;
+}
+}
 }
 else
-_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth);
+{
+int len = strlen( file );
-if(!hdc)
+if(len > 4)
+{
+if(stricmp(file + len - 4, ".ico") == 0)
+icon = WinLoadFileIcon((PSZ)file, FALSE);
+else
+_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth);
+}
+}
+if(!hdc && !icon)
 return;
 dw_window_set_data(handle, "_dw_hps", (void *)hps);
 dw_window_set_data(handle, "_dw_hdc", (void *)hdc);
 dw_window_set_data(handle, "_dw_width", (void *)width);
 dw_window_set_data(handle, "_dw_height", (void *)height);
 }
 else
 return;
-if ( id )
-WinReleasePS(hps);
 dw_window_set_data(handle, "_dw_bitmap", (void *)hbm);
-/* If we changed the bitmap... */
+_dw_window_set_bitmap(handle, hbm, hdc, hps, width, height, depth, icon);
-{
-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.
 * Parameters:
 /* If id is non-zero use the resource */
 else if ( id )
 {
 hps = WinGetPS( handle );
 hbm = GpiLoadBitmap( hps, NULLHANDLE, id, 0, 0 );
+WinReleasePS(hps);
 }
 else
 return;
-if ( id )
-WinReleasePS(hps);
 dw_window_set_data(handle, "_dw_bitmap", (void *)hbm);
+_dw_window_set_bitmap(handle, hbm, hdc, hps, width, height, depth, 0);
 }
 /*
 * Sets the text used for a given window.
 * Parameters:

Mercurial > dwindows

comparison os2/dw.c @ 1824:213420512084