Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a virtual method to method to return properly

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6719 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca 2004-02-24 11:53:35 +00:00
parent 82cde293d6
commit a00a89d9c6
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/servers/app/server/ViewDriver.cpp
View File

@ -72,8 +72,7 @@ VDWIN_SETCURSOR,
extern RGBColor workspace_default_color;
bool is_initialized=false;
bool is_initialized = false;
VDView::VDView(BRect bounds)
: BView(bounds,"viewdriver_view",B_FOLLOW_ALL, B_WILL_DRAW)
@ -1234,19 +1233,19 @@ void ViewDriver::CopyToBitmap(ServerBitmap *destbmp, const BRect &sourcerect)
}
bool ViewDriver::AcquireBuffer(FBBitmap *fbmp)
bool ViewDriver::AcquireBuffer(FBBitmap *bmp)
{
if(!fbmp || !is_initialized)
if(!bmp || !is_initialized)
return false;
screenwin->Lock();
framebuffer->Lock();
fbmp->SetBytesPerRow(framebuffer->BytesPerRow());
fbmp->SetSpace(framebuffer->ColorSpace());
fbmp->SetSize(framebuffer->Bounds().IntegerWidth(), framebuffer->Bounds().IntegerHeight());
fbmp->SetBuffer(framebuffer->Bits());
fbmp->SetBitsPerPixel(framebuffer->ColorSpace(),framebuffer->BytesPerRow());
bmp->SetBytesPerRow(framebuffer->BytesPerRow());
bmp->SetSpace(framebuffer->ColorSpace());
bmp->SetSize(framebuffer->Bounds().IntegerWidth(), framebuffer->Bounds().IntegerHeight());
bmp->SetBuffer(framebuffer->Bits());
bmp->SetBitsPerPixel(framebuffer->ColorSpace(),framebuffer->BytesPerRow());
return true;
}

39
src/servers/app/server/ViewDriver.h
View File

@ -102,31 +102,32 @@ public:
ViewDriver(void);
~ViewDriver(void);
bool Initialize(void); // Sets the driver
void Shutdown(void); // You never know when you'll need this
virtual bool Initialize(void); // Sets the driver
virtual void Shutdown(void); // You never know when you'll need this
// Drawing functions
void DrawBitmap(ServerBitmap *bmp, const BRect &src, const BRect &dest, const DrawData *d);
void InvertRect(const BRect &r);
virtual void InvertRect(const BRect &r);
virtual void StrokeLineArray(BPoint *pts, const int32 &numlines, const DrawData *d, RGBColor *colors);
virtual void StrokeLineArray(BPoint *pts, const int32 &numlines,
const DrawData *d, RGBColor *colors);
void SetMode(const display_mode &mode);
virtual void SetMode(const display_mode &mode);
bool DumpToFile(const char *path);
virtual bool DumpToFile(const char *path);
VDWindow *screenwin;
VDWindow *screenwin;
virtual status_t SetDPMSMode(const uint32 &state);
virtual uint32 DPMSMode(void) const;
virtual uint32 DPMSCapabilities(void) const;
virtual status_t GetDeviceInfo(accelerant_device_info *info);
virtual status_t GetModeList(display_mode **mode_list, uint32 *count);
virtual status_t GetPixelClockLimits(display_mode *mode, uint32 *low, uint32 *high);
virtual status_t GetTimingConstraints(display_timing_constraints *dtc);
virtual status_t ProposeMode(display_mode *candidate, const display_mode *low, const display_mode *high);
virtual status_t WaitForRetrace(bigtime_t timeout=B_INFINITE_TIMEOUT);
virtual status_t SetDPMSMode(const uint32 &state);
virtual uint32 DPMSMode(void) const;
virtual uint32 DPMSCapabilities(void) const;
virtual status_t GetDeviceInfo(accelerant_device_info *info);
virtual status_t GetModeList(display_mode **mode_list, uint32 *count);
virtual status_t GetPixelClockLimits(display_mode *mode, uint32 *low, uint32 *high);
virtual status_t GetTimingConstraints(display_timing_constraints *dtc);
virtual status_t ProposeMode(display_mode *candidate, const display_mode *low, const display_mode *high);
virtual status_t WaitForRetrace(bigtime_t timeout=B_INFINITE_TIMEOUT);
protected:
void FillSolidRect(const BRect &rect, RGBColor &color);
@ -138,9 +139,9 @@ protected:
void CopyBitmap(ServerBitmap *bitmap, const BRect &source, const BRect &dest, const DrawData *d);
void CopyToBitmap(ServerBitmap *target, const BRect &source);
bool AcquireBuffer(FBBitmap *fbmp);
void ReleaseBuffer(void);
void Invalidate(const BRect &r);
virtual bool AcquireBuffer(FBBitmap *bmp);
virtual void ReleaseBuffer(void);
virtual void Invalidate(const BRect &r);
// void BlitMono2RGB32(FT_Bitmap *src, BPoint pt, DrawData *d);
// void BlitGray2RGB32(FT_Bitmap *src, BPoint pt, DrawData *d);