Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed app_server build, though I don't exactly know why that fixes it

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12130 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-03-29 18:32:43 +00:00
parent d3db964ed0
commit 9c59f2f207
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/servers/app/Desktop.cpp
View File

@ -127,8 +127,8 @@ Desktop::AddDriver(DisplayDriver *driver)
{
if (driver->Initialize()) {
// TODO: be careful of screen initialization - monitor may not support 640x480
// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1);
Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1);
Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB32, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(1024, 768), B_RGB32, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_CMAP8, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_GRAY8, fScreenList.CountItems()+1);
// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB15, fScreenList.CountItems()+1);

8
src/servers/app/Jamfile
View File

@ -102,15 +102,23 @@ Server app_server :
# link libraries for app_server and libappserver.so
if $(TARGET_PLATFORM) = haiku {
LinkSharedOSLibs libappserver.so :
libroot.so libbe.so libfreetype.so ;
LinkSharedOSLibs app_server :
libroot.so libtranslation.so libz.so libpng.so libbe.so
libappserver.so libfreetype.so libtextencoding.so ;
} else {
LINKFLAGS on app_server ?= $(LINKFLAGS) ;
LINKFLAGS on app_server += -lbe ;
LinkSharedOSLibs libappserver.so :
root be <boot!home!config!lib>libopenbeos.so
libfreetype.so ;
LinkSharedOSLibs app_server :
root be game translation libz.so libpng.so libappserver.so
libpainter.a <boot!home!config!lib>libopenbeos.so

2
src/servers/app/drawing/HWInterface.h
View File

@ -63,7 +63,7 @@ class HWInterface : public BLocker {
// Invalidate is planned to be used for scheduling an area for updating
status_t Invalidate(const BRect& frame);
// while as CopyBackToFront() actually performs the operation
status_t CopyBackToFront(const BRect& frame);
virtual status_t CopyBackToFront(const BRect& frame);
protected:
// implement this in derived classes

13
src/servers/app/drawing/ViewHWInterface.cpp
View File

@ -261,7 +261,7 @@ STRACE("CardWindow::MessageReceived()\n");
case MSG_UPDATE:
STRACE("MSG_UPDATE\n");
// invalidate all areas in the view that need redrawing
if (fUpdateLock.LockWithTimeout(0LL) >= B_OK) {
if (fUpdateLock.LockWithTimeout(2000LL) >= B_OK) {
/* int32 count = fUpdateRegion.CountRects();
for (int32 i = 0; i < count; i++) {
fView->Invalidate(fUpdateRegion.RectAt(i));
@ -595,6 +595,17 @@ ViewHWInterface::BackBuffer() const
return fBackBuffer;
}
// CopyBackToFront
status_t
ViewHWInterface::CopyBackToFront(const BRect& frame)
{
status_t ret = HWInterface::CopyBackToFront(frame);
// TODO: investigate why this function is called before SetMode() was called!
if (fWindow)
fWindow->Invalidate(frame);
return ret;
}
// _DrawCursor
void
ViewHWInterface::_DrawCursor(BRect area) const

2
src/servers/app/drawing/ViewHWInterface.h
View File

@ -53,6 +53,8 @@ class ViewHWInterface : public HWInterface {
virtual RenderingBuffer* FrontBuffer() const;
virtual RenderingBuffer* BackBuffer() const;
virtual status_t CopyBackToFront(const BRect& frame);
protected:
virtual void _DrawCursor(BRect area) const;