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

apple: assorted fixes

Browse source
This commit is contained in:
IoI_xD 2026-03-25 19:09:01 -07:00
commit 90706b184f
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/backend/cocoa.m
View file

@ -1,9 +1,6 @@
#include "Mw/BaseTypes.h"
#include "Mw/LowLevel.h"
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include <objc/objc.h>
#include "../../external/stb_ds.h" #include "../../external/stb_ds.h"
#include "Mw/TypeDefs.h" #include "Mw/LowLevel/Cocoa.h"
#ifdef __clang__ #ifdef __clang__
#pragma clang push #pragma clang push
@ -904,9 +901,8 @@ static void recursive_dispatch_key_released(MwLL handle, int* k) {
- (void)mouseMoved:(NSEvent*)ev { - (void)mouseMoved:(NSEvent*)ev {
MwLLMouse mouse; MwLLMouse mouse;
NSPoint mousePoint = [ev locationInWindow]; NSPoint mousePoint = pointFlip([ev locationInWindow]);
MwLL this = [((MilskoFakePointer*)[[self subviews] objectAtIndex:0]) pointer]; MwLL this = [((MilskoFakePointer*)[[self subviews] objectAtIndex:0]) pointer];
mousePoint.y = [[ev window] frame].size.height - mousePoint.y;
mouse.button = MwLLMouseLeft; mouse.button = MwLLMouseLeft;
mouse.point.x = mousePoint.x; mouse.point.x = mousePoint.x;
mouse.point.y = mousePoint.y; mouse.point.y = mousePoint.y;
@ -914,6 +910,10 @@ static void recursive_dispatch_key_released(MwLL handle, int* k) {
[this->cocoa.real nudge]; [this->cocoa.real nudge];
[super mouseMoved:ev]; [super mouseMoved:ev];
} }
- (BOOL)mouseDownCanMoveWindow {
return NO;
}
- (void)mouseDown:(NSEvent*)ev { - (void)mouseDown:(NSEvent*)ev {
MwLLMouse mouse; MwLLMouse mouse;
NSPoint mousePoint = [ev locationInWindow]; NSPoint mousePoint = [ev locationInWindow];
@ -990,11 +990,12 @@ static void recursive_dispatch_key_released(MwLL handle, int* k) {
- (NSSize)windowWillResize:(NSWindow*)win toSize:(NSSize)frameSize; - (NSSize)windowWillResize:(NSWindow*)win toSize:(NSSize)frameSize;
{ {
if([[[win contentView] subviews] count] >= 1) { if([[[win contentView] subviews] count] >= 1) {
MilskoFakePointer* ptr = [[[win contentView] subviews] objectAtIndex:0]; NSView* ptr = [[[win contentView] subviews] objectAtIndex:0];
MwLL h = [ptr pointer]; if([ptr isKindOfClass:[MilskoFakePointer class]]) {
MwLL h = [(MilskoFakePointer*)ptr pointer];
MwLLDispatch(h, resize, NULL); MwLLDispatch(h, resize, NULL);
MwLLDispatch(h, draw, NULL); // MwLLDispatch(h, draw, NULL);
}
} }
return frameSize; return frameSize;
} }
@ -1159,6 +1160,7 @@ static MwLLPixmap MwLLCreatePixmapImpl(MwLL handle, unsigned char* data,
(void)handle; (void)handle;
MwLLPixmap r = malloc(sizeof(*r)); MwLLPixmap r = malloc(sizeof(*r));
memset(r, 0, sizeof(*r));
r->common.raw = malloc(4 * width * height); r->common.raw = malloc(4 * width * height);
memcpy(r->common.raw, data, 4 * width * height); memcpy(r->common.raw, data, 4 * width * height);
@ -1169,7 +1171,6 @@ static MwLLPixmap MwLLCreatePixmapImpl(MwLL handle, unsigned char* data,
r->cocoa.real = [MilskoCocoaPixmap newWithWidth:width height:height]; r->cocoa.real = [MilskoCocoaPixmap newWithWidth:width height:height];
MwLLPixmapUpdate(r); MwLLPixmapUpdate(r);
free(r->common.raw);
return r; return r;
} }