dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2382:41a04e6b3e8e

iOS: More conversion... mostly drawing related changes.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 21 Mar 2021 02:37:37 +0000
parents	3777ea1cccdb
children	a410d42d9e36

comparison

equal deleted inserted replaced

-:3777ea1cccdb
+:41a04e6b3e8e
 /* Some internal prototypes */
 static void _do_resize(Box *thisbox, int x, int y);
 void _handle_resize_events(Box *thisbox);
 int _remove_userdata(UserData **root, const char *varname, int all);
 int _dw_main_iteration(NSDate *date);
-CGContextRef _dw_draw_context(UIImage *image);
+CGContextRef _dw_draw_context(UIImage *image, bool antialias);
 typedef id (*DWIMP)(id, SEL, ...);
 /* Internal function to queue a window redraw */
 void _dw_redraw(id window, int skip)
 {
 bltdest = [render cachedDrawingRep];
 }
 if([bltdest isMemberOfClass:[UIImage class]])
 {
-UIGraphicsPushContext(_dw_draw_context(bltdest));
+_dw_draw_context(bltdest, NO);
 }
 if(bltdest && [bltsrc isMemberOfClass:[UIImage class]])
 {
 UIImage *rep = bltsrc;
 UIImage *image = [[UIImage alloc] initWithCGImage:[rep CGImage]];
 [bltsrc release];
 [image release];
 }
 if([bltdest isMemberOfClass:[UIImage class]])
 {
-UIGraphicsPopContext();
+UIGraphicsEndImageContext();
 }
 free(bltinfo);
 }
 -(void)doFlush:(id)param
 {
 {
 DWSlider *slider = [[DWSlider alloc] init];
 [slider setMaximumValue:(double)increments];
 [slider setMinimumValue:0];
 [slider setContinuous:YES];
-[slider setTarget:slider];
+[slider addTarget:slider
-[slider setAction:@selector(sliderChanged:)];
+action:@selector(sliderChanged:)
+forControlEvents:UIControlEventValueChanged];
 [slider setTag:cid];
 return slider;
 }
 /*
 DW_LOCAL_POOL_OUT;
 #endif
 return value;
 }
-CGContextRef _dw_draw_context(UIImage *image)
+CGContextRef _dw_draw_context(UIImage *image, bool antialiased)
 {
-return [NSGraphicsContext graphicsContextWithCGContext:[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] CGContext] flipped:YES];
+CGContextRef context;
+UIGraphicsBeginImageContext(image.size);
+context = UIGraphicsGetCurrentContext();
+CGContextSetAllowsAntialiasing(context, antialiased);
+return context;
 }
 /* Draw a point on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 bi = [render cachedDrawingRep];
 }
 }
 if(bi)
 {
-[NSGraphicsContext saveGraphicsState];
+_dw_draw_context(bi, NO);
-[NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
 }
 if(bCanDraw == YES)
 {
-NSBezierPath* aPath = [NSBezierPath bezierPath];
+UIBezierPath* aPath = [UIBezierPath bezierPath];
 [aPath setLineWidth: 0.5];
 UIColor *color = pthread_getspecific(_dw_fg_color_key);
 [color set];
-[aPath moveToPoint:NSMakePoint(x, y)];
+[aPath moveToPoint:CGPointMake(x, y)];
 [aPath stroke];
 }
 if(bi)
-[NSGraphicsContext restoreGraphicsState];
+UIGraphicsEndImageContext();
 DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /* Draw a line on a window (preferably a render window).
 bi = [render cachedDrawingRep];
 }
 }
 if(bi)
 {
-[NSGraphicsContext saveGraphicsState];
+_dw_draw_context(bi, NO);
-[NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
 }
 if(bCanDraw == YES)
 {
-NSBezierPath* aPath = [NSBezierPath bezierPath];
+UIBezierPath* aPath = [UIBezierPath bezierPath];
 UIColor *color = pthread_getspecific(_dw_fg_color_key);
 [color set];
-[aPath moveToPoint:NSMakePoint(x1 + 0.5, y1 + 0.5)];
+[aPath moveToPoint:CGPointMake(x1 + 0.5, y1 + 0.5)];
-[aPath lineToPoint:NSMakePoint(x2 + 0.5, y2 + 0.5)];
+[aPath lineToPoint:CGPointMake(x2 + 0.5, y2 + 0.5)];
 [aPath stroke];
 }
 if(bi)
-[NSGraphicsContext restoreGraphicsState];
+UIGraphicsEndImageContext();
 DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /* Draw text on a window (preferably a render window).
 font = [render font];
 bi = [render cachedDrawingRep];
 }
 if(bi)
 {
-[NSGraphicsContext saveGraphicsState];
+_dw_draw_context(bi, NO);
-[NSGraphicsContext setCurrentContext:_dw_draw_context(bi)];
 }
 if(bCanDraw == YES)
 {
 UIColor *fgcolor = pthread_getspecific(_dw_fg_color_key);
 UIColor *bgcolor = pthread_getspecific(_dw_bg_color_key);
 NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:fgcolor, NSForegroundColorAttributeName, nil];
 if(bgcolor)
 [dict setValue:bgcolor forKey:NSBackgroundColorAttributeName];
 if(font)
-[dict setValue:font forKey:UIFontAttributeName];
+[dict setValue:font forKey:NSFontAttributeName];
-[nstr drawAtPoint:NSMakePoint(x, y) withAttributes:dict];
+[nstr drawAtPoint:CGPointMake(x, y) withAttributes:dict];
 [dict release];
 }
 if(bi)
-[NSGraphicsContext restoreGraphicsState];
+UIGraphicsEndImageContext();
 DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /* Query the width and height of a text string.
 font = [object font];
 }
 /* If we got a font... add it to the dictionary */
 if(font)
 {
-[dict setValue:font forKey:UIFontAttributeName];
+[dict setValue:font forKey:NSFontAttributeName];
 }
 /* Calculate the size of the string */
 CGSize size = [nstr sizeWithAttributes:dict];
 [dict release];
 /* Return whatever information we can */
 if(height)
 {
 *height = size.height;
 }
 DW_LOCAL_POOL_OUT;
-}
-/* Internal function to create an image graphics context...
-* with or without antialiasing enabled.
-*/
-id _create_gc(id image, bool antialiased)
-{
-CGContextRef  context = (CGContextRef)[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] CGContext];
-NSGraphicsContext *gc = [NSGraphicsContext graphicsContextWithCGContext:context flipped:YES];
-[gc setShouldAntialias:antialiased];
-CGContextSetAllowsAntialiasing(context, antialiased);
-return gc;
 }
 /* Draw a polygon on a window (preferably a render window).
 * Parameters:
 *       handle: Handle to the window.
 bi = [render cachedDrawingRep];
 }
 }
 if(bi)
 {
-id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
+_dw_draw_context(bi, flags & DW_DRAW_NOAA ? NO : YES);
-[NSGraphicsContext saveGraphicsState];
-[NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw == YES)
 {
-NSBezierPath* aPath = [NSBezierPath bezierPath];
+UIBezierPath* aPath = [UIBezierPath bezierPath];
 UIColor *color = pthread_getspecific(_dw_fg_color_key);
 [color set];
-[aPath moveToPoint:NSMakePoint(*x + 0.5, *y + 0.5)];
+[aPath moveToPoint:CGPointMake(*x + 0.5, *y + 0.5)];
 for(z=1;z<npoints;z++)
 {
-[aPath lineToPoint:NSMakePoint(x[z] + 0.5, y[z] + 0.5)];
+[aPath addLineToPoint:CGPointMake(x[z] + 0.5, y[z] + 0.5)];
 }
 [aPath closePath];
 if(flags & DW_DRAW_FILL)
-{
 [aPath fill];
-}
+else
 [aPath stroke];
 }
 if(bi)
-[NSGraphicsContext restoreGraphicsState];
+UIGraphicsEndImageContext();
 DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /* Draw a rectangle on a window (preferably a render window).
 bi = [render cachedDrawingRep];
 }
 }
 if(bi)
 {
-id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
+_dw_draw_context(bi, flags & DW_DRAW_NOAA ? NO : YES);
-[NSGraphicsContext saveGraphicsState];
-[NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw == YES)
 {
 UIColor *color = pthread_getspecific(_dw_fg_color_key);
+UIBezierPath *bp = [UIBezierPath bezierPathWithRect:CGRectMake(x, y, width, height)];;
 [color set];
 if(flags & DW_DRAW_FILL)
-[NSBezierPath fillRect:NSMakeRect(x, y, width, height)];
+[bp fill];
 else
-[NSBezierPath strokeRect:NSMakeRect(x, y, width, height)];
+[bp stroke];
 }
 if(bi)
-[NSGraphicsContext restoreGraphicsState];
+UIGraphicsEndImageContext();
 DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /* Draw an arc on a window (preferably a render window).
 bi = [render cachedDrawingRep];
 }
 }
 if(bi)
 {
-id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
+_dw_draw_context(bi, flags & DW_DRAW_NOAA ? NO : YES);
-[NSGraphicsContext saveGraphicsState];
-[NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw)
 {
-NSBezierPath* aPath = [NSBezierPath bezierPath];
+UIBezierPath* aPath;
 UIColor *color = pthread_getspecific(_dw_fg_color_key);
 [color set];
 /* Special case of a full circle/oval */
 if(flags & DW_DRAW_FULL)
