dwindows: mac/dw.m comparison

comparison mac/dw.m @ 653:36c6669422d2

Continuing to add types... looking to almost be usable. :)

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 23 Feb 2011 15:40:46 +0000
parents	ef0f484c6c4b
children	80e253df49fd

comparison

equal deleted inserted replaced

-:ef0f484c6c4b
+:36c6669422d2
 	SignalHandler *handler = _get_handler(object, message);
 	NSLog(@"Event handler\n");
 	if(handler)
 	{
-		if(message == 3 || message == 4)
+		switch(message)
 		{
-			int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
+			case 3:
-			int flags = [object pressedMouseButtons];
+			case 4:
-			NSPoint point = [object mouseLocation];
+			{
-			int button = 0;
+				int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
-			char *which = "pressed";
+				int flags = [object pressedMouseButtons];
+				NSPoint point = [object mouseLocation];
+				int button = 0;
+				char *which = "pressed";
-			if(message == 4)
+				if(message == 4)
+				{
+					which = "released";
+				}
+				if(flags & 1)
+				{
+					button = 1;
+				}
+				else if(flags & (1 << 1))
+				{
+					button = 2;
+				}
+				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:
 			{
-				which = "released";
+				int (* API closefunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
+				NSLog(@"Close\n");
+				return closefunc(object, handler->data);
 			}
+			case 7:
+			{
+				DWExpose exp;
+				int (* API exposefunc)(HWND, DWExpose *, void *) = (int (* API)(HWND, DWExpose *, void *))handler->signalfunction;
+				NSRect rect = [object frame];
-			if(flags & 1)
+				exp.x = rect.origin.x;
+				exp.y = rect.origin.y;
+				exp.width = rect.size.width;
+				exp.height = rect.size.height;
+				return exposefunc(object, &exp, handler->data);
+			}
+			case 8:
 			{
-				button = 1;
+				int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
+				NSLog(@"Clicked\n");
+				return clickfunc(object, handler->data);
 			}
-			else if(flags & (1 << 1))
-			{
-				button = 2;
-			}
-			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);
 		}
-		else if(message == 7)
+	}
-		{
+	return -1;
-			DWExpose exp;
-			int (* API exposefunc)(HWND, DWExpose *, void *) = (int (* API)(HWND, DWExpose *, void *))handler->signalfunction;
-			NSRect rect = [object frame];
-			exp.x = rect.origin.x;
-			exp.y = rect.origin.y;
-			exp.width = rect.size.width;
-			exp.height = rect.size.height;
-			return exposefunc(object, &exp, handler->data);
-		}
-		else if(message == 8)
-		{
-			int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
-			NSLog(@"Clicked\n");
-			return clickfunc(object, handler->data);
-		}
-	}
-	return 0;
 }
 /* So basically to implement our event handlers...
 * it looks like we are going to have to subclass
 * basically everything.  Was hoping to add methods
 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
 @end
 /* Subclass for a top-level window */
 @interface DWView : DWBox  { }
+-(BOOL)windowShouldClose:(id)sender;
 @end
 @implementation DWView
--(void)windowWillClose:(NSNotification *)note
+-(BOOL)windowShouldClose:(id)sender
 {
-[[NSApplication sharedApplication] terminate:self];
+if(_event_handler(self, nil, 6) == FALSE)
+		return NO;
+	return YES;
 }
 - (void)viewDidMoveToWindow
 {
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
 }
 			NSSize size = [view frame].size;
 			_do_resize(&box, size.width, size.height);
 		}
 	}
 }
