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

renamed DisplayDriverPainter.* to DrawingEngine.*

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14695 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-11-04 15:54:16 +00:00
parent 58468dfed0
commit 6ed894182f
18 changed files with 30 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
headers/private/servers/app/DisplayDriver.h
View File

@ -1,224 +0,0 @@
/*
* Copyright 2001-2005, Haiku, Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* DarkWyrm <bpmagic@columbus.rr.com>
* Gabe Yoder <gyoder@stny.rr.com>
* Stephan Aßmus <superstippi@gmx.de>
*/
#ifndef _DISPLAY_DRIVER_H_
#define _DISPLAY_DRIVER_H_
#include <Accelerant.h>
#include <Font.h>
#include <Locker.h>
#include <Point.h>
class BPoint;
class BRect;
class BRegion;
class DrawState;
class HWInterface;
class RGBColor;
class ServerBitmap;
class ServerCursor;
class ServerFont;
/*!
\brief Data structure for passing cursor information to hardware drivers.
*/
/*typedef struct
{
uchar *xormask, *andmask;
int32 width, height;
int32 hotx, hoty;
} cursor_data;*/
typedef struct
{
BPoint pt1;
BPoint pt2;
rgb_color color;
} LineArrayData;
class DisplayDriver {
public:
DisplayDriver();
virtual ~DisplayDriver();
// when implementing, be sure to call the inherited version
virtual status_t Initialize();
virtual void Shutdown();
// call this on mode changes!
virtual void Update() = 0;
virtual void SetHWInterface(HWInterface* interface) = 0;
// clipping for all drawing functions
virtual void ConstrainClippingRegion(BRegion* region) = 0;
// Graphics calls implemented in DisplayDriver
virtual void CopyRegion( /*const*/ BRegion* region,
int32 xOffset,
int32 yOffset) = 0;
virtual void CopyRegionList( BList* list,
BList* pList,
int32 rCount,
BRegion* clipReg) = 0;
virtual void InvertRect( BRect r) = 0;
virtual void DrawBitmap( ServerBitmap *bitmap,
const BRect &source,
const BRect &dest,
const DrawState *d) = 0;
virtual void FillArc( BRect r,
const float &angle,
const float &span,
const DrawState *d) = 0;
virtual void FillBezier( BPoint *pts,
const DrawState *d) = 0;
virtual void FillEllipse( BRect r,
const DrawState *d) = 0;
virtual void FillPolygon( BPoint *ptlist,
int32 numpts,
BRect bounds,
const DrawState *d) = 0;
virtual void FillRect( BRect r,
const RGBColor &color) = 0;
virtual void FillRect( BRect r,
const DrawState *d) = 0;
virtual void FillRegion( BRegion &r,
const DrawState *d) = 0;
virtual void FillRoundRect( BRect r,
const float &xrad,
const float &yrad,
const DrawState *d) = 0;
virtual void FillShape( const BRect &bounds,
const int32 &opcount,
const int32 *oplist,
const int32 &ptcount,
const BPoint *ptlist,
const DrawState *d) = 0;
virtual void FillTriangle( BPoint *pts,
BRect bounds,
const DrawState *d) = 0;
virtual void StrokeArc( BRect r,
const float &angle,
const float &span,
const DrawState *d) = 0;
virtual void StrokeBezier( BPoint *pts,
const DrawState *d) = 0;
virtual void StrokeEllipse( BRect r,
const DrawState *d) = 0;
// this version used by Decorator
virtual void StrokeLine( const BPoint &start,
const BPoint &end,
const RGBColor &color) = 0;
virtual void StrokeLine( const BPoint &start,
const BPoint &end,
DrawState *d) = 0;
virtual void StrokeLineArray(const int32 &numlines,
const LineArrayData *data,
const DrawState *d) = 0;
// this version used by Decorator
virtual void StrokePoint( const BPoint &pt,
const RGBColor &color) = 0;
virtual void StrokePoint( const BPoint &pt,
DrawState *d) = 0;
virtual void StrokePolygon( BPoint *ptlist,
int32 numpts,
BRect bounds,
const DrawState *d,
bool is_closed=true) = 0;
// this version used by Decorator
virtual void StrokeRect( BRect r,
const RGBColor &color) = 0;
virtual void StrokeRect( BRect r,
const DrawState *d) = 0;
virtual void StrokeRegion( BRegion &r,
const DrawState *d) = 0;
virtual void StrokeRoundRect(BRect r,
const float &xrad,
const float &yrad,
const DrawState *d) = 0;
virtual void StrokeShape( const BRect &bounds,
const int32 &opcount,
const int32 *oplist,
const int32 &ptcount,
const BPoint *ptlist,
const DrawState *d) = 0;
virtual void StrokeTriangle( BPoint *pts,
const BRect &bounds,
const DrawState *d) = 0;
// Font-related calls
// DrawState is NOT const because this call updates the pen position in the passed DrawState
virtual void DrawString( const char* string,
int32 length,
const BPoint& pt,
DrawState* d,
escapement_delta *delta = NULL) = 0;
/* virtual void DrawString( const char *string,
const int32 &length,
const BPoint &pt,
const RGBColor &color,
escapement_delta *delta = NULL) = 0;*/
virtual float StringWidth( const char* string,
int32 length,
const DrawState* d,
escapement_delta *delta = NULL) = 0;
virtual float StringWidth( const char* string,
int32 length,
const ServerFont& font,
escapement_delta *delta = NULL) = 0;
virtual float StringHeight( const char *string,
int32 length,
const DrawState *d) = 0;
virtual bool Lock() = 0;
virtual void Unlock() = 0;
virtual bool DumpToFile(const char *path) = 0;
virtual ServerBitmap* DumpToBitmap() = 0;
};
#endif

