dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2390:2613d1533f1a

iOS: Fix initial window display and handle resize/rotation events. Add _dw to internal functions keeping with changes done in the GTK4 port. Remove some left over tree code, there is no tree/outline view in iOS.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 24 Mar 2021 20:11:11 +0000
parents	7b06fc7c8130
children	a7bfb97fd80e

comparison

equal deleted inserted replaced

-:7b06fc7c8130
+:2613d1533f1a
 /*
 * List those icons that have transparency first
 */
 #define NUM_EXTS 8
-char *image_exts[NUM_EXTS] =
+char *_dw_image_exts[NUM_EXTS+1] =
 {
 ".png",
 ".ico",
 ".icns",
 ".gif",
 ".jpg",
 ".jpeg",
 ".tiff",
-".bmp"
+".bmp",
+NULL
 };
 char *_dw_get_image_extension(const char *filename)
 {
 char *file = alloca(strlen(filename) + 6);
 /* Try various extentions */
 for ( i = 0; i < NUM_EXTS; i++ )
 {
 strcpy( file, filename );
-strcat( file, image_exts[i] );
+strcat( file, _dw_image_exts[i] );
 if ( access( file, R_OK ) == 0 )
 {
 found_ext = 1;
 break;
 }
 }
 if ( found_ext == 1 )
 {
-return image_exts[i];
+return _dw_image_exts[i];
 }
 return NULL;
 }
 /* Return the RGB color regardless if a predefined color was passed */
-unsigned long _get_color(unsigned long thiscolor)
+unsigned long _dw_get_color(unsigned long thiscolor)
 {
 if(thiscolor & DW_RGB_COLOR)
 {
 return thiscolor & ~DW_RGB_COLOR;
 }
 int DWOSMajor, DWOSMinor, DWOSBuild;
 static char _dw_bundle_path[PATH_MAX+1] = { 0 };
 static char _dw_app_id[_DW_APP_ID_SIZE+1]= {0};
 /* Create a default colors for a thread */
-void _init_colors(void)
+void _dw_init_colors(void)
 {
 UIColor *fgcolor = [[UIColor grayColor] retain];
 pthread_setspecific(_dw_fg_color_key, fgcolor);
 pthread_setspecific(_dw_bg_color_key, NULL);
 }
 SignalHandler *Root = NULL;
 /* Some internal prototypes */
-static void _do_resize(Box *thisbox, int x, int y);
+static void _dw_do_resize(Box *thisbox, int x, int y);
-void _handle_resize_events(Box *thisbox);
+void _dw_handle_resize_events(Box *thisbox);
-int _remove_userdata(UserData **root, const char *varname, int all);
+int _dw_remove_userdata(UserData **root, const char *varname, int all);
 int _dw_main_iteration(NSDate *date);
 CGContextRef _dw_draw_context(UIImage *image, bool antialias);
 typedef id (*DWIMP)(id, SEL, ...);
 /* Internal function to queue a window redraw */
 {
 dw_window_redraw(redraw);
 }
 }
-SignalHandler *_get_handler(HWND window, int messageid)
+SignalHandler *_dw_get_handler(HWND window, int messageid)
 {
 SignalHandler *tmp = Root;
 /* Find any callbacks for this function */
 while(tmp)
 { 17,   DW_SIGNAL_COLUMN_CLICK },
 { 18,   DW_SIGNAL_HTML_RESULT },
 { 19,   DW_SIGNAL_HTML_CHANGED }
 };
-int _event_handler1(id object, UIEvent *event, int message)
+int _dw_event_handler1(id object, UIEvent *event, int message)
 {
-SignalHandler *handler = _get_handler(object, message);
+SignalHandler *handler = _dw_get_handler(object, message);
 /* NSLog(@"Event handler - type %d\n", message); */
 if(handler)
 {
 switch(message)
 }
 return -1;
 }
 /* Sub function to handle redraws */
