AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 18:15:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mac classic: Keyboard input somewhat works now

Browse Source
This commit is contained in:
UnknownShadow200 2024-06-04 19:48:22 +10:00
parent b6539ef09c
commit 0c3aa4e1a4
2 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Platform_MacClassic.c
View File

@ -230,8 +230,7 @@ cc_result File_Length(cc_file file, cc_uint32* len) {
*--------------------------------------------------------Threading--------------------------------------------------------* *--------------------------------------------------------Threading--------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
void Thread_Sleep(cc_uint32 milliseconds) { void Thread_Sleep(cc_uint32 milliseconds) {
// TODO Delay API long delay = milliseconds * 1000 / 60;
long delay = milliseconds * 100; // TODO wrong
long final; long final;
Delay(delay, &final); Delay(delay, &final);
} }

60
src/Window_MacClassic.c
View File

@ -18,7 +18,7 @@
#include <Scrap.h> #include <Scrap.h>
#include <Gestalt.h> #include <Gestalt.h>
static WindowPtr win; static WindowPtr win;
static cc_bool hasColorQD; static cc_bool hasColorQD, useGWorld;
/*########################################################################################################################* /*########################################################################################################################*
@ -81,7 +81,6 @@ void Window_PreInit(void) {
long tmpLong = 0; long tmpLong = 0;
Gestalt(gestaltQuickdrawVersion, &tmpLong); Gestalt(gestaltQuickdrawVersion, &tmpLong);
hasColorQD = tmpLong >= gestalt32BitQD; hasColorQD = tmpLong >= gestalt32BitQD;
if (!hasColorQD) Platform_LogConst("RUNNING IN SLOW MODE");
} }
void Window_Init(void) { void Window_Init(void) {
@ -105,10 +104,18 @@ static void DoCreateWindow(int width, int height) {
InsetRect(&r, 100, 100); InsetRect(&r, 100, 100);
if (hasColorQD) { if (hasColorQD) {
win = NewCWindow(NULL, &r, "\pClassiCube", true, 0, (WindowPtr)-1, false, 0); win = NewCWindow(NULL, &r, "\pClassiCube", true, documentProc, (WindowPtr)-1, true, 0);
} else { } else {
win = NewWindow( NULL, &r, "\pClassiCube", true, 0, (WindowPtr)-1, false, 0); win = NewWindow( NULL, &r, "\pClassiCube", true, documentProc, (WindowPtr)-1, true, 0);
} }
if (hasColorQD) {
Platform_LogConst("BLITTING IN FAST MODE");
} else {
Platform_LogConst("BLITTING IN SLOW MODE");
}
useGWorld = hasColorQD;
SetPort(win); SetPort(win);
r = win->portRect; r = win->portRect;
@ -168,7 +175,6 @@ void Window_SetSize(int width, int height) {
void Window_RequestClose(void) { void Window_RequestClose(void) {
Event_RaiseVoid(&WindowEvents.Closing); Event_RaiseVoid(&WindowEvents.Closing);
// TODO
} }
@ -201,8 +207,10 @@ static void HandleMouseDown(EventRecord* event) {
DragWindow(window, event->where, &qd.screenBits.bounds); DragWindow(window, event->where, &qd.screenBits.bounds);
break; break;
case inGoAway: case inGoAway:
if (TrackGoAway(window, event->where)) if (TrackGoAway(window, event->where)) {
Window_RequestClose(); Window_RequestClose();
Window_Main.Exists = false;
}
} }
} }
@ -211,9 +219,25 @@ static void HandleMouseUp(EventRecord* event) {
Input_SetReleased(CCMOUSE_L); Input_SetReleased(CCMOUSE_L);
} }
static void HandleKeyPress(EventRecord* event) { static void HandleKeyDown(EventRecord* event) {
if ((event->modifiers & cmdKey)) if ((event->modifiers & cmdKey))
HiliteMenu(0); HiliteMenu(0);
int ch = event->message & 0xFF;
int key = (event->message >> 8) & 0xFF;
if (ch >= 32 && ch <= 127)
Event_RaiseInt(&InputEvents.Press, (cc_unichar)ch);
key = MapNativeKey(key);
if (key) Input_SetPressed(key);
}
static void HandleKeyUp(EventRecord* event) {
int key = (event->message >> 8) & 0xFF;
key = MapNativeKey(key);
if (key) Input_SetReleased(key);
} }
void Window_ProcessEvents(float delta) { void Window_ProcessEvents(float delta) {
@ -231,7 +255,10 @@ void Window_ProcessEvents(float delta) {
break; break;
case keyDown: case keyDown:
case autoKey: case autoKey:
HandleKeyPress(&event); HandleKeyDown(&event);
break;
case keyUp:
HandleKeyUp(&event);
break; break;
case updateEvt: case updateEvt:
BeginUpdate((WindowPtr)event.message); BeginUpdate((WindowPtr)event.message);
@ -260,8 +287,11 @@ void Window_ProcessGamepads(float delta) {
} }
static void Cursor_GetRawPos(int* x, int* y) { static void Cursor_GetRawPos(int* x, int* y) {
// TODO Point point;
*x=0;*y=0; GetMouse(&point);
*x = point.h;
*y = point.v;
} }
void Cursor_SetPosition(int x, int y) { void Cursor_SetPosition(int x, int y) {
@ -302,7 +332,7 @@ static char* fb_bits;
void Window_AllocFramebuffer(struct Bitmap* bmp) { void Window_AllocFramebuffer(struct Bitmap* bmp) {
bmp->scan0 = (BitmapCol*)Mem_Alloc(bmp->width * bmp->height, 4, "window pixels"); bmp->scan0 = (BitmapCol*)Mem_Alloc(bmp->width * bmp->height, 4, "window pixels");
if (!hasColorQD) return; if (!useGWorld) return;
// TODO bmp->scan0 should be the fb_world // TODO bmp->scan0 should be the fb_world
QDErr err = NewGWorld(&fb_world, 32, &win->portRect, 0, 0, 0); QDErr err = NewGWorld(&fb_world, 32, &win->portRect, 0, 0, 0);
@ -316,7 +346,7 @@ void Window_AllocFramebuffer(struct Bitmap* bmp) {
fb_bits = (char*)GetPixBaseAddr(fb_pixmap); fb_bits = (char*)GetPixBaseAddr(fb_pixmap);
} }
static void DrawFramebufferFast(Rect2D r, struct Bitmap* bmp) { static void DrawFramebufferBulk(Rect2D r, struct Bitmap* bmp) {
GrafPtr thePort = (GrafPtr)win; GrafPtr thePort = (GrafPtr)win;
const BitMap* memBits; const BitMap* memBits;
const BitMap* winBits; const BitMap* winBits;
@ -372,8 +402,8 @@ static void DrawFramebufferSlow(Rect2D r, struct Bitmap* bmp) {
void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) { void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) {
SetPort(win); SetPort(win);
if (hasColorQD) { if (useGWorld) {
DrawFramebufferFast(r, bmp); DrawFramebufferBulk(r, bmp);
} else { } else {
DrawFramebufferSlow(r, bmp); DrawFramebufferSlow(r, bmp);
} }
@ -381,7 +411,7 @@ void Window_DrawFramebuffer(Rect2D r, struct Bitmap* bmp) {
void Window_FreeFramebuffer(struct Bitmap* bmp) { void Window_FreeFramebuffer(struct Bitmap* bmp) {
Mem_Free(bmp->scan0); Mem_Free(bmp->scan0);
if (!hasColorQD) return; if (!useGWorld) return;
UnlockPixels(fb_pixmap); UnlockPixels(fb_pixmap);
DisposeGWorld(fb_world); DisposeGWorld(fb_world);