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

More encapsulation of directwindow stuff into DirectWindowData.

Browse Source 
I changed lot of code (while trying to fix ticket #4311), reverted some old
changes and probably messed up a lot. It's very much a work in progress.
Anyway, DirectWindowStars still work correctly, but Chart (and GLTeapot) do
not. I suspect a race condition between the DirectWindow creation and
the activation of the direct mode on the server, maybe exposed more easily 
by the changes in the scheduler.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32625 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2009-08-23 07:08:39 +00:00
parent 97cccf16b0
commit f6ad8d5abb
4 changed files with 93 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/servers/app/DirectWindowSupport.cpp
View File

@ -9,7 +9,14 @@
#include "DirectWindowSupport.h"
#include <Autolock.h>
#include "RenderingBuffer.h"
#include "clipping.h"
#include <string.h>
#include <syslog.h>
DirectWindowData::DirectWindowData()
:
@ -89,55 +96,76 @@ DirectWindowData::SyncronizeWithClient()
bool
DirectWindowData::SetState(const direct_buffer_state& bufferState,
const direct_driver_state& driverState)
const direct_driver_state& driverState, RenderingBuffer *buffer,
const BRect& windowFrame, const BRegion& clipRegion)
{
BufferState inputState(bufferState);
BufferState currentState(buffer_info->buffer_state);
bool wasStopped = fTransition <= 0;
bool handle = false;
if ((bufferState & B_DIRECT_MODE_MASK) == B_DIRECT_STOP)
fTransition--;
else if ((bufferState & B_DIRECT_MODE_MASK) == B_DIRECT_START)
fTransition++;
if (inputState.Action() == B_DIRECT_STOP)
handle = _HandleStop(bufferState);
else if (inputState.Action() == B_DIRECT_START)
handle = _HandleStart(bufferState);
else if (inputState.Action() == B_DIRECT_MODIFY)
handle = _HandleModify(bufferState);
bool isStopped = fTransition <= 0;
if (wasStopped && isStopped)
return false;
buffer_info->buffer_state = bufferState;
if (driverState != -1)
buffer_info->driver_state = driverState;
return handle;
}
bool
DirectWindowData::_HandleStop(const direct_buffer_state& state)
{
buffer_info->buffer_state = B_DIRECT_STOP;
if (fTransition-- >= 1)
return true;
return false;
}
bool
DirectWindowData::_HandleStart(const direct_buffer_state& state)
{
buffer_info->buffer_state = (direct_buffer_state)
(BufferState(buffer_info->buffer_state).Reason() | state);
if (fTransition++ >= 0)
return true;
return false;
}
bool
DirectWindowData::_HandleModify(const direct_buffer_state& state)
{
buffer_info->buffer_state = state;
if (fTransition > 0)
return true;
return false;
if ((bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_STOP) {
buffer_info->bits = buffer->Bits();
buffer_info->pci_bits = NULL; // TODO
buffer_info->bytes_per_row = buffer->BytesPerRow();
switch (buffer->ColorSpace()) {
case B_RGB32:
case B_RGBA32:
case B_RGB32_BIG:
case B_RGBA32_BIG:
buffer_info->bits_per_pixel = 32;
break;
case B_RGB24:
case B_RGB24_BIG:
buffer_info->bits_per_pixel = 24;
break;
case B_RGB16:
case B_RGB16_BIG:
case B_RGB15:
case B_RGB15_BIG:
buffer_info->bits_per_pixel = 16;
break;
case B_CMAP8:
case B_GRAY8:
buffer_info->bits_per_pixel = 8;
break;
default:
syslog(LOG_ERR,
"unknown colorspace in DirectWindowData::SetState()!\n");
buffer_info->bits_per_pixel = 0;
break;
}
buffer_info->pixel_format = buffer->ColorSpace();
buffer_info->layout = B_BUFFER_NONINTERLEAVED;
buffer_info->orientation = B_BUFFER_TOP_TO_BOTTOM;
// TODO
buffer_info->window_bounds = to_clipping_rect(windowFrame);
// TODO: Review this
const int32 kMaxClipRectsCount = (DIRECT_BUFFER_INFO_AREA_SIZE
- sizeof(direct_buffer_info)) / sizeof(clipping_rect);
buffer_info->clip_list_count = min_c(clipRegion.CountRects(),
kMaxClipRectsCount);
buffer_info->clip_bounds = clipRegion.FrameInt();
for (uint32 i = 0; i < buffer_info->clip_list_count; i++)
buffer_info->clip_list[i] = clipRegion.RectAtInt(i);
}
return true;
}

10
src/servers/app/DirectWindowSupport.h
View File

@ -4,10 +4,13 @@
*
*/
#include <Autolock.h>
#include <DirectWindow.h>
#include <DirectWindowPrivate.h>
class RenderingBuffer;
struct BufferState {
BufferState(const direct_buffer_state& state)
:
@ -41,7 +44,10 @@ public:
status_t SyncronizeWithClient();
bool SetState(const direct_buffer_state& bufferState,
const direct_driver_state& driverState);
const direct_driver_state& driverState,
RenderingBuffer *renderingBuffer,
const BRect& windowFrame,
const BRegion& clipRegion);
BRect old_window_frame;
direct_buffer_info* buffer_info;
@ -50,11 +56,11 @@ public:
private:
bool _HandleStop(const direct_buffer_state& state);
bool _HandleStart(const direct_buffer_state& state);
bool _HandleModify(const direct_buffer_state& state);
sem_id fSem;
sem_id fAcknowledgeSem;
area_id fBufferArea;
direct_buffer_state fPreviousState;
int32 fTransition;
};