-int _event_handler(id object, UIEvent *event, int message)
+int _dw_event_handler(id object, UIEvent *event, int message)
 {
-int ret = _event_handler1(object, event, message);
+int ret = _dw_event_handler1(object, event, message);
 if(ret != -1)
 _dw_redraw(nil, FALSE);
 return ret;
 }
 @interface DWTimerHandler : NSObject { }
 -(void)runTimer:(id)sender;
 @end
 @implementation DWTimerHandler
--(void)runTimer:(id)sender { _event_handler(sender, nil, 0); }
+-(void)runTimer:(id)sender { _dw_event_handler(sender, nil, 0); }
 @end
 UIApplication *DWApp = nil;
 UIFont *DWDefaultFont;
 DWTimerHandler *DWHandler;
 {
 UserData *root = userdata;
 if(box->items)
 free(box->items);
 free(box);
-_remove_userdata(&root, NULL, TRUE);
+_dw_remove_userdata(&root, NULL, TRUE);
 dw_signal_disconnect_by_window(self);
 [super dealloc];
 }
 -(Box *)box { return box; }
 -(id)contentView { return self; }
 [bgcolor set];
 UIRectFill([self bounds]);
 }
 }
 -(BOOL)isFlipped { return YES; }
--(void)mouseDown:(UIEvent *)theEvent { _event_handler(self, (void *)1, 3); }
+-(void)mouseDown:(UIEvent *)theEvent { _dw_event_handler(self, (void *)1, 3); }
--(void)mouseUp:(UIEvent *)theEvent { _event_handler(self, (void *)1, 4); }
+-(void)mouseUp:(UIEvent *)theEvent { _dw_event_handler(self, (void *)1, 4); }
--(DWMenu *)menuForEvent:(UIEvent *)theEvent { _event_handler(self, (void *)2, 3); return nil; }
+-(DWMenu *)menuForEvent:(UIEvent *)theEvent { _dw_event_handler(self, (void *)2, 3); return nil; }
--(void)rightMouseUp:(UIEvent *)theEvent { _event_handler(self, (void *)2, 4); }
+-(void)rightMouseUp:(UIEvent *)theEvent { _dw_event_handler(self, (void *)2, 4); }
--(void)otherMouseDown:(UIEvent *)theEvent { _event_handler(self, (void *)3, 3); }
+-(void)otherMouseDown:(UIEvent *)theEvent { _dw_event_handler(self, (void *)3, 3); }
--(void)otherMouseUp:(UIEvent *)theEvent { _event_handler(self, (void *)3, 4); }
+-(void)otherMouseUp:(UIEvent *)theEvent { _dw_event_handler(self, (void *)3, 4); }
--(void)keyDown:(UIEvent *)theEvent { _event_handler(self, theEvent, 2); }
+-(void)keyDown:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 2); }
 -(void)setColor:(unsigned long)input
 {
 id orig = bgcolor;
 if(input == _colors[DW_CLR_DEFAULT])
 -(void)sendEvent:(UIEvent *)theEvent
 {
 int rcode = -1;
 if([theEvent type] == UIEventTypePresses)
 {
-rcode = _event_handler(self, theEvent, 2);
+rcode = _dw_event_handler(self, theEvent, 2);
 }
 if ( rcode != TRUE )
 [super sendEvent:theEvent];
 }
 -(void)keyDown:(UIEvent *)theEvent { }
--(void)mouseDragged:(UIEvent *)theEvent { _event_handler(self, theEvent, 5); }
+-(void)mouseDragged:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 5); }
 -(int)redraw { return redraw; }
 -(void)setRedraw:(int)val { redraw = val; }
 -(int)shown { return shown; }
 -(void)setShown:(int)val { shown = val; }
 -(void)dealloc { dw_signal_disconnect_by_window(self); [super dealloc]; }
 return cachedDrawingRep;
 }
 -(void)mouseDown:(UIEvent *)theEvent
 {
 if(![theEvent isMemberOfClass:[UIEvent class]])
-_event_handler(self, theEvent, 3);
+_dw_event_handler(self, theEvent, 3);
 }
