dwindows: gtk4/dw.c comparison

comparison gtk4/dw.c @ 2315:112595f9a645

GTK4: Remove unnecessary cruft and move pixmap functions into thread safety.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 16 Feb 2021 05:09:26 +0000
parents	eda7642d80df
children	1f85311baa65

comparison

equal deleted inserted replaced

-:eda7642d80df
+:112595f9a645
 };
 /*
 * List those icons that have transparency first
 */
-#define NUM_EXTS 9
+static char *_dw_image_exts[] =
-char *_dw_image_exts[NUM_EXTS+1] =
 {
 ".xpm",
 ".png",
 ".ico",
 ".icns",
 pthread_key_t _dw_bg_color_key;
 pthread_key_t _dw_event_key;
 static int _dw_ignore_expand = 0;
 static pthread_t _dw_thread = (pthread_t)-1;
-#define DEFAULT_SIZE_WIDTH 12
-#define DEFAULT_SIZE_HEIGHT 6
-#define DEFAULT_TITLEBAR_HEIGHT 22
 #define _DW_TREE_TYPE_CONTAINER  1
 #define _DW_TREE_TYPE_TREE       2
 #define _DW_TREE_TYPE_LISTBOX    3
 #define _DW_TREE_TYPE_COMBOBOX   4
 }
 /* Convert DW style font to CSS syntax (or Pango for older versions):
 * font: font-style font-variant font-weight font-size/line-height font-family
 */
