interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed bleh_darwin.m's tracking area logic and rewrote it in Objective-C in area_darwin.m.

This commit is contained in:
Pietro Gagliardi 2014-05-15 20:42:29 -04:00
parent 100a41e1c9
commit 7645f459e7
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
area_darwin.m
View File

@ -55,7 +55,12 @@
- (void)retrack
{
trackingArea = makeTrackingArea(self); // TODO make inline
trackingArea = [[NSTrackingArea alloc]
initWithRect:[self bounds]
// this bit mask (except for NSTrackingInVisibleRect, which was added later to prevent events from being triggered outside the visible area of the Area) comes from https://github.com/andlabs/misctestprogs/blob/master/cocoaviewmousetest.m (and I wrote this bit mask on 25 april 2014) and yes I know it includes enter/exit even though we don't watch those events; it probably won't really matter anyway but if it does I can change it easily
options:(NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingActiveAlways | NSTrackingEnabledDuringMouseDrag | NSTrackingInVisibleRect)
owner:self
userInfo:nil];
[self addTrackingArea:trackingArea];
}

24
bleh_darwin.m
View File

@ -205,30 +205,6 @@ void *_appDelegate_applicationShouldTerminate = (void *) __appDelegate_applicati
char *encodedTerminateReply = @encode(NSApplicationTerminateReply);
/*
tracking areas; also here for convenience only
*/
/* IDK if this is needed; just to be safe */
static id (*objc_msgSend_initTrackingArea)(id, SEL, NSRect, NSTrackingAreaOptions, id, id) =
(id (*)(id, SEL, NSRect, NSTrackingAreaOptions, id, id)) objc_msgSend;
#include <AppKit/NSView.h>
id makeTrackingArea(id area)
{
id trackingArea;
trackingArea = objc_msgSend(c_NSTrackingArea, s_alloc);
NSView *v;
v = (NSView *) area;
trackingArea = (*objc_msgSend_initTrackingArea)(trackingArea, s_initTrackingArea,
[v bounds], /* initWithRect: */
/* this bit mask (except for NSTrackingInVisibleRect, which was added later to prevent events from being triggered outside the visible area of the Area) comes from https://github.com/andlabs/misctestprogs/blob/master/cocoaviewmousetest.m (and I wrote this bit mask on 25 april 2014) and yes I know it includes enter/exit even though we don't watch those events; it probably won't really matter anyway but if it does I can change it easily */
(NSTrackingAreaOptions) (NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved | NSTrackingActiveAlways | NSTrackingEnabledDuringMouseDrag | NSTrackingInVisibleRect), /* options: */
area, /* owner: */
nil); /* userData: */
return trackingArea;
}
/*
Objective-C 1.0 has the class field of struct objc_super field as class
Objective-C 2.0 has it as super_class

1
objc_darwin.h
View File

@ -57,7 +57,6 @@ extern id makeDummyEvent();
/* TODO apparently ISO C forbids casting a function pointer to a non-function pointer; this will need to change???? */
extern void *_areaView_drawRect;
extern void drawImage(void *, int64_t, int64_t, int64_t, int64_t, int64_t);
extern id makeTrackingArea(id);
extern struct xpoint getTranslatedEventPoint(id, id);
/* for objc_darwin.go */