--(void)mouseUp:(UIEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)mouseUp:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 4); }
--(DWMenu *)menuForEvent:(UIEvent *)theEvent { _event_handler(self, theEvent, 3); return nil; }
+-(DWMenu *)menuForEvent:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 3); return nil; }
--(void)rightMouseUp:(UIEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)rightMouseUp:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 4); }
--(void)otherMouseDown:(UIEvent *)theEvent { _event_handler(self, theEvent, 3); }
+-(void)otherMouseDown:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 3); }
--(void)otherMouseUp:(UIEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)otherMouseUp:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 4); }
--(void)mouseDragged:(UIEvent *)theEvent { _event_handler(self, theEvent, 5); }
+-(void)mouseDragged:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 5); }
 -(void)drawRect:(CGRect)rect {
-_event_handler(self, nil, 7);
+_dw_event_handler(self, nil, 7);
 if (cachedDrawingRep)
 {
 [cachedDrawingRep drawInRect:self.bounds];
 [_DWDirtyDrawables removeObject:self];
 [self setNeedsDisplay];
 }
 }
--(void)keyDown:(UIEvent *)theEvent { _event_handler(self, theEvent, 2); }
+-(void)keyDown:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 2); }
 -(BOOL)isFlipped { return YES; }
 -(void)dealloc {
 UserData *root = userdata;
-_remove_userdata(&root, NULL, TRUE);
+_dw_remove_userdata(&root, NULL, TRUE);
 [font release];
 dw_signal_disconnect_by_window(self);
 [cachedDrawingRep release];
 [_DWDirtyDrawables removeObject:self];
 [super dealloc];
 return [super init];
 }
 -(void)uselessThread:(id)sender { /* Thread only to initialize threading */ }
 -(void)menuHandler:(id)param
 {
-_event_handler(param, nil, 8);
+_dw_event_handler(param, nil, 8);
 }
 -(void)callBack:(NSPointerArray *)params
 {
 void (*mycallback)(NSPointerArray *) = [params pointerAtIndex:0];
 if(mycallback)
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [[self URL] absoluteString] };
-_event_handler(self, (UIEvent *)params, 19);
+_dw_event_handler(self, (UIEvent *)params, 19);
 }
 -(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [[self URL] absoluteString] };
-_event_handler(self, (UIEvent *)params, 19);
+_dw_event_handler(self, (UIEvent *)params, 19);
 }
 -(void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [[self URL] absoluteString] };
-_event_handler(self, (UIEvent *)params, 19);
+_dw_event_handler(self, (UIEvent *)params, 19);
 }
 -(void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_REDIRECT), [[self URL] absoluteString] };
