dwindows: mac/dw.m comparison

comparison mac/dw.m @ 671:c60a4f6cfae8

Implemented icon support on the Mac. In the process created a new HICN type. The existing implementation works well on OS/2 but it is kind of bad on the other platforms. I should revisit the Windows and GTK implementations. The typedef currently in use should be backwards compatible for now.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 27 Feb 2011 19:01:40 +0000
parents	0b920d0dc13e
children	388f2a48aaae

comparison

equal deleted inserted replaced

-:0b920d0dc13e
+:c60a4f6cfae8
 *          A GTK like implementation of the MacOS GUI using Cocoa
 *
 * (C) 2011 Brian Smith <brian@dbsoft.org>
 *
 * Using garbage collection so requires 10.5 or later.
-* clang -std=c99 -g -o dwtest -D__MAC__ -I. mac/dw.m -framework Cocoa -fobjc-gc-only
+* clang -std=c99 -g -o dwtest -D__MAC__ -I. dwtest.c mac/dw.m -framework Cocoa -framework WebKit -fobjc-gc-only
 */
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 #include "dw.h"
 #include <sys/utsname.h>
 			{
 				int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
 				int flags = (int)[object pressedMouseButtons];
 				NSPoint point = [object mouseLocation];
 				int button = 0;
-				char *which = "pressed";
-				if(message == 4)
-				{
-					which = "released";
-				}
 				if(flags & 1)
 				{
 					button = 1;
 				}
 				else if(flags & (1 << 2))
 				{
 					button = 3;
 				}
-				NSLog(@"Button %s x:%d y:%d button:%d\n", which, (int)point.x, (int)point.y, (int)button);
 				return buttonfunc(object, point.x, point.y, button, handler->data);
 			}
 			case 6:
 			{
 				int (* API closefunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
 	}
 	return 0L;
 }
 unsigned long _foreground = 0xAAAAAA, _background = 0;
-/* This function will recursively search a box and add up the total height of it */
-static void _count_size(HWND thisbox, int type, int *xsize, int *xorigsize)
-{
-int size = 0, origsize = 0, z;
-DWBox *box = thisbox;
-Box *tmp = [box box];
-if(!tmp)
-{
-*xsize = *xorigsize = 0;
-return;
-}
-if(type == tmp->type)
-{
-/* If the box is going in the direction we want, then we
-* return the entire sum of the items.
-*/
-for(z=0;z<tmp->count;z++)
-{
-if(tmp->items[z].type == TYPEBOX)
-{
-int s, os;
-_count_size(tmp->items[z].hwnd, type, &s, &os);
-size += s;
-origsize += os;
-}
-else
-{
-size += (type == DW_HORZ ? tmp->items[z].width : tmp->items[z].height);
-origsize += (type == DW_HORZ ? tmp->items[z].origwidth : tmp->items[z].origheight);
-}
-}
-}
-else
-{
-/* If the box is not going in the direction we want, then we only
-* want to return the maximum value.
-*/
-int tmpsize = 0, tmporigsize = 0;
-for(z=0;z<tmp->count;z++)
-{
-if(tmp->items[z].type == TYPEBOX)
-_count_size(tmp->items[z].hwnd, type, &tmpsize, &tmporigsize);
-else
-{
-tmpsize = (type == DW_HORZ ? tmp->items[z].width : tmp->items[z].height);
-tmporigsize = (type == DW_HORZ ? tmp->items[z].origwidth : tmp->items[z].origheight);
-}
-if(tmpsize > size)
-size = tmpsize;
-}
-}
-*xsize = size;
-*xorigsize = origsize;
-}
 /* This function calculates how much space the widgets and boxes require
 * and does expansion as necessary.
 */
 static int _resize_box(Box *thisbox, int *depth, int x, int y, int *usedx, int *usedy,
 _resize_box(thisbox, &depth, x, y, &usedx, &usedy, 2, &usedpadx, &usedpady);
 }
 }
 }
