dwindows: os2/dw.c comparison

comparison os2/dw.c @ 1837:d7e13f446c41

Initial attempt at code to generate icon masks on OS/2 from the background color when creating icons from file. This doesn't quite work, I clearly don't understand the format of the masks... the documentation says there are AND and XOR masks in the double sized mask bitmap.... not sure which goes where and how they are used... but this is a step in the needed direction.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sat, 10 Nov 2012 16:33:02 +0000
parents	692c3a18a112
children	4790589f52a9

comparison

equal deleted inserted replaced

-:692c3a18a112
+:d7e13f446c41
 {
 /* Using CLR_PALEGRAY as a default alpha background... we can
 * change this to use WinQuerySysColor() later, but pale gray is
 * already hardcoded elsewhere so just continue using it here.
 */
-char options[101] = "back_rgb=52020_52020_52020";
+char options[101] = "back_rgb=52224_52224_52224";
 /* Ask the control if it has another color set */
 if(backrgb == DW_CLR_DEFAULT && handle)
 {
 RGB rgb = {0};
 if(WinQueryPresParam(handle, PP_BACKGROUNDCOLOR, PP_BACKGROUNDCOLORINDEX, NULL, sizeof(rgb), &rgb, QPF_NOINHERIT | QPF_PURERGBCOLOR | QPF_ID2COLORINDEX))
-sprintf(options, "back_rgb=%d_%d_%d", rgb.bRed * 255, rgb.bGreen * 255, rgb.bBlue * 255);
+sprintf(options, "back_rgb=%d_%d_%d", rgb.bRed * 256, rgb.bGreen * 256, rgb.bBlue * 256);
 }
 else if(backrgb & DW_RGB_COLOR)
 {
-sprintf(options, "back_rgb=%d_%d_%d", (int)DW_RED_VALUE(backrgb) * 255, (int)DW_GREEN_VALUE(backrgb) * 255, (int)DW_BLUE_VALUE(backrgb) * 255);
+sprintf(options, "back_rgb=%d_%d_%d", (int)DW_RED_VALUE(backrgb) * 256, (int)DW_GREEN_VALUE(backrgb) * 256, (int)DW_BLUE_VALUE(backrgb) * 256);
 }
 /* Read the file header */
 if((err = _gbm_read_header(file, fd, z, &gbm, options)) == 0)
 break;
 if(_To24Bit(&gbm, gbmrgb, &BitmapFileBegin))
 *depth = 24;
 else
 {
 #ifdef DEBUG
-dw_debug("GBM: Failed 24bpp conversion\n", z, file, err, _gbm_err(err));
+dw_debug("GBM: Failed 24bpp conversion \"%s\"\n", file);
 #endif
 DosFreeMem(BitmapFileBegin);
 return 0;
 }
 HICN API dw_icon_load(unsigned long module, unsigned long id)
 {
 return WinLoadPointer(HWND_DESKTOP,module,id);
 }
+#if 0
+/* Internal function to create pointer/icon masks */
+void _create_mask(HPIXMAP src, HPIXMAP mask, unsigned long backrgb)
+{
+LONG maskcolor = (DW_RED_VALUE(backrgb) << 16) | (DW_GREEN_VALUE(backrgb) << 8) | DW_BLUE_VALUE(backrgb);
+int x, y;
+for(x=0; x < src->width; x++)
+{
+for(y=0; y < src->height; y++)
+{
+POINTL pt = {x, y};
+LONG color = GpiQueryPel(src->hps, &pt);
+dw_debug("Mask color %x (%dx%d) %x\n", (int)maskcolor, x, y, (int)color);
+if(color == maskcolor)
+{
+GpiSetColor(mask->hps, CLR_WHITE);
+GpiSetPel(mask->hps, &pt);
+pt.y = y + src->height;
+GpiSetPel(mask->hps, &pt);
+}
+}
+}
+}
+#endif
 /* Internal function to create an icon from an existing pixmap */
-HICN _create_icon(HPIXMAP src)
+HICN _create_icon(HPIXMAP src, unsigned long backrgb)
 {
 HPIXMAP pntr = dw_pixmap_new(hwndApp, WinQuerySysValue(HWND_DESKTOP, SV_CXICON), WinQuerySysValue(HWND_DESKTOP, SV_CYICON), src->depth);
 HPIXMAP mask = dw_pixmap_new(hwndApp, pntr->width, pntr->height*2, 1);
 HPIXMAP minipntr = dw_pixmap_new(hwndApp, pntr->width/2, pntr->height/2, src->depth);
 HPIXMAP minimask = dw_pixmap_new(hwndApp, minipntr->width, minipntr->height*2, 1);
 /* Create the masks, all in black */
 dw_color_foreground_set(DW_CLR_BLACK);
 dw_draw_rect(0, mask, DW_DRAW_FILL, 0, 0, mask->width, mask->height);
 dw_draw_rect(0, minimask, DW_DRAW_FILL, 0, 0, minimask->width, minimask->height);
+#if 0
+/* If we have a background color... create masks */
+if(backrgb & DW_RGB_COLOR)
+{
+_create_mask(pntr, mask, backrgb);
+_create_mask(minipntr, minimask, backrgb);
+}
+#endif
 _foreground = oldcol;
 /* Assemble the Pointer Info structure */
 pi.hbmPointer = mask->hbm;
 pi.hbmColor = pntr->hbm;
 pi.hbmMiniPointer = minimask->hbm;
 pi.hbmMiniColor = minipntr->hbm;
-/* Destroy the pixmaps but not the bitmaps */
+/* Destroy the temporary pixmaps */
 mask->hbm = pntr->hbm = minimask->hbm = minipntr->hbm = 0;
 dw_pixmap_destroy(mask);
 dw_pixmap_destroy(pntr);
 dw_pixmap_destroy(minimask);
 dw_pixmap_destroy(minipntr);
 HICN API dw_icon_load_from_file(char *filename)
 {
 char *file = alloca(strlen(filename) + 6);
 HPIXMAP src = alloca(sizeof(struct _hpixmap));
 HICN icon = 0;
+unsigned long defcol = DW_RGB(204, 204, 204);
 if(!file || !src)
 return 0;
 strcpy(file, filename);
 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, hwndApp, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, DW_CLR_DEFAULT))
+_load_bitmap_file(file, hwndApp, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, defcol))
 {
-icon = _create_icon(src);
+icon = _create_icon(src, defcol);
 break;
 }
 }
 }
-else if(_load_bitmap_file(file, hwndApp, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, DW_CLR_DEFAULT))
+else if(_load_bitmap_file(file, hwndApp, &src->hbm, &src->hdc, &src->hps, &src->width, &src->height, &src->depth, defcol))
-icon = _create_icon(src);
+icon = _create_icon(src, defcol);
 /* Free temporary resources if in use */
 if(icon)
 {
 GpiSetBitmap(src->hps, NULLHANDLE);
 GpiDeleteBitmap(src->hbm);

Mercurial > dwindows

comparison os2/dw.c @ 1837:d7e13f446c41