interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:andlabs/libui

This commit is contained in:
Pietro Gagliardi 2016-05-24 01:04:25 -04:00
parent 3272515de6 ea6bef5146
commit 18f225fddb
4 changed files with 69 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
darwin/main.m
View File

@ -2,6 +2,7 @@
#import "uipriv_darwin.h"
static BOOL canQuit = NO;
static NSAutoreleasePool *globalPool;
@implementation applicationClass
@ -72,7 +73,8 @@ static BOOL canQuit = NO;
- (void)dealloc
{
[self.menuManager release];
// Apple docs: "Don't Use Accessor Methods in Initializer Methods and dealloc"
[_menuManager release];
[super dealloc];
}
@ -99,6 +101,10 @@ uiInitOptions options;
const char *uiInit(uiInitOptions *o)
{
globalPool = [[NSAutoreleasePool alloc] init];
@autoreleasepool {
options = *o;
[applicationClass sharedApplication];
// don't check for a NO return; something (launch services?) causes running from application bundles to always return NO when asking to change activation policy, even if the change is to the same activation policy!
@ -109,21 +115,28 @@ const char *uiInit(uiInitOptions *o)
initAlloc();
// always do this so we always have an application menu
appDelegate().menuManager = [menuManager new];
appDelegate().menuManager = [[menuManager new] autorelease];
[realNSApp() setMainMenu:[appDelegate().menuManager makeMenubar]];
setupFontPanel();
return NULL;
} // @autoreleasepool
}
void uiUninit(void)
{
uninitMenus();
[realNSApp() setDelegate:nil];
@autoreleasepool {
[appDelegate() release];
[realNSApp() setDelegate:nil];
[realNSApp() release];
uninitAlloc();
} // @autoreleasepool
[globalPool release];
}
void uiFreeInitError(const char *err)

16
darwin/map.m
View File

@ -41,3 +41,19 @@ void mapDelete(struct mapTable *m, void *key)
{
NSMapRemove(m->m, key);
}
void mapWalk(struct mapTable *m, void (*f)(void *key, void *value))
{
NSMapEnumerator e = NSEnumerateMapTable(m->m);
void *k = NULL;
void *v = NULL;
while (NSNextMapEnumeratorPair(&e, &k, &v)) {
f(k, v);
}
NSEndMapTableEnumeration(&e);
}
void mapReset(struct mapTable *m)
{
NSResetMapTable(m->m);
}

50
darwin/menu.m
View File

