dwindows: win/dw.c comparison

comparison win/dw.c @ 1250:ed2119fc210d

Initial commit of GDI+ image loader for Windows to allow use of other image formats... not finished nor enabled by default currently but hopefully soon.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 23 Oct 2011 19:54:09 +0000
parents	c191a562c14a
children	7809be48de7d

comparison

equal deleted inserted replaced

-:b31056c321a2
+:ed2119fc210d
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <process.h>
 #include <time.h>
+#ifdef GDIPLUS
+#include <gdiplustypes.h>
+#include <gdiplusflat.h>
+#endif
 #include "dw.h"
 #include "XBrowseForFolder.h"
 /*
 * MinGW (as at 3.2.3) doesn't have MIM_MENUDATA
 FreeLibrary(hinstDll);
 }
 return dwVersion;
 }
+#ifdef GDIPLUS
+/*
+* List those icons that have transparency first
+* GDI+ List of supported formats: BMP, ICON, GIF, JPEG, Exif, PNG, TIFF, WMF, and EMF.
+* Not sure if we should include all these or not... maybe we should add TIFF and GIF?
+*/
+#define NUM_EXTS 7
+char *image_exts[NUM_EXTS] =
+{
+".png",
+".ico",
+".gif",
+".jpg",
+".jpeg",
+".tiff",
+".bmp"
+};
+/* Section for loading files of types besides BMP and ICO and return HBITMAP or HICON */
+GpBitmap *_dw_load_gpbitmap( char *filename )
+{
+int found_ext = 0,i, wclen = (strlen(filename) + 6) * sizeof(wchar_t);
+char *file = _alloca(strlen(filename) + 6);
+wchar_t *wfile = _alloca(wclen);
+GpBitmap *image;
+/* Try various extentions */
+for ( i = 0; i < NUM_EXTS; i++ )
+{
+strcpy( file, filename );
+strcat( file, image_exts[i] );
+if ( access( file, 04 ) == 0 )
+{
+/* Convert to wide format */
+MultiByteToWideChar(CP_ACP, 0, file, strlen(file), wfile, wclen);
+if(GdipCreateBitmapFromFile(wfile, &image))
+return image;
+}
+}
+return NULL;
+}
+/* Try to load the appropriate image and return the HBITMAP handle */
+HBITMAP _dw_load_bitmap(char *filename, unsigned long *depth)
+{
+GpBitmap *bitmap = _dw_load_gpbitmap(filename);
+if(bitmap)
+{
+HBITMAP hbm;
+if(GdipCreateHBITMAPFromBitmap(bitmap, &hbm, 0))
+{
+if(depth)
+{
+/* TODO: Actually query the color depth here */
+*depth = 32;
+}
+return hbm;
+}
+}
+return NULL;
+}
+/* Try to load the appropriate image and return the HICON handle */
+HICON _dw_load_icon(char *filename)
+{
+GpBitmap *bitmap = _dw_load_gpbitmap(filename);
+if(bitmap)
+{
+HICON hicon;
+if(GdipCreateHICONFromBitmap(bitmap, &hicon))
+return hicon;
+}
+return NULL;
+}
+#endif
 /* This function adds a signal handler callback into the linked list.
 */
 void _new_signal(ULONG message, HWND window, int id, void *signalfunction, void *data)
 {
 /* Associate the tooltip with the "tool" window. */
 SendMessage(hwndTT, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti);
 }
+#ifndef GDIPLUS
 /* This function determines the handle for a supplied image filename
 */
 int _dw_get_image_handle(char *filename, HANDLE *icon, HBITMAP *hbitmap)
 {
 int len, windowtype = 0;
 }
 free(file);
 }
 return windowtype;
 }
+#endif
 /* Initialize thread local values to the defaults */
 void _init_thread(void)
 {
 COLORREF foreground = RGB(128,128,128);
 int windowtype = 0, len;
 if (!(bubble = calloc(1, sizeof(BubbleButton))))
 return 0;
+#ifdef GDIPLUS
+windowtype = BS_BITMAP;
+hbitmap = _dw_load_bitmap(filename, NULL);
+#else
 windowtype = _dw_get_image_handle(filename, &icon, &hbitmap);
+#endif
 tmp = CreateWindow( BUTTONCLASSNAME,
 "",
 windowtype | WS_CHILD | BS_PUSHBUTTON | WS_CLIPCHILDREN | WS_VISIBLE,
 0,0,2000,1000,
 SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)bubble);
 _create_tooltip(tmp, text);
+#ifndef GDIPLUS
 if (icon)
 {
 SendMessage(tmp, BM_SETIMAGE,(WPARAM) IMAGE_ICON,(LPARAM) icon);
 }