-char *_convert_font(const char *font)
+char *_dw_convert_font(const char *font)
 {
 char *newfont = NULL;
 if(font)
 {
 DW_FUNCTION_ADD_PARAM2(handle, fontname)
 DW_FUNCTION_RETURN(dw_window_set_font, int)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, fontname, const char *)
 {
 GtkWidget *handle2 = handle;
-char *font = _convert_font(fontname);
+char *font = _dw_convert_font(fontname);
 gpointer data;
 int retval = DW_ERROR_NONE;
 if(GTK_IS_SCROLLED_WINDOW(handle))
 {
 DW_FUNCTION_ADD_PARAM3(handle, id, filename)
 DW_FUNCTION_NO_RETURN(dw_window_set_bitmap)
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, id, ULONG, filename, const char *)
 {
 GdkPixbuf *tmp = NULL;
-int found_ext = 0;
-int i;
 if(id)
 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
 else
 {
 strcpy(file, filename);
 /* check if we can read from this file (it exists and read permission) */
 if(access(file, 04) != 0)
 {
+int i = 0;
 /* Try with various extentions */
-for(i=0; i<NUM_EXTS; i++)
+while(_dw_image_exts[i] && !tmp)
 {
 strcpy(file, filename);
 strcat(file, _dw_image_exts[i]);
 if(access(file, 04) == 0)
-{
+tmp = gdk_pixbuf_new_from_file(file, NULL);
-found_ext = 1;
+i++;
-break;
-}
 }
 }
-if(found_ext)
+else
 tmp = gdk_pixbuf_new_from_file(file, NULL);
 }
 if(tmp)
 {
 {
 return (HICN)id;
 }
 /* Internal function to keep HICNs from getting too big */
-GdkPixbuf *_icon_resize(GdkPixbuf *ret)
+GdkPixbuf *_dw_icon_resize(GdkPixbuf *ret)
 {
 if(ret)
 {
 int pwidth = gdk_pixbuf_get_width(ret);
 int pheight = gdk_pixbuf_get_height(ret);
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
 HICN API dw_icon_load_from_file(const char *filename)
 {
-char *file = alloca(strlen(filename) + 6);
+HICN retval = 0;
-int i, found_ext = 0;
+if(filename && *filename)
-if (!file)
+{
-return 0;
+char *file = alloca(strlen(filename) + 6);
 strcpy(file, filename);
 /* check if we can read from this file (it exists and read permission) */
-if (access(file, 04) != 0)
+if(access(file, 04) != 0)
 {
-/* Try with various extentions */
+int i = 0;
-for ( i = 0; i < NUM_EXTS; i++ )
-{
+/* Try with various extentions */
-strcpy( file, filename );
+while(_dw_image_exts[i] && !retval)
-strcat( file, _dw_image_exts[i] );
-if ( access( file, 04 ) == 0 )
 {
-found_ext = 1;
+strcpy(file, filename);
-break;
+strcat(file, _dw_image_exts[i]);
+if(access(file, 04) == 0)
+retval = _dw_icon_resize(gdk_pixbuf_new_from_file(file, NULL));
+i++;
 }
 }
-if ( found_ext == 0 )
+else
-{
+retval = _dw_icon_resize(gdk_pixbuf_new_from_file(file, NULL));
-return 0;
+}
-}
+return retval;
-}
-return _icon_resize(gdk_pixbuf_new_from_file(file, NULL));
 }
 /*
 * Obtains an icon from data.
 * Parameters:
 close(fd);
 }
 /* Bail if we couldn't write full file */
 if(fd == -1 || written != len)
 return 0;
-ret = _icon_resize(gdk_pixbuf_new_from_file(template, NULL));
+ret = _dw_icon_resize(gdk_pixbuf_new_from_file(template, NULL));
 unlink(template);
 return ret;
 }
 /*
 *       height: Height of the pixmap in pixels.
 *       depth: Color depth of the pixmap.
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
-HPIXMAP dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
+DW_FUNCTION_DEFINITION(dw_pixmap_new, HPIXMAP, HWND handle, unsigned long width, unsigned long height, DW_UNUSED(int depth))
-{
+DW_FUNCTION_ADD_PARAM4(handle, width, height, depth)
-HPIXMAP pixmap;
+DW_FUNCTION_RETURN(dw_pixmap_new, HPIXMAP)
+DW_FUNCTION_RESTORE_PARAM4(handle, HWND, width, unsigned long, height, unsigned long, DW_UNUSED(depth), int)
-if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+{
-return NULL;
+HPIXMAP pixmap = 0;
-if (!depth)
+if((pixmap = calloc(1,sizeof(struct _hpixmap))))
-depth = -1;
+{
+pixmap->width = width;
-pixmap->width = width; pixmap->height = height;
+pixmap->height = height;
+pixmap->handle = handle;
+/* Depth needs to be divided by 3... but for the RGB colorspace...
-pixmap->handle = handle;
+* only 8 bits per sample is allowed, so to avoid issues just pass 8 for now.
-/* Depth needs to be divided by 3... but for the RGB colorspace...
+*/
-* only 8 bits per sample is allowed, so to avoid issues just pass 8 for now.
+pixmap->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-*/
+pixmap->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
-pixmap->pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, FALSE, 8, width, height );
+}
-pixmap->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+DW_FUNCTION_RETURN_THIS(pixmap);
-return pixmap;
 }
 /*
 * Creates a pixmap from a file.
 * Parameters:
 *                 DW pick the appropriate file extension.
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
-HPIXMAP dw_pixmap_new_from_file(HWND handle, const char *filename)
+DW_FUNCTION_DEFINITION(dw_pixmap_new_from_file, HPIXMAP, HWND handle, const char *filename)
-{
+DW_FUNCTION_ADD_PARAM2(handle, filename)
-HPIXMAP pixmap;
+DW_FUNCTION_RETURN(dw_pixmap_new_from_file, HPIXMAP)
-char *file = alloca(strlen(filename) + 6);
+DW_FUNCTION_RESTORE_PARAM2(handle, HWND, filename, const char *)
-int found_ext = 0;
+{
-int i;
+HPIXMAP pixmap = 0;
-if (!file || !(pixmap = calloc(1,sizeof(struct _hpixmap))))
+if(filename && *filename && (pixmap = calloc(1,sizeof(struct _hpixmap))))
-return NULL;
+{
+char *file = alloca(strlen(filename) + 6);
-strcpy(file, filename);
+strcpy(file, filename);
-/* check if we can read from this file (it exists and read permission) */
-if(access(file, 04) != 0)
+/* check if we can read from this file (it exists and read permission) */
-{
+if(access(file, 04) != 0)
-/* Try with various extentions */
+{
-for ( i = 0; i < NUM_EXTS; i++ )
+int i = 0;
-{
-strcpy( file, filename );
+/* Try with various extentions */
-strcat( file, _dw_image_exts[i] );
+while(_dw_image_exts[i] && !pixmap->pixbuf)
-if ( access( file, 04 ) == 0 )
 {
-found_ext = 1;
+strcpy(file, filename);
-break;
+strcat(file, _dw_image_exts[i]);
+if(access(file, 04 ) == 0)
+pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
+i++;
 }
 }
-if ( found_ext == 0 )
+else
+pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
+if(pixmap->pixbuf)
+{
+pixmap->image = cairo_image_surface_create_from_png(file);
+pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
+pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
+pixmap->handle = handle;
+}
+else
 {
 free(pixmap);
-return NULL;
+pixmap = 0;
 }
 }
+DW_FUNCTION_RETURN_THIS(pixmap);
-pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
-pixmap->image = cairo_image_surface_create_from_png(file);
-pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
-pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
-pixmap->handle = handle;
-return pixmap;
 }
 /*
 * Creates a pixmap from data
 * Parameters:
 *                 DW pick the appropriate file extension.
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
-HPIXMAP dw_pixmap_new_from_data(HWND handle, const char *data, int len)
+DW_FUNCTION_DEFINITION(dw_pixmap_new_from_data, HPIXMAP, HWND handle, const char *data, int len)
-{
+DW_FUNCTION_ADD_PARAM3(handle, data, len)
-int fd, written = -1;
+DW_FUNCTION_RETURN(dw_pixmap_new_from_data, HPIXMAP)
-HPIXMAP pixmap;
+DW_FUNCTION_RESTORE_PARAM3(handle, HWND, data, const char *, len, int)
-char template[] = "/tmp/dwpixmapXXXXXX";
+{
+HPIXMAP pixmap = 0;
-if(!data || !(pixmap = calloc(1,sizeof(struct _hpixmap))))
-return NULL;
+if(data && len > 0 && (pixmap = calloc(1,sizeof(struct _hpixmap))))
+{
-/*
+int fd, written = -1;
-* A real hack; create a temporary file and write the contents
+char template[] = "/tmp/dwpixmapXXXXXX";
-* of the data to the file
-*/
+/*
-if((fd = mkstemp(template)) != -1)
+* A real hack; create a temporary file and write the contents
-{
+* of the data to the file
-written = write(fd, data, len);
+*/
-close(fd);
+if((fd = mkstemp(template)) != -1)
-}
+{
-/* Bail if we couldn't write full file */
+written = write(fd, data, len);
-if(fd == -1 || written != len)
+close(fd);
-return 0;
+}
-pixmap->pixbuf = gdk_pixbuf_new_from_file(template, NULL);
+/* Bail if we couldn't write full file */
-pixmap->image = cairo_image_surface_create_from_png(template);
+if(fd != -1 && written == len)
-pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
+{
-pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
+pixmap->pixbuf = gdk_pixbuf_new_from_file(template, NULL);
-/* remove our temporary file */
+pixmap->image = cairo_image_surface_create_from_png(template);
-unlink(template);
+pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
-pixmap->handle = handle;
+pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
-return pixmap;
+/* remove our temporary file */
+unlink(template);
+pixmap->handle = handle;
+}
+}
+DW_FUNCTION_RETURN_THIS(pixmap);
 }
 /*
 * Sets the transparent color for a pixmap
 * Parameters:
 *       handle: Window handle the pixmap is associated with.
 *       id: Resource ID associated with requested pixmap.
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
-HPIXMAP dw_pixmap_grab(HWND handle, ULONG id)
+DW_FUNCTION_DEFINITION(dw_pixmap_grab, HPIXMAP, HWND handle, ULONG id)
-{
+DW_FUNCTION_ADD_PARAM2(handle, id)
-HPIXMAP pixmap;
+DW_FUNCTION_RETURN(dw_pixmap_grab, HPIXMAP)
+DW_FUNCTION_RESTORE_PARAM2(handle, HWND, id, ULONG)
-if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+{
-return NULL;
+HPIXMAP pixmap = 0;
-pixmap->pixbuf = gdk_pixbuf_copy(_dw_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height));
+if((pixmap = calloc(1,sizeof(struct _hpixmap))))
-return pixmap;
+{
+pixmap->pixbuf = gdk_pixbuf_copy(_dw_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height));
+pixmap->handle = handle;
+}
+DW_FUNCTION_RETURN_THIS(pixmap);
 }
 /* Call this after drawing to the screen to make sure
 * anything you have drawn is visible.
 */
 {
 if(pixmap)
 {
 char *oldfont = pixmap->font;
-pixmap->font = _convert_font(fontname);
+pixmap->font = _dw_convert_font(fontname);
 if(oldfont)
 free(oldfont);
 return DW_ERROR_NONE;
 }

Mercurial > dwindows

comparison gtk4/dw.c @ 2315:112595f9a645