dwindows: mac/dw.m comparison

comparison mac/dw.m @ 661:eee90a788876

Added missing functions needed to build HandyFTP. Fixed render area rendering fonts upside down.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 25 Feb 2011 03:45:44 +0000
parents	2784e7ee8bcb
children	d7badd5606ca

comparison

equal deleted inserted replaced

-:2784e7ee8bcb
+:eee90a788876
 }
 int _event_handler(id object, NSEvent *event, int message)
 {
 	SignalHandler *handler = _get_handler(object, message);
-	NSLog(@"Event handler - type %d\n", message);
+	/*NSLog(@"Event handler - type %d\n", message);*/
 	if(handler)
 	{
 		switch(message)
 		{
 				return buttonfunc(object, point.x, point.y, button, handler->data);
 			}
 			case 6:
 			{
 				int (* API closefunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
-				NSLog(@"Close\n");
 				return closefunc(object, handler->data);
 			}
 			case 7:
 			{
 				DWExpose exp;
 				exp.x = rect.origin.x;
 				exp.y = rect.origin.y;
 				exp.width = rect.size.width;
 				exp.height = rect.size.height;
 				int result = exposefunc(object, &exp, handler->data);
-				NSGraphicsContext *gc = [[object window] graphicsContext];
+				[[object window] flushWindow];
-				[gc flushGraphics];
 				return result;
 			}
 			case 8:
 			{
 				int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
-				NSLog(@"Clicked\n");
 				return clickfunc(object, handler->data);
 			}
 			case 10:
 			{
 				int (* API containercontextfunc)(HWND, char *, int, int, void *, void *) = (int (* API)(HWND, char *, int, int, void *, void *))handler->signalfunction;
 NSMenu *DWMainMenu;
 DWTimerHandler *DWHandler;
 #if !defined(GARBAGE_COLLECT)
 NSAutoreleasePool *pool;
 #endif
+HWND _DWLastDrawable;
 /* So basically to implement our event handlers...
 * it looks like we are going to have to subclass
 * basically everything.  Was hoping to add methods
 * to the superclasses but it looks like you can
 	void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)drawRect:(NSRect)rect;
--(BOOL)isFlipped;
 -(void)mouseDown:(NSEvent *)theEvent;
 -(void)mouseUp:(NSEvent *)theEvent;
 @end
 @implementation DWRender
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)drawRect:(NSRect)rect { _event_handler(self, nil, 7); }
--(BOOL)isFlipped { return YES; }
 -(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
 @end
 /* Subclass for a MLE type */
 (*depth)++;
 _resize_box(tmp, depth, x, y, &nux, &nuy, 3, &nupx, &nupy);
 (*depth)--;
+				[box setBox:_tmp];
 }
 }
 }
 				if(view != nil)
 				{
 					Box box = [view box];
 					NSSize size = [view frame].size;
 					_do_resize(&box, size.width, size.height);
+					[view setBox:box];
 				}
 			}
 			else if([handle isMemberOfClass:[DWRender class]])
 			{
 				_event_handler(handle, nil, 1);
+			}
+			else if([handle isMemberOfClass:[WebView class]])
+			{
+				NSLog(@"x: %d y: %d width: %d height: %d", (int)point.x, (int)point.y, (int)size.width, (int)size.height);
 			}
 			if(thisbox->type == DW_HORZ)
 currentx += width + vectorx + (pad * 2);
 if(thisbox->type == DW_VERT)
 #if !defined(GARBAGE_COLLECT)
 	pool = [[NSAutoreleasePool alloc] init];
 #endif
 	DWMainMenu = _generate_main_menu();
 	[DWApp setMainMenu:DWMainMenu];
