i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sorry, forgot to commit the move of the locking implementation

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12093 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-03-28 13:43:39 +00:00
parent 181a984e2a
commit 197f82a8fe
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/servers/app/DisplayDriver.h
+2 -4
View File
@@ -303,8 +303,8 @@ class DisplayDriver {
// These two will rarely be implemented by subclasses, // These two will rarely be implemented by subclasses,
// but it still needs to be possible // but it still needs to be possible
virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT); virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT) = 0;
virtual void Unlock(); virtual void Unlock() = 0;
// display mode access // display mode access
virtual void SetMode(const display_mode &mode); virtual void SetMode(const display_mode &mode);
@@ -358,8 +358,6 @@ class DisplayDriver {
virtual void ConstrainClippingRegion(BRegion *reg) = 0; virtual void ConstrainClippingRegion(BRegion *reg) = 0;
protected: protected:
BLocker fLocker;
CursorHandler fCursorHandler; CursorHandler fCursorHandler;
display_mode fDisplayMode; display_mode fDisplayMode;
headers/private/servers/app/DisplayDriverImpl.h
+4 -11
View File
@@ -282,8 +282,8 @@ class DisplayDriverImpl : public DisplayDriver {
// These two will rarely be implemented by subclasses, // These two will rarely be implemented by subclasses,
// but it still needs to be possible // but it still needs to be possible
// virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT); virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT);
// virtual void Unlock(); virtual void Unlock();
virtual bool DumpToFile(const char *path); virtual bool DumpToFile(const char *path);
virtual ServerBitmap* DumpToBitmap(); virtual ServerBitmap* DumpToBitmap();
@@ -406,15 +406,8 @@ friend class WinBorder;
virtual void StrokeSolidRect(const BRect &rect, virtual void StrokeSolidRect(const BRect &rect,
const RGBColor &color); const RGBColor &color);
protected:
// PatternHandler fDrawPattern; BLocker fLocker;
// RGBColor fDrawColor;
// int fLineThickness;
// accelerant_device_info fAccDeviceInfo;
// DrawData fDrawData;
}; };
#endif #endif
headers/private/servers/app/ServerConfig.h
+1
View File
@@ -36,6 +36,7 @@
// Display driver to be used by the server. // Display driver to be used by the server.
#define DISPLAYDRIVER PAINTERDRIVER #define DISPLAYDRIVER PAINTERDRIVER
//#define DISPLAYDRIVER VIEWDRIVER
// Uncomment this if the DisplayDriver should only rely on drawing functions implemented // Uncomment this if the DisplayDriver should only rely on drawing functions implemented
// in software even though hardware-accelerated functions are available // in software even though hardware-accelerated functions are available