-{
+aPath = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(x1, y1, x2 - x1, y2 - y1)];
-[aPath appendBezierPathWithOvalInRect:NSMakeRect(x1, y1, x2 - x1, y2 - y1)];
-}
 else
 {
 double a1 = atan2((y1-yorigin), (x1-xorigin));
 double a2 = atan2((y2-yorigin), (x2-xorigin));
 double dx = xorigin - x1;
 /* Convert to degrees */
 a1 *= (180.0 / M_PI);
 a2 *= (180.0 / M_PI);
 /* Prepare to draw */
-[aPath appendBezierPathWithArcWithCenter:NSMakePoint(xorigin, yorigin)
+aPath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(xorigin, yorigin)
-radius:r startAngle:a1 endAngle:a2];
+radius:r startAngle:a1 endAngle:a2 clockwise:NO];
 }
 /* If the fill flag is passed */
 if(flags & DW_DRAW_FILL)
-{
 [aPath fill];
-}
+else
-/* Actually do the drawing */
+[aPath stroke];
-[aPath stroke];
 }
 if(bi)
-[NSGraphicsContext restoreGraphicsState];
+UIGraphicsEndImageContext();
 DW_LOCAL_POOL_OUT;
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 DW_FUNCTION_RETURN(dw_container_new, HWND)
 DW_FUNCTION_RESTORE_PARAM2(cid, ULONG, multi, int)
 {
 DW_FUNCTION_INIT;
 DWContainer *cont = _dw_cont_new(cid, multi);
-UIScrollView *scrollview = [cont scrollview];
+/* TODO: Switch to new action system
-[scrollview setHasHorizontalScroller:YES];
+[cont setDoubleAction:@selector(doubleClicked:)];*/
-NSTableHeaderView *header = [[[NSTableHeaderView alloc] init] autorelease];
-[cont setHeaderView:header];
-[cont setTarget:cont];
-[cont setDoubleAction:@selector(doubleClicked:)];
 DW_FUNCTION_RETURN_THIS(cont);
 }
 /*
 * Sets up the container columns.
 [cont setup];
 for(z=0;z<count;z++)
 {
+#if 0 /* TODO: Convert this to simulate columns */
 NSString *title = [NSString stringWithUTF8String:titles[z]];
