From 85d521b1961024085cf1701cdb51cf1f46dfa79b Mon Sep 17 00:00:00 2001 From: Iliyas Jorio Date: Mon, 16 Nov 2020 07:05:38 +0100 Subject: [PATCH] New placeholders: OffsetRect, PenNormal, PenSize, FrameArc, GetMouse, SndDoCommand --- src/Graphics/Graphics.cpp | 23 +++++++++++++++++++ src/Input/SDLInput.cpp | 7 ++++++ src/Pomme.h | 45 ++++++++++++++++++++++++++++++++------ src/Sound/SoundManager.cpp | 6 +++++ 4 files changed, 74 insertions(+), 7 deletions(-) diff --git a/src/Graphics/Graphics.cpp b/src/Graphics/Graphics.cpp index 77904c4..ecb8d13 100644 --- a/src/Graphics/Graphics.cpp +++ b/src/Graphics/Graphics.cpp @@ -191,6 +191,14 @@ void SetRect(Rect* r, short left, short top, short right, short bottom) r->bottom = bottom; } +void OffsetRect(Rect* r, short dh, short dv) +{ + r->left += dh; + r->right += dh; + r->top += dv; + r->bottom += dv; +} + // ---------------------------------------------------------------------------- - // GWorld @@ -352,6 +360,16 @@ void RGBForeColor2(const UInt32 color) penFG = 0xFF000000 | (color & 0x00FFFFFF); } +void PenNormal(void) +{ + TODOMINOR(); +} + +void PenSize(short width, short height) +{ + TODOMINOR(); +} + // ---------------------------------------------------------------------------- - // Paint @@ -448,6 +466,11 @@ void FrameRect(const Rect* r) curPort->DamageRegion(*r); } +void FrameArc(const Rect* r, short startAngle, short arcAngle) +{ + TODOMINOR(); +} + void Pomme::Graphics::DrawARGBPixmap(int left, int top, ARGBPixmap& pixmap) { if (!curPort) diff --git a/src/Input/SDLInput.cpp b/src/Input/SDLInput.cpp index b69302d..db152e9 100644 --- a/src/Input/SDLInput.cpp +++ b/src/Input/SDLInput.cpp @@ -179,6 +179,13 @@ void GetKeys(KeyMap km) #endif } +void GetMouse(Point* mouseLoc) +{ + ONCE(TODOMINOR()); + mouseLoc->h = 320; + mouseLoc->v = 240; +} + Boolean Button(void) { ONCE(TODOMINOR()); diff --git a/src/Pomme.h b/src/Pomme.h index 296735e..a911608 100644 --- a/src/Pomme.h +++ b/src/Pomme.h @@ -96,12 +96,20 @@ long GetResourceSizeOnDisk(Handle); long SizeResource(Handle); //----------------------------------------------------------------------------- -// QuickDraw 2D +// QuickDraw 2D: Shapes void SetRect(Rect* r, short left, short top, short right, short bottom); +void OffsetRect(Rect* r, short dh, short dv); + +// ---------------------------------------------------------------------------- +// QuickDraw 2D: PICT + PicHandle GetPicture(short PICTresourceID); +// ---------------------------------------------------------------------------- +// QuickDraw 2D: GWorld + void DisposeGWorld(GWorldPtr offscreenGWorld); // IM:QD:6-16 @@ -118,6 +126,15 @@ void GetGWorld(CGrafPtr* port, GDHandle* gdh); void SetGWorld(CGrafPtr port, GDHandle gdh); +// IM:QD:6-31 +PixMapHandle GetGWorldPixMap(GWorldPtr offscreenGWorld); + +// IM:QD:6-38 +Ptr GetPixBaseAddr(PixMapHandle pm); + +// ---------------------------------------------------------------------------- +// QuickDraw 2D: Port + void SetPort(GrafPtr port); void GetPort(GrafPtr* port); @@ -126,6 +143,9 @@ CGrafPtr GetWindowPort(WindowPtr window); Rect* GetPortBounds(CGrafPtr port, Rect* rect); +// ---------------------------------------------------------------------------- +// QuickDraw 2D: Pen state manipulation + void MoveTo(short h, short v); void GetForeColor(RGBColor* rgb); @@ -144,6 +164,13 @@ void RGBBackColor2(UInt32 color); // Pomme extension (not part of the original Toolbox API). void RGBForeColor2(UInt32 color); +void PenNormal(void); + +void PenSize(short width, short height); + +// ---------------------------------------------------------------------------- +// QuickDraw 2D: Paint + void PaintRect(const Rect* r); void EraseRect(const Rect* r); @@ -152,6 +179,11 @@ void LineTo(short h, short v); void FrameRect(const Rect*); +void FrameArc(const Rect* r, short startAngle, short arcAngle); + +// ---------------------------------------------------------------------------- +// QuickDraw 2D: Text rendering + //short TextWidth(const char* textBuf, short firstByte, short byteCount); short TextWidthC(const char* cstr); @@ -163,12 +195,6 @@ void DrawStringC(const char* cstr); // IM:QD:7-44 void DrawPicture(PicHandle myPicture, const Rect* dstRect); -// IM:QD:6-31 -PixMapHandle GetGWorldPixMap(GWorldPtr offscreenGWorld); - -// IM:QD:6-38 -Ptr GetPixBaseAddr(PixMapHandle pm); - void CopyBits( const PixMap* srcBits, PixMap* dstBits, @@ -218,6 +244,9 @@ void NumToStringC(long theNum, Str255 theString); void GetKeys(KeyMap); +// Gets current mouse coordinates relative to current port +void GetMouse(Point* mouseLoc); + Boolean Button(void); //----------------------------------------------------------------------------- @@ -319,6 +348,8 @@ OSErr SndChannelStatus(SndChannelPtr chan, short theLength, SCStatusPtr theStatu OSErr SndDoImmediate(SndChannelPtr chan, const SndCommand* cmd); +OSErr SndDoCommand(SndChannelPtr chan, const SndCommand* cmd, Boolean noWait); + OSErr GetSoundHeaderOffset(SndListHandle sndHandle, long* offset); OSErr SndStartFilePlay(SndChannelPtr chan, short fRefNum, short resNum, long bufferSize, Ptr theBuffer, /*AudioSelectionPtr*/ void* theSelection, FilePlayCompletionUPP theCompletion, Boolean async); diff --git a/src/Sound/SoundManager.cpp b/src/Sound/SoundManager.cpp index fef9969..777ee60 100644 --- a/src/Sound/SoundManager.cpp +++ b/src/Sound/SoundManager.cpp @@ -521,6 +521,12 @@ OSErr SndDoImmediate(SndChannelPtr chan, const SndCommand* cmd) return noErr; } +OSErr SndDoCommand(SndChannelPtr chan, const SndCommand* cmd, Boolean noWait) +{ + TODOMINOR(); + return noErr; +} + template static void Expect(const T a, const T b, const char* msg) {