-	DWObject *test = [[DWObject alloc] init];
+	/*DWObject *test = [[DWObject alloc] init];
 	NSThread *thread = [[ NSThread alloc] initWithTarget:test selector:@selector(uselessThread:) object:nil];
-	[thread start];
+	[thread start];*/
 	return 0;
 }
 /*
 * Runs a message loop for Dynamic Windows.
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
+		_DWLastDrawable = handle;
 	}
 	NSRect rect = NSMakeRect(x, y, x, y);
 	[[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] set];
 	NSRectFill(rect);
 	[image unlockFocus];
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
+		_DWLastDrawable = handle;
 	}
 	NSBezierPath* aPath = [NSBezierPath bezierPath];
-	[aPath setLineWidth: 1.0];
+	[aPath setLineWidth: 0.5];
 	[aPath moveToPoint:NSMakePoint(x1, y1)];
 	[aPath lineToPoint:NSMakePoint(x2, y2)];
 	[aPath stroke];
 			[image lockFocusIfCanDraw];
 			NSDictionary *dict = [[NSDictionary alloc] init];
 			[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
 			[image unlockFocus];
 		}
+		_DWLastDrawable = handle;
 	}
 	if(pixmap)
 	{
 		image = (id)pixmap->handle;
 		[image lockFocus];
 *       height Pointer to a variable to be filled in with the height.
 */
 void API dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, char *text, int *width, int *height)
 {
 	id image = handle;
+	NSString *nstr = [ NSString stringWithUTF8String:text ];
 	if(pixmap)
 	{
 		image = (id)pixmap->handle;
-	}
+		[image lockFocus];
-	NSLog(@"dw_font_text_extents_get() unimplemented\n");
+	}
+	else
+	{
+		[image lockFocusIfCanDraw];
+	}
+	NSDictionary *dict = [[NSDictionary alloc] init];
+	NSSize size = [nstr sizeWithAttributes:dict];
+	if(width)
+	{
+		*width = size.width;
+	}
+	if(height)
+	{
+		*height = size.height;
+	}
+	[image unlockFocus];
 }
 /* Draw a polygon on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
+		_DWLastDrawable = handle;
 	}
 	NSBezierPath* aPath = [NSBezierPath bezierPath];
-	[aPath setLineWidth: 1.0];
+	[aPath setLineWidth: 0.5];
 	[aPath moveToPoint:NSMakePoint(*x, *y)];
 	for(z=1;z<npoints;z++)
 	{
 		[aPath lineToPoint:NSMakePoint(x[z], y[z])];
 		[image lockFocus];
 	}
 	else
 	{
 		[image lockFocusIfCanDraw];
+		_DWLastDrawable = handle;
 	}
 	NSRect rect = NSMakeRect(x, y, x + width, y + height);
 	[[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] set];
 	NSRectFill(rect);
 	[image unlockFocus];
 		[bltdest lockFocus];
 	}
 	else
 	{
 		[bltdest lockFocusIfCanDraw];
+		_DWLastDrawable = dest;
 	}
 	if(srcp)
 	{
 		bltsrc = (id)srcp->handle;
 		NSImage *image = bltsrc;
 DWView *view = [[DWView alloc] init];
 [window setContentView:view];
 [window setDelegate:view];
 [window makeKeyAndOrderFront:nil];
+	[window setAllowsConcurrentViewDrawing:NO];
 	return (HWND)window;
 }
 /*
 *       handle: Handle to the window.
 *       id: An ID to be used to specify the icon.
 */
 void API dw_window_set_icon(HWND handle, ULONG id)
 {
-	NSLog(@"dw_window_set_icon() unimplemented\n");
+	/* This isn't needed, it is loaded from the bundle */
 }
 /*
 * Gets the child window handle with specified ID.
 * Parameters:
 /* Call this after drawing to the screen to make sure
 * anything you have drawn is visible.
 */
 void API dw_flush(void)
 {
+	if(_DWLastDrawable)
+	{
+		id object = _DWLastDrawable;
+		NSWindow *window = [object window];
+		[window flushWindow];
+	}
 }
 /* Functions for managing the user data lists that are associated with
 * a given window handle.  Used in dw_window_set_data() and
 * dw_window_get_data().
 DWTID dw_thread_id(void)
 {
 return (DWTID)pthread_self();
 }
+/*
+* Execute and external program in a seperate session.
+* Parameters:
+*       program: Program name with optional path.
+*       type: Either DW_EXEC_CON or DW_EXEC_GUI.
+*       params: An array of pointers to string arguements.
+* Returns:
+*       -1 on error.
+*/
+int dw_exec(char *program, int type, char **params)
+{
+	int ret = -1;
+	if((ret = fork()) == 0)
+	{
+		int i;
+		for (i = 3; i < 256; i++)
+			close(i);
+		setsid();
+		if(type == DW_EXEC_GUI)
+		{
+			execvp(program, params);
+		}
+		else if(type == DW_EXEC_CON)
+		{
+			char **tmpargs;
+			if(!params)
+			{
+				tmpargs = malloc(sizeof(char *));
+				tmpargs[0] = NULL;
+			}
+			else
+			{
+				int z = 0;
+				while(params[z])
+				{
+					z++;
+				}
+				tmpargs = malloc(sizeof(char *)*(z+3));
+				z=0;
+				tmpargs[0] = "xterm";
+				tmpargs[1] = "-e";
+				while(params[z])
+				{
+					tmpargs[z+2] = params[z];
+					z++;
+				}
+				tmpargs[z+2] = NULL;
+			}
+			execvp("xterm", tmpargs);
+			free(tmpargs);
+		}
+		/* If we got here exec failed */
+		_exit(-1);
+	}
+	return ret;
+}
+/*
+* Loads a web browser pointed at the given URL.
+* Parameters:
+*       url: Uniform resource locator.
+*/
+int dw_browse(char *url)
+{
+	/* Is there a way to find the webbrowser in Unix? */
+	char *execargs[3], *browser = "netscape", *tmp;
+	tmp = getenv( "DW_BROWSER" );
+	if(tmp) browser = tmp;
+	execargs[0] = browser;
+	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;

Mercurial > dwindows

comparison mac/dw.m @ 661:eee90a788876