dwindows: ios/dw.m comparison

comparison ios/dw.m @ 2393:6669e152e30b

iOS: More namespace cleanup.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 25 Mar 2021 07:48:38 +0000
parents	a7bfb97fd80e
children	2618277de356

comparison

equal deleted inserted replaced

-:9fcc9ee25c4b
+:6669e152e30b
 #define DW_FUNCTION_RETURN_THIS(_retvar) { void *_myreturn = malloc(sizeof(_retvar)); \
 memcpy(_myreturn, (void *)&_retvar, sizeof(_retvar)); \
 [_args addPointer:_myreturn]; }}
 #define DW_FUNCTION_RETURN_NOTHING }
-unsigned long _colors[] =
+unsigned long _dw_colors[] =
 {
 0x00000000,   /* 0  black */
 0x000000bb,   /* 1  red */
 0x0000bb00,   /* 2  green */
 0x0000aaaa,   /* 3  yellow */
 {
 return thiscolor & ~DW_RGB_COLOR;
 }
 else if(thiscolor < 17)
 {
-return _colors[thiscolor];
+return _dw_colors[thiscolor];
 }
 return 0;
 }
 /* Thread specific storage */
 pthread_key_t _dw_pool_key;
 pthread_key_t _dw_fg_color_key;
 pthread_key_t _dw_bg_color_key;
-int DWOSMajor, DWOSMinor, DWOSBuild;
+static 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 _dw_init_colors(void)
 void *discfunction;
 void *data;
 } SignalHandler;
