From 62bcb2e51b45e744d0b27b124179cb6ec435188d Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Mon, 17 Aug 2009 12:57:37 +0000 Subject: Commit (slightly) modified version of patch #2831248: Allow suspend/resume for PSP svn-id: r43477 --- backends/platform/psp/osys_psp.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'backends/platform/psp/osys_psp.h') diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 34957b293c..46607dac34 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -23,6 +23,9 @@ * */ +#ifndef OSYS_PSP_H +#define OSYS_PSP_H + #include "common/scummsys.h" #include "graphics/surface.h" #include "graphics/colormasks.h" @@ -144,3 +147,5 @@ public: virtual Common::WriteStream *createConfigWriteStream(); }; + +#endif /* OSYS_PSP_H */ -- cgit v1.2.3 From a35056b55531edcd384c3fa0dafc9a4ee6bfb6ee Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Tue, 18 Aug 2009 18:06:50 +0000 Subject: Implement setCursorPalette(), correct hasFeature() <-> getFeatureState() mixup. svn-id: r43519 --- backends/platform/psp/osys_psp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'backends/platform/psp/osys_psp.h') diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 46607dac34..310efdc7d4 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -68,6 +68,7 @@ protected: int _mouseHotspotX, _mouseHotspotY; byte _mouseKeyColour; byte *_mouseBuf; + bool _cursorPaletteDisabled; uint32 _prevButtons; uint32 _lastPadCheck; -- cgit v1.2.3 From bbac75bc1c4e45bcdcb6fecd9f0f99d916ca80ef Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Wed, 19 Aug 2009 16:23:44 +0000 Subject: PSP: throttle the number of updateScreen() calls svn-id: r43539 --- backends/platform/psp/osys_psp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'backends/platform/psp/osys_psp.h') diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 310efdc7d4..94488a92ce 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -59,6 +59,7 @@ protected: uint16 _palette[256]; bool _overlayVisible; uint32 _shakePos; + uint32 _lastScreenUpdate; Graphics::Surface _framebuffer; -- cgit v1.2.3 From 7d350b215c62f6d08c9bc33da9648fd72ee5599e Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Fri, 21 Aug 2009 19:11:02 +0000 Subject: fix compilation after RGB API changes svn-id: r43606 --- backends/platform/psp/osys_psp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/platform/psp/osys_psp.h') diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 94488a92ce..68e1a7da22 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -97,7 +97,7 @@ public: virtual bool setGraphicsMode(int mode); bool setGraphicsMode(const char *name); virtual int getGraphicsMode() const; - virtual void initSize(uint width, uint height); + virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format); virtual int16 getWidth(); virtual int16 getHeight(); virtual void setPalette(const byte *colors, uint start, uint num); @@ -120,7 +120,7 @@ public: virtual bool showMouse(bool visible); virtual void warpMouse(int x, int y); - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int cursorTargetScale = 1); + virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format); virtual bool pollEvent(Common::Event &event); virtual uint32 getMillis(); -- cgit v1.2.3 From 9a3218e67302e825b3df4e2f26df5601fb48f0db Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Fri, 21 Aug 2009 22:30:35 +0000 Subject: unify OSystem_PSP_GU and OSystem_PSP (which was hopelessly outdated and mostly useless) svn-id: r43615 --- backends/platform/psp/osys_psp.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'backends/platform/psp/osys_psp.h') diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 68e1a7da22..353561cced 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -50,6 +50,11 @@ public: static OSystem *instance(); protected: + struct Vertex { + float u,v; + float x,y,z; + }; + uint16 _screenWidth; uint16 _screenHeight; uint16 _overlayWidth; @@ -71,6 +76,14 @@ protected: byte *_mouseBuf; bool _cursorPaletteDisabled; + int _graphicMode; + Vertex *_vertices; + unsigned short* _clut; + unsigned short* _kbdClut; + bool _keyboardVisible; + int _keySelected; + int _keyboardMode; + uint32 _prevButtons; uint32 _lastPadCheck; uint32 _padAccel; @@ -101,6 +114,8 @@ public: virtual int16 getWidth(); virtual int16 getHeight(); virtual void setPalette(const byte *colors, uint start, uint num); + virtual void setCursorPalette(const byte *colors, uint start, uint num); + virtual void disableCursorPalette(bool disable); virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h); virtual Graphics::Surface *lockScreen(); virtual void unlockScreen(); @@ -123,6 +138,7 @@ public: virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format); virtual bool pollEvent(Common::Event &event); + virtual bool processInput(Common::Event &event); virtual uint32 getMillis(); virtual void delayMillis(uint msecs); -- cgit v1.2.3 From 978d9dfd10c8290a6123bd96dba84a5563c0f9c2 Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Fri, 21 Aug 2009 22:44:49 +0000 Subject: some cleanup svn-id: r43618 --- backends/platform/psp/osys_psp.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'backends/platform/psp/osys_psp.h') diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 353561cced..047fbff97e 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -96,7 +96,6 @@ protected: Common::TimerManager *_timer; public: - OSystem_PSP(); virtual ~OSystem_PSP(); @@ -105,15 +104,19 @@ public: virtual bool hasFeature(Feature f); virtual void setFeatureState(Feature f, bool enable); virtual bool getFeatureState(Feature f); + virtual const GraphicsMode *getSupportedGraphicsModes() const; virtual int getDefaultGraphicsMode() const; virtual bool setGraphicsMode(int mode); bool setGraphicsMode(const char *name); virtual int getGraphicsMode() const; + virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format); virtual int16 getWidth(); virtual int16 getHeight(); + virtual void setPalette(const byte *colors, uint start, uint num); + virtual void grabPalette(byte *colors, uint start, uint num); virtual void setCursorPalette(const byte *colors, uint start, uint num); virtual void disableCursorPalette(bool disable); virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h); @@ -129,16 +132,15 @@ public: virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); virtual int16 getOverlayHeight(); virtual int16 getOverlayWidth(); - virtual void grabPalette(byte *colors, uint start, uint num); virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<4444>(); } virtual bool showMouse(bool visible); - virtual void warpMouse(int x, int y); virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format); virtual bool pollEvent(Common::Event &event); virtual bool processInput(Common::Event &event); + virtual uint32 getMillis(); virtual void delayMillis(uint msecs); -- cgit v1.2.3