fixed app_server build, though I don't exactly know why that fixes it
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12130 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -127,8 +127,8 @@ Desktop::AddDriver(DisplayDriver *driver)
|
|||||||
{
|
{
|
||||||
if (driver->Initialize()) {
|
if (driver->Initialize()) {
|
||||||
// TODO: be careful of screen initialization - monitor may not support 640x480
|
// 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(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(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_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_GRAY8, fScreenList.CountItems()+1);
|
||||||
// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB15, fScreenList.CountItems()+1);
|
// Screen *sc = new Screen(driver, BPoint(640, 480), B_RGB15, fScreenList.CountItems()+1);
|
||||||
|
|||||||
@@ -102,15 +102,23 @@ Server app_server :
|
|||||||
# link libraries for app_server and libappserver.so
|
# link libraries for app_server and libappserver.so
|
||||||
|
|
||||||
if $(TARGET_PLATFORM) = haiku {
|
if $(TARGET_PLATFORM) = haiku {
|
||||||
|
|
||||||
LinkSharedOSLibs libappserver.so :
|
LinkSharedOSLibs libappserver.so :
|
||||||
libroot.so libbe.so libfreetype.so ;
|
libroot.so libbe.so libfreetype.so ;
|
||||||
|
|
||||||
LinkSharedOSLibs app_server :
|
LinkSharedOSLibs app_server :
|
||||||
libroot.so libtranslation.so libz.so libpng.so libbe.so
|
libroot.so libtranslation.so libz.so libpng.so libbe.so
|
||||||
libappserver.so libfreetype.so libtextencoding.so ;
|
libappserver.so libfreetype.so libtextencoding.so ;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
LINKFLAGS on app_server ?= $(LINKFLAGS) ;
|
||||||
|
LINKFLAGS on app_server += -lbe ;
|
||||||
|
|
||||||
LinkSharedOSLibs libappserver.so :
|
LinkSharedOSLibs libappserver.so :
|
||||||
root be <boot!home!config!lib>libopenbeos.so
|
root be <boot!home!config!lib>libopenbeos.so
|
||||||
libfreetype.so ;
|
libfreetype.so ;
|
||||||
|
|
||||||
LinkSharedOSLibs app_server :
|
LinkSharedOSLibs app_server :
|
||||||
root be game translation libz.so libpng.so libappserver.so
|
root be game translation libz.so libpng.so libappserver.so
|
||||||
libpainter.a <boot!home!config!lib>libopenbeos.so
|
libpainter.a <boot!home!config!lib>libopenbeos.so
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ class HWInterface : public BLocker {
|
|||||||
// Invalidate is planned to be used for scheduling an area for updating
|
// Invalidate is planned to be used for scheduling an area for updating
|
||||||
status_t Invalidate(const BRect& frame);
|
status_t Invalidate(const BRect& frame);
|
||||||
// while as CopyBackToFront() actually performs the operation
|
// while as CopyBackToFront() actually performs the operation
|
||||||
status_t CopyBackToFront(const BRect& frame);
|
virtual status_t CopyBackToFront(const BRect& frame);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// implement this in derived classes
|
// implement this in derived classes
|
||||||
|
|||||||
@@ -261,7 +261,7 @@ STRACE("CardWindow::MessageReceived()\n");
|
|||||||
case MSG_UPDATE:
|
case MSG_UPDATE:
|
||||||
STRACE("MSG_UPDATE\n");
|
STRACE("MSG_UPDATE\n");
|
||||||
// invalidate all areas in the view that need redrawing
|
// 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();
|
/* int32 count = fUpdateRegion.CountRects();
|
||||||
for (int32 i = 0; i < count; i++) {
|
for (int32 i = 0; i < count; i++) {
|
||||||
fView->Invalidate(fUpdateRegion.RectAt(i));
|
fView->Invalidate(fUpdateRegion.RectAt(i));
|
||||||
@@ -595,6 +595,17 @@ ViewHWInterface::BackBuffer() const
|
|||||||
return fBackBuffer;
|
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
|
// _DrawCursor
|
||||||
void
|
void
|
||||||
ViewHWInterface::_DrawCursor(BRect area) const
|
ViewHWInterface::_DrawCursor(BRect area) const
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ class ViewHWInterface : public HWInterface {
|
|||||||
virtual RenderingBuffer* FrontBuffer() const;
|
virtual RenderingBuffer* FrontBuffer() const;
|
||||||
virtual RenderingBuffer* BackBuffer() const;
|
virtual RenderingBuffer* BackBuffer() const;
|
||||||
|
|
||||||
|
virtual status_t CopyBackToFront(const BRect& frame);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void _DrawCursor(BRect area) const;
|
virtual void _DrawCursor(BRect area) const;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user