-SignalHandler *Root = NULL;
+static SignalHandler *DWRoot = NULL;
 /* Some internal prototypes */
 static void _dw_do_resize(Box *thisbox, int x, int y);
 void _dw_handle_resize_events(Box *thisbox);
 int _dw_remove_userdata(UserData **root, const char *varname, int all);
 }
 }
 SignalHandler *_dw_get_handler(HWND window, int messageid)
 {
-SignalHandler *tmp = Root;
+SignalHandler *tmp = DWRoot;
 /* Find any callbacks for this function */
 while(tmp)
 {
 if(tmp->message == messageid && window == tmp->window)
 } SignalList;
 /* List of signals */
 #define SIGNALMAX 19
-SignalList SignalTranslate[SIGNALMAX] = {
+static SignalList DWSignalTranslate[SIGNALMAX] = {
 { 1,    DW_SIGNAL_CONFIGURE },
 { 2,    DW_SIGNAL_KEY_PRESS },
 { 3,    DW_SIGNAL_BUTTON_PRESS },
 { 4,    DW_SIGNAL_BUTTON_RELEASE },
 { 5,    DW_SIGNAL_MOTION_NOTIFY },
 {
 return true;
 }
 @end
-UIApplication *DWApp = nil;
+static UIApplication *DWApp = nil;
-UIFont *DWDefaultFont;
+static UIFont *DWDefaultFont;
-DWTimerHandler *DWHandler;
+static DWTimerHandler *DWHandler;
-NSAutoreleasePool *pool;
+static NSMutableArray *_DWDirtyDrawables;
-NSMutableArray *_DWDirtyDrawables;
+static DWTID DWThread = (DWTID)-1;
-DWTID DWThread = (DWTID)-1;
 /* Used for doing bitblts from the main thread */
 typedef struct _bitbltinfo
 {
 id src;
 -(void)keyDown:(UIEvent *)theEvent { _dw_event_handler(self, theEvent, 2); }
 -(void)setColor:(unsigned long)input
 {
 id orig = bgcolor;
-if(input == _colors[DW_CLR_DEFAULT])
+if(input == _dw_colors[DW_CLR_DEFAULT])
 {
 bgcolor = nil;
 }
 else
 {
 -(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
 /* Subclass for a button type */
 @interface DWButton : UIButton
 {
 void *userdata;
 new->signalfunction = signalfunction;
 new->discfunction = discfunc;
 new->data = data;
 new->next = NULL;
-if (!Root)
+if (!DWRoot)
-Root = new;
+DWRoot = new;
 else
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 while(tmp)
 {
 if(tmp->message == message &&
 tmp->window == window &&
 tmp->id == msgid &&
 tmp = tmp->next;
 }
 if(prev)
 prev->next = new;
 else
-Root = new;
+DWRoot = new;
 }
 }
 /* Finds the message number for a given signal name */
 ULONG _dw_findsigmessage(const char *signame)
 {
 int z;
 for(z=0;z<SIGNALMAX;z++)
 {
-if(strcasecmp(signame, SignalTranslate[z].name) == 0)
+if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
-return SignalTranslate[z].message;
+return DWSignalTranslate[z].message;
 }
 return 0L;
 }
-unsigned long _foreground = 0xAAAAAA, _background = 0;
+unsigned long _dw_foreground = 0xAAAAAA, _dw_background = 0;
 void _dw_handle_resize_events(Box *thisbox)
 {
 int z;
 _dw_resize_box(thisbox, &depth, x, y, 2);
 }
 }
 }
-static int _dw_argc;
+static int _dw_argc = 0;
-static char **_dw_argv;
+static char **_dw_argv = NULL;
 /*
 * Runs a message loop for Dynamic Windows.
 */
 void API dw_main(void)
 /*
 * Cleanly terminates a DW session, should be signal handler safe.
 */
 void API dw_shutdown(void)
 {
-pool = pthread_getspecific(_dw_pool_key);
+NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
 [pool drain];
 }
 /*
 * Cleanly terminates a DW session, should be signal handler safe.
 {
 UIColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
 UIColor *newcolor;
 DW_LOCAL_POOL_IN;
-_foreground = _dw_get_color(value);
+_dw_foreground = _dw_get_color(value);
-newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_foreground)/255.0 green:
+newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_dw_foreground)/255.0 green:
-DW_GREEN_VALUE(_foreground)/255.0 blue:
+DW_GREEN_VALUE(_dw_foreground)/255.0 blue:
-DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
+DW_BLUE_VALUE(_dw_foreground)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_fg_color_key, newcolor);
 [oldcolor release];
 DW_LOCAL_POOL_OUT;
 }
 {
 pthread_setspecific(_dw_bg_color_key, NULL);
 }
 else
 {
-_background = _dw_get_color(value);
+_dw_background = _dw_get_color(value);
-newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_background)/255.0 green:
+newcolor = [[UIColor colorWithRed:  DW_RED_VALUE(_dw_background)/255.0 green:
-DW_GREEN_VALUE(_background)/255.0 blue:
+DW_GREEN_VALUE(_dw_background)/255.0 blue:
-DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
+DW_BLUE_VALUE(_dw_background)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_bg_color_key, newcolor);
 }
 [oldcolor release];
 DW_LOCAL_POOL_OUT;
 }
 void API dw_taskbar_delete(HWND handle, HICN icon)
 {
 }
 /* Internal function to keep HICNs from getting too big */
-void _icon_resize(UIImage *image)
+void _dw_icon_resize(UIImage *image)
 {
 if(image)
 {
 CGSize size = [image size];
 if(size.width > 24 || size.height > 24)
 *              to an embedded XPM.
 */
 HICN API dw_icon_load(unsigned long module, unsigned long resid)
 {
 UIImage *image = _dw_icon_load(resid);
-_icon_resize(image);
+_dw_icon_resize(image);
 return image;
 }
 /*
 * Obtains an icon from a file.
 if(!image && ext)
 {
 nstr = [nstr stringByAppendingString: [NSString stringWithUTF8String:ext]];
 image = [[UIImage alloc] initWithContentsOfFile:nstr];
 }
-_icon_resize(image);
+_dw_icon_resize(image);
 return image;
 }
 /*
 * Obtains an icon from data
 */
 HICN API dw_icon_load_from_data(const char *data, int len)
 {
 NSData *thisdata = [NSData dataWithBytes:data length:len];
 UIImage *image = [[UIImage alloc] initWithData:thisdata];
-_icon_resize(image);
+_dw_icon_resize(image);
 return image;
 }
 /*
 * Frees a loaded resource in OS/2 and Windows.
 CGPoint p = CGPointMake(x, y);
 [UIContextMenuInteraction a
 #endif
 }
-char _removetilde(char *dest, const char *src)
+char _dw_removetilde(char *dest, const char *src)
 {
 int z, cur=0;
 char accel = '\0';
 for(z=0;z<strlen(src);z++)
 char *newtitle = malloc(strlen(title)+1);
 NSString *nstr;
 UIMenu *newmenu, *oldmenu = [menu menu];
 NSArray *newchildren, *oldchildren = [oldmenu children];
-accel[0] = _removetilde(newtitle, title);
+accel[0] = _dw_removetilde(newtitle, title);
 accel[1] = 0;
 nstr = [ NSString stringWithUTF8String:newtitle ];
 free(newtitle);
 #endif
 }
 }
 /* Gets the notebook page from associated ID */
-DWNotebookPage *_notepage_from_id(DWNotebook *notebook, unsigned long pageid)
+DWNotebookPage *_dw_notepage_from_id(DWNotebook *notebook, unsigned long pageid)
 {
 NSArray *pages = [notebook views];
 for(DWNotebookPage *notepage in pages)
 {
 if([notepage pageid] == pageid)
 *          pageid: ID of the page to be destroyed.
 */
 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid)
 {
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 DW_LOCAL_POOL_IN;
 if(notepage != nil)
 {
 NSMutableArray<DWNotebookPage *> *views = [notebook views];
 */
 void API dw_notebook_page_set(HWND handle, unsigned int pageid)
 {
 #if 0 /* TODO: Don't see a method to select a tab */
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 if(notepage != nil)
 {
 NSMutableArray<DWNotebookPage *> *views = [notebook views];
 NSUInteger index = [views indexOfObject:notepage];
 */
 void API dw_notebook_pack(HWND handle, ULONG pageid, HWND page)
 {
 #if 0 /* TODO: Haven't implemented the content yet since UISegmentedControl is just the buttons */
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 if(notepage != nil)
 {
 HWND tmpbox = dw_box_new(DW_VERT, 0);
 DWBox *box = tmpbox;
 /* 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().
 */
-UserData *_find_userdata(UserData **root, const char *varname)
+UserData *_dw_find_userdata(UserData **root, const char *varname)
 {
 UserData *tmp = *root;
 while(tmp)
 {
 tmp = tmp->next;
 }
 return NULL;
 }
-int _new_userdata(UserData **root, const char *varname, void *data)
+int _dw_new_userdata(UserData **root, const char *varname, void *data)
 {
-UserData *new = _find_userdata(root, varname);
+UserData *new = _dw_find_userdata(root, varname);
 if(new)
 {
 new->data = data;
 return TRUE;
 blah = calloc(1, sizeof(WindowData));
 [object setUserdata:blah];
 }
 if(data)
-_new_userdata(&(blah->root), dataname, data);
+_dw_new_userdata(&(blah->root), dataname, data);
 else
 {
 if(dataname)
 _dw_remove_userdata(&(blah->root), dataname, FALSE);
 else
 }
 WindowData *blah = (WindowData *)[object userdata];
 if(blah && blah->root && dataname)
 {
-UserData *ud = _find_userdata(&(blah->root), dataname);
+UserData *ud = _dw_find_userdata(&(blah->root), dataname);
 if(ud)
 return ud->data;
 }
 return NULL;
 }
 #define DW_TIMER_MAX 64
-NSTimer *DWTimers[DW_TIMER_MAX];
+static NSTimer *DWTimers[DW_TIMER_MAX];
 /*
 * Add a callback to a timer event.
 * Parameters:
 *       interval: Milliseconds to delay between calls.
 * Parameters:
 *       id: Timer ID returned by dw_timer_connect().
 */
 void API dw_timer_disconnect(int timerid)
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 NSTimer *thistimer;
 /* 0 is an invalid timer ID */
 if(timerid < 1 || !DWTimers[timerid-1])
 return;
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 * Parameters:
 *       window: Window handle of callback to be removed.
 */
 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 ULONG message;
 if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0)
 return;
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 * Parameters:
 *       window: Window handle of callback to be removed.
 */
 void API dw_signal_disconnect_by_window(HWND window)
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 while(tmp)
 {
 if(tmp->window == window)
 {
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 *       window: Window handle of callback to be removed.
 *       data: Pointer to the data to be compared against.
 */
 void API dw_signal_disconnect_by_data(HWND window, void *data)
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 while(tmp)
 {
 if(tmp->window == window && tmp->data == data)
 {
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 tmp = tmp->next;
 }
 }
 }
-void _my_strlwr(char *buf)
+void _dw_my_strlwr(char *buf)
 {
 int z, len = (int)strlen(buf);
 for(z=0;z<len;z++)
 {
 if(!newname)
 return -1;
 sprintf(newname, "lib%s.dylib", name);
-_my_strlwr(newname);
+_dw_my_strlwr(newname);
 *handle = dlopen(newname, RTLD_NOW);
 if(*handle == NULL)
 {
 strncpy(errorbuf, dlerror(), 1024);
 struct _seminfo {
 int fd;
 int waiting;
 };
-static void _handle_sem(int *tmpsock)
+static void _dw_handle_sem(int *tmpsock)
 {
 fd_set rd;
 struct _seminfo *array = (struct _seminfo *)malloc(sizeof(struct _seminfo));
 int listenfd = tmpsock[0];
 int bytesread, connectcount = 1, maxfd, z, posted = 0;
 free(eve);
 return NULL;
 }
 /* Create a thread to handle this event semaphore */
-pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
+pthread_create(&dwthread, NULL, (void *)_dw_handle_sem, (void *)tmpsock);
 eve->alive = ev;
 return eve;
 }
 /* Open an already existing named event semaphore.
 *              an open or create call.
 */
 int dw_named_event_close(HEV eve)
 {
 /* Finally close the domain socket,
-* cleanup will continue in _handle_sem.
+* cleanup will continue in _dw_handle_sem.
 */
 if(eve)
 {
 close(eve->alive);
 free(eve);
 /* Release the pool when we are done so we don't leak */
 color = pthread_getspecific(_dw_fg_color_key);
 [color release];
 color = pthread_getspecific(_dw_bg_color_key);
 [color release];
-pool = pthread_getspecific(_dw_pool_key);
+NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
 [pool drain];
 }
 /*
 * Setup thread independent pools.
 /* Create the application object */
 _dw_app_init();
 /* Create object for handling timers */
 DWHandler = [[DWTimerHandler alloc] init];
 pthread_key_create(&_dw_pool_key, NULL);
-pool = [[NSAutoreleasePool alloc] init];
+NSAutoreleasePool *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);
 _dw_init_colors();
 DWObj = [[DWObject alloc] init];

Mercurial > dwindows

comparison ios/dw.m @ 2393:6669e152e30b