gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved externals + small fix

Browse Source
This commit is contained in:
NeeEoo
2024-04-15 14:36:27 +02:00
parent 7d236db474
commit 688c078e4a
11 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/external/ExternalMac.hx
Vendored
+11
View File
@@ -0,0 +1,11 @@
package external;
#if mac
@:build(external.LinkerMacro.xml('external_code.xml'))
@:native("ExternalMac")
@:include('Mac.h')
extern class ExternalMac {
@:native("ExternalMac::setCursorIcon")
public static function setCursorIcon(icon:Int):Bool;
}
#end
source/external/LinkerMacro.hx
Vendored
+40
View File
@@ -0,0 +1,40 @@
package external;
import haxe.io.Path;
import haxe.macro.Expr;
import haxe.macro.Context;
import haxe.xml.Printer;
import sys.FileSystem;
class LinkerMacro
{
public static macro function xml(filename:String = 'Build.xml'):Array<Field>
{
var pos:Position = Context.currentPos();
var sourcePath:String = Path.directory(Context.getPosInfos(pos).file);
if (!Path.isAbsolute(sourcePath))
sourcePath = FileSystem.absolutePath(sourcePath);
sourcePath = Path.removeTrailingSlashes(Path.normalize(sourcePath));
var includeElement:Xml = Xml.createElement('include');
includeElement.set('name', Path.join([sourcePath, filename]));
@:privateAccess
{
var printer:Printer = new Printer(true);
printer.writeNode(includeElement, '\n');
Context.getLocalClass().get().meta.add(':buildXml', [{
expr: EConst(CString(printer.output.toString())),
pos: pos
}], pos);
}
return Context.getBuildFields();
}
}
source/external/external_code.xml
Vendored
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<xml>
<pragma once="true" />
<files id="haxe">
<compilerflag value="-I${this_dir}/include/mac" if="macos" />
</files>
<files id="__main__">
<compilerflag value="-I${this_dir}/include/mac" if="macos" />
</files>
<files id="external-code">
<section if="macos">
<compilerflag value="-I${this_dir}/include/mac" />
<file name="${this_dir}/src/mac/CursorHelper.mm" />
<file name="${this_dir}/src/mac/Mac.mm" />
</section>
</files>
<target id="haxe">
<section if="macos">
<vflag name="-framework" value="IOKit" />
<vflag name="-framework" value="AppKit" />
<vflag name="-framework" value="Cocoa" />
<vflag name="-framework" value="Foundation" />
</section>
<files id="external-code" />
</target>
</xml>
source/external/include/mac/CursorHelper.h
Vendored
+7
View File
@@ -0,0 +1,7 @@
#import <Foundation/Foundation.h>
@interface CursorHelper : NSObject
+ (NSCursor *)getCursorForSelector:(SEL)selector defaultCursor:(NSCursor *)defaultCursor;
@end
source/external/include/mac/Mac.h
Vendored
+13
View File
@@ -0,0 +1,13 @@
#ifndef MAC_H
#define MAC_H
#if defined(__APPLE__)
namespace ExternalMac
{
bool setCursorIcon(int icon);
}
#endif
#endif
source/external/src/mac/CursorHelper.mm
Vendored
+21
View File
@@ -0,0 +1,21 @@
#import <Cocoa/Cocoa.h>
#import "CursorHelper.h"
@implementation CursorHelper
+ (NSCursor *)getCursorForSelector:(SEL)selector defaultCursor:(NSCursor *)defaultCursor {
NSCursor *cursor = nil;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundeclared-selector"
if ([NSCursor respondsToSelector:selector]) {
cursor = [NSCursor performSelector:selector];
} else {
cursor = defaultCursor;
}
#pragma clang diagnostic pop
return cursor;
}
@end
source/external/src/mac/Mac.mm
Vendored
+80
View File
@@ -0,0 +1,80 @@
#import <Cocoa/Cocoa.h>
#import "CursorHelper.h"
#define ARROW 0
#define CROSSHAIR 1
#define CLICK 2
#define IBEAM 3
#define MOVE 4
#define HAND 5
#define DRAG 6
#define DRAG_OPEN 7
#define WAIT 8
#define WAIT_ARROW 9
#define DISABLED 10
#define RESIZE_TR 11
#define RESIZE_BL 12
#define RESIZE_TL 13
#define RESIZE_BR 14
#define RESIZE_H 15
#define RESIZE_V 16
#define RESIZE_T 17
#define RESIZE_B 18
#define RESIZE_L 19
#define RESIZE_R 20
#define CUSTOM -1
namespace ExternalMac {
bool setCursorIcon(int icon/*, const char *customCursor, float customX, float customY*/) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundeclared-selector"
NSCursor *cursor = nil;
switch(icon) {
case ARROW: cursor = [NSCursor arrowCursor]; break;
case CLICK: cursor = [NSCursor pointingHandCursor]; break;
case CROSSHAIR: cursor = [NSCursor crosshairCursor]; break;
case HAND: cursor = [NSCursor closedHandCursor]; break;
case IBEAM: cursor = [NSCursor IBeamCursor]; break;
//case MOVE: cursor = [NSCursor moveCursor]; break;
case RESIZE_H: cursor = [NSCursor resizeLeftRightCursor]; break;
case RESIZE_V: cursor = [NSCursor resizeUpDownCursor]; break;
// TODO: DEFAULTS
case RESIZE_TL: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeNorthWestCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_TR: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeNorthEastCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_BL: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeSouthWestCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_BR: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeSouthEastCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_T: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeNorthCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_B: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeSouthCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_L: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeWestCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case RESIZE_R: cursor = [CursorHelper getCursorForSelector:@selector(_windowResizeEastCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case WAIT: cursor = [CursorHelper getCursorForSelector:@selector(_waitCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case WAIT_ARROW: cursor = [CursorHelper getCursorForSelector:@selector(_waitCursor) defaultCursor:[NSCursor arrowCursor]]; break;
case DISABLED: cursor = [NSCursor operationNotAllowedCursor]; break;
case DRAG: cursor = [NSCursor closedHandCursor]; break;
case DRAG_OPEN: cursor = [NSCursor openHandCursor]; break;
/*case CUSTOM: {
// TODO: CACHING
NSString *cursorImageName = [NSString stringWithUTF8String:customCursor];
NSImage *tmpImage = [NSImage imageNamed:cursorImageName];
NSCursor *pointer = [[NSCursor alloc] initWithImage:tmpImage hotSpot:NSMakePoint(customX, customY)];
cursor = [NSCursor pointer]
break;
}*/
case CUSTOM: cursor = [NSCursor arrowCursor]; break;
}
#pragma clang diagnostic pop
if(cursor != nil) {
[cursor set];
return true;
}
return false;
}
}