Removed PicturePlayer, it only contains code duplicated from TPicture. Some cleanups for BPicture. This commit also completes previous commit for BMenu
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16002 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
parent
ffa2503b55
commit
9e8d2dd28b
@ -1,118 +1,107 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// Copyright (c) 2001-2002, OpenBeOS
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
// and/or sell copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// File Name: TPicture.h
|
||||
// Author: Marc Flerackers (mflerackers@androme.be)
|
||||
// Description: TPicture is used to create and play picture data.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#ifndef _TPICTURE_H
|
||||
#define _TPICTURE_H
|
||||
|
||||
// Standard Includes -----------------------------------------------------------
|
||||
|
||||
// System Includes -------------------------------------------------------------
|
||||
#include <GraphicsDefs.h>
|
||||
#include <Point.h>
|
||||
#include <Rect.h>
|
||||
#include <DataIO.h>
|
||||
|
||||
// Project Includes ------------------------------------------------------------
|
||||
|
||||
// Local Includes --------------------------------------------------------------
|
||||
|
||||
// Local Defines ---------------------------------------------------------------
|
||||
|
||||
// Globals ---------------------------------------------------------------------
|
||||
|
||||
// TPicture class --------------------------------------------------------------
|
||||
class TPicture {
|
||||
public:
|
||||
TPicture();
|
||||
TPicture(void *data, int32 size, BList &pictures);
|
||||
virtual ~TPicture();
|
||||
|
||||
int16 GetOp();
|
||||
bool GetBool();
|
||||
int16 GetInt8();
|
||||
int16 GetInt16();
|
||||
int32 GetInt32();
|
||||
int64 GetInt64();
|
||||
float GetFloat();
|
||||
BPoint GetCoord();
|
||||
BRect GetRect();
|
||||
rgb_color GetColor();
|
||||
//void GetString(char *);
|
||||
|
||||
void *GetData(int32);
|
||||
void GetData(void *data, int32 size);
|
||||
|
||||
void AddInt8(int8);
|
||||
void AddInt16(int16);
|
||||
void AddInt32(int32);
|
||||
void AddInt64(int64);
|
||||
void AddFloat(float);
|
||||
void AddCoord(BPoint);
|
||||
void AddRect(BRect);
|
||||
void AddColor(rgb_color);
|
||||
void AddString(char *);
|
||||
|
||||
void AddData(void *data, int32 size);
|
||||
|
||||
// SwapOp();
|
||||
// SwapInt8();
|
||||
// SwapInt16();
|
||||
// SwapInt32();
|
||||
// SwapInt64();
|
||||
// SwapFloat();
|
||||
// SwapCoord();
|
||||
// SwapRect();
|
||||
// SwapIRect();
|
||||
// SwapColor();
|
||||
// SwapString();
|
||||
|
||||
// Swap();
|
||||
|
||||
// CheckPattern();
|
||||
|
||||
void BeginOp(int32);
|
||||
void EndOp();
|
||||
|
||||
void EnterStateChange();
|
||||
void ExitStateChange();
|
||||
|
||||
void EnterFontChange();
|
||||
void ExitFontChange();
|
||||
|
||||
status_t Play(void **callBackTable, int32 tableEntries,
|
||||
void *userData);
|
||||
status_t Rewind();
|
||||
|
||||
private:
|
||||
BMemoryIO fData;
|
||||
int32 fSize;
|
||||
BList &fPictures;
|
||||
};
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
//status_t do_playback(void *, long, BArray<BPicture *> &, void **, long, void *)
|
||||
|
||||
#endif // _TPICTURE_H
|
||||
//------------------------------------------------------------------------------
|
||||
// Copyright (c) 2001-2002, OpenBeOS
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
// and/or sell copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// File Name: TPicture.h
|
||||
// Author: Marc Flerackers (mflerackers@androme.be)
|
||||
// Description: TPicture is used to create and play picture data.
|
||||
//------------------------------------------------------------------------------
|
||||
#ifndef _TPICTURE_H
|
||||
#define _TPICTURE_H
|
||||
|
||||
|
||||
#include <GraphicsDefs.h>
|
||||
#include <Point.h>
|
||||
#include <Rect.h>
|
||||
#include <DataIO.h>
|
||||
|
||||
|
||||
class TPicture {
|
||||
public:
|
||||
TPicture();
|
||||
TPicture(void *data, int32 size, BList *pictures);
|
||||
virtual ~TPicture();
|
||||
|
||||
int16 GetOp();
|
||||
bool GetBool();
|
||||
int16 GetInt8();
|
||||
int16 GetInt16();
|
||||
int32 GetInt32();
|
||||
int64 GetInt64();
|
||||
float GetFloat();
|
||||
BPoint GetCoord();
|
||||
BRect GetRect();
|
||||
rgb_color GetColor();
|
||||
//void GetString(char *);
|
||||
|
||||
void *GetData(int32);
|
||||
void GetData(void *data, int32 size);
|
||||
|
||||
void AddInt8(int8);
|
||||
void AddInt16(int16);
|
||||
void AddInt32(int32);
|
||||
void AddInt64(int64);
|
||||
void AddFloat(float);
|
||||
void AddCoord(BPoint);
|
||||
void AddRect(BRect);
|
||||
void AddColor(rgb_color);
|
||||
void AddString(char *);
|
||||
|
||||
void AddData(void *data, int32 size);
|
||||
|
||||
// SwapOp();
|
||||
// SwapInt8();
|
||||
// SwapInt16();
|
||||
// SwapInt32();
|
||||
// SwapInt64();
|
||||
// SwapFloat();
|
||||
// SwapCoord();
|
||||
// SwapRect();
|
||||
// SwapIRect();
|
||||
// SwapColor();
|
||||
// SwapString();
|
||||
|
||||
// Swap();
|
||||
|
||||
// CheckPattern();
|
||||
|
||||
void BeginOp(int32);
|
||||
void EndOp();
|
||||
|
||||
void EnterStateChange();
|
||||
void ExitStateChange();
|
||||
|
||||
void EnterFontChange();
|
||||
void ExitFontChange();
|
||||
|
||||
status_t Play(void **callBackTable, int32 tableEntries,
|
||||
void *userData);
|
||||
status_t Rewind();
|
||||
|
||||
private:
|
||||
BMemoryIO fData;
|
||||
int32 fSize;
|
||||
BList *fPictures;
|
||||
};
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
status_t do_playback(void *, long, BList *, void **, long, void *);
|
||||
|
||||
#endif // _TPICTURE_H
|
||||
|
||||
@ -196,11 +196,14 @@ BMenuItem::SetLabel(const char *string)
|
||||
void
|
||||
BMenuItem::SetEnabled(bool state)
|
||||
{
|
||||
if (fSubmenu != NULL)
|
||||
fSubmenu->SetEnabled(state);
|
||||
if (fEnabled == state)
|
||||
return;
|
||||
|
||||
fEnabled = state;
|
||||
|
||||
if (fSubmenu != NULL)
|
||||
fSubmenu->SetEnabled(state);
|
||||
|
||||
BMenu *menu = Menu();
|
||||
if (menu != NULL && menu->LockLooper()) {
|
||||
menu->Invalidate(fBounds);
|
||||
|
||||
@ -71,10 +71,6 @@ private:
|
||||
};
|
||||
|
||||
|
||||
status_t do_playback(void * data, int32 size, BList& pictures,
|
||||
void **callBackTable, int32 tableEntries, void *user);
|
||||
|
||||
|
||||
BPicture::BPicture()
|
||||
:
|
||||
token(-1),
|
||||
@ -265,7 +261,8 @@ BPicture::Play(void **callBackTable, int32 tableEntries, void *user)
|
||||
if (!assert_local_copy())
|
||||
return B_ERROR;
|
||||
|
||||
return do_playback(const_cast<void *>(extent->Data()), extent->Size(), extent->Pictures(),
|
||||
BList &pictures = extent->Pictures();
|
||||
return do_playback(const_cast<void *>(extent->Data()), extent->Size(), &pictures,
|
||||
callBackTable, tableEntries, user);
|
||||
}
|
||||
|
||||
@ -584,7 +581,7 @@ BPicture::step_down()
|
||||
|
||||
|
||||
status_t
|
||||
do_playback(void * data, int32 size, BList& pictures,
|
||||
do_playback(void * data, int32 size, BList* pictures,
|
||||
void **callBackTable, int32 tableEntries, void *user)
|
||||
{
|
||||
TPicture picture(data, size, pictures);
|
||||
|
||||
@ -1,490 +1,490 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// Copyright (c) 2001-2002, OpenBeOS
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
// and/or sell copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// File Name: TPicture.cpp
|
||||
// Author: Marc Flerackers (mflerackers@androme.be)
|
||||
// Description: TPicture is used to create and play picture data.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// Standard Includes -----------------------------------------------------------
|
||||
#include <stdio.h>
|
||||
|
||||
// System Includes -------------------------------------------------------------
|
||||
#include <TPicture.h>
|
||||
#include <PictureProtocol.h>
|
||||
|
||||
// Project Includes ------------------------------------------------------------
|
||||
|
||||
// Local Includes --------------------------------------------------------------
|
||||
|
||||
// Local Defines ---------------------------------------------------------------
|
||||
|
||||
// Globals ---------------------------------------------------------------------
|
||||
|
||||
typedef void (*fnc)(void*);
|
||||
typedef void (*fnc_BPoint)(void*, BPoint);
|
||||
typedef void (*fnc_BPointBPoint)(void*, BPoint, BPoint);
|
||||
typedef void (*fnc_BRect)(void*, BRect);
|
||||
typedef void (*fnc_BRectBPoint)(void*, BRect, BPoint);
|
||||
typedef void (*fnc_PBPoint)(void*, BPoint*);
|
||||
typedef void (*fnc_i)(void*, int32);
|
||||
typedef void (*fnc_iPBPointb)(void*, int32, BPoint*, bool);
|
||||
typedef void (*fnc_iPBPoint)(void*, int32, BPoint*);
|
||||
typedef void (*fnc_Pc)(void*, char*);
|
||||
typedef void (*fnc_Pcff)(void*, char*, float, float);
|
||||
typedef void (*fnc_BPointBPointff)(void*, BPoint, BPoint, float, float);
|
||||
typedef void (*fnc_s)(void*, int16);
|
||||
typedef void (*fnc_ssf)(void*, int16, int16, float);
|
||||
typedef void (*fnc_f)(void*, float);
|
||||
typedef void (*fnc_Color)(void*, rgb_color);
|
||||
typedef void (*fnc_Pattern)(void*, pattern);
|
||||
typedef void (*fnc_PBRecti)(void*, BRect*, int32);
|
||||
typedef void (*fnc_DrawPixels)(void *, BRect, BRect, int32, int32, int32,
|
||||
int32, int32, void*);
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
TPicture::TPicture(void *data, int32 size, BList &pictures)
|
||||
: fData(data, size),
|
||||
fPictures(pictures)
|
||||
{
|
||||
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
TPicture::~TPicture()
|
||||
{
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
int16 TPicture::GetOp()
|
||||
{
|
||||
int16 data;
|
||||
|
||||
fData.Read(&data, sizeof(int16));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
bool TPicture::GetBool()
|
||||
{
|
||||
bool data;
|
||||
|
||||
fData.Read(&data, sizeof(bool));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
int16 TPicture::GetInt16()
|
||||
{
|
||||
int16 data;
|
||||
|
||||
fData.Read(&data, sizeof(int16));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
int32 TPicture::GetInt32()
|
||||
{
|
||||
int32 data;
|
||||
|
||||
fData.Read(&data, sizeof(int32));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
float TPicture::GetFloat()
|
||||
{
|
||||
float data;
|
||||
|
||||
fData.Read(&data, sizeof(float));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
BPoint TPicture::GetCoord()
|
||||
{
|
||||
BPoint data;
|
||||
|
||||
fData.Read(&data, sizeof(BPoint));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
BRect TPicture::GetRect()
|
||||
{
|
||||
BRect data;
|
||||
|
||||
fData.Read(&data, sizeof(BRect));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
rgb_color TPicture::GetColor()
|
||||
{
|
||||
rgb_color data;
|
||||
|
||||
fData.Read(&data, sizeof(rgb_color));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
void TPicture::GetData(void *data, int32 size)
|
||||
{
|
||||
fData.Read(data, size);
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
status_t TPicture::Play(void **callBackTable, int32 tableEntries,
|
||||
void *userData)
|
||||
{
|
||||
// TODO: we should probably check if the functions in the table are not 0
|
||||
// before calling them.
|
||||
|
||||
int16 op=0;
|
||||
int32 size=0;
|
||||
off_t pos=0;
|
||||
|
||||
while (fData.Position() < size)
|
||||
{
|
||||
op = GetOp();
|
||||
size = GetInt32();
|
||||
pos = fData.Position();
|
||||
|
||||
switch (op)
|
||||
{
|
||||
case B_PIC_MOVE_PEN_BY:
|
||||
{
|
||||
BPoint where = GetCoord();
|
||||
((fnc_BPoint)callBackTable[1])(userData, where);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_LINE:
|
||||
{
|
||||
BPoint start = GetCoord();
|
||||
BPoint end = GetCoord();
|
||||
((fnc_BPointBPoint)callBackTable[2])(userData, start, end);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
((fnc_BRect)callBackTable[3])(userData, rect);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
((fnc_BRect)callBackTable[4])(userData, rect);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ROUND_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint radii = GetCoord();
|
||||
((fnc_BRectBPoint)callBackTable[5])(userData, rect, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ROUND_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint radii = GetCoord();
|
||||
((fnc_BRectBPoint)callBackTable[6])(userData, rect, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_BEZIER:
|
||||
{
|
||||
BPoint control[4];
|
||||
GetData(control, sizeof(control));
|
||||
((fnc_PBPoint)callBackTable[7])(userData, control);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_BEZIER:
|
||||
{
|
||||
BPoint control[4];
|
||||
GetData(control, sizeof(control));
|
||||
((fnc_PBPoint)callBackTable[8])(userData, control);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_POLYGON:
|
||||
{
|
||||
int32 numPoints = GetInt32();
|
||||
BPoint *points = new BPoint[numPoints];
|
||||
GetData(points, numPoints * sizeof(BPoint));
|
||||
bool isClosed = GetBool();
|
||||
((fnc_iPBPointb)callBackTable[13])(userData, numPoints, points, isClosed);
|
||||
delete points;
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_POLYGON:
|
||||
{
|
||||
int32 numPoints = GetInt32();
|
||||
BPoint *points = new BPoint[numPoints];
|
||||
GetData(points, numPoints * sizeof(BPoint));
|
||||
((fnc_iPBPoint)callBackTable[14])(userData, numPoints, points);
|
||||
delete points;
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_SHAPE:
|
||||
case B_PIC_FILL_SHAPE:
|
||||
break;
|
||||
case B_PIC_DRAW_STRING:
|
||||
{
|
||||
int32 len = GetInt32();
|
||||
char *string = new char[len + 1];
|
||||
GetData(string, len);
|
||||
string[len] = '\0';
|
||||
float deltax = GetFloat();
|
||||
float deltay = GetFloat();
|
||||
((fnc_Pcff)callBackTable[17])(userData, string, deltax, deltay);
|
||||
delete string;
|
||||
break;
|
||||
}
|
||||
case B_PIC_DRAW_PIXELS:
|
||||
{
|
||||
BRect src = GetRect();
|
||||
BRect dest = GetRect();
|
||||
int32 width = GetInt32();
|
||||
int32 height = GetInt32();
|
||||
int32 bytesPerRow = GetInt32();
|
||||
int32 pixelFormat = GetInt32();
|
||||
int32 flags = GetInt32();
|
||||
char *data = new char[size - (fData.Position() - pos)];
|
||||
GetData(data, size - (fData.Position() - pos));
|
||||
((fnc_DrawPixels)callBackTable[18])(userData, src, dest,
|
||||
width, height, bytesPerRow, pixelFormat, flags, data);
|
||||
delete data;
|
||||
break;
|
||||
}
|
||||
case B_PIC_DRAW_PICTURE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ARC:
|
||||
{
|
||||
BPoint center = GetCoord();
|
||||
BPoint radii = GetCoord();
|
||||
float startTheta = GetFloat();
|
||||
float arcTheta = GetFloat();
|
||||
((fnc_BPointBPointff)callBackTable[9])(userData, center, radii,
|
||||
startTheta, arcTheta);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ARC:
|
||||
{
|
||||
BPoint center = GetCoord();
|
||||
BPoint radii = GetCoord();
|
||||
float startTheta = GetFloat();
|
||||
float arcTheta = GetFloat();
|
||||
((fnc_BPointBPointff)callBackTable[10])(userData, center, radii,
|
||||
startTheta, arcTheta);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ELLIPSE:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint center;
|
||||
BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f);
|
||||
center = rect.LeftTop() + radii;
|
||||
((fnc_BPointBPoint)callBackTable[11])(userData, center, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ELLIPSE:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint center;
|
||||
BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f);
|
||||
center = rect.LeftTop() + radii;
|
||||
((fnc_BPointBPoint)callBackTable[12])(userData, center, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_ENTER_STATE_CHANGE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_CLIPPING_RECTS:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_CLIP_TO_PICTURE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_PUSH_STATE:
|
||||
{
|
||||
((fnc)callBackTable[22])(userData);
|
||||
break;
|
||||
}
|
||||
case B_PIC_POP_STATE:
|
||||
{
|
||||
((fnc)callBackTable[23])(userData);
|
||||
break;
|
||||
}
|
||||
case B_PIC_CLEAR_CLIPPING_RECTS:
|
||||
{
|
||||
((fnc_PBRecti)callBackTable[20])(userData, NULL, 0);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_ORIGIN:
|
||||
{
|
||||
BPoint pt = GetCoord();
|
||||
((fnc_BPoint)callBackTable[28])(userData, pt);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_PEN_LOCATION:
|
||||
{
|
||||
BPoint pt = GetCoord();
|
||||
((fnc_BPoint)callBackTable[29])(userData, pt);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_DRAWING_MODE:
|
||||
{
|
||||
int16 mode = GetInt16();
|
||||
((fnc_s)callBackTable[30])(userData, mode);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_LINE_MODE:
|
||||
{
|
||||
int16 capMode = GetInt16();
|
||||
int16 joinMode = GetInt16();
|
||||
float miterLimit = GetFloat();
|
||||
((fnc_ssf)callBackTable[31])(userData, capMode, joinMode, miterLimit);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_PEN_SIZE:
|
||||
{
|
||||
float size = GetFloat();
|
||||
((fnc_f)callBackTable[32])(userData, size);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_SCALE:
|
||||
{
|
||||
float scale = GetFloat();
|
||||
((fnc_f)callBackTable[36])(userData, scale);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FORE_COLOR:
|
||||
{
|
||||
rgb_color color = GetColor();
|
||||
((fnc_Color)callBackTable[33])(userData, color);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_BACK_COLOR:
|
||||
{
|
||||
rgb_color color = GetColor();
|
||||
((fnc_Color)callBackTable[34])(userData, color);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_STIPLE_PATTERN:
|
||||
{
|
||||
pattern p;
|
||||
GetData(&p, sizeof(p));
|
||||
((fnc_Pattern)callBackTable[35])(userData, p);
|
||||
break;
|
||||
}
|
||||
case B_PIC_ENTER_FONT_STATE:
|
||||
{
|
||||
((fnc)callBackTable[26])(userData);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_BLENDING_MODE:
|
||||
{
|
||||
//int16 alphaSrcMode = GetInt16();
|
||||
//int16 alphaFncMode = GetInt16();
|
||||
//((fnc_Pattern)callBackTable[??])(userData, alphaSrcMode,
|
||||
// alphaFncMode);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_FAMILY:
|
||||
{
|
||||
int32 len = GetInt32();
|
||||
char *string = new char[len + 1];
|
||||
GetData(string, len);
|
||||
string[len] = '\0';
|
||||
((fnc_Pc)callBackTable[37])(userData, string);
|
||||
delete string;
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_STYLE:
|
||||
{
|
||||
int32 len = GetInt32();
|
||||
char *string = new char[len + 1];
|
||||
GetData(string, len);
|
||||
string[len] = '\0';
|
||||
((fnc_Pc)callBackTable[38])(userData, string);
|
||||
delete string;
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_SPACING:
|
||||
{
|
||||
int32 spacing = GetInt32();
|
||||
((fnc_i)callBackTable[39])(userData, spacing);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_ENCODING:
|
||||
{
|
||||
int32 encoding = GetInt32();
|
||||
((fnc_i)callBackTable[42])(userData, encoding);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_FLAGS:
|
||||
{
|
||||
int32 flags = GetInt32();
|
||||
((fnc_i)callBackTable[43])(userData, flags);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_SIZE:
|
||||
{
|
||||
float size = GetFloat();
|
||||
((fnc_f)callBackTable[40])(userData, size);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_ROTATE:
|
||||
{
|
||||
float rotation = GetFloat();
|
||||
((fnc_f)callBackTable[41])(userData, rotation);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_SHEAR:
|
||||
{
|
||||
float shear = GetFloat();
|
||||
((fnc_f)callBackTable[44])(userData, shear);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_FACE:
|
||||
{
|
||||
int32 flags = GetInt32();
|
||||
((fnc_i)callBackTable[46])(userData, flags);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// If we didn't read enough bytes, skip them. This is not a error
|
||||
// since the instructions can change over time.
|
||||
if (fData.Position() - pos < size)
|
||||
fData.Seek(size - (fData.Position() - pos), SEEK_CUR);
|
||||
|
||||
// TODO: what if too much was read, should we return B_ERROR?
|
||||
}
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Copyright (c) 2001-2002, OpenBeOS
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
// and/or sell copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// File Name: TPicture.cpp
|
||||
// Author: Marc Flerackers (mflerackers@androme.be)
|
||||
// Description: TPicture is used to create and play picture data.
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
// Standard Includes -----------------------------------------------------------
|
||||
#include <stdio.h>
|
||||
|
||||
// System Includes -------------------------------------------------------------
|
||||
#include <TPicture.h>
|
||||
#include <PictureProtocol.h>
|
||||
|
||||
// Project Includes ------------------------------------------------------------
|
||||
|
||||
// Local Includes --------------------------------------------------------------
|
||||
|
||||
// Local Defines ---------------------------------------------------------------
|
||||
|
||||
// Globals ---------------------------------------------------------------------
|
||||
|
||||
typedef void (*fnc)(void*);
|
||||
typedef void (*fnc_BPoint)(void*, BPoint);
|
||||
typedef void (*fnc_BPointBPoint)(void*, BPoint, BPoint);
|
||||
typedef void (*fnc_BRect)(void*, BRect);
|
||||
typedef void (*fnc_BRectBPoint)(void*, BRect, BPoint);
|
||||
typedef void (*fnc_PBPoint)(void*, BPoint*);
|
||||
typedef void (*fnc_i)(void*, int32);
|
||||
typedef void (*fnc_iPBPointb)(void*, int32, BPoint*, bool);
|
||||
typedef void (*fnc_iPBPoint)(void*, int32, BPoint*);
|
||||
typedef void (*fnc_Pc)(void*, char*);
|
||||
typedef void (*fnc_Pcff)(void*, char*, float, float);
|
||||
typedef void (*fnc_BPointBPointff)(void*, BPoint, BPoint, float, float);
|
||||
typedef void (*fnc_s)(void*, int16);
|
||||
typedef void (*fnc_ssf)(void*, int16, int16, float);
|
||||
typedef void (*fnc_f)(void*, float);
|
||||
typedef void (*fnc_Color)(void*, rgb_color);
|
||||
typedef void (*fnc_Pattern)(void*, pattern);
|
||||
typedef void (*fnc_PBRecti)(void*, BRect*, int32);
|
||||
typedef void (*fnc_DrawPixels)(void *, BRect, BRect, int32, int32, int32,
|
||||
int32, int32, void*);
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
TPicture::TPicture(void *data, int32 size, BList *pictures)
|
||||
: fData(data, size),
|
||||
fPictures(pictures)
|
||||
{
|
||||
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
TPicture::~TPicture()
|
||||
{
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
int16 TPicture::GetOp()
|
||||
{
|
||||
int16 data;
|
||||
|
||||
fData.Read(&data, sizeof(int16));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
bool TPicture::GetBool()
|
||||
{
|
||||
bool data;
|
||||
|
||||
fData.Read(&data, sizeof(bool));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
int16 TPicture::GetInt16()
|
||||
{
|
||||
int16 data;
|
||||
|
||||
fData.Read(&data, sizeof(int16));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
int32 TPicture::GetInt32()
|
||||
{
|
||||
int32 data;
|
||||
|
||||
fData.Read(&data, sizeof(int32));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
float TPicture::GetFloat()
|
||||
{
|
||||
float data;
|
||||
|
||||
fData.Read(&data, sizeof(float));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
BPoint TPicture::GetCoord()
|
||||
{
|
||||
BPoint data;
|
||||
|
||||
fData.Read(&data, sizeof(BPoint));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
BRect TPicture::GetRect()
|
||||
{
|
||||
BRect data;
|
||||
|
||||
fData.Read(&data, sizeof(BRect));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
rgb_color TPicture::GetColor()
|
||||
{
|
||||
rgb_color data;
|
||||
|
||||
fData.Read(&data, sizeof(rgb_color));
|
||||
|
||||
return data;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
void TPicture::GetData(void *data, int32 size)
|
||||
{
|
||||
fData.Read(data, size);
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
status_t TPicture::Play(void **callBackTable, int32 tableEntries,
|
||||
void *userData)
|
||||
{
|
||||
// TODO: we should probably check if the functions in the table are not 0
|
||||
// before calling them.
|
||||
|
||||
int16 op=0;
|
||||
int32 size=0;
|
||||
off_t pos=0;
|
||||
|
||||
while (fData.Position() < size)
|
||||
{
|
||||
op = GetOp();
|
||||
size = GetInt32();
|
||||
pos = fData.Position();
|
||||
|
||||
switch (op)
|
||||
{
|
||||
case B_PIC_MOVE_PEN_BY:
|
||||
{
|
||||
BPoint where = GetCoord();
|
||||
((fnc_BPoint)callBackTable[1])(userData, where);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_LINE:
|
||||
{
|
||||
BPoint start = GetCoord();
|
||||
BPoint end = GetCoord();
|
||||
((fnc_BPointBPoint)callBackTable[2])(userData, start, end);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
((fnc_BRect)callBackTable[3])(userData, rect);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
((fnc_BRect)callBackTable[4])(userData, rect);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ROUND_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint radii = GetCoord();
|
||||
((fnc_BRectBPoint)callBackTable[5])(userData, rect, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ROUND_RECT:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint radii = GetCoord();
|
||||
((fnc_BRectBPoint)callBackTable[6])(userData, rect, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_BEZIER:
|
||||
{
|
||||
BPoint control[4];
|
||||
GetData(control, sizeof(control));
|
||||
((fnc_PBPoint)callBackTable[7])(userData, control);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_BEZIER:
|
||||
{
|
||||
BPoint control[4];
|
||||
GetData(control, sizeof(control));
|
||||
((fnc_PBPoint)callBackTable[8])(userData, control);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_POLYGON:
|
||||
{
|
||||
int32 numPoints = GetInt32();
|
||||
BPoint *points = new BPoint[numPoints];
|
||||
GetData(points, numPoints * sizeof(BPoint));
|
||||
bool isClosed = GetBool();
|
||||
((fnc_iPBPointb)callBackTable[13])(userData, numPoints, points, isClosed);
|
||||
delete points;
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_POLYGON:
|
||||
{
|
||||
int32 numPoints = GetInt32();
|
||||
BPoint *points = new BPoint[numPoints];
|
||||
GetData(points, numPoints * sizeof(BPoint));
|
||||
((fnc_iPBPoint)callBackTable[14])(userData, numPoints, points);
|
||||
delete points;
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_SHAPE:
|
||||
case B_PIC_FILL_SHAPE:
|
||||
break;
|
||||
case B_PIC_DRAW_STRING:
|
||||
{
|
||||
int32 len = GetInt32();
|
||||
char *string = new char[len + 1];
|
||||
GetData(string, len);
|
||||
string[len] = '\0';
|
||||
float deltax = GetFloat();
|
||||
float deltay = GetFloat();
|
||||
((fnc_Pcff)callBackTable[17])(userData, string, deltax, deltay);
|
||||
delete string;
|
||||
break;
|
||||
}
|
||||
case B_PIC_DRAW_PIXELS:
|
||||
{
|
||||
BRect src = GetRect();
|
||||
BRect dest = GetRect();
|
||||
int32 width = GetInt32();
|
||||
int32 height = GetInt32();
|
||||
int32 bytesPerRow = GetInt32();
|
||||
int32 pixelFormat = GetInt32();
|
||||
int32 flags = GetInt32();
|
||||
char *data = new char[size - (fData.Position() - pos)];
|
||||
GetData(data, size - (fData.Position() - pos));
|
||||
((fnc_DrawPixels)callBackTable[18])(userData, src, dest,
|
||||
width, height, bytesPerRow, pixelFormat, flags, data);
|
||||
delete data;
|
||||
break;
|
||||
}
|
||||
case B_PIC_DRAW_PICTURE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ARC:
|
||||
{
|
||||
BPoint center = GetCoord();
|
||||
BPoint radii = GetCoord();
|
||||
float startTheta = GetFloat();
|
||||
float arcTheta = GetFloat();
|
||||
((fnc_BPointBPointff)callBackTable[9])(userData, center, radii,
|
||||
startTheta, arcTheta);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ARC:
|
||||
{
|
||||
BPoint center = GetCoord();
|
||||
BPoint radii = GetCoord();
|
||||
float startTheta = GetFloat();
|
||||
float arcTheta = GetFloat();
|
||||
((fnc_BPointBPointff)callBackTable[10])(userData, center, radii,
|
||||
startTheta, arcTheta);
|
||||
break;
|
||||
}
|
||||
case B_PIC_STROKE_ELLIPSE:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint center;
|
||||
BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f);
|
||||
center = rect.LeftTop() + radii;
|
||||
((fnc_BPointBPoint)callBackTable[11])(userData, center, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_FILL_ELLIPSE:
|
||||
{
|
||||
BRect rect = GetRect();
|
||||
BPoint center;
|
||||
BPoint radii((rect.Width() + 1) / 2.0f, (rect.Height() + 1) / 2.0f);
|
||||
center = rect.LeftTop() + radii;
|
||||
((fnc_BPointBPoint)callBackTable[12])(userData, center, radii);
|
||||
break;
|
||||
}
|
||||
case B_PIC_ENTER_STATE_CHANGE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_CLIPPING_RECTS:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_CLIP_TO_PICTURE:
|
||||
{
|
||||
break;
|
||||
}
|
||||
case B_PIC_PUSH_STATE:
|
||||
{
|
||||
((fnc)callBackTable[22])(userData);
|
||||
break;
|
||||
}
|
||||
case B_PIC_POP_STATE:
|
||||
{
|
||||
((fnc)callBackTable[23])(userData);
|
||||
break;
|
||||
}
|
||||
case B_PIC_CLEAR_CLIPPING_RECTS:
|
||||
{
|
||||
((fnc_PBRecti)callBackTable[20])(userData, NULL, 0);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_ORIGIN:
|
||||
{
|
||||
BPoint pt = GetCoord();
|
||||
((fnc_BPoint)callBackTable[28])(userData, pt);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_PEN_LOCATION:
|
||||
{
|
||||
BPoint pt = GetCoord();
|
||||
((fnc_BPoint)callBackTable[29])(userData, pt);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_DRAWING_MODE:
|
||||
{
|
||||
int16 mode = GetInt16();
|
||||
((fnc_s)callBackTable[30])(userData, mode);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_LINE_MODE:
|
||||
{
|
||||
int16 capMode = GetInt16();
|
||||
int16 joinMode = GetInt16();
|
||||
float miterLimit = GetFloat();
|
||||
((fnc_ssf)callBackTable[31])(userData, capMode, joinMode, miterLimit);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_PEN_SIZE:
|
||||
{
|
||||
float size = GetFloat();
|
||||
((fnc_f)callBackTable[32])(userData, size);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_SCALE:
|
||||
{
|
||||
float scale = GetFloat();
|
||||
((fnc_f)callBackTable[36])(userData, scale);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FORE_COLOR:
|
||||
{
|
||||
rgb_color color = GetColor();
|
||||
((fnc_Color)callBackTable[33])(userData, color);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_BACK_COLOR:
|
||||
{
|
||||
rgb_color color = GetColor();
|
||||
((fnc_Color)callBackTable[34])(userData, color);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_STIPLE_PATTERN:
|
||||
{
|
||||
pattern p;
|
||||
GetData(&p, sizeof(p));
|
||||
((fnc_Pattern)callBackTable[35])(userData, p);
|
||||
break;
|
||||
}
|
||||
case B_PIC_ENTER_FONT_STATE:
|
||||
{
|
||||
((fnc)callBackTable[26])(userData);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_BLENDING_MODE:
|
||||
{
|
||||
//int16 alphaSrcMode = GetInt16();
|
||||
//int16 alphaFncMode = GetInt16();
|
||||
//((fnc_Pattern)callBackTable[??])(userData, alphaSrcMode,
|
||||
// alphaFncMode);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_FAMILY:
|
||||
{
|
||||
int32 len = GetInt32();
|
||||
char *string = new char[len + 1];
|
||||
GetData(string, len);
|
||||
string[len] = '\0';
|
||||
((fnc_Pc)callBackTable[37])(userData, string);
|
||||
delete string;
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_STYLE:
|
||||
{
|
||||
int32 len = GetInt32();
|
||||
char *string = new char[len + 1];
|
||||
GetData(string, len);
|
||||
string[len] = '\0';
|
||||
((fnc_Pc)callBackTable[38])(userData, string);
|
||||
delete string;
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_SPACING:
|
||||
{
|
||||
int32 spacing = GetInt32();
|
||||
((fnc_i)callBackTable[39])(userData, spacing);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_ENCODING:
|
||||
{
|
||||
int32 encoding = GetInt32();
|
||||
((fnc_i)callBackTable[42])(userData, encoding);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_FLAGS:
|
||||
{
|
||||
int32 flags = GetInt32();
|
||||
((fnc_i)callBackTable[43])(userData, flags);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_SIZE:
|
||||
{
|
||||
float size = GetFloat();
|
||||
((fnc_f)callBackTable[40])(userData, size);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_ROTATE:
|
||||
{
|
||||
float rotation = GetFloat();
|
||||
((fnc_f)callBackTable[41])(userData, rotation);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_SHEAR:
|
||||
{
|
||||
float shear = GetFloat();
|
||||
((fnc_f)callBackTable[44])(userData, shear);
|
||||
break;
|
||||
}
|
||||
case B_PIC_SET_FONT_FACE:
|
||||
{
|
||||
int32 flags = GetInt32();
|
||||
((fnc_i)callBackTable[46])(userData, flags);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
// If we didn't read enough bytes, skip them. This is not a error
|
||||
// since the instructions can change over time.
|
||||
if (fData.Position() - pos < size)
|
||||
fData.Seek(size - (fData.Position() - pos), SEEK_CUR);
|
||||
|
||||
// TODO: what if too much was read, should we return B_ERROR?
|
||||
}
|
||||
|
||||
return B_OK;
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@ -36,7 +36,6 @@ Server app_server :
|
||||
OffscreenServerWindow.cpp
|
||||
OffscreenWindowLayer.cpp
|
||||
PNGDump.cpp
|
||||
PicturePlayer.cpp
|
||||
RAMLinkMsgReader.cpp
|
||||
RGBColor.cpp
|
||||
ScreenManager.cpp
|
||||
|
||||
@ -611,6 +611,6 @@ ServerPicture::SyncState(ViewLayer *view)
|
||||
void
|
||||
ServerPicture::Play(ViewLayer *view)
|
||||
{
|
||||
//TPicture picture((void *)fData.Buffer(), fData.BufferLength(), NULL);
|
||||
//picture.Play((void *)tableEntries, sizeof(tableEntries) / sizeof(void*), view);
|
||||
TPicture picture(const_cast<void *>(fData.Buffer()), fData.BufferLength(), NULL);
|
||||
picture.Play(const_cast<void **>(tableEntries), sizeof(tableEntries) / sizeof(void *), view);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user