+@end
+/* Subclass for a slider type */
+@interface DWSlider : NSSlider
+{
+	void *userdata;
+}
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
+@end
+@implementation DWSlider
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
+@end
+/* Subclass for a slider type */
+@interface DWScrollbar : NSScroller
+{
+	void *userdata;
+	float range;
+	float visible;
+}
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
+-(float)range;
+-(float)visible;
+-(void)setRange:(float)input1 andVisible:(float)input2;
+@end
+@implementation DWScrollbar
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
+-(float)range { return range; }
+-(float)visible { return visible; }
+-(void)setRange:(float)input1 andVisible:(float)input2 { range = input1; visible = input2; }
+@end
+/* Subclass for a render area type */
+@interface DWRender : NSView
+{
+	void *userdata;
+}
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
+-(void)drawRect:(NSRect)rect;
+-(BOOL)isFlipped;
+@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; }
+@end
+/* Subclass for a MLE type */
+@interface DWMLE : NSTextView
+{
+	void *userdata;
+}
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
+@end
+@implementation DWMLE
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
 @end
 NSApplication *DWApp;
 NSRunLoop *DWRunLoop;
 #if !defined(GARBAGE_COLLECT)
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_button_new(char *text, ULONG id)
 {
 	DWButton *button = [[DWButton alloc] init];
-	[button setTitle:[ NSString stringWithUTF8String:text ]];
+	if(text && *text)
+	{
+		[button setTitle:[ NSString stringWithUTF8String:text ]];
+	}
 	[button setButtonType:NSMomentaryPushInButton];
 	[button setBezelStyle:NSThickerSquareBezelStyle];
 	[button setTarget:button];
 	[button setAction:@selector(buttonClicked:)];
 	/*[button setGradientType:NSGradientConvexWeak];*/
 *                 DW pick the appropriate file extension.
 *                 (BMP on OS/2 or Windows, XPM on Unix)
 */
 HWND API dw_bitmapbutton_new_from_file(char *text, unsigned long id, char *filename)
 {
-	NSLog(@"dw_bitmapbutton_new_from_file() unimplemented\n");
+	NSImage *image = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
-	return HWND_DESKTOP;
+	DWButton *button = dw_button_new("", id);
+	[button setImage:image];
+	return button;
 }
 /*
 * Create a new bitmap button window (widget) to be packed from data.
 * Parameters:
 *            (BMP or ICO on OS/2 or Windows, XPM on Unix)
 *       len: length of str
 */
 HWND API dw_bitmapbutton_new_from_data(char *text, unsigned long id, char *data, int len)
 {
-	NSLog(@"dw_bitmapbutton_new_from_data() unimplemented\n");
+	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
-	return HWND_DESKTOP;
+	NSImage *image = [[NSImage alloc] initWithData:thisdata];
+	DWButton *button = dw_button_new("", id);
+	[button setImage:image];
+	return button;
 }
 /*
 * Create a new spinbutton window (widget) to be packed.
 * Parameters:
 *       increments: Number of increments available.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_slider_new(int vertical, int increments, ULONG id)
 {
-	NSLog(@"dw_slider_new() unimplemented\n");
+	DWSlider *slider = [[DWSlider alloc] init];
-	return HWND_DESKTOP;
+	[slider setMaxValue:(double)increments];
+	[slider setMinValue:0];
+	return slider;
 }
 /*
 * Returns the position of the slider.
 * Parameters:
 *          handle: Handle to the slider to be queried.
 */
 unsigned int API dw_slider_get_pos(HWND handle)
 {
-	NSLog(@"dw_slider_get_pos() unimplemented\n");
+	DWSlider *slider = handle;
-	return 0;
+	double val = [slider doubleValue];
+	return (int)val;
 }
 /*
 * Sets the slider position.
 * Parameters:
 *          handle: Handle to the slider to be set.
 *          position: Position of the slider withing the range.
 */
 void API dw_slider_set_pos(HWND handle, unsigned int position)
 {
-	NSLog(@"dw_slider_set_pos() unimplemented\n");
+	DWSlider *slider = handle;
+	[slider setDoubleValue:(double)position];
 }
 /*
 * Create a new scrollbar window (widget) to be packed.
 * Parameters:
 *       increments: Number of increments available.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_scrollbar_new(int vertical, ULONG id)
 {
-	NSLog(@"dw_scrollbar_new() unimplemented\n");
+	DWScrollbar *scrollbar = [[DWScrollbar alloc] init];
-	return HWND_DESKTOP;
+	return scrollbar;
 }
 /*
 * Returns the position of the scrollbar.
 * Parameters:
 *          handle: Handle to the scrollbar to be queried.
 */
 unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
-	NSLog(@"dw_scrollbar_get_pos() unimplemented\n");
+	DWScrollbar *scrollbar = handle;
-	return 0;
+	float range = [scrollbar range];
+	float fresult = [scrollbar doubleValue] * range;
+	return (int)fresult;
 }
 /*
 * Sets the scrollbar position.
 * Parameters:
 *          handle: Handle to the scrollbar to be set.
 *          position: Position of the scrollbar withing the range.
 */
 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
 {
-	NSLog(@"dw_scrollbar_set_pos() unimplemented\n");
+	DWScrollbar *scrollbar = handle;
+	double range = (double)[scrollbar range];
+	double newpos = (double)position/range;
+	[scrollbar setDoubleValue:newpos];
 }
 /*
 * Sets the scrollbar range.
 * Parameters:
 *          range: Maximum range value.
 *          visible: Visible area relative to the range.
 */
 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
 {
-	NSLog(@"dw_scrollbar_set_range() unimplemented\n");
+	DWScrollbar *scrollbar = handle;
+	float knob = (float)visible/(float)range;
+	[scrollbar setRange:(float)range andVisible:(float)visible];
+	[scrollbar setKnobProportion:knob];
 }
 /*
 * Create a new percent bar window (widget) to be packed.
 * Parameters:
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_mle_new(ULONG id)
 {
-	NSLog(@"dw_mle_new() unimplemented\n");
+	DWMLE *mle = [[DWMLE alloc] init];
-	return HWND_DESKTOP;
+	return mle;
 }
 /*
 * Adds text to an MLE box and returns the current point.
 * Parameters:
 *          buffer: Text buffer to be imported.
 *          startpoint: Point to start entering text.
 */
 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
 {
-	NSLog(@"dw_mle_import() unimplemented\n");
+	DWMLE *mle = handle;
-	return 0;
+	[mle insertText:[ NSString stringWithUTF8String:buffer ]];
+	return strlen(buffer) + startpoint;
 }
 /*
 * Grabs text from an MLE box.
 * Parameters:
 *          handle: Handle to the MLE.
 *          state: TRUE if it can be edited, FALSE for readonly.
 */
 void API dw_mle_set_editable(HWND handle, int state)
 {
-	NSLog(@"dw_mle_set_editable() unimplemented\n");
+	DWMLE *mle = handle;
+	if(state)
+	{
+		[mle setEditable:YES];
+	}
+	else
+	{
+		[mle setEditable:NO];
+	}
 }
 /*
 * Sets the word wrap state of an MLE box.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_status_text_new(char *text, ULONG id)
 {
-	NSLog(@"dw_status_text_new() unimplemented\n");
+	NSTextField *textfield = dw_text_new(text, id);
-	return HWND_DESKTOP;
+	[textfield setBordered:YES];
+	[textfield setBezeled:YES];
+	[textfield setBezelStyle:NSRecessedBezelStyle];
+	return textfield;
 }
 /*
 * Create a new static text window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_text_new(char *text, ULONG id)
 {
-	NSLog(@"dw_text_new() unimplemented\n");
+	NSTextField *textfield = [[NSTextField alloc] init];
-	return HWND_DESKTOP;
+	[textfield setEditable:NO];
+	[textfield setSelectable:NO];
+	[textfield setBordered:NO];
+	[textfield setDrawsBackground:NO];
+	[textfield setStringValue:[ NSString stringWithUTF8String:text ]];
+	return textfield;
 }
 /*
 * Creates a rendering context widget (window) to be packed.
 * Parameters:
 * Returns:
 *       A handle to the widget or NULL on failure.
 */
 HWND API dw_render_new(unsigned long id)
 {
-	NSLog(@"dw_render_new() unimplemented\n");
+	DWRender *render = [[DWRender alloc] init];
-	return HWND_DESKTOP;
+	return render;
 }
 /* Sets the current foreground drawing color.
 * Parameters:
 *       red: red value.
 *       x: X coordinate.
 *       y: Y coordinate.
 */
 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
 {
-	NSLog(@"dw_draw_point() unimplemented\n");
+	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);
 }
 /* Draw a line on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 *       width: Width of rectangle.
 *       height: Height of rectangle.
 */
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
 {
-	NSLog(@"dw_draw_rect() unimplemented\n");
+	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);
 }
 /*
 * Create a tree object to be packed.
 * Parameters:
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_bitmap_new(ULONG id)
 {
-	NSLog(@"dw_bitmap_new() unimplemented\n");
+	NSImageView *bitmap = [[NSImageView alloc] init];
-	return HWND_DESKTOP;
+	[bitmap setImageFrameStyle:NSImageFrameNone];
+	[bitmap setEditable:NO];
+	return bitmap;
 }
 /*
 * Creates a pixmap with given parameters.
 * Parameters:
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
 {
-	NSLog(@"dw_pixmap_new() unimplemented\n");
+	NSSize size = { (float)width, (float)height };
-	return HWND_DESKTOP;
+	NSImage *pixmap = [[NSImage alloc] initWithSize:size];
+	return (HPIXMAP)pixmap;
 }
 /*
 * Creates a pixmap from a file.
 * Parameters:
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
 {
-	NSLog(@"dw_pixmap_new_from_file() unimplemented\n");
+	NSImage *pixmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
-	return HWND_DESKTOP;
+	return (HPIXMAP)pixmap;
 }
 /*
 * Creates a pixmap from memory.
 * Parameters:
 * Returns:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
 {
-	NSLog(@"dw_pixmap_new_from_data() unimplemented\n");
+	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
-	return HWND_DESKTOP;
+	NSImage *pixmap = [[NSImage alloc] initWithData:thisdata];
+	return (HPIXMAP)pixmap;
 }
 /*
 * Creates a bitmap mask for rendering bitmaps with transparent backgrounds
 */
 *       pixmap: Handle to a pixmap returned by
 *               dw_pixmap_new..
 */
 void API dw_pixmap_destroy(HPIXMAP pixmap)
 {
-	NSLog(@"dw_pixmap_destroy() unimplemented\n");
+	NSImage *image = (NSImage *)pixmap;
+	[image dealloc];
 }
 /*
 * Copies from one item to another.
 * Parameters:
 HWND API dw_window_new(HWND hwndOwner, char *title, ULONG flStyle)
 {
 	NSRect frame = NSMakeRect(1,1,1,1);
 NSWindow *window = [[NSWindow alloc]
 						initWithContentRect:frame
-						styleMask:flStyle
+						styleMask:(flStyle | NSTexturedBackgroundWindowMask)
 						backing:NSBackingStoreBuffered
 						defer:false];
 [window setTitle:[ NSString stringWithUTF8String:title ]];
 *          fore: Foreground color in DW_RGB format or a default color index.
 *          back: Background color in DW_RGB format or a default color index.
 */
 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
 {
-	NSLog(@"dw_window_set_color() unimplemented\n");
+	id object = handle;
-	return -1;
+	if([object isMemberOfClass:[NSTextFieldCell class]])
+	{
+		NSTextFieldCell *text = object;
+		[text setTextColor:[NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1]];
+	}
+	return 0;
 }
 /*
 * Sets the font used by a specified window (widget) handle.
 * Parameters:
 *          handle: The window (widget) handle.
 *          border: Size of the window border in pixels.
 */
 int API dw_window_set_border(HWND handle, int border)
 {
-	NSLog(@"dw_window_set_border() unimplemented\n");
 	return 0;
 }
 /*
 * Sets the style of a given window (widget).
 *          width: New width in pixels.
 *          height: New height in pixels.
 */
 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
 {
-	NSLog(@"dw_window_set_style() unimplemented\n");
+	id object = handle;
+	if([object isMemberOfClass:[NSWindow class]])
+	{
+		NSWindow *window = object;
+		int currentstyle = [window styleMask];
+		int tmp;
+		tmp = currentstyle | mask;
+		tmp ^= mask;
+		tmp |= style;
+		[window setStyleMask:tmp];
+	}
 }
 /*
 * Sets the default focus item for a window/dialog.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 653:36c6669422d2