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

Set up the infrastructure for replacing NSMutableDictionary with a proper non-copying map.

This commit is contained in:
Pietro Gagliardi 2015-08-17 01:03:53 -04:00
parent 9d3ba0cfd7
commit 22551413aa
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redo/reredo/darwin/GNUmakeinc.mk
View File

@ -13,6 +13,7 @@ osMFILES = \
darwin/group.m \
darwin/label.m \
darwin/main.m \
darwin/map.m \
darwin/menu.m \
darwin/progressbar.m \
darwin/radiobuttons.m \

28
redo/reredo/darwin/map.m Normal file
View File

@ -0,0 +1,28 @@
// 17 august 2015
#import "uipriv_darwin.h"
// unfortunately NSMutableDictionary copies its keys, meaning we can't use it for pointers
// hence, this file
NSMapTable *newMap(void)
{
// TODO NSPointerFunctionsOpaquePersonality?
return [NSMapTable mapTableWithKeyOptions:NSPointerFunctionsOpaqueMemory
valueOptions:NSPointerFunctionsOpaqueMemory];
}
void *mapGet(NSMapTable *map, id key)
{
NSValue *v;
v = (NSValue *) [self->items objectForKey:sender];
return [v pointerValue];
}
void mapSet(NSMapTable *map, id key, void *value)
{
NSValue *v;
v = [NSValue valueWithPointer:value];
[map setObject:v forKey:key];
}

6
redo/reredo/darwin/menu.m
View File

@ -1,6 +1,8 @@
// 28 april 2015
#import "uipriv_darwin.h"
// TODO migrate to map.m functions
static NSMutableArray *menus = nil;
static BOOL menusFinalized = NO;
@ -35,9 +37,7 @@ enum {
{
self = [super init];
if (self) {
// TODO NSPointerFunctionsOpaquePersonality?
self->items = [NSMapTable mapTableWithKeyOptions:NSPointerFunctionsOpaqueMemory
valueOptions:NSPointerFunctionsOpaqueMemory];
self->items = newMap();
self->hasQuit = NO;
self->hasPreferences = NO;
self->hasAbout = NO;

6
redo/reredo/darwin/uipriv_darwin.h
View File

@ -11,7 +11,6 @@
// menu.m
@interface menuManager : NSObject {
// unfortunately NSMutableDictionary copies its keys, meaning we can't use it for pointers
NSMapTable *items;
BOOL hasQuit;
BOOL hasPreferences;
@ -58,5 +57,10 @@ extern void setHuggingPri(NSView *, NSLayoutPriority, NSLayoutConstraintOrientat
extern void layoutSingleView(NSView *, NSView *, int);
extern NSSize fittingAlignmentSize(NSView *);
// map.m
extern NSMapTable *newMap(void);
extern void *mapGet(NSMapTable *map, id key);
extern void mapSet(NSMapTable *map, id key, void *value);
// TODO
#define PUT_CODE_HERE 0