sorry, forgot to commit the move of the locking implementation
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12093 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
181a984e2a
commit
197f82a8fe
@ -303,8 +303,8 @@ class DisplayDriver {
|
||||
|
||||
// These two will rarely be implemented by subclasses,
|
||||
// but it still needs to be possible
|
||||
virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT);
|
||||
virtual void Unlock();
|
||||
virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT) = 0;
|
||||
virtual void Unlock() = 0;
|
||||
|
||||
// display mode access
|
||||
virtual void SetMode(const display_mode &mode);
|
||||
@ -358,8 +358,6 @@ class DisplayDriver {
|
||||
virtual void ConstrainClippingRegion(BRegion *reg) = 0;
|
||||
|
||||
protected:
|
||||
BLocker fLocker;
|
||||
|
||||
CursorHandler fCursorHandler;
|
||||
|
||||
display_mode fDisplayMode;
|
||||
|
@ -282,8 +282,8 @@ class DisplayDriverImpl : public DisplayDriver {
|
||||
|
||||
// These two will rarely be implemented by subclasses,
|
||||
// but it still needs to be possible
|
||||
// virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT);
|
||||
// virtual void Unlock();
|
||||
virtual bool Lock(bigtime_t timeout = B_INFINITE_TIMEOUT);
|
||||
virtual void Unlock();
|
||||
|
||||
virtual bool DumpToFile(const char *path);
|
||||
virtual ServerBitmap* DumpToBitmap();
|
||||
@ -406,15 +406,8 @@ friend class WinBorder;
|
||||
virtual void StrokeSolidRect(const BRect &rect,
|
||||
const RGBColor &color);
|
||||
|
||||
|
||||
// PatternHandler fDrawPattern;
|
||||
// RGBColor fDrawColor;
|
||||
// int fLineThickness;
|
||||
|
||||
// accelerant_device_info fAccDeviceInfo;
|
||||
|
||||
|
||||
// DrawData fDrawData;
|
||||
protected:
|
||||
BLocker fLocker;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -36,6 +36,7 @@
|
||||
|
||||
// Display driver to be used by the server.
|
||||
#define DISPLAYDRIVER PAINTERDRIVER
|
||||
//#define DISPLAYDRIVER VIEWDRIVER
|
||||
|
||||
// Uncomment this if the DisplayDriver should only rely on drawing functions implemented
|
||||
// in software even though hardware-accelerated functions are available
|
||||
|
Loading…
Reference in New Issue
Block a user