@ -27,6 +27,14 @@ enum {
typeSeparator,
};
static void mapItemReleaser(void *key, void *value)
{
uiMenuItem *item;
item = (uiMenuItem *)value;
[item->item release];
}
@implementation menuManager
- (id)init
@ -43,6 +51,9 @@ enum {
- (void)dealloc
{
uninitMenus();
mapWalk(self->items, mapItemReleaser);
mapReset(self->items);
mapDestroy(self->items);
[super dealloc];
}
@ -116,14 +127,14 @@ enum {
NSMenu *servicesMenu;
appName = [[NSProcessInfo processInfo] processName];
appMenuItem = [[NSMenuItem alloc] initWithTitle:appName action:NULL keyEquivalent:@""];
appMenu = [[NSMenu alloc] initWithTitle:appName];
appMenuItem = [[[NSMenuItem alloc] initWithTitle:appName action:NULL keyEquivalent:@""] autorelease];
appMenu = [[[NSMenu alloc] initWithTitle:appName] autorelease];
[appMenuItem setSubmenu:appMenu];
[menubar addItem:appMenuItem];
// first is About
title = [@"About " stringByAppendingString:appName];
item = [[NSMenuItem alloc] initWithTitle:title action:@selector(onClicked:) keyEquivalent:@""];
item = [[[NSMenuItem alloc] initWithTitle:title action:@selector(onClicked:) keyEquivalent:@""] autorelease];
[item setTarget:self];
[appMenu addItem:item];
self.aboutItem = item;
@ -131,7 +142,7 @@ enum {
[appMenu addItem:[NSMenuItem separatorItem]];
// next is Preferences
item = [[NSMenuItem alloc] initWithTitle:@"Preferences…" action:@selector(onClicked:) keyEquivalent:@","];
item = [[[NSMenuItem alloc] initWithTitle:@"Preferences…" action:@selector(onClicked:) keyEquivalent:@","] autorelease];
[item setTarget:self];
[appMenu addItem:item];
self.preferencesItem = item;
@ -139,8 +150,8 @@ enum {
[appMenu addItem:[NSMenuItem separatorItem]];
// next is Services
item = [[NSMenuItem alloc] initWithTitle:@"Services" action:NULL keyEquivalent:@""];
servicesMenu = [[NSMenu alloc] initWithTitle:@"Services"];
item = [[[NSMenuItem alloc] initWithTitle:@"Services" action:NULL keyEquivalent:@""] autorelease];
servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
[item setSubmenu:servicesMenu];
[realNSApp() setServicesMenu:servicesMenu];
[appMenu addItem:item];
@ -149,14 +160,14 @@ enum {
// next are the three hiding options
title = [@"Hide " stringByAppendingString:appName];
item = [[NSMenuItem alloc] initWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
item = [[[NSMenuItem alloc] initWithTitle:title action:@selector(hide:) keyEquivalent:@"h"] autorelease];
// the .xib file says they go to -1 ("First Responder", which sounds wrong...)
// to do that, we simply leave the target as nil
[appMenu addItem:item];
item = [[NSMenuItem alloc] initWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
item = [[[NSMenuItem alloc] initWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"] autorelease];
[item setKeyEquivalentModifierMask:(NSAlternateKeyMask | NSCommandKeyMask)];
[appMenu addItem:item];
item = [[NSMenuItem alloc] initWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
item = [[[NSMenuItem alloc] initWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""] autorelease];
[appMenu addItem:item];
[appMenu addItem:[NSMenuItem separatorItem]];
@ -164,7 +175,7 @@ enum {
// and finally Quit
// DON'T use @selector(terminate:) as the action; we handle termination ourselves
title = [@"Quit " stringByAppendingString:appName];
item = [[NSMenuItem alloc] initWithTitle:title action:@selector(onQuitClicked:) keyEquivalent:@"q"];
item = [[[NSMenuItem alloc] initWithTitle:title action:@selector(onQuitClicked:) keyEquivalent:@"q"] autorelease];
[item setTarget:self];
[appMenu addItem:item];
self.quitItem = item;
@ -174,7 +185,7 @@ enum {
{
NSMenu *menubar;
menubar = [[NSMenu alloc] initWithTitle:@""];
menubar = [[[NSMenu alloc] initWithTitle:@""] autorelease];
[self buildApplicationMenu:menubar];
return menubar;
}
@ -222,6 +233,8 @@ void uiMenuItemSetChecked(uiMenuItem *item, int checked)
static uiMenuItem *newItem(uiMenu *m, int type, const char *name)
{
@autoreleasepool {
uiMenuItem *item;
if (menusFinalized)
@ -232,16 +245,16 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name)
item->type = type;
switch (item->type) {
case typeQuit:
item->item = appDelegate().menuManager.quitItem;
item->item = [appDelegate().menuManager.quitItem retain];
break;
case typePreferences:
item->item = appDelegate().menuManager.preferencesItem;
item->item = [appDelegate().menuManager.preferencesItem retain];
break;
case typeAbout:
item->item = appDelegate().menuManager.aboutItem;
item->item = [appDelegate().menuManager.aboutItem retain];
break;
case typeSeparator:
item->item = [NSMenuItem separatorItem];
item->item = [[NSMenuItem separatorItem] retain];
[m->menu addItem:item->item];
break;
default:
@ -257,6 +270,8 @@ static uiMenuItem *newItem(uiMenu *m, int type, const char *name)
[m->items addObject:[NSValue valueWithPointer:item]];
return item;
} // @autoreleasepool
}
uiMenuItem *uiMenuAppendItem(uiMenu *m, const char *name)
@ -294,6 +309,8 @@ void uiMenuAppendSeparator(uiMenu *m)
uiMenu *uiNewMenu(const char *name)
{
@autoreleasepool {
uiMenu *m;
if (menusFinalized)
@ -316,6 +333,8 @@ uiMenu *uiNewMenu(const char *name)
[menus addObject:[NSValue valueWithPointer:m]];
return m;
} // @autoreleasepool
}
void finalizeMenus(void)
@ -327,7 +346,6 @@ void uninitMenus(void)
{
if (menus == NULL)
return;
// don't worry about the actual NSMenus and NSMenuItems; they'll be freed when we clean up the NSApplication
[menus enumerateObjectsUsingBlock:^(id obj, NSUInteger index, BOOL *stop) {
NSValue *v;
uiMenu *m;

2
darwin/uipriv_darwin.h
View File

@ -89,6 +89,8 @@ extern void mapDestroy(struct mapTable *m);
extern void *mapGet(struct mapTable *m, void *key);
extern void mapSet(struct mapTable *m, void *key, void *value);
extern void mapDelete(struct mapTable *m, void *key);
extern void mapWalk(struct mapTable *m, void (*f)(void *key, void *value));
extern void mapReset(struct mapTable *m);
// area.m
extern int sendAreaEvents(NSEvent *);