6
headers/private/servers/app/DisplayDriverPainter.h → headers/private/servers/app/DrawingEngine.h
View File

@ -7,8 +7,8 @@
* Gabe Yoder <gyoder@stny.rr.com>
* Stephan Aßmus <superstippi@gmx.de>
*/
#ifndef _DISPLAY_DRIVER_H_
#define _DISPLAY_DRIVER_H_
#ifndef DRAWING_ENGINE_H_
#define DRAWING_ENGINE_H_
#include <Accelerant.h>
@ -229,4 +229,4 @@ public:
uint32 fAvailableHWAccleration;
};
#endif // _DISPLAY_DRIVER_PAINTER_H_
#endif // DRAWING_ENGINE_H_

2
src/servers/app/Decorator.cpp
View File

@ -11,7 +11,7 @@
#include "ColorSet.h"
#include "Decorator.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include <Region.h>

2
src/servers/app/DefaultDecorator.cpp
View File

@ -14,7 +14,7 @@
#include "ColorUtils.h"
#include "DesktopSettings.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "DrawState.h"
#include "FontManager.h"
#include "PatternHandler.h"

2
src/servers/app/Desktop.cpp
View File

@ -20,7 +20,7 @@
#include <ServerProtocol.h>
#include "AppServer.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "Globals.h"
#include "Layer.h"
#include "RootLayer.h"

5
src/servers/app/Jamfile
View File

@ -42,7 +42,6 @@ SharedLibrary libappserver.so :
# drawing
PatternHandler.cpp
DisplayDriver.cpp
# libraries
: libroot.so libbe.so libfreetype.so libtextencoding.so
@ -69,11 +68,11 @@ Server app_server :
ServerApp.cpp
ServerWindow.cpp
# DisplayDriver Classes
# DrawingEngine Classes
AccelerantBuffer.cpp
AccelerantHWInterface.cpp
BitmapBuffer.cpp
DisplayDriverPainter.cpp
DrawingEngine.cpp
MallocBuffer.cpp
UpdateQueue.cpp

2
src/servers/app/Layer.cpp
View File

@ -37,7 +37,7 @@
#include <View.h>
#include "DebugInfoManager.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "DrawState.h"
#include "PortLink.h"
#include "RootLayer.h"

2
src/servers/app/OffscreenWinBorder.cpp
View File

@ -11,7 +11,7 @@
#include "DebugInfoManager.h"
#include "BitmapHWInterface.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "ServerBitmap.h"
#include "OffscreenWinBorder.h"

4
src/servers/app/PicturePlayer.cpp
View File