-_event_handler(self, (UIEvent *)params, 19);
+_dw_event_handler(self, (UIEvent *)params, 19);
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a top-level window */
 @interface DWView : DWBox /* <UIWindowDelegate> */
 {
 @end
 @implementation DWView
 -(BOOL)windowShouldClose:(id)sender
 {
-if(_event_handler(sender, nil, 6) > 0)
+if(_dw_event_handler(sender, nil, 6) > 0)
 return NO;
 return YES;
 }
 -(void)viewDidMoveToWindow
 {
-#if 0 /* TODO */
+#if 0 /* TODO: Find the correct way to do this on iOS */
-[[UINotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:UIWindowDidResizeNotification object:[self window]];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
-[[UINotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:UIWindowDidBecomeMainNotification object:[self window]];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:[self window]];
 #endif
 }
 -(void)dealloc
 {
 if(windowmenu)
 }
 [[NSNotificationCenter defaultCenter] removeObserver:self];
 dw_signal_disconnect_by_window(self);
 [super dealloc];
 }
--(void)windowResized:(NSNotification *)notification;
+-(void)windowResized:(CGSize)size;
 {
-CGSize size = [self frame].size;
 if(oldsize.width != size.width || oldsize.height != size.height)
 {
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_event_handler([self window], nil, 1);
+_dw_event_handler([self window], nil, 1);
 oldsize.width = size.width;
 oldsize.height = size.height;
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 -(void)showWindow
 {
 CGSize size = [self frame].size;
 if(oldsize.width == size.width && oldsize.height == size.height)
 {
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 -(void)windowDidBecomeMain:(id)sender
 {
-_event_handler([self window], nil, 13);
+_dw_event_handler([self window], nil, 13);
 }
 -(void)setMenu:(DWMenu *)input { windowmenu = input; [windowmenu retain]; }
 -(void)menuHandler:(id)sender
 {
 [DWObj menuHandler:sender];
 }
 @end
+@interface DWViewController : UIViewController
+-(void)viewWillLayoutSubviews;
+@end
+@implementation DWViewController : UIViewController {}
+-(void)viewWillLayoutSubviews
+{
+DWWindow *window = (DWWindow *)[[self view] window];
+NSArray *array = [window subviews];
+DWView *view = [array firstObject];
+[view setFrame:[window frame]];
+[view windowResized:[window frame].size];
+}
+@end
 /* Subclass for a button type */
 @interface DWButton : UIButton
 {
 void *userdata;
 @implementation DWButton
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)buttonClicked:(id)sender
 {
-_event_handler(self, nil, 8);
+_dw_event_handler(self, nil, 8);
 }
 -(UIButtonType)buttonType { return buttonType; }
 -(void)setParent:(DWBox *)input { parent = input; }
 -(DWBox *)parent { return parent; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a progress type */
 @interface DWPercent : UIProgressView
 {
 @end
 @implementation DWPercent
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a menu item type */
 @implementation DWMenuItem
 -(void)setCheck:(int)input { check = input; }
 @implementation DWScrollBox
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)setBox:(void *)input { box = input; }
 -(id)box { return box; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 @interface DWEntryFieldFormatter : NSFormatter
 {
 int maxLength;
 @implementation DWEntryField
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)setClickDefault:(id)input { clickDefault = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a text and status text type */
 @interface DWText : UILabel
 {
 @end
 @implementation DWText
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); [super dealloc]; }
 @end
 /* Subclass for a Notebook page type */
 @interface DWNotebookPage : UIView
 {
 if([object isMemberOfClass:[DWBox class]])
 {
 DWBox *view = object;
 Box *box = [view box];
 CGSize size = [view frame].size;
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 #endif
-_event_handler(self, DW_INT_TO_POINTER([self selectedSegmentIndex]), 15);
+_dw_event_handler(self, DW_INT_TO_POINTER([self selectedSegmentIndex]), 15);
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 @implementation DWNotebookPage
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(int)pageid { return pageid; }
 -(void)setPageid:(int)input { pageid = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a splitbar type */
 @interface DWSplitBar : UISplitViewController <UISplitViewControllerDelegate>
 {
 if([object isMemberOfClass:[DWBox class]])
 {
 DWBox *view = object;
 Box *box = [view box];
 CGSize size = [view frame].size;
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 }
 -(void)setTag:(NSInteger)tag { Tag = tag; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(float)percent { return percent; }
 -(void)setPercent:(float)input { percent = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a slider type */
 @interface DWSlider : UISlider
 {
 @end
 @implementation DWSlider
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)sliderChanged:(id)sender { int intVal = (int)[self value]; _event_handler(self, DW_INT_TO_POINTER(intVal), 14); }
+-(void)sliderChanged:(id)sender { int intVal = (int)[self value]; _dw_event_handler(self, DW_INT_TO_POINTER(intVal), 14); }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a MLE type */
 @interface DWMLE : UITextView
 {
 @implementation DWMLE
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(id)scrollview { return scrollview; }
 -(void)setScrollview:(id)input { scrollview = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* TODO: UITableView does not support variable columns...
 * also OutlineView does not exist in iOS.
 */
 id scrollview;
 int filesystem;
 }
 -(NSInteger)tableView:(UITableView *)aTable numberOfRowsInSection:(NSInteger)section;
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath;
--(void)tableView: (UITableView*)tableView willDisplayCell: (UITableViewCell*)cell forRowAtIndexPath: (NSIndexPath*)indexPath;
+-(void)tableView:(UITableView*)tableView willDisplayCell:(UITableViewCell*)cell forRowAtIndexPath:(NSIndexPath*)indexPath;
 -(void)addColumn:(NSString *)input andType:(int)type;
 -(NSString *)getColumn:(int)col;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)setFilesystem:(int)input;
 /* Return the result */
 return result;
 }
 return nil;
 }
--(void)tableView: (UITableView*)tableView willDisplayCell: (UITableViewCell*)cell forRowAtIndexPath: (NSIndexPath*)indexPath
+-(void)tableView:(UITableView*)tableView willDisplayCell:(UITableViewCell*)cell forRowAtIndexPath:(NSIndexPath*)indexPath
 {
 if(indexPath.row % 2 == 0)
 {
 if(evencolor)
 [cell setBackgroundColor:evencolor];
 -(void)refreshColors
 {
 UIColor *oldodd = oddcolor;
 UIColor *oldeven = evencolor;
 unsigned long thisodd = dw_oddcolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_ODD : dw_oddcolor;
-unsigned long _odd = _get_color(thisodd);
+unsigned long _odd = _dw_get_color(thisodd);
 unsigned long thiseven = dw_evencolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_EVEN : dw_evencolor;
-unsigned long _even = _get_color(thiseven);
+unsigned long _even = _dw_get_color(thiseven);
 /* Get the UIColor for non-default colors */
 if(thisodd != DW_RGB_TRANSPARENT)
 oddcolor = [[UIColor colorWithRed: DW_RED_VALUE(_odd)/255.0 green: DW_GREEN_VALUE(_odd)/255.0 blue: DW_BLUE_VALUE(_odd)/255.0 alpha: 1] retain];
 else
 params[0] = (void *)[self getRowTitle:(int)[self indexPathForSelectedRow].row];
 params[1] = (void *)[self getRowData:(int)[self indexPathForSelectedRow].row];
 /* Handler for container class */
-_event_handler(self, (UIEvent *)params, 9);
+_dw_event_handler(self, (UIEvent *)params, 9);
 }
 -(void)selectionChanged:(id)sender
 {
 void *params[2];
 params[0] = (void *)[self getRowTitle:(int)[self indexPathForSelectedRow].row];
 params[1] = (void *)[self getRowData:(int)[self indexPathForSelectedRow].row];
 /* Handler for container class */
-_event_handler(self, (UIEvent *)params, 12);
+_dw_event_handler(self, (UIEvent *)params, 12);
 /* Handler for listbox class */
-_event_handler(self, DW_INT_TO_POINTER((int)[self indexPathForSelectedRow].row), 11);
+_dw_event_handler(self, DW_INT_TO_POINTER((int)[self indexPathForSelectedRow].row), 11);
 }
 -(DWMenu *)menuForEvent:(UIEvent *)event
 {
 #if 0 /* TODO: Fix this */
 int row;
 CGPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
 row = (int)[self rowAtPoint:where];
-_event_handler(self, (UIEvent *)[self getRowTitle:row], 10);
+_dw_event_handler(self, (UIEvent *)[self getRowTitle:row], 10);
 #endif
 return nil;
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
-/* Dive into the tree freeing all desired child nodes */
-void _free_tree_recurse(NSMutableArray *node, NSMutableArray *item)
-{
-if(node && ([node isKindOfClass:[NSArray class]]))
-{
-int count = (int)[node count];
-NSInteger index = -1;
-int z;
-if(item)
-index = [node indexOfObject:item];
-for(z=0;z<count;z++)
-{
-NSMutableArray *pnt = [node objectAtIndex:z];
-NSMutableArray *children = nil;
-if(pnt && [pnt isKindOfClass:[NSArray class]])
-{
-children = (NSMutableArray *)[pnt objectAtIndex:3];
-}
-if(z == index)
-{
-_free_tree_recurse(children, NULL);
-[node removeObjectAtIndex:z];
-count = (int)[node count];
-index = -1;
-z--;
-}
-else if(item == NULL)
-{
-NSString *oldstr = [pnt objectAtIndex:1];
-[oldstr release];
-_free_tree_recurse(children, item);
-}
-else
-_free_tree_recurse(children, item);
-}
-}
-if(!item)
-{
-[node release];
-}
-}
 /* Subclass for a Calendar type */
 @interface DWCalendar : UIDatePicker
 {
 void *userdata;
 @end
 @implementation DWCalendar
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a stepper component of the spinbutton type */
 /* This is a bad way of doing this... but I can't get the other methods to work */
 @interface DWStepper : UIStepper
 -(UIStepper *)stepper { return stepper; }
 -(void)controlTextDidChange:(NSNotification *)aNotification
 {
 long val = [[textfield text] intValue];
 [stepper setValue:(float)val];
-_event_handler(self, DW_INT_TO_POINTER(val), 14);
+_dw_event_handler(self, DW_INT_TO_POINTER(val), 14);
 }
 -(void)setClickDefault:(id)input { clickDefault = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 API_AVAILABLE(ios(10.0))
 @interface DWUserNotificationCenterDelegate : NSObject <UNUserNotificationCenterDelegate>
 @end
 dw_signal_disconnect_by_window(notification);
 }
 else if ([response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier])
 {
 /* The user launched the app. */
-_event_handler(notification, nil, 8);
+_dw_event_handler(notification, nil, 8);
 dw_signal_disconnect_by_window(notification);
 }
 completionHandler();
 }
 @end
 @implementation DWMDI
 @end
 /* This function adds a signal handler callback into the linked list.
 */
-void _new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data)
+void _dw_new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data)
 {
 SignalHandler *new = malloc(sizeof(SignalHandler));
 new->message = message;
 new->window = window;
 Root = new;
 }
 }
 /* Finds the message number for a given signal name */
-ULONG _findsigmessage(const char *signame)
+ULONG _dw_findsigmessage(const char *signame)
 {
 int z;
 for(z=0;z<SIGNALMAX;z++)
 {
 return 0L;
 }
 unsigned long _foreground = 0xAAAAAA, _background = 0;
-void _handle_resize_events(Box *thisbox)
+void _dw_handle_resize_events(Box *thisbox)
 {
 int z;
 for(z=0;z<thisbox->count;z++)
 {
 {
 Box *tmp = (Box *)[handle box];
 if(tmp)
 {
-_handle_resize_events(tmp);
+_dw_handle_resize_events(tmp);
 }
 }
 else
 {
 if([handle isMemberOfClass:[DWRender class]])
 if(oldsize.width != newsize.width || oldsize.height != newsize.height)
 {
 if(newsize.width > 0 && newsize.height > 0)
 {
 [render setSize:newsize];
-_event_handler(handle, nil, 1);
+_dw_event_handler(handle, nil, 1);
 }
 }
 }
 /* Special handling for notebook controls */
 #if 0 /* TODO: Segmented control might not have subviews */
 id view = [notepage view];
 if([view isMemberOfClass:[DWBox class]])
 {
 Box *box = (Box *)[view box];
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 #endif
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 NSArray *subviews = [scrollbox subviews];
 DWBox *contentbox = [subviews firstObject];
 Box *thisbox = [contentbox box];
 /* Get the required space for the box */
-_handle_resize_events(thisbox);
+_dw_handle_resize_events(thisbox);
 }
 }
 }
 }
 /* This function calculates how much space the widgets and boxes require
 * and does expansion as necessary.
 */
-static void _resize_box(Box *thisbox, int *depth, int x, int y, int pass)
+static void _dw_resize_box(Box *thisbox, int *depth, int x, int y, int pass)
 {
 /* Current item position */
 int z, currentx = thisbox->pad, currenty = thisbox->pad;
 /* Used x, y and padding maximum values...
 * These will be used to find the widest or
 if(pass == 1)
 {
 (*depth)++;
 /* Save the newly calculated values on the box */
-_resize_box(tmp, depth, x, y, pass);
+_dw_resize_box(tmp, depth, x, y, pass);
 /* Duplicate the values in the item list for use below */
 thisbox->items[z].width = tmp->minwidth;
 thisbox->items[z].height = tmp->minheight;
 Box *tmp = (Box *)[box box];
 if(tmp)
 {
 (*depth)++;
-_resize_box(tmp, depth, width, height, pass);
+_dw_resize_box(tmp, depth, width, height, pass);
 (*depth)--;
 }
 }
 #if 0 /* TODO: Segemented control may not have subviews */
 if([view isMemberOfClass:[DWBox class]])
 {
 Box *box = (Box *)[view box];
 CGSize size = [view frame].size;
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 #endif
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 Box *thisbox = [contentbox box];
 CGSize contentsize = [scrollbox contentSize];
 CGRect frame = [contentbox frame];
 /* Get the required space for the box */
-_resize_box(thisbox, &depth, x, y, 1);
+_dw_resize_box(thisbox, &depth, x, y, 1);
 if(contentsize.width < thisbox->minwidth)
 {
 contentsize.width = thisbox->minwidth;
 }
 }
 frame.size = contentsize;
 [contentbox setFrame:frame];
 /* Layout the content of the scrollbox */
-_do_resize(thisbox, contentsize.width, contentsize.height);
+_dw_do_resize(thisbox, contentsize.width, contentsize.height);
-_handle_resize_events(thisbox);
+_dw_handle_resize_events(thisbox);
 }
 /* Special handling for spinbutton controls */
 else if([handle isMemberOfClass:[DWSpinButton class]])
 {
 DWSpinButton *spinbutton = (DWSpinButton *)handle;
 }
 }
 }
 }
-static void _do_resize(Box *thisbox, int x, int y)
+static void _dw_do_resize(Box *thisbox, int x, int y)
 {
 if(x > 0 && y > 0)
 {
 if(thisbox)
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, x, y, 1);
+_dw_resize_box(thisbox, &depth, x, y, 1);
 /* Finally place all the boxes and controls */
-_resize_box(thisbox, &depth, x, y, 2);
+_dw_resize_box(thisbox, &depth, x, y, 2);
 }
 }
 }
 /*
 {
 UIColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
 UIColor *newcolor;
 DW_LOCAL_POOL_IN;
-_foreground = _get_color(value);
+_foreground = _dw_get_color(value);
 newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_foreground)/255.0 green:
 DW_GREEN_VALUE(_foreground)/255.0 blue:
 DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_fg_color_key, newcolor);
 {
 pthread_setspecific(_dw_bg_color_key, NULL);
 }
 else
 {
-_background = _get_color(value);
+_background = _dw_get_color(value);
 newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_background)/255.0 green:
 DW_GREEN_VALUE(_background)/255.0 blue:
 DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_bg_color_key, newcolor);
 {
 DW_LOCAL_POOL_OUT;
 return value;
 }
-unsigned long tempcol = _get_color(value);
+unsigned long tempcol = _dw_get_color(value);
 UIColor *color = [[UIColor colorWithDeviceRed: DW_RED_VALUE(tempcol)/255.0 green: DW_GREEN_VALUE(tempcol)/255.0 blue: DW_BLUE_VALUE(tempcol)/255.0 alpha: 1] retain];
 [colorDlg setColor:color];
 dialog = dw_dialog_new(colorDlg);
 [colorDlg setDialog:dialog];
 DW_LOCAL_POOL_IN;
 [html evaluateJavaScript:[NSString stringWithUTF8String:script] completionHandler:^(NSString *result, NSError *error)
 {
 void *params[2] = { result, scriptdata };
-_event_handler(html, (UIEvent *)params, 18);
+_dw_event_handler(html, (UIEvent *)params, 18);
 }];
 DW_LOCAL_POOL_OUT;
 return DW_ERROR_NONE;
 }
 DW_FUNCTION_ADD_PARAM3(hwndOwner, title, flStyle)
 DW_FUNCTION_RETURN(dw_window_new, HWND)
 DW_FUNCTION_RESTORE_PARAM3(hwndOwner, HWND, title, char *, flStyle, ULONG)
 {
 DW_FUNCTION_INIT;
-DWWindow *window = [[DWWindow alloc] init];
+DWWindow *window = [[DWWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 DWView *view = [[DWView alloc] init];
+window.rootViewController = [[DWViewController alloc] init];
 [window addSubview:view];
 /* TODO: Handle style flags */
 if(@available(iOS 13.0, *)) {
 {
 /* Determine the contents size */
 dw_window_set_size(handle, 0, 0);
 }
 if(![window shown])
+{
+[window makeKeyAndVisible];
 [window setShown:YES];
+}
 }
 return 0;
 }
 /*
 *          back: Background color in DW_RGB format or a default color index.
 */
 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
 {
 id object = handle;
-unsigned long _fore = _get_color(fore);
+unsigned long _fore = _dw_get_color(fore);
-unsigned long _back = _get_color(back);
+unsigned long _back = _dw_get_color(back);
 UIColor *fg = NULL;
 UIColor *bg = NULL;
 /* Get the UIColor for non-default colors */
 if(fore != DW_CLR_DEFAULT)
 if((thisbox = (Box *)[object box]))
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, 0, 0, 1);
+_dw_resize_box(thisbox, &depth, 0, 0, 1);
 /* Return what was requested */
 if(width) *width = thisbox->minwidth;
 if(height) *height = thisbox->minheight;
 }
 }
 }
 return FALSE;
 }
