IoI_xD/milsko
1
0
Fork 0
forked from pyrite-dev/milsko
Code Pull requests Activity

format objective c files

Browse source
This commit is contained in:
Nishi 2026-01-15 05:31:04 +09:00
commit e2f34df4e3
Signed by: nishi
GPG key ID: 27EF69B208EB9343
3 changed files with 268 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.clang-format
View file

@ -1,5 +1,4 @@
---
Language: Cpp
UseTab: Always
TabWidth: 8
AlignConsecutiveAssignments:

2
Makefile.pl
View file

@ -184,7 +184,7 @@ print(OUT " cp -rf include \$(DESTDIR)\$(PREFIX)/\n");
print(OUT "\n");
print(OUT "format:\n");
print(OUT
" clang-format --verbose -i `find src include examples -name \"*.c\" -or -name \"*.h\"`\n"
" clang-format --verbose -i `find src include examples -name \"*.c\" -or -name \"*.h\" -or -name \"*.m\"`\n"
);
print(OUT
" perltidy -b -bext=\"/\" --paren-tightness=2 `find tools pl Makefile.pl -name \"*.pl\"`\n"

198
src/backend/cocoa.m
View file

@ -13,17 +13,17 @@
#include "../../external/stb_ds.h"
@interface MilskoCocoaPixmap : NSObject {
NSImage *image;
NSImage* image;
}
+ (MilskoCocoaPixmap *)newWithWidth:(int)width height:(int)height;
- (void)updateWithData:(void *)data;
+ (MilskoCocoaPixmap*)newWithWidth:(int)width height:(int)height;
- (void)updateWithData:(void*)data;
- (void)destroy;
@end
@implementation MilskoCocoaPixmap
+ (MilskoCocoaPixmap *)newWithWidth:(int)width height:(int)height {
MilskoCocoaPixmap *p = [MilskoCocoaPixmap alloc];
+ (MilskoCocoaPixmap*)newWithWidth:(int)width height:(int)height {
MilskoCocoaPixmap* p = [MilskoCocoaPixmap alloc];
NSSize sz;
sz.width = width;
@ -33,7 +33,7 @@
return p;
}
- (void)updateWithData:(void *)data {
- (void)updateWithData:(void*)data {
}
- (void)destroy {
[self->image dealloc];
@ -41,31 +41,31 @@
@end
@interface MilskoCocoa : NSObject {
NSApplication *application;
NSWindow *window;
NSApplication* application;
NSWindow* window;
NSRect rect;
}
+ (MilskoCocoa *)newWithParent:(MwLL)parent
+ (MilskoCocoa*)newWithParent:(MwLL)parent
x:(int)x
y:(int)y
width:(int)width
height:(int)height;
- (void)polygonWithPoints:(MwPoint *)points
- (void)polygonWithPoints:(MwPoint*)points
points_count:(int)points_count
color:(MwLLColor)color;
- (void)lineWithPoints:(MwPoint *)points color:(MwLLColor)color;
- (void)getX:(int *)x Y:(int *)y W:(unsigned int *)w H:(unsigned int *)h;
- (void)lineWithPoints:(MwPoint*)points color:(MwLLColor)color;
- (void)getX:(int*)x Y:(int*)y W:(unsigned int*)w H:(unsigned int*)h;
- (void)setX:(int)x Y:(int)y;
- (void)setW:(int)w H:(int)h;
- (int)pending;
- (void)getNextEvent;
- (void)setTitle:(const char *)title;
- (void)drawPixmap:(MwLLPixmap)pixmap rect:(MwRect *)rect;
- (void)setTitle:(const char*)title;
- (void)drawPixmap:(MwLLPixmap)pixmap rect:(MwRect*)rect;
- (void)setIcon:(MwLLPixmap)pixmap;
- (void)forceRender;
- (void)setCursor:(MwCursor *)image mask:(MwCursor *)mask;
- (void)detachWithPoint:(MwPoint *)point;
- (void)setCursor:(MwCursor*)image mask:(MwCursor*)mask;
- (void)detachWithPoint:(MwPoint*)point;
- (void)show:(int)show;
- (void)makePopupWithParent:(MwLL)parent;
- (void)setSizeHintsWithMinX:(int)minx
@ -75,29 +75,29 @@
- (void)makeBorderless:(int)toggle;
- (void)focus;
- (void)grabPointer:(int)toggle;
- (void)setClipboard:(const char *)text;
- (void)setClipboard:(const char*)text;
- (void)makeToolWindow;
- (void)getCursorCoord:(MwPoint *)point;
- (void)getScreenSize:(MwRect *)rect;
- (void)getCursorCoord:(MwPoint*)point;
- (void)getScreenSize:(MwRect*)rect;
- (void)destroy;
@end
@implementation MilskoCocoa
+ (MilskoCocoa *)newWithParent:(MwLL)parent
+ (MilskoCocoa*)newWithParent:(MwLL)parent
x:(int)x
y:(int)y
width:(int)width
height:(int)height {
MilskoCocoa *c = [MilskoCocoa alloc];
MilskoCocoa* c = [MilskoCocoa alloc];
bool centerX = false, centerY = false;
if (x == MwDEFAULT) {
if(x == MwDEFAULT) {
x = 0;
centerX = true;
}
if (y == MwDEFAULT) {
if(y == MwDEFAULT) {
y = 0;
centerY = true;
}
@ -116,20 +116,20 @@
defer:NO];
[c->window makeKeyAndOrderFront:c->application];
if (parent != NULL) {
MilskoCocoa *p = parent->cocoa.real;
if(parent != NULL) {
MilskoCocoa* p = parent->cocoa.real;
[p->window addChildWindow:c->window ordered:NSWindowAbove];
}
return c;
}
- (void)polygonWithPoints:(MwPoint *)points
- (void)polygonWithPoints:(MwPoint*)points
points_count:(int)points_count
color:(MwLLColor)color {
};
- (void)lineWithPoints:(MwPoint *)points color:(MwLLColor)color {
- (void)lineWithPoints:(MwPoint*)points color:(MwLLColor)color {
};
- (void)getX:(int *)x Y:(int *)y W:(unsigned int *)w H:(unsigned int *)h {
- (void)getX:(int*)x Y:(int*)y W:(unsigned int*)w H:(unsigned int*)h {
NSRect frame = [self->window frame];
*x = frame.origin.x;
@ -144,44 +144,44 @@
NSRect frame = [self->window frame];
frame.origin.x = x;
frame.origin.y = y;
[self->window setFrame: frame display: YES animate: true];
[self->window setFrame:frame display:YES animate:true];
};
- (void)setW:(int)w H:(int)h {
NSRect frame = [self->window frame];
frame.size.width = w;
frame.size.height = h;
[self->window setFrame: frame display: YES animate: true];
[self->window setFrame:frame display:YES animate:true];
};
- (int)pending {
return 1;
};
- (void)getNextEvent {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSEvent *event = [self->application nextEventMatchingMask:NSAnyEventMask
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
NSEvent* event = [self->application nextEventMatchingMask:NSAnyEventMask
untilDate:nil
inMode:NSDefaultRunLoopMode
dequeue:YES];
if (event != nil) {
if(event != nil) {
printf("got event: %p\n", event);
}
[pool release];
};
- (void)setTitle:(const char *)title {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- (void)setTitle:(const char*)title {
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
[self->window
setTitleWithRepresentedFilename:[NSString stringWithUTF8String:title]];
[pool release];
};
- (void)drawPixmap:(MwLLPixmap)pixmap rect:(MwRect *)rect {
- (void)drawPixmap:(MwLLPixmap)pixmap rect:(MwRect*)rect {
};
- (void)setIcon:(MwLLPixmap)pixmap {
};
- (void)forceRender {
};
- (void)setCursor:(MwCursor *)image mask:(MwCursor *)mask {
- (void)setCursor:(MwCursor*)image mask:(MwCursor*)mask {
};
- (void)detachWithPoint:(MwPoint *)point {
- (void)detachWithPoint:(MwPoint*)point {
};
- (void)show:(int)show {
};
@ -194,7 +194,7 @@
};
- (void)makeBorderless:(int)toggle {
uint32_t mask = [self->window styleMask];
if (mask & NSBorderlessWindowMask) {
if(mask & NSBorderlessWindowMask) {
mask ^= NSBorderlessWindowMask;
mask |= NSTitledWindowMask;
} else {
@ -213,19 +213,19 @@
/* MacOS didn't have a "pointer grab" function until 10.13.2 so I need to do
* this manually */
};
- (void)setClipboard:(const char *)text {
- (void)setClipboard:(const char*)text {
};
- (void)getClipboard {
};
- (void)makeToolWindow {
};
- (void)getCursorCoord:(MwPoint *)point {
- (void)getCursorCoord:(MwPoint*)point {
NSPoint p = [NSEvent mouseLocation];
point->x = p.x;
point->y = p.y;
};
- (void)getScreenSize:(MwRect *)_rect {
NSScreen *screen = [self->window screen];
- (void)getScreenSize:(MwRect*)_rect {
NSScreen* screen = [self->window screen];
_rect->x = [screen frame].origin.x;
_rect->y = [screen frame].origin.y;
_rect->width = [screen frame].size.width;
@ -247,15 +247,19 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
MwLLCreateCommon(r);
MilskoCocoa *o =
[MilskoCocoa newWithParent:parent x:x y:y width:width height:height];
MilskoCocoa* o =
[MilskoCocoa newWithParent:parent
x:x
y:y
width:width
height:height];
r->cocoa.real = o;
return r;
}
static void MwLLDestroyImpl(MwLL handle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h destroy];
@ -264,18 +268,22 @@ static void MwLLDestroyImpl(MwLL handle) {
free(handle);
}
static void MwLLBeginDrawImpl(MwLL handle) { (void)handle; }
static void MwLLBeginDrawImpl(MwLL handle) {
(void)handle;
}
static void MwLLEndDrawImpl(MwLL handle) { (void)handle; }
static void MwLLEndDrawImpl(MwLL handle) {
(void)handle;
}
static void MwLLPolygonImpl(MwLL handle, MwPoint *points, int points_count,
static void MwLLPolygonImpl(MwLL handle, MwPoint* points, int points_count,
MwLLColor color) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h polygonWithPoints:points points_count:points_count color:color];
}
static void MwLLLineImpl(MwLL handle, MwPoint *points, MwLLColor color) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLLineImpl(MwLL handle, MwPoint* points, MwLLColor color) {
MilskoCocoa* h = handle->cocoa.real;
[h lineWithPoints:points color:color];
}
@ -293,41 +301,43 @@ static void MwLLColorUpdateImpl(MwLL handle, MwLLColor c, int r, int g, int b) {
c->common.blue = b;
}
static void MwLLGetXYWHImpl(MwLL handle, int *x, int *y, unsigned int *w,
unsigned int *height) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLGetXYWHImpl(MwLL handle, int* x, int* y, unsigned int* w,
unsigned int* height) {
MilskoCocoa* h = handle->cocoa.real;
[h getX:x Y:y W:w H:height];
}
static void MwLLSetXYImpl(MwLL handle, int x, int y) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h setX:x Y:y];
}
static void MwLLSetWHImpl(MwLL handle, int w, int height) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h setW:w H:height];
}
static void MwLLFreeColorImpl(MwLLColor color) { free(color); }
static void MwLLFreeColorImpl(MwLLColor color) {
free(color);
}
static int MwLLPendingImpl(MwLL handle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
return [h pending];
}
static void MwLLNextEventImpl(MwLL handle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h getNextEvent];
}
static void MwLLSetTitleImpl(MwLL handle, const char *title) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLSetTitleImpl(MwLL handle, const char* title) {
MilskoCocoa* h = handle->cocoa.real;
[h setTitle:title];
}
static MwLLPixmap MwLLCreatePixmapImpl(MwLL handle, unsigned char *data,
static MwLLPixmap MwLLCreatePixmapImpl(MwLL handle, unsigned char* data,
int width, int height) {
(void)handle;
@ -346,100 +356,108 @@ static MwLLPixmap MwLLCreatePixmapImpl(MwLL handle, unsigned char *data,
}
static void MwLLPixmapUpdateImpl(MwLLPixmap pixmap) {
MilskoCocoaPixmap *p = pixmap->cocoa.real;
MilskoCocoaPixmap* p = pixmap->cocoa.real;
[p updateWithData:pixmap->common.raw];
}
static void MwLLDestroyPixmapImpl(MwLLPixmap pixmap) {
MilskoCocoaPixmap *p = pixmap->cocoa.real;
MilskoCocoaPixmap* p = pixmap->cocoa.real;
[p destroy];
free(pixmap);
}
static void MwLLDrawPixmapImpl(MwLL handle, MwRect *rect, MwLLPixmap pixmap) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) {
MilskoCocoa* h = handle->cocoa.real;
[h drawPixmap:pixmap rect:rect];
}
static void MwLLSetIconImpl(MwLL handle, MwLLPixmap pixmap) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h setIcon:pixmap];
}
static void MwLLForceRenderImpl(MwLL handle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h forceRender];
}
static void MwLLSetCursorImpl(MwLL handle, MwCursor *image, MwCursor *mask) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLSetCursorImpl(MwLL handle, MwCursor* image, MwCursor* mask) {
MilskoCocoa* h = handle->cocoa.real;
[h setCursor:image mask:mask];
}
static void MwLLDetachImpl(MwLL handle, MwPoint *point) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLDetachImpl(MwLL handle, MwPoint* point) {
MilskoCocoa* h = handle->cocoa.real;
[h detachWithPoint:point];
}
static void MwLLShowImpl(MwLL handle, int show) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h show:show];
}
static void MwLLMakePopupImpl(MwLL handle, MwLL parent) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h makePopupWithParent:parent];
}
static void MwLLSetSizeHintsImpl(MwLL handle, int minx, int miny, int maxx,
int maxy) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h setSizeHintsWithMinX:minx MinY:miny MaxX:maxx MaxY:maxy];
}
static void MwLLMakeBorderlessImpl(MwLL handle, int toggle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h makeBorderless:toggle];
}
static void MwLLFocusImpl(MwLL handle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h focus];
}
static void MwLLGrabPointerImpl(MwLL handle, int toggle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h grabPointer:toggle];
}
static void MwLLSetClipboardImpl(MwLL handle, const char *text) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLSetClipboardImpl(MwLL handle, const char* text) {
MilskoCocoa* h = handle->cocoa.real;
[h setClipboard:text];
}
static void MwLLGetClipboardImpl(MwLL handle) { (void)handle; }
static void MwLLGetClipboardImpl(MwLL handle) {
(void)handle;
}
static void MwLLMakeToolWindowImpl(MwLL handle) {
MilskoCocoa *h = handle->cocoa.real;
MilskoCocoa* h = handle->cocoa.real;
[h makeToolWindow];
}
static void MwLLGetCursorCoordImpl(MwLL handle, MwPoint *point) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLGetCursorCoordImpl(MwLL handle, MwPoint* point) {
MilskoCocoa* h = handle->cocoa.real;
[h getCursorCoord:point];
}
static void MwLLGetScreenSizeImpl(MwLL handle, MwRect *rect) {
MilskoCocoa *h = handle->cocoa.real;
static void MwLLGetScreenSizeImpl(MwLL handle, MwRect* rect) {
MilskoCocoa* h = handle->cocoa.real;
[h getScreenSize:rect];
}
static void MwLLBeginStateChangeImpl(MwLL handle) { MwLLShow(handle, 0); }
static void MwLLBeginStateChangeImpl(MwLL handle) {
MwLLShow(handle, 0);
}
static void MwLLEndStateChangeImpl(MwLL handle) { MwLLShow(handle, 1); }
static void MwLLEndStateChangeImpl(MwLL handle) {
MwLLShow(handle, 1);
}
static int MwLLCocoaCallInitImpl(void) { return 0; }
static int MwLLCocoaCallInitImpl(void) {
return 0;
}
#include "call.c"
CALL(Cocoa);