From d4045331c8650c11875299cf678c1115c1681dd7 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Sat, 14 May 2005 16:04:49 +0000 Subject: [PATCH] some minor cleanups git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12664 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/ServerWindow.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index d04e8413a3..e700bc2865 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -442,7 +442,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) region = cl->fParent->ConvertFromParent(&(cl->fFull)); dst.OffsetBy(point); - cl->fDriver->DrawBitmap(®ion, sbmp, src, dst, cl->fLayerData); + cl->GetDisplayDriver()->DrawBitmap(®ion, sbmp, src, dst, cl->fLayerData); } // TODO: Adi -- shouldn't AS_LAYER_DRAW_BITMAP_SYNC_AT_POINT sync with the client? @@ -468,7 +468,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) region = cl->fParent->ConvertFromParent(&(cl->fFull)); dst.OffsetBy(point); - cl->fDriver->DrawBitmap(®ion, sbmp, src, dst, cl->fLayerData); + cl->GetDisplayDriver()->DrawBitmap(®ion, sbmp, src, dst, cl->fLayerData); } break; } @@ -491,7 +491,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) dst = cl->fParent->ConvertFromParent(cl->fFull.Frame()); dstRect.OffsetBy(dst.left, dst.top); - cl->fDriver->DrawBitmap(®ion, sbmp, srcRect, dstRect, cl->fLayerData); + cl->GetDisplayDriver()->DrawBitmap(®ion, sbmp, srcRect, dstRect, cl->fLayerData); } // TODO: Adi -- shouldn't AS_LAYER_DRAW_BITMAP_SYNC_IN_RECT sync with the client? @@ -516,7 +516,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) dst = cl->fParent->ConvertFromParent(cl->fFull.Frame()); dstRect.OffsetBy(dst.left, dst.top); - cl->fDriver->DrawBitmap(®ion, sbmp, srcRect, dstRect, cl->fLayerData); + cl->GetDisplayDriver()->DrawBitmap(®ion, sbmp, srcRect, dstRect, cl->fLayerData); } break; } @@ -1039,7 +1039,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) } // search for a picture with the specified token. - ServerPicture *sp = cl->fServerWin->fServerApp->FindPicture(pictureToken); + ServerPicture *sp = fServerApp->FindPicture(pictureToken); // TODO: Increase that picture's reference count.(~ allocate a picture) if (sp == NULL) break; @@ -1088,7 +1088,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) link.Read(&where); // TODO: Increase that picture's reference count.(~ allocate a picture) - ServerPicture *sp = cl->fServerWin->fServerApp->FindPicture(pictureToken); + ServerPicture *sp = fServerApp->FindPicture(pictureToken); if (sp == NULL) break; @@ -2169,7 +2169,7 @@ ServerWindow::_CopyBits(RootLayer* rootLayer, Layer* layer, // move the region back for the actual operation copyRegion.OffsetBy(-xOffset, -yOffset); - layer->fDriver->CopyRegion(©Region, xOffset, yOffset); + layer->GetDisplayDriver()->CopyRegion(©Region, xOffset, yOffset); // trigger the redraw rootLayer->GoRedraw(fWinBorder, invalidRegion);