-NSTableColumn *column = [[NSTableColumn alloc] initWithIdentifier:title];
-[column setTitle:title];
 /* Defaults to left justified so just handle right and center */
-if(flags[z] & DW_CFA_RIGHT)
+#endif
-[(NSCell *)[column headerCell] setAlignment:DWTextAlignmentRight];
-else if(flags[z] & DW_CFA_CENTER)
-[(NSCell *)[column headerCell] setAlignment:DWTextAlignmentCenter];
-[column setEditable:NO];
-[cont addTableColumn:column];
-[cont addColumn:column andType:(int)flags[z]];
-[column release];
 }
 DW_FUNCTION_RETURN_THIS(retval);
 }
 /*
 }
 id object = [cont getRow:(row+lastadd) and:column];
 /* If it is a cell, change the content of the cell */
-if([object isMemberOfClass:[NSTableCellView class]])
+if([object isMemberOfClass:[UITableViewCell class]])
 {
-NSTableCellView *cell = object;
+UITableViewCell *cell = object;
 if(icon)
-[[cell imageView] setImage:icon];
+{
+if(@available(iOS 14.0, *))
+{
+UIListContentConfiguration *content = [cell defaultContentConfiguration];
+[content setImage:icon];
+}
+else
+{
+[cell setImage:icon];
+}
+}
 else
-[[cell textField] setStringValue:text];
+{
+if(@available(iOS 14.0, *))
+{
+UIListContentConfiguration *content = [cell defaultContentConfiguration];
+[content setText:text];
+}
+else
+{
+[cell setText:text];
+}
+}
 }
 else /* Otherwise replace it with a new cell */
 [cont editCell:_dw_table_cell_view_new(icon, text) at:(row+lastadd) and:column];
 [cont setNeedsDisplay];
 DW_FUNCTION_RETURN_NOTHING;
 lastadd = [cont lastAddPoint];
 id object = [cont getRow:(row+lastadd) and:0];
 /* If it is a cell, change the content of the cell */
