dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2391:a7bfb97fd80e

iOS: Switch to using UIApplicationMain() in dw_main(). This is not a long term solution since it never exits and has some other limitations, but apparently it does some setup we were not doing. We are now getting auto constraint errors due to conflicts with the DW layout engine. Some changes to avoid these but still getting them... so more work needed.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 25 Mar 2021 05:30:52 +0000
parents	2613d1533f1a
children	6669e152e30b

comparison

equal deleted inserted replaced

-:2613d1533f1a
+:a7bfb97fd80e
 @implementation DWTimerHandler
 -(void)runTimer:(id)sender { _dw_event_handler(sender, nil, 0); }
 @end
+@interface DWAppDel : UIResponder <UIApplicationDelegate> { }
+-(void)applicationWillTerminate:(UIApplication *)application;
+-(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions;
+@end
+@implementation DWAppDel
+-(void)applicationWillTerminate:(UIApplication *)application
+{
+/* On iOS we can't prevent temrination, but send the notificatoin anyway */
+_dw_event_handler(application, nil, 6);
+}
+-(BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey, id> *)launchOptions
+{
+return true;
+}
+@end
 UIApplication *DWApp = nil;
 UIFont *DWDefaultFont;
 DWTimerHandler *DWHandler;
 NSAutoreleasePool *pool;
 NSMutableArray *_DWDirtyDrawables;
 -(void)rightMouseUp:(UIEvent *)theEvent;
 -(void)otherMouseDown:(UIEvent *)theEvent;
 -(void)otherMouseUp:(UIEvent *)theEvent;
 -(void)keyDown:(UIEvent *)theEvent;
 -(void)setColor:(unsigned long)input;
+-(void)layoutSubviews;
 @end
 @implementation DWBox
 -(id)init
 {
 }
 }
 [self setNeedsDisplay];
 [orig release];
 }
+-(void)layoutSubviews { };
 @end
 @interface DWWindow : UIWindow
 {
 int redraw;
 -(void)mouseDragged:(UIEvent *)theEvent;
 -(int)redraw;
 -(void)setRedraw:(int)val;
 -(int)shown;
 -(void)setShown:(int)val;
+-(void)layoutSubviews;
 @end
 @implementation DWWindow
 -(void)sendEvent:(UIEvent *)theEvent
 {
 -(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]; }
+-(void)layoutSubviews { }
 @end
 /* Subclass for a render area type */
 @interface DWRender : UIControl
 {
 {
 if(_dw_event_handler(sender, nil, 6) > 0)
 return NO;
 return YES;
 }
--(void)viewDidMoveToWindow
+-(void)willMoveToSuperview:(UIView *)newSuperview
 {
-#if 0 /* TODO: Find the correct way to do this on iOS */
+if(newSuperview)
-[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:UIWindowDidBecomeKeyNotification object:[newSuperview window]];
-[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:[self window]];
-#endif
 }
 -(void)dealloc
 {
 if(windowmenu)
 {
 -(void)viewWillLayoutSubviews
 {
 DWWindow *window = (DWWindow *)[[self view] window];
 NSArray *array = [window subviews];
 DWView *view = [array firstObject];
+#if 0
+id object = [array lastObject];
+/* Remove the UITransitionView... for testing purposes */
+if(![object isMemberOfClass:[DWView class]])
+[object removeFromSuperview];
+#endif
 [view setFrame:[window frame]];
 [view windowResized:[window frame].size];
 }
 @end
 _dw_resize_box(thisbox, &depth, x, y, 2);
 }
 }
 }
+static int _dw_argc;
+static char **_dw_argv;
 /*
 * Runs a message loop for Dynamic Windows.
 */
 void API dw_main(void)
 {
 DWThread = dw_thread_id();
 /* Make sure any queued redraws are handled */
 _dw_redraw(0, FALSE);
-[[NSRunLoop mainRunLoop] run];
+UIApplicationMain(_dw_argc, _dw_argv, nil, NSStringFromClass([DWAppDel class]));
 DWThread = (DWTID)-1;
 }
 /*
 * Causes running dw_main() to return.
 DW_FUNCTION_RESTORE_PARAM2(type, int, pad, int)
 {
 DW_FUNCTION_INIT;
 DWBox *view = [[DWBox alloc] init];
 Box *newbox = [view box];
+[view setTranslatesAutoresizingMaskIntoConstraints:NO];
 memset(newbox, 0, sizeof(Box));
 newbox->pad = pad;
 newbox->type = type;
 DW_FUNCTION_RETURN_THIS(view);
 }
 * Parameters:
 *       owner: The Owner's window handle or HWND_DESKTOP.
 *       title: The Window title.
 *       flStyle: Style flags, see the PM reference.
 */
-DW_FUNCTION_DEFINITION(dw_window_new, HWND, HWND hwndOwner, const char *title, ULONG flStyle)
+DW_FUNCTION_DEFINITION(dw_window_new, HWND, DW_UNUSED(HWND hwndOwner), const char *title, DW_UNUSED(ULONG flStyle))
 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_RESTORE_PARAM3(DW_UNUSED(hwndOwner), HWND, title, char *, DW_UNUSED(flStyle), ULONG)
 {
 DW_FUNCTION_INIT;
 DWWindow *window = [[DWWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
 DWView *view = [[DWView alloc] init];
-window.rootViewController = [[DWViewController alloc] init];
+[window setRootViewController:[[DWViewController alloc] init]];
 [window addSubview:view];
-/* TODO: Handle style flags */
+/* TODO: Handle style flags... if we can? There is no visible frame */
 if(@available(iOS 13.0, *)) {
 [window setLargeContentTitle:[NSString stringWithUTF8String:title]];
 }
 DW_FUNCTION_RETURN_THIS(window);
 }
 if(![window shown])
 {
 [window makeKeyAndVisible];
 [window setShown:YES];
 }
+else
+[window setHidden:NO];
 }
 return 0;
 }
 /*
 }
 /* Internal function to return a pointer to an item struct
 * with information about the packing information regarding object.
 */
-Item *_box_item(id object)
+Item *_dw_box_item(id object)
 {
 /* Find the item within the box it is packed into */
 if([object isKindOfClass:[DWBox class]] || [object isKindOfClass:[UIControl class]])
 {
 DWBox *parent = (DWBox *)[object superview];
 [render setFont:font];
 }
 else
 return DW_ERROR_UNKNOWN;
 /* If we changed the text... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 [control setText:[NSString stringWithUTF8String:text]];
 }
 else
 return;
 /* If we changed the text... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 int newwidth, newheight;
 if(pixmap)
 {
 [object setImage:pixmap];
 }
 /* If we changed the bitmap... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 if(bitmap)
 {
 [object setImage:bitmap];
 /* If we changed the bitmap... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 *                      False if there is already a message loop running.
 */
 int API dw_init(int newthread, int argc, char *argv[])
 {
 char *lang = getenv("LANG");
+_dw_argc = argc;
+_dw_argv = argv;
 /* Correct the startup path if run from a bundle */
 if(argc > 0 && argv[0])
 {
 char *pathcopy = strdup(argv[0]);

Mercurial > dwindows

comparison ios/dw.m @ 2391:a7bfb97fd80e