-static void _changebox(Box *thisbox, int percent, int type)
-{
-int z;
-for(z=0;z<thisbox->count;z++)
-{
-if(thisbox->items[z].type == TYPEBOX)
-{
-		 DWBox *box = thisbox->items[z].hwnd;
-		 Box *tmp = [box box];
-_changebox(tmp, percent, type);
-}
-else
-{
-if(type == DW_HORZ)
-{
-if(thisbox->items[z].hsize == SIZEEXPAND)
-thisbox->items[z].width = (int)(((float)thisbox->items[z].origwidth) * (((float)percent)/((float)100.0)));
-}
-else
-{
-if(thisbox->items[z].vsize == SIZEEXPAND)
-thisbox->items[z].height = (int)(((float)thisbox->items[z].origheight) * (((float)percent)/((float)100.0)));
-}
-}
-}
-}
 NSMenu *_generate_main_menu()
 {
 	/* This only works on 10.6 so we have a backup method */
 	NSString * applicationName = [[NSRunningApplication currentApplication] localizedName];
 	if(applicationName == nil)
 	DWApp = [NSApplication sharedApplication];
 	/* Create a run loop for doing manual loops */
 	DWRunLoop = [NSRunLoop alloc];
 	/* Create object for handling timers */
 	DWHandler = [[DWTimerHandler alloc] init];
+/* If we aren't using garbage collection we need autorelease pools */
 #if !defined(GARBAGE_COLLECT)
 	pool = [[NSAutoreleasePool alloc] init];
 #endif
+/* Create a default main menu, with just the application menu */
 	DWMainMenu = _generate_main_menu();
 	[DWApp setMainMenu:DWMainMenu];
-	/*DWObject *test = [[DWObject alloc] init];
+	DWObject *test = [[DWObject alloc] init];
+/* Use NSThread to start a dummy thread to initialize the threading subsystem */
 	NSThread *thread = [[ NSThread alloc] initWithTarget:test selector:@selector(uselessThread:) object:nil];
-	[thread start];*/
+	[thread start];
 	return 0;
 }
 /*
 * Runs a message loop for Dynamic Windows.
 *       text: Bubble help text to be displayed.
 *       id: An ID of a bitmap in the resource file.
 */
 HWND API dw_bitmapbutton_new(char *text, ULONG resid)
 {
+/* TODO: Implement tooltips */
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
 	NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
 	DWButton *button = _button_new("", resid);
 *       green: green value.
 *       blue: blue value.
 */
 void API dw_color_foreground_set(unsigned long value)
 {
+/* This may need to be thread specific */
 	_foreground = _get_color(value);
 }
 /* Sets the current background drawing color.
 * Parameters:
 *       green: green value.
 *       blue: blue value.
 */
 void API dw_color_background_set(unsigned long value)
 {
+/* This may need to be thread specific */
 	_background = _get_color(value);
 }
 /* Allows the user to choose a color using the system's color chooser dialog.
 * Parameters:
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 *          parent: Parent handle or 0 if root.
 *          itemdata: Item specific data.
 */
-HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, unsigned long icon, HTREEITEM parent, void *itemdata)
+HTREEITEM API dw_tree_insert_after(HWND handle, HTREEITEM item, char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
 	NSLog(@"dw_tree_insert_item_after() unimplemented\n");
 	return HWND_DESKTOP;
 }
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 *          parent: Parent handle or 0 if root.
 *          itemdata: Item specific data.
 */
-HTREEITEM API dw_tree_insert(HWND handle, char *title, unsigned long icon, HTREEITEM parent, void *itemdata)
+HTREEITEM API dw_tree_insert(HWND handle, char *title, HICN icon, HTREEITEM parent, void *itemdata)
 {
 	NSLog(@"dw_tree_insert_item() unimplemented\n");
 	return HWND_DESKTOP;
 }
 *          handle: Handle to the tree containing the item.
 *          item: Handle of the item to be modified.
 *          title: The text title of the entry.
 *          icon: Handle to coresponding icon.
 */
