i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable state synching for ServerPictures. Fixes bug 520

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19379 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-11-28 14:52:51 +00:00
parent 8535905415
commit 0c48fc7c74
2 changed files with 22 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/interface/PictureDataWriter.h
+5 -4
View File
@@ -49,16 +49,17 @@ public:
status_t WritePushState(); status_t WritePushState();
status_t WritePopState(); status_t WritePopState();
private:
BPositionIO *fData;
std::stack<off_t> fStack;
protected:
status_t WriteData(const void *data, size_t size); status_t WriteData(const void *data, size_t size);
template <typename T> status_t Write(const T &data) { return WriteData(&data, sizeof(data)); } template <typename T> status_t Write(const T &data) { return WriteData(&data, sizeof(data)); }
status_t BeginOp(const int16 &op); status_t BeginOp(const int16 &op);
status_t EndOp(); status_t EndOp();
private:
BPositionIO *fData;
std::stack<off_t> fStack;
}; };
#endif // __PICTUREDATAWRITER_H #endif // __PICTUREDATAWRITER_H
src/servers/app/ServerPicture.cpp
+17 -135
View File
@@ -622,154 +622,36 @@ ServerPicture::~ServerPicture()
{ {
} }
/*
void
ServerPicture::EnterStateChange()
{
// BeginOp(B_PIC_ENTER_STATE_CHANGE);
}
void
ServerPicture::ExitStateChange()
{
// EndOp();
}
void
ServerPicture::EnterFontChange()
{
// BeginOp(B_PIC_ENTER_FONT_STATE);
}
void
ServerPicture::ExitFontChange()
{
// EndOp();
}
void
ServerPicture::AddInt8(int8 data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddInt16(int16 data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddInt32(int32 data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddInt64(int64 data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddFloat(float data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddCoord(BPoint data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddRect(BRect data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddColor(rgb_color data)
{
fData.Write(&data, sizeof(data));
}
void
ServerPicture::AddString(const char *data)
{
int32 len = data ? strlen(data) : 0;
fData.Write(&len, sizeof(int32));
fData.Write(data, len);
}
void
ServerPicture::AddData(const void *data, int32 size)
{
fData.Write(data, size);
}
*/
void void
ServerPicture::SyncState(ViewLayer *view) ServerPicture::SyncState(ViewLayer *view)
{ {
/* BeginOp(B_PIC_ENTER_STATE_CHANGE); // TODO: Finish this
BeginOp(B_PIC_ENTER_STATE_CHANGE);
BeginOp(B_PIC_SET_PEN_LOCATION);
AddCoord(view->CurrentState()->PenLocation());
EndOp();
BeginOp(B_PIC_SET_PEN_SIZE);
AddFloat(view->CurrentState()->PenSize());
EndOp();
BeginOp(B_PIC_SET_SCALE);
AddFloat(view->CurrentState()->Scale());
EndOp();
BeginOp(B_PIC_SET_LINE_MODE);
AddInt16((int16)view->CurrentState()->LineCapMode());
AddInt16((int16)view->CurrentState()->LineJoinMode());
AddFloat(view->CurrentState()->MiterLimit());
EndOp();
// WriteSetPenLocation(view->CurrentState()->PenLocation());
WriteSetPenSize(view->CurrentState()->PenSize());
WriteSetScale(view->CurrentState()->Scale());
WriteSetLineMode(view->CurrentState()->LineCapMode(), view->CurrentState()->LineJoinMode(),
view->CurrentState()->MiterLimit());
/*
BeginOp(B_PIC_SET_STIPLE_PATTERN); BeginOp(B_PIC_SET_STIPLE_PATTERN);
AddData(view->CurrentState()->GetPattern().GetInt8(), sizeof(pattern)); AddData(view->CurrentState()->GetPattern().GetInt8(), sizeof(pattern));
EndOp(); EndOp();
*/
BeginOp(B_PIC_SET_DRAWING_MODE); WriteSetDrawingMode(view->CurrentState()->GetDrawingMode());
AddInt16((int16)view->CurrentState()->GetDrawingMode());
EndOp();
BeginOp(B_PIC_SET_BLENDING_MODE); /*BeginOp(B_PIC_SET_BLENDING_MODE);
AddInt16((int16)view->CurrentState()->AlphaSrcMode()); AddInt16((int16)view->CurrentState()->AlphaSrcMode());
AddInt16((int16)view->CurrentState()->AlphaFncMode()); AddInt16((int16)view->CurrentState()->AlphaFncMode());
EndOp(); EndOp();
BeginOp(B_PIC_SET_FORE_COLOR);
AddColor(view->CurrentState()->HighColor().GetColor32());
EndOp();
BeginOp(B_PIC_SET_BACK_COLOR);
AddColor(view->CurrentState()->LowColor().GetColor32());
EndOp();
EndOp();
*/ */
WriteSetHighColor(view->CurrentState()->HighColor().GetColor32());
WriteSetLowColor(view->CurrentState()->LowColor().GetColor32());
EndOp();
} }