83
src/servers/app/ServerWindow.cpp
View File

@ -3483,78 +3483,25 @@ ServerWindow::HandleDirectConnection(int32 bufferState, int32 driverState)
if (fDirectWindowData == NULL)
return;
if (!fDirectWindowData->SetState((direct_buffer_state)bufferState,
(direct_driver_state)driverState))
return;
if ((bufferState & B_DIRECT_MODE_MASK) != B_DIRECT_STOP) {
// TODO: Locking ?
RenderingBuffer *buffer = fDesktop->HWInterface()->FrontBuffer();
fDirectWindowData->buffer_info->bits = buffer->Bits();
fDirectWindowData->buffer_info->pci_bits = NULL; // TODO
fDirectWindowData->buffer_info->bytes_per_row = buffer->BytesPerRow();
switch (buffer->ColorSpace()) {
case B_RGB32:
case B_RGBA32:
case B_RGB32_BIG:
case B_RGBA32_BIG:
fDirectWindowData->buffer_info->bits_per_pixel = 32;
break;
case B_RGB24:
case B_RGB24_BIG:
fDirectWindowData->buffer_info->bits_per_pixel = 24;
break;
case B_RGB16:
case B_RGB16_BIG:
case B_RGB15:
case B_RGB15_BIG:
fDirectWindowData->buffer_info->bits_per_pixel = 16;
break;
case B_CMAP8:
case B_GRAY8:
fDirectWindowData->buffer_info->bits_per_pixel = 8;
break;
default:
syslog(LOG_ERR,
"unknown colorspace in HandleDirectConnection()!\n");
fDirectWindowData->buffer_info->bits_per_pixel = 0;
break;
if (fDesktop->LockSingleWindow()) {
if (!fDirectWindowData->SetState((direct_buffer_state)bufferState,
(direct_driver_state)driverState,
fDesktop->HWInterface()->FrontBuffer(), fWindow->Frame(),
fWindow->VisibleContentRegion())) {
fDesktop->UnlockSingleWindow();
return;
}
fDirectWindowData->buffer_info->pixel_format = buffer->ColorSpace();
fDirectWindowData->buffer_info->layout = B_BUFFER_NONINTERLEAVED;
fDirectWindowData->buffer_info->orientation = B_BUFFER_TOP_TO_BOTTOM;
// TODO
fDirectWindowData->buffer_info->window_bounds
= to_clipping_rect(fWindow->Frame());
status_t status = fDirectWindowData->SyncronizeWithClient();
// TODO: Review this
const int32 kMaxClipRectsCount = (DIRECT_BUFFER_INFO_AREA_SIZE
- sizeof(direct_buffer_info)) / sizeof(clipping_rect);
// We just want the region inside the window, border excluded.
BRegion clipRegion = fWindow->VisibleContentRegion();
fDirectWindowData->buffer_info->clip_list_count
= min_c(clipRegion.CountRects(), kMaxClipRectsCount);
fDirectWindowData->buffer_info->clip_bounds = clipRegion.FrameInt();
for (uint32 i = 0; i < fDirectWindowData->buffer_info->clip_list_count;
i++) {
fDirectWindowData->buffer_info->clip_list[i]
= clipRegion.RectAtInt(i);
if (status != B_OK) {
// The client application didn't release the semaphore
// within the given timeout. Or something else went wrong.
// Deleting this member should make it crash.
delete fDirectWindowData;
fDirectWindowData = NULL;
}
}
status_t status = fDirectWindowData->SyncronizeWithClient();
if (status != B_OK) {
// The client application didn't release the semaphore
// within the given timeout. Or something else went wrong.
// Deleting this member should make it crash.
delete fDirectWindowData;
fDirectWindowData = NULL;
fDesktop->UnlockSingleWindow();
}
}

1
src/servers/app/Window.cpp
View File

@ -214,7 +214,6 @@ Window::SetClipping(BRegion* stillAvailableOnScreen)
fVisibleContentRegionValid = false;
fEffectiveDrawingRegionValid = false;
// TODO: review this!
fWindow->HandleDirectConnection(B_DIRECT_MODIFY | B_CLIPPING_MODIFIED);
}