-void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, unsigned long icon)
+void API dw_tree_item_change(HWND handle, HTREEITEM item, char *title, HICN icon)
 {
 	NSLog(@"dw_tree_item_change() unimplemented\n");
 }
 /*
 	for(z=0;z<count;z++)
 	{
 		NSTableColumn *column = [[NSTableColumn alloc] init];
 		[[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
+if(flags[z] & DW_CFA_BITMAPORICON)
+{
+NSImageCell *imagecell = [[[NSImageCell alloc] init] autorelease];
+[column setDataCell:imagecell];
+}
 		[cont addTableColumn:column];
 		[cont addColumn:column andType:(int)flags[z]];
 	}
 	return TRUE;
 {
 	DWContainer *cont = handle;
 	id object = nil;
 	int type = [cont cellType:column];
 	int lastadd = [cont lastAddPoint];
+if(!data)
+{
+return;
+}
 	if(type & DW_CFA_BITMAPORICON)
 	{
-		/* TODO: Handle image here */
+		object = *((NSImage **)data);
 	}
 	else if(type & DW_CFA_STRING)
 	{
 		object = [ NSString stringWithUTF8String:data ];
 	}
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          column: Zero based column of data being set.
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
-void API dw_filesystem_change_file(HWND handle, int row, char *filename, unsigned long icon)
+void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon)
 {
+dw_container_change_item(handle, 0, row, &icon);
 	dw_container_change_item(handle, 1, row, filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 *          column: Zero based column of data being set.
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
-void API dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, unsigned long icon)
+void API dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon)
 {
+dw_container_set_item(handle, pointer, 0, row, &icon);
 	dw_container_set_item(handle, pointer, 1, row, filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *       handle: Window handle that will handle taskbar icon messages.
 *       icon: Icon handle to display in the taskbar.
 *       bubbletext: Text to show when the mouse is above the icon.
 */
-void API dw_taskbar_insert(HWND handle, unsigned long icon, char *bubbletext)
+void API dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
 {
 	NSLog(@"dw_taskbar_insert() unimplemented\n");
 }
 /*
 * Deletes an icon from the taskbar.
 * Parameters:
 *       handle: Window handle that was used with dw_taskbar_insert().
 *       icon: Icon handle that was used with dw_taskbar_insert().
 */
-void API dw_taskbar_delete(HWND handle, unsigned long icon)
+void API dw_taskbar_delete(HWND handle, HICN icon)
 {
 	NSLog(@"dw_taskbar_delete() unimplemented\n");
 }
 /*
 *          module: Handle to module (DLL) in OS/2 and Windows.
 *          id: A unsigned long id int the resources on OS/2 and
 *              Windows, on GTK this is converted to a pointer
 *              to an embedded XPM.
 */
-unsigned long API dw_icon_load(unsigned long module, unsigned long id)
+HICN API dw_icon_load(unsigned long module, unsigned long resid)
 {
-	NSLog(@"dw_icon_load() unimplemented\n");
+NSBundle *bundle = [NSBundle mainBundle];
-	return 0;
+NSString *respath = [bundle resourcePath];
+NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
+	NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
+[bundle release];
+[respath release];
+[filepath release];
+	return image;
 }
 /*
 * Obtains an icon from a file.
 * Parameters:
 *       filename: Name of the file, omit extention to have
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
-unsigned long API dw_icon_load_from_file(char *filename)
+HICN API dw_icon_load_from_file(char *filename)
 {
-	NSLog(@"dw_icon_load_from_file() unimplemented\n");
+	return [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
-	return 0;
 }
 /*
 * Obtains an icon from data
 * Parameters:
 *       filename: Name of the file, omit extention to have
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
-unsigned long API dw_icon_load_from_data(char *data, int len)
+HICN API dw_icon_load_from_data(char *data, int len)
 {
-	NSLog(@"dw_icon_load_from_data() unimplemented\n");
+	NSData *thisdata = [[[NSData alloc] dataWithBytes:data length:len] autorelease];
-	return 0;
+	NSImage *image = [[NSImage alloc] initWithData:thisdata];
+[thisdata release];
+	return image;
 }
 /*
 * Frees a loaded resource in OS/2 and Windows.
 * Parameters:
 *          handle: Handle to icon returned by dw_icon_load().
 */
-void API dw_icon_free(unsigned long handle)
+void API dw_icon_free(HICN handle)
 {
-	NSLog(@"dw_icon_free() unimplemented\n");
+NSImage *image = handle;
+[image release];
 }
 /*
 * Create a new MDI Frame to be packed.
 * Parameters:
 	NSImage *image = [[NSImage alloc] initWithData:thisdata];
 	NSSize size = [image size];
 	pixmap->width = size.width;
 	pixmap->height = size.height;
 	pixmap->handle = image;
+[thisdata release];
 	return pixmap;
 }
 /*
 * Creates a bitmap mask for rendering bitmaps with transparent backgrounds
 /* Call this after drawing to the screen to make sure
 * anything you have drawn is visible.
 */
 void API dw_flush(void)
 {
+/* This may need to be thread specific */
 	if(_DWLastDrawable)
 	{
 		id object = _DWLastDrawable;
 		NSWindow *window = [object window];
 		[window flushWindow];
 */
 void _dwthreadstart(void *data)
 {
 void (*threadfunc)(void *) = NULL;
 void **tmp = (void **)data;
+/* If we aren't using garbage collection we need autorelease pools */
 #if !defined(GARBAGE_COLLECT)
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 #endif
 threadfunc = (void (*)(void *))tmp[0];
 threadfunc(tmp[1]);
+/* Release the pool when we are done so we don't leak */
 #if !defined(GARBAGE_COLLECT)
 	[pool release];
 #endif
 free(tmp);
 }
 	execargs[1] = url;
 	execargs[2] = NULL;
 	return dw_exec(browser, DW_EXEC_GUI, execargs);
 }
-#ifdef DWTEST
-int main(int argc, char *argv[])
-{
-	HWND window, box, vbox, hbox, button, text, checkbox, html;
-	LONG x, y;
-	ULONG width, height;
-	dw_init(TRUE, argc, argv);
-	window = dw_window_new(HWND_DESKTOP, "Dynamic Windows Test", DW_FCF_TITLEBAR | DW_FCF_SYSMENU | DW_FCF_MINMAX | DW_FCF_SIZEBORDER);
-	box = dw_box_new(DW_VERT, 0);
-	vbox = dw_groupbox_new(DW_VERT, 4, "Checks");
-	checkbox = dw_checkbox_new("Checkbox 1", 0);
-	dw_box_pack_start(vbox, checkbox, 100, 25, TRUE, FALSE, 2);
-	checkbox = dw_checkbox_new("Checkbox 2", 0);
-	dw_box_pack_start(vbox, checkbox, 100, 25, TRUE, FALSE, 2);
-	checkbox = dw_checkbox_new("Checkbox 3", 0);
-	dw_box_pack_start(vbox, checkbox, 100, 25, TRUE, FALSE, 2);
-	hbox = dw_box_new(DW_HORZ, 0);
-	button = dw_button_new("Test Button", 0);
-	/*dw_window_disable(button);*/
-	text = dw_entryfield_new("Entry", 0);
-	dw_box_pack_start(hbox, button, 100, 40, TRUE, FALSE, 2);
-	dw_box_pack_start(hbox, text, 100, 40, TRUE, FALSE, 2);
-	dw_box_pack_start(vbox, hbox, 0, 0, TRUE, FALSE, 0);
-	html = dw_html_new(0);
-	dw_html_url(html, "http://dbsoft.org");
-	dw_box_pack_start(vbox, html, 0, 0, TRUE, TRUE, 0);
-	dw_box_pack_start(box, vbox, 0, 0, TRUE, TRUE, 0);
-	dw_box_pack_start(window, box, 0, 0, TRUE, TRUE, 0);
-	dw_window_show(window);
-	dw_window_set_pos_size(window, 400, 400, 500, 500);
-	dw_window_get_pos_size(window, &x, &y, &width, &height);
-	dw_messagebox("Dynamic Windows Information", DW_MB_OK | DW_MB_INFORMATION, "%d %d %d %d %d %d %d\n", (int)x, (int)y, (int)width, (int)height, (int)dw_screen_width(), (int)dw_screen_height(), (int)dw_color_depth_get());
-	dw_messagebox("File selection", DW_MB_OK | DW_MB_INFORMATION, "%s", dw_file_browse("Choose file", "", "", DW_FILE_OPEN));
-	dw_main();
-	return 0;
-}
-#endif

Mercurial > dwindows

comparison mac/dw.m @ 671:c60a4f6cfae8