summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-03-10 23:42:13 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-03-11 11:29:02 -0500
commite69615ccb016de1c64864bbc9cf1bbef9f50c1da (patch)
treedc46cc3bc0438bfc828b72a56d8d731e53d4addc /vcl
parent736420454a7ff46ffc298221e176443f06775634 (diff)
fdo#74702 Moved ImplInitGraphics into correct classes
Currently we check to see what type of class is being used. This really violates the Single Responsibility Principle, and tightly couples the code to OutputDevice. The responsibility for initializing graphics should be done by Printer, VirtualDevice and Window. Please note: to get this working, I've had to make Printer a friend class of VirtualDevice. I'm not entirely happy about this, I'll need to revisit this later when I look at Printer in more detail. For now, this is a hack to allow me to seperate out this function. Change-Id: I9d5946c22fa70670a4f85bf338b4209499d0aa54 Reviewed-on: https://gerrit.libreoffice.org/8528 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/outdev.cxx149
-rw-r--r--vcl/source/gdi/print.cxx71
-rw-r--r--vcl/source/gdi/virdev.cxx44
-rw-r--r--vcl/source/window/window.cxx68
4 files changed, 183 insertions, 149 deletions
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index c1f42d7ce875..1b797a13a908 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -550,155 +550,6 @@ SalGraphics const *OutputDevice::ImplGetGraphics() const
return mpGraphics;
}
-bool OutputDevice::ImplInitGraphics() const
-{
- DBG_TESTSOLARMUTEX();
-
- mbInitLineColor = true;
- mbInitFillColor = true;
- mbInitFont = true;
- mbInitTextColor = true;
- mbInitClipRegion = true;
-
- ImplSVData* pSVData = ImplGetSVData();
-
- // TODO: move this out of OutputDevice and into subclasses
- if ( meOutDevType == OUTDEV_WINDOW )
- {
- Window* pWindow = (Window*)this;
-
- mpGraphics = pWindow->mpWindowImpl->mpFrame->AcquireGraphics();
- // try harder if no wingraphics was available directly
- if ( !mpGraphics )
- {
- // find another output device in the same frame
- OutputDevice* pReleaseOutDev = pSVData->maGDIData.mpLastWinGraphics;
- while ( pReleaseOutDev )
- {
- if ( ((Window*)pReleaseOutDev)->mpWindowImpl->mpFrame == pWindow->mpWindowImpl->mpFrame )
- break;
- pReleaseOutDev = pReleaseOutDev->mpPrevGraphics;
- }
-
- if ( pReleaseOutDev )
- {
- // steal the wingraphics from the other outdev
- mpGraphics = pReleaseOutDev->mpGraphics;
- pReleaseOutDev->ImplReleaseGraphics( false );
- }
- else
- {
- // if needed retry after releasing least recently used wingraphics
- while ( !mpGraphics )
- {
- if ( !pSVData->maGDIData.mpLastWinGraphics )
- break;
- pSVData->maGDIData.mpLastWinGraphics->ImplReleaseGraphics();
- mpGraphics = pWindow->mpWindowImpl->mpFrame->AcquireGraphics();
- }
- }
- }
-
- // update global LRU list of wingraphics
- if ( mpGraphics )
- {
- mpNextGraphics = pSVData->maGDIData.mpFirstWinGraphics;
- pSVData->maGDIData.mpFirstWinGraphics = const_cast<OutputDevice*>(this);
- if ( mpNextGraphics )
- mpNextGraphics->mpPrevGraphics = const_cast<OutputDevice*>(this);
- if ( !pSVData->maGDIData.mpLastWinGraphics )
- pSVData->maGDIData.mpLastWinGraphics = const_cast<OutputDevice*>(this);
- }
- }
- else if ( meOutDevType == OUTDEV_VIRDEV )
- {
- const VirtualDevice* pVirDev = (const VirtualDevice*)this;
-
- if ( pVirDev->mpVirDev )
- {
- mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
- // if needed retry after releasing least recently used virtual device graphics
- while ( !mpGraphics )
- {
- if ( !pSVData->maGDIData.mpLastVirGraphics )
- break;
- pSVData->maGDIData.mpLastVirGraphics->ImplReleaseGraphics();
- mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
- }
- // update global LRU list of virtual device graphics
- if ( mpGraphics )
- {
- mpNextGraphics = pSVData->maGDIData.mpFirstVirGraphics;
- pSVData->maGDIData.mpFirstVirGraphics = const_cast<OutputDevice*>(this);
- if ( mpNextGraphics )
- mpNextGraphics->mpPrevGraphics = const_cast<OutputDevice*>(this);
- if ( !pSVData->maGDIData.mpLastVirGraphics )
- pSVData->maGDIData.mpLastVirGraphics = const_cast<OutputDevice*>(this);
- }
- }
- }
- else if ( meOutDevType == OUTDEV_PRINTER )
- {
- const Printer* pPrinter = (const Printer*)this;
-
- if ( pPrinter->mpJobGraphics )
- mpGraphics = pPrinter->mpJobGraphics;
- else if ( pPrinter->mpDisplayDev )
- {
- const VirtualDevice* pVirDev = pPrinter->mpDisplayDev;
- mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
- // if needed retry after releasing least recently used virtual device graphics
- while ( !mpGraphics )
- {
- if ( !pSVData->maGDIData.mpLastVirGraphics )
- break;
- pSVData->maGDIData.mpLastVirGraphics->ImplReleaseGraphics();
- mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
- }
- // update global LRU list of virtual device graphics
- if ( mpGraphics )
- {
- mpNextGraphics = pSVData->maGDIData.mpFirstVirGraphics;
- pSVData->maGDIData.mpFirstVirGraphics = const_cast<OutputDevice*>(this);
- if ( mpNextGraphics )
- mpNextGraphics->mpPrevGraphics = const_cast<OutputDevice*>(this);
- if ( !pSVData->maGDIData.mpLastVirGraphics )
- pSVData->maGDIData.mpLastVirGraphics = const_cast<OutputDevice*>(this);
- }
- }
- else
- {
- mpGraphics = pPrinter->mpInfoPrinter->AcquireGraphics();
- // if needed retry after releasing least recently used printer graphics
- while ( !mpGraphics )
- {
- if ( !pSVData->maGDIData.mpLastPrnGraphics )
- break;
- pSVData->maGDIData.mpLastPrnGraphics->ImplReleaseGraphics();
- mpGraphics = pPrinter->mpInfoPrinter->AcquireGraphics();
- }
- // update global LRU list of printer graphics
- if ( mpGraphics )
- {
- mpNextGraphics = pSVData->maGDIData.mpFirstPrnGraphics;
- pSVData->maGDIData.mpFirstPrnGraphics = const_cast<OutputDevice*>(this);
- if ( mpNextGraphics )
- mpNextGraphics->mpPrevGraphics = const_cast<OutputDevice*>(this);
- if ( !pSVData->maGDIData.mpLastPrnGraphics )
- pSVData->maGDIData.mpLastPrnGraphics = const_cast<OutputDevice*>(this);
- }
- }
- }
-
- if ( mpGraphics )
- {
- mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
- mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
- }
-
- return mpGraphics ? true : false;
-}
-
void OutputDevice::ImplReleaseGraphics( bool bRelease )
{
DBG_TESTSOLARMUTEX();
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index a50770c38c9a..7eca283e557f 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -35,6 +35,7 @@
#include <vcl/print.hxx>
#include <salinst.hxx>
+#include <salvd.hxx>
#include <salgdi.hxx>
#include <salptype.hxx>
#include <salprn.hxx>
@@ -453,6 +454,76 @@ void Printer::ImplInitData()
pSVData->maGDIData.mpFirstPrinter = this;
}
+bool Printer::ImplInitGraphics() const
+{
+ DBG_TESTSOLARMUTEX();
+
+ mbInitLineColor = true;
+ mbInitFillColor = true;
+ mbInitFont = true;
+ mbInitTextColor = true;
+ mbInitClipRegion = true;
+
+ ImplSVData* pSVData = ImplGetSVData();
+
+ const Printer* pPrinter = (const Printer*)this;
+
+ if ( pPrinter->mpJobGraphics )
+ mpGraphics = pPrinter->mpJobGraphics;
+ else if ( pPrinter->mpDisplayDev )
+ {
+ const VirtualDevice* pVirDev = pPrinter->mpDisplayDev;
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
+ // if needed retry after releasing least recently used virtual device graphics
+ while ( !mpGraphics )
+ {
+ if ( !pSVData->maGDIData.mpLastVirGraphics )
+ break;
+ pSVData->maGDIData.mpLastVirGraphics->ImplReleaseGraphics();
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
+ }
+ // update global LRU list of virtual device graphics
+ if ( mpGraphics )
+ {
+ mpNextGraphics = pSVData->maGDIData.mpFirstVirGraphics;
+ pSVData->maGDIData.mpFirstVirGraphics = const_cast<Printer*>(this);
+ if ( mpNextGraphics )
+ mpNextGraphics->mpPrevGraphics = const_cast<Printer*>(this);
+ if ( !pSVData->maGDIData.mpLastVirGraphics )
+ pSVData->maGDIData.mpLastVirGraphics = const_cast<Printer*>(this);
+ }
+ }
+ else
+ {
+ mpGraphics = pPrinter->mpInfoPrinter->AcquireGraphics();
+ // if needed retry after releasing least recently used printer graphics
+ while ( !mpGraphics )
+ {
+ if ( !pSVData->maGDIData.mpLastPrnGraphics )
+ break;
+ pSVData->maGDIData.mpLastPrnGraphics->ImplReleaseGraphics();
+ mpGraphics = pPrinter->mpInfoPrinter->AcquireGraphics();
+ }
+ // update global LRU list of printer graphics
+ if ( mpGraphics )
+ {
+ mpNextGraphics = pSVData->maGDIData.mpFirstPrnGraphics;
+ pSVData->maGDIData.mpFirstPrnGraphics = const_cast<Printer*>(this);
+ if ( mpNextGraphics )
+ mpNextGraphics->mpPrevGraphics = const_cast<Printer*>(this);
+ if ( !pSVData->maGDIData.mpLastPrnGraphics )
+ pSVData->maGDIData.mpLastPrnGraphics = const_cast<Printer*>(this);
+ }
+ }
+
+ if ( mpGraphics )
+ {
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+ }
+
+ return mpGraphics ? true : false;
+}
void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
{
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index eda91c0060dc..bb9d37fd5ab1 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -34,7 +34,51 @@
using namespace ::com::sun::star::uno;
+bool VirtualDevice::ImplInitGraphics() const
+{
+ DBG_TESTSOLARMUTEX();
+
+ mbInitLineColor = true;
+ mbInitFillColor = true;
+ mbInitFont = true;
+ mbInitTextColor = true;
+ mbInitClipRegion = true;
+
+ ImplSVData* pSVData = ImplGetSVData();
+
+ const VirtualDevice* pVirDev = (const VirtualDevice*)this;
+
+ if ( pVirDev->mpVirDev )
+ {
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
+ // if needed retry after releasing least recently used virtual device graphics
+ while ( !mpGraphics )
+ {
+ if ( !pSVData->maGDIData.mpLastVirGraphics )
+ break;
+ pSVData->maGDIData.mpLastVirGraphics->ImplReleaseGraphics();
+ mpGraphics = pVirDev->mpVirDev->AcquireGraphics();
+ }
+ // update global LRU list of virtual device graphics
+ if ( mpGraphics )
+ {
+ mpNextGraphics = pSVData->maGDIData.mpFirstVirGraphics;
+ pSVData->maGDIData.mpFirstVirGraphics = const_cast<VirtualDevice*>(this);
+ if ( mpNextGraphics )
+ mpNextGraphics->mpPrevGraphics = const_cast<VirtualDevice*>(this);
+ if ( !pSVData->maGDIData.mpLastVirGraphics )
+ pSVData->maGDIData.mpLastVirGraphics = const_cast<VirtualDevice*>(this);
+ }
+ }
+ if ( mpGraphics )
+ {
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+ }
+
+ return mpGraphics ? true : false;
+}
void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 691a17dfdabe..54a6835e43b7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -352,6 +352,74 @@ const char* ImplDbgCheckWindow( const void* pObj )
}
#endif
+bool Window::ImplInitGraphics() const
+{
+ DBG_TESTSOLARMUTEX();
+
+ if ( mpGraphics )
+ return mpGraphics;
+
+ mbInitLineColor = true;
+ mbInitFillColor = true;
+ mbInitFont = true;
+ mbInitTextColor = true;
+ mbInitClipRegion = true;
+
+ ImplSVData* pSVData = ImplGetSVData();
+
+ Window* pWindow = (Window*)this;
+
+ mpGraphics = pWindow->mpWindowImpl->mpFrame->AcquireGraphics();
+ // try harder if no wingraphics was available directly
+ if ( !mpGraphics )
+ {
+ // find another output device in the same frame
+ OutputDevice* pReleaseOutDev = pSVData->maGDIData.mpLastWinGraphics;
+ while ( pReleaseOutDev )
+ {
+ if ( ((Window*)pReleaseOutDev)->mpWindowImpl->mpFrame == pWindow->mpWindowImpl->mpFrame )
+ break;
+ pReleaseOutDev = pReleaseOutDev->mpPrevGraphics;
+ }
+
+ if ( pReleaseOutDev )
+ {
+ // steal the wingraphics from the other outdev
+ mpGraphics = pReleaseOutDev->mpGraphics;
+ pReleaseOutDev->ImplReleaseGraphics( false );
+ }
+ else
+ {
+ // if needed retry after releasing least recently used wingraphics
+ while ( !mpGraphics )
+ {
+ if ( !pSVData->maGDIData.mpLastWinGraphics )
+ break;
+ pSVData->maGDIData.mpLastWinGraphics->ImplReleaseGraphics();
+ mpGraphics = pWindow->mpWindowImpl->mpFrame->AcquireGraphics();
+ }
+ }
+ }
+
+ // update global LRU list of wingraphics
+ if ( mpGraphics )
+ {
+ mpNextGraphics = pSVData->maGDIData.mpFirstWinGraphics;
+ pSVData->maGDIData.mpFirstWinGraphics = const_cast<Window*>(this);
+ if ( mpNextGraphics )
+ mpNextGraphics->mpPrevGraphics = const_cast<Window*>(this);
+ if ( !pSVData->maGDIData.mpLastWinGraphics )
+ pSVData->maGDIData.mpLastWinGraphics = const_cast<Window*>(this);
+ }
+
+ if ( mpGraphics )
+ {
+ mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+ mpGraphics->setAntiAliasB2DDraw(mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW);
+ }
+
+ return mpGraphics ? true : false;
+}
bool Window::HasMirroredGraphics() const