-int _remove_userdata(UserData **root, const char *varname, int all)
+int _dw_remove_userdata(UserData **root, const char *varname, int all)
 {
 UserData *prev = NULL, *tmp = *root;
 while(tmp)
 {
 if(data)
 _new_userdata(&(blah->root), dataname, data);
 else
 {
 if(dataname)
-_remove_userdata(&(blah->root), dataname, FALSE);
+_dw_remove_userdata(&(blah->root), dataname, FALSE);
 else
-_remove_userdata(&(blah->root), NULL, TRUE);
+_dw_remove_userdata(&(blah->root), NULL, TRUE);
 }
 }
 /*
 * Gets a named user data item to a window handle.
 if(sigfunc && !DWTimers[z])
 {
 NSTimeInterval seconds = (double)interval / 1000.0;
 NSTimer *thistimer = DWTimers[z] = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
-_new_signal(0, thistimer, z+1, sigfunc, NULL, data);
+_dw_new_signal(0, thistimer, z+1, sigfunc, NULL, data);
 return z+1;
 }
 return 0;
 }
 window = DWApp;
 }
 if(window && signame && sigfunc)
 {
-if((message = _findsigmessage(signame)) != 0)
+if((message = _dw_findsigmessage(signame)) != 0)
 {
-_new_signal(message, window, (int)msgid, sigfunc, discfunc, data);
+_dw_new_signal(message, window, (int)msgid, sigfunc, discfunc, data);
 }
 }
 }
 /*
 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
 {
 SignalHandler *prev = NULL, *tmp = Root;
 ULONG message;
-if(!window || !signame || (message = _findsigmessage(signame)) == 0)
+if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0)
 return;
 while(tmp)
 {
 if(tmp->window == window && tmp->message == message)
 void API _dw_init_thread(void)
 {
 /* If we aren't using garbage collection we need autorelease pools */
 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 pthread_setspecific(_dw_pool_key, pool);
-_init_colors();
+_dw_init_colors();
 }
 /*
 * Generally an internal function called from a terminating
 * thread to cleanup the Dynamic Windows environment for the thread.
 pthread_key_create(&_dw_pool_key, NULL);
 pool = [[NSAutoreleasePool alloc] init];
 pthread_setspecific(_dw_pool_key, pool);
 pthread_key_create(&_dw_fg_color_key, NULL);
 pthread_key_create(&_dw_bg_color_key, NULL);
-_init_colors();
+_dw_init_colors();
 DWObj = [[DWObject alloc] init];
 DWDefaultFont = nil;
 if (@available(iOS 10.0, *))
 {
 if([[NSBundle mainBundle] bundleIdentifier] != nil)

Mercurial > dwindows

comparison ios/dw.m @ 2390:2613d1533f1a