From 127b4b0a4b8123bafde1a2724498f14d703e3e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 29 Mar 2005 22:22:44 +0000 Subject: [PATCH] moved more of the old stuff from DisplayDriver into DisplayDriverImpl git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12142 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/servers/app/DisplayDriver.h | 17 ++++++----------- headers/private/servers/app/ServerConfig.h | 3 ++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/headers/private/servers/app/DisplayDriver.h b/headers/private/servers/app/DisplayDriver.h index 7a522218e2..67e6c24be5 100644 --- a/headers/private/servers/app/DisplayDriver.h +++ b/headers/private/servers/app/DisplayDriver.h @@ -307,10 +307,9 @@ class DisplayDriver { virtual void Unlock() = 0; // display mode access - virtual void SetMode(const display_mode &mode); - void GetMode(display_mode *mode); - inline const display_mode* DisplayMode() const - { return &fDisplayMode; } + virtual void SetMode(const display_mode &mode) = 0; + virtual void GetMode(display_mode *mode) = 0; + virtual const display_mode* DisplayMode() = 0; virtual bool DumpToFile(const char *path) = 0; virtual ServerBitmap* DumpToBitmap() = 0; @@ -319,9 +318,9 @@ class DisplayDriver { const LineArrayData *data, const DrawData *d) = 0; - virtual status_t SetDPMSMode(const uint32 &state); - virtual uint32 DPMSMode(); - virtual uint32 DPMSCapabilities(); + virtual status_t SetDPMSMode(const uint32 &state) = 0; + virtual uint32 DPMSMode() = 0; + virtual uint32 DPMSCapabilities() = 0; virtual status_t GetDeviceInfo(accelerant_device_info *info) = 0; virtual status_t GetModeList(display_mode **mode_list, @@ -357,10 +356,6 @@ class DisplayDriver { // needed by Layer virtual void ConstrainClippingRegion(BRegion *reg) = 0; - protected: - display_mode fDisplayMode; - uint32 fDPMSState; - uint32 fDPMSCaps; }; #endif diff --git a/headers/private/servers/app/ServerConfig.h b/headers/private/servers/app/ServerConfig.h index df61f3415a..ae3bfaf623 100644 --- a/headers/private/servers/app/ServerConfig.h +++ b/headers/private/servers/app/ServerConfig.h @@ -38,7 +38,8 @@ // Display driver to be used by the server. #ifndef DISPLAYDRIVER -# define DISPLAYDRIVER PAINTERDRIVER +//# define DISPLAYDRIVER PAINTERDRIVER +# define DISPLAYDRIVER VIEWDRIVER #endif // Uncomment this if the DisplayDriver should only rely on drawing functions implemented