-if([object isMemberOfClass:[NSTableCellView class]])
+if([object isMemberOfClass:[UITableViewCell class]])
 {
-NSTableCellView *cell = object;
+UITableViewCell *cell = object;
 if(icon)
-[[cell imageView] setImage:icon];
+{
+if(@available(iOS 14.0, *))
+{
+UIListContentConfiguration *content = [cell defaultContentConfiguration];
+[content setImage:icon];
+}
+else
+{
+[cell setImage:icon];
+}
+}
 if(text)
-[[cell textField] setStringValue:text];
+{
+if(@available(iOS 14.0, *))
+{
+UIListContentConfiguration *content = [cell defaultContentConfiguration];
+[content setText:text];
+}
+else
+{
+[cell setText:text];
+}
+}
 }
 else /* Otherwise replace it with a new cell */
 [cont editCell:_dw_table_cell_view_new(icon, text) at:(row+lastadd) and:0];
 [cont setNeedsDisplay];
 DW_FUNCTION_RETURN_NOTHING;
 * Parameters:
 *          handle: Handle to window (widget) of container.
 *          column: Zero based column of width being set.
 *          width: Width of column in pixels.
 */
-DW_FUNCTION_DEFINITION(dw_container_set_column_width, void, HWND handle, int column, int width)
+void API dw_container_set_column_width(HWND handle, int column, int width)
-DW_FUNCTION_ADD_PARAM3(handle, column, width)
+{
-DW_FUNCTION_NO_RETURN(dw_container_set_column_width)
-DW_FUNCTION_RESTORE_PARAM3(handle, HWND, column, int, width, int)
-{
-DW_FUNCTION_INIT;
-DWContainer *cont = handle;
-if([cont filesystem])
-column++;
-NSTableColumn *col = [cont getColumn:column];
-[col setWidth:width];
-DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 * Sets the title of a row in the container.
 * Parameters:
 DW_FUNCTION_RESTORE_PARAM3(handle, HWND, direction, int, rows, long)
 {
 DW_FUNCTION_INIT;
 DWContainer *cont = handle;
 UIScrollView *sv = [cont scrollview];
-NSScroller *scrollbar = [sv verticalScroller];
 int rowcount = (int)[cont numberOfRowsInTableView:cont];
-float currpos = [scrollbar floatValue];
+CGPoint offset = [sv contentOffset];
 float change;
 /* Safety check */
 if(rowcount < 1)
 {
 switch(direction)
 {
 case DW_SCROLL_TOP:
 {
-[scrollbar setFloatValue:0];
+offset.y = 0;
 break;
 }
 case DW_SCROLL_BOTTOM:
 {
-[scrollbar setFloatValue:1];
+offset.y = [sv contentSize].height - [sv visibleSize].height;
 break;
 }
 case DW_SCROLL_UP:
 {
-float newpos = currpos - change;
+offset.y = offset.y - [sv visibleSize].height;
-if(newpos < 0)
-{
-newpos = 0;
-}
-[scrollbar setFloatValue:newpos];
 break;
 }
 case DW_SCROLL_DOWN:
 {
-float newpos = currpos + change;
+offset.y = offset.y + [sv visibleSize].height;
-if(newpos > 1)
-{
-newpos = 1;
-}
-[scrollbar setFloatValue:newpos];
 break;
 }
 }
+if(offset.y < 0)
+offset.y = 0;
+[sv setContentOffset:offset];
 DW_FUNCTION_RETURN_NOTHING;
 }
 /*
 * Starts a new query of a container.
 {
 char *name = strchr(fontname, '.');
 if(name && (name++))
 {
+UIFontDescriptorSymbolicTraits traits = 0;
+UIFontDescriptor* fd;
 int size = atoi(fontname);
 char *Italic = strstr(name, " Italic");
 char *Bold = strstr(name, " Bold");
 size_t len = (Italic ? (Bold ? (Italic > Bold ? (Bold - name) : (Italic - name)) : (Italic - name)) : (Bold ? (Bold - name) : strlen(name)));
 char *newname = alloca(len+1);
 memset(newname, 0, len+1);
 strncpy(newname, name, len);
-font = [DWFontManager fontWithFamily:[NSString stringWithUTF8String:newname]
+if(Bold)
-traits:(Italic ? NSItalicFontMask : 0)|(Bold ? NSBoldFontMask : 0)
+traits |= UIFontDescriptorTraitBold;
-weight:5
+if(Italic)
-size:(float)size];
+traits |= UIFontDescriptorTraitItalic;
+fd = [UIFontDescriptor
+fontDescriptorWithFontAttributes:@{UIFontDescriptorFamilyAttribute:[NSString stringWithUTF8String:newname],
+UIFontDescriptorTraitsAttribute: @{UIFontSymbolicTrait:[NSNumber numberWithInteger:traits]}}];
+NSArray* matches = [fd matchingFontDescriptorsWithMandatoryKeys:
+[NSSet setWithObjects:UIFontDescriptorFamilyAttribute, UIFontDescriptorTraitsAttribute, nil]];
+if(matches.count != 0)
+font = [UIFont fontWithDescriptor:matches[0] size:size];
 }
 }
 return font;
 }
 DW_FUNCTION_RETURN(dw_bitmap_new, HWND)
 DW_FUNCTION_RESTORE_PARAM1(cid, ULONG)
 {
 DW_FUNCTION_INIT;
 UIImageView *bitmap = [[UIImageView alloc] init];
-[bitmap setImageFrameStyle:UIImageFrameNone];
-[bitmap setImageScaling:UIImageScaleNone];
-[bitmap setEditable:NO];
 [bitmap setTag:cid];
 DW_FUNCTION_RETURN_THIS(bitmap);
 }
 /*
 * 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)
 {
-HPIXMAP pixmap;
+HPIXMAP pixmap = NULL;
-if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
+if((pixmap = calloc(1,sizeof(struct _hpixmap))))
-return NULL;
+{
-pixmap->width = width;
+CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
-pixmap->height = height;
+CGDataProviderRef provider = CGDataProviderCreateWithData(NULL, calloc(width*height, 4), width*height*32, NULL);
-pixmap->handle = handle;
+CGImageRef image = CGImageCreate(width, height, 8, 32, 32 * width,
-pixmap->image = [[UIImage alloc]
+rgb, kCGBitmapByteOrderDefault | kCGImageAlphaLast,
-initWithBitmapDataPlanes:NULL
+provider, NULL, false, kCGRenderingIntentDefault);
-pixelsWide:width
+pixmap->width = width;
-pixelsHigh:height
+pixmap->height = height;
-bitsPerSample:8
+pixmap->handle = handle;
-samplesPerPixel:4
+pixmap->image = [[[UIImage alloc] initWithCGImage:image] retain];
-hasAlpha:YES
+}
-isPlanar:NO
-colorSpaceName:NSDeviceRGBColorSpace
-bytesPerRow:0
-bitsPerPixel:0];
 return pixmap;
 }
 /*
 * Creates a pixmap from a file.
 {
 DW_LOCAL_POOL_OUT;
 return NULL;
 }
 pixmap->width = [tmpimage size].width;
-pixmap->height = [tmpimage size]size.height;
+pixmap->height = [tmpimage size].height;
 pixmap->image = tmpimage;
 pixmap->handle = handle;
 DW_LOCAL_POOL_OUT;
 return pixmap;
 }
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%lu.png", resid];
 UIImage *tmpimage = [[UIImage alloc] initWithContentsOfFile:filepath];
-if(temp)
+if(tmpimage)
 {
 pixmap->width = [tmpimage size].width;
 pixmap->height = [tmpimage size].height;
 pixmap->image = tmpimage;
 pixmap->handle = handle;

Mercurial > dwindows

comparison ios/dw.m @ 2382:41a04e6b3e8e