@ -32,13 +32,13 @@
#include "ServerBitmap.h"
#include "DisplayDriver.h"
#include "DrawingEngine.h"
#include "PictureProtocol.h"
#include "Utils.h"
#include "PicturePlayer.h"
PicturePlayer::PicturePlayer(DisplayDriver *d,void *data, int32 size)
PicturePlayer::PicturePlayer(DrawingEngine *d,void *data, int32 size)
: fData(data, size)
{
fdriver=d;

6
src/servers/app/PicturePlayer.h
View File

@ -35,12 +35,12 @@
#include "DrawState.h"
#include "PatternHandler.h" // for pattern_union
class DisplayDriver;
class DrawingEngine;
class PicturePlayer
{
public:
PicturePlayer(DisplayDriver *driver,void *data, int32 size);
PicturePlayer(DrawingEngine *driver,void *data, int32 size);
virtual ~PicturePlayer();
int16 GetOp();
@ -87,7 +87,7 @@ public:
private:
BMemoryIO fData;
int32 fSize;
DisplayDriver *fdriver;
DrawingEngine *fdriver;
DrawState fldata;
BPoint forigin;
Pattern stipplepat;

2
src/servers/app/RootLayer.cpp
View File

@ -23,7 +23,7 @@
#include <PortLink.h>
#include "Decorator.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "Globals.h"
#include "HWInterface.h"
#include "Layer.h"

6
src/servers/app/ServerApp.cpp
View File

@ -35,7 +35,7 @@
#include "CursorSet.h"
#include "Desktop.h"
#include "DecorManager.h"
#include "DisplayDriver.h"
#include "DrawingEngine.h"
#include "FontManager.h"
#include "HWInterface.h"
//#include "DrawState.h"
@ -454,7 +454,7 @@ ServerApp::_MessageLooper()
STRACE(("ServerApp %s:Server shutdown notification received\n", Signature()));
// If we are using the real, accelerated version of the
// DisplayDriver, we do NOT want the user to be able shut down
// DrawingEngine, we do NOT want the user to be able shut down
// the server. The results would NOT be pretty
#if TEST_MODE
BMessage pleaseQuit(B_QUIT_REQUESTED);
@ -1331,7 +1331,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
if (!stringArray[i] || lengthArray[i] <= 0)
widthArray[i] = 0.0;
else {
//widthArray[i] = fDesktop->GetDisplayDriver()->StringWidth(stringArray[i], lengthArray[i], font);
//widthArray[i] = fDesktop->GetDrawingEngine()->StringWidth(stringArray[i], lengthArray[i], font);
// NOTE: The line below will return the exact same thing. However,
// the line above uses the AGG rendering backend, for which glyph caching
// actually works. It is about 20 times faster!

2
src/servers/app/ServerScreen.cpp
View File

@ -17,7 +17,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "HWInterface.h"
#include "ServerScreen.h"

2
src/servers/app/ServerWindow.cpp
View File

@ -39,7 +39,7 @@
#include "BGet++.h"
#include "DebugInfoManager.h"
#include "Desktop.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
#include "HWInterface.h"
#include "Layer.h"
#include "MessagePrivate.h"

1
src/servers/app/VirtualScreen.cpp
View File

@ -9,7 +9,6 @@
#include "VirtualScreen.h"
#include <DisplayDriver.h>
#include "HWInterface.h"
#include "Desktop.h"

15
src/servers/app/WorkspacesLayer.cpp
View File

@ -4,19 +4,20 @@
*
* Authors:
* Axel Dörfler, axeld@pinc-software.de
* Stephan Aßmus <superstippi@gmx.de>
*/
#include "WorkspacesLayer.h"
#include "Workspace.h"
#include "RootLayer.h"
#include "DisplayDriverPainter.h"
#include "AppServer.h"
#include "WinBorder.h"
#include <ColorSet.h>
#include <WindowPrivate.h>
#include "AppServer.h"
#include "DrawingEngine.h"
#include "RootLayer.h"
#include "WinBorder.h"
#include "Workspace.h"
#include "WorkspacesLayer.h"
WorkspacesLayer::WorkspacesLayer(BRect frame, const char* name,
int32 token, uint32 resizeMode, uint32 flags, DrawingEngine* driver)

52
src/servers/app/drawing/DisplayDriver.cpp
View File

@ -1,52 +0,0 @@
//------------------------------------------------------------------------------
// Copyright (c) 2001-2005, Haiku, Inc. All rights reserved
// Distributed under the terms of the MIT license.
//
// File Name: DisplayDriver.cpp
// Authors: DarkWyrm <bpmagic@columbus.rr.com>
// Gabe Yoder <gyoder@stny.rr.com>
// Stephan Aßmus <superstippi@gmx.de>
//
// Description: Abstract class which handles all graphics output
// for the server
//
//------------------------------------------------------------------------------
#include <stdio.h>
#include <string.h>
#include "DisplayDriver.h"
DisplayDriver::DisplayDriver()
{
}
DisplayDriver::~DisplayDriver()
{
}
/*!
\brief Initializes the driver object.
\return true if successful, false if not
Derived versions should set up the driver for display,
including the initial clearing of the screen. If things
do not go as they should, false should be returned.
*/
status_t
DisplayDriver::Initialize()
{
return B_OK;
}
/*!
\brief Shuts down the driver's video subsystem
Any work done by Initialize() should be undone here. Note that Shutdown() is
called even if Initialize() was unsuccessful.
*/
void
DisplayDriver::Shutdown()
{
}

2
src/servers/app/drawing/DisplayDriverPainter.cpp → src/servers/app/drawing/DrawingEngine.cpp
View File

@ -16,7 +16,7 @@
#include "PNGDump.h"
#include "RenderingBuffer.h"
#include "DisplayDriverPainter.h"
#include "DrawingEngine.h"
// make_rect_valid