-else if (hbitmap)
+else
+#endif
+if (hbitmap)
 {
 SendMessage(tmp, BM_SETIMAGE,(WPARAM) IMAGE_BITMAP, (LPARAM) hbitmap);
 }
 return tmp;
 }
 fp = fopen( file, "wb" );
 if ( fp != NULL )
 {
 fwrite( data, 1, len, fp );
 fclose( fp );
+#ifdef GDIPLUS
+windowtype = BS_BITMAP;
+hbitmap = _dw_load_bitmap(file, NULL);
+#else
 if ( len > 1 && data[0] == 'B' && data[1] == 'M' ) /* first 2 chars of data is BM, then its a BMP */
 {
 hbitmap = (HBITMAP)LoadImage( NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
 windowtype = BS_BITMAP;
 }
 else /* otherwise its assumed to be an ico */
 {
 icon = LoadImage( NULL, file, IMAGE_ICON, 0, 0, LR_LOADFROMFILE );
 windowtype = BS_ICON;
 }
+#endif
 }
 else
 {
 unlink( file );
 free( file );
 hbitmap = LoadImage(DWInstance, MAKEINTRESOURCE(id), IMAGE_BITMAP, 0, 0, LR_LOADMAP3DCOLORS | LR_SHARED);
 icon = LoadImage(DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, LR_SHARED);
 }
 else if(filename)
 {
+#ifdef GDIPLUS
+hbitmap = _dw_load_bitmap(filename, NULL);
+#else
 _dw_get_image_handle(filename, &icon, &hbitmap);
+#endif
 if (icon == 0 && hbitmap == 0)
 return;
 }
 if(icon)
 fp = fopen( file, "wb" );
 if ( fp != NULL )
 {
 fwrite( data, 1, len, fp );
 fclose( fp );
+#ifdef GDIPLUS
+hbitmap = _dw_load_bitmap(file, NULL);
+#else
 if ( len > 1 && data[0] == 'B' && data[1] == 'M' ) /* first 2 chars of data is BM, then its a BMP */
 hbitmap = (HBITMAP)LoadImage( NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
 else /* otherwise its assumed to be an ico */
 icon = LoadImage( NULL, file, IMAGE_ICON, 0, 0, LR_LOADFROMFILE );
+#endif
 }
 else
 {
 unlink( file );
 free( file );
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
 HICN API dw_icon_load_from_file(char *filename)
 {
+#ifdef GDIPLUS
+return _dw_load_icon(filename);
+#else
 char *file = malloc(strlen(filename) + 5);
 HANDLE icon;
 if(!file)
 return 0;
 }
 }
 icon = LoadImage(NULL, file, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
 free(file);
 return (HICN)icon;
+#endif
 }
 /*
 * Obtains an icon from data
 * Parameters:
 fp = fopen( file, "wb" );
 if ( fp != NULL )
 {
 fwrite( data, 1, len, fp );
 fclose( fp );
+#ifdef GDIPLUS
+icon = _dw_load_icon(file);
+#else
 icon = LoadImage( NULL, file, IMAGE_ICON, 0, 0, LR_LOADFROMFILE );
+#endif
 }
 else
 {
 unlink( file );
 free( file );
 ReleaseDC(handle, hdc);
 return pixmap;
 }
+#ifndef GDIPLUS
 /* Read the file bitmap header ourselves...
 * apparently we can't check the depth once loaded...
 * since it seems to normalize it to our screen depth.
 */
 unsigned long _read_bitmap_header(char *file)
 }
 free(info);
 fclose(fp);
 return depth;
 }
+#endif
 /*
 * Creates a pixmap from a file.
 * Parameters:
 *       handle: Window handle the pixmap is associated with.
 {
 HPIXMAP pixmap;
 BITMAP bm;
 HDC hdc;
 ULONG cx, cy;
-char *file = malloc(strlen(filename) + 5);
 BITMAPINFO *info;
+#ifndef GDIPLUS
-if (!file || !(pixmap = calloc(1,sizeof(struct _hpixmap))))
+char *file;
-{
+#endif
-if(file)
-free(file);
+if (!filename || !(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
-}
+#ifdef GDIPLUS
+pixmap->hbm = _dw_load_bitmap(filename, &pixmap->depth);
+#else
+file = _alloca(strlen(filename) + 5);
 strcpy(file, filename);
 /* check if we can read from this file (it exists and read permission) */
 if(access(file, 04) != 0)
 {
 free(file);
 return NULL;
 }
 }
-hdc = GetDC(handle);
-pixmap->handle = handle;
 pixmap->hbm = (HBITMAP)LoadImage(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
 pixmap->depth = _read_bitmap_header(file);
+#endif
+pixmap->handle = handle;
 if ( !pixmap->hbm )
 {
-free(file);
 free(pixmap);
-ReleaseDC(handle, hdc);
 return NULL;
 }
+hdc = GetDC(handle);
 pixmap->hdc = CreateCompatibleDC( hdc );
 GetObject( pixmap->hbm, sizeof(bm), &bm );
 pixmap->width = bm.bmWidth; pixmap->height = bm.bmHeight;
 SelectObject( pixmap->hdc, pixmap->hbm );
 ReleaseDC( handle, hdc );
-free( file );
 pixmap->transcolor = DW_RGB_TRANSPARENT;
 return pixmap;
 }
 fp = fopen( file, "wb" );
 if ( fp != NULL )
 {
 fwrite( data, 1, len, fp );
 fclose( fp );
+#ifdef GDIPLUS
+pixmap->hbm = _dw_load_bitmap(file);
+#else
 pixmap->hbm = (HBITMAP)LoadImage( NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
 pixmap->depth = _read_bitmap_header(file);
+#endif
 }
 else
 {
 unlink( file );
 free( file );

Mercurial > dwindows

comparison win/dw.c @ 1250:ed2119fc210d