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

Removed Utils.cpp - it's not really useful anymore.

Browse Source 
Note, I temporarily kept the Utils.h in, because I have other local changes to be
committed soon (sorry for this, but it shouldn't harm).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15043 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-20 16:09:16 +00:00
parent ae3ba51fc1
commit d1071ff01b
10 changed files with 30 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Jamfile
-1
View File
@@ -51,7 +51,6 @@ Server app_server :
ServerWindow.cpp ServerWindow.cpp
SubWindowList.cpp SubWindowList.cpp
SystemPalette.cpp SystemPalette.cpp
Utils.cpp
VirtualScreen.cpp VirtualScreen.cpp
WinBorder.cpp WinBorder.cpp
Workspace.cpp Workspace.cpp
src/servers/app/PicturePlayer.cpp
+30 -1
View File
@@ -34,10 +34,39 @@
#include "DrawingEngine.h" #include "DrawingEngine.h"
#include "PictureProtocol.h" #include "PictureProtocol.h"
#include "Utils.h"
#include "PicturePlayer.h" #include "PicturePlayer.h"
BRect
CalculatePolygonBounds(BPoint *pts, int32 pointcount)
{
if (!pts)
return BRect(0,0,0,0);
BRect r(0,0,0,0);
// shamelessly stolen from Marc's BPolygon code and tweaked to fit. :P
r = BRect(pts[0], pts[0]);
for (int32 i = 1; i < 4; i++) {
if (pts[i].x < r.left)
r.left = pts[i].x;
if (pts[i].y < r.top)
r.top = pts[i].y;
if (pts[i].x > r.right)
r.right = pts[i].x;
if (pts[i].y > r.bottom)
r.bottom = pts[i].y;
}
return r;
}
// #pragma mark -
PicturePlayer::PicturePlayer(DrawingEngine *d,void *data, int32 size) PicturePlayer::PicturePlayer(DrawingEngine *d,void *data, int32 size)
: fData(data, size) : fData(data, size)
{ {
src/servers/app/Utils.cpp
-334
View File
@@ -1,334 +0,0 @@
/*
* Copyright 2001-2005, Haiku, Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* DarkWyrm <[email protected]>
*/
/** Miscellaneous utility functions */
#include "Utils.h"
#include <Entry.h>
#include <GraphicsDefs.h>
#include <String.h>
#include <stdio.h>
/*!
\brief Send a BMessage to a Looper target
\param port Receiver port of the targeted Looper
\param BMessage to send
This SendMessage takes ownership of the message sent, so deleting them after this
call is unnecessary. Passing an invalid port will have unpredictable results.
*/
void
SendMessage(port_id port, BMessage *message, int32 target)
{
if (!message)
return;
#ifndef USING_MESSAGE4
if (target == -1)
_set_message_target_(message, target, true);
else
_set_message_target_(message, target, false);
#else
BMessage::Private(message).SetTarget(target, target == -1);
#endif
ssize_t size = message->FlattenedSize();
char *buffer = new char[size];
if (message->Flatten(buffer, size)==B_OK)
write_port(port, message->what, buffer, size);
delete [] buffer;
delete message;
}
#ifndef USING_MESSAGE4
/*
Below are friend functions for BMessage which currently are not in the Message.cpp
that we need to send messages to BLoopers and such. Placed here to allow compilation.
*/
void
_set_message_target_(BMessage *msg, int32 target, bool preferred)
{
if (preferred) {
msg->fTarget = -1;
msg->fPreferred = true;
} else {
msg->fTarget = target;
msg->fPreferred = false;
}
}
int32
_get_message_target_(BMessage *msg)
{
if (msg->fPreferred)
return -1;
return msg->fTarget;
}
bool
_use_preferred_target_(BMessage *msg)
{
return msg->fPreferred;
}
#endif
const char *
MsgCodeToString(int32 code)
{
// Used to translate BMessage message codes back to a character
// format
char string [10];
sprintf(string, "'%c%c%c%c'", (char)((code & 0xFF000000) >> 24),
(char)((code & 0x00FF0000) >> 16),
(char)((code & 0x0000FF00) >> 8),
(char)((code & 0x000000FF)) );
return string;
}
BString
MsgCodeToBString(int32 code)
{
// Used to translate BMessage message codes back to a character
// format
char buffer[10];
sprintf(buffer, "'%c%c%c%c'", (char)((code & 0xFF000000) >> 24),
(char)((code & 0x00FF0000) >> 16),
(char)((code & 0x0000FF00) >> 8),
(char)((code & 0x000000FF)) );
BString string(buffer);
return string;
}
status_t
ConvertModeToDisplayMode(uint32 mode, display_mode *dmode)
{
if (!mode)
return B_BAD_VALUE;
switch (mode) {
case B_8_BIT_640x400:
{
dmode->virtual_width=640;
dmode->virtual_height=400;
dmode->space=B_CMAP8;
break;
}
case B_8_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_RGB32;
break;
}
default:
return B_ERROR;
}
return B_OK;
}
BRect
CalculatePolygonBounds(BPoint *pts, int32 pointcount)
{
if (!pts)
return BRect(0,0,0,0);
BRect r(0,0,0,0);
// shamelessly stolen from Marc's BPolygon code and tweaked to fit. :P
r = BRect(pts[0], pts[0]);
for (int32 i = 1; i < 4; i++) {
if (pts[i].x < r.left)
r.left = pts[i].x;
if (pts[i].y < r.top)
r.top = pts[i].y;
if (pts[i].x > r.right)
r.right = pts[i].x;
if (pts[i].y > r.bottom)
r.bottom = pts[i].y;
}
return r;
}
src/servers/app/Utils.h
-13
View File
@@ -27,17 +27,4 @@
#ifndef UTILS_H_ #ifndef UTILS_H_
#define UTILS_H_ #define UTILS_H_
#include <Message.h>
#include <OS.h>
#include <Accelerant.h>
#ifdef USING_MESSAGE4
#include <MessagePrivate.h>
#endif
void SendMessage(port_id port, BMessage *message, int32 target=-1);
const char *MsgCodeToString(int32 code);
BString MsgCodeToBString(int32 code);
status_t ConvertModeToDisplayMode(uint32 mode, display_mode *dmode);
BRect CalculatePolygonBounds(BPoint *pts, int32 pointcount);
#endif #endif
src/tests/apps/fake_app_server/AppServer.cpp
-1
View File
@@ -42,7 +42,6 @@
#include "ServerCursor.h" #include "ServerCursor.h"
#include "ServerProtocol.h" #include "ServerProtocol.h"
#include "SystemPalette.h" #include "SystemPalette.h"
#include "Utils.h"
#include "AppServer.h" #include "AppServer.h"
src/tests/apps/fake_app_server/Jamfile
-1
View File
@@ -12,6 +12,5 @@ Server fake_app_server :
AppServer.cpp AppServer.cpp
ServerApp.cpp ServerApp.cpp
BGet++.cpp BGet++.cpp
Utils.cpp
: libroot.so libbe.so : libroot.so libbe.so
; ;
src/tests/apps/fake_app_server/ServerApp.cpp
-1
View File
@@ -31,7 +31,6 @@
#include "ServerBitmap.h" #include "ServerBitmap.h"
#include "ServerConfig.h" #include "ServerConfig.h"
#include "SystemPalette.h" #include "SystemPalette.h"
#include "Utils.h"
//#define DEBUG_SERVERAPP //#define DEBUG_SERVERAPP
src/tests/apps/fake_app_server/Utils.cpp
-333
View File
@@ -1,333 +0,0 @@
//------------------------------------------------------------------------------
// Copyright (c) 2001-2002, Haiku
//
// 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: Utils.cpp
// Author: DarkWyrm <[email protected]>
// Description: Miscellaneous utility functions
//
//------------------------------------------------------------------------------
#include <Entry.h>
#include <stdio.h>
#include "Utils.h"
#include <String.h>
/*!
\brief Send a BMessage to a Looper target
\param port Receiver port of the targeted Looper
\param BMessage to send
This SendMessage takes ownership of the message sent, so deleting them after this
call is unnecessary. Passing an invalid port will have unpredictable results.
*/
void SendMessage(port_id port, BMessage *message, int32 target)
{
if(!message)
return;
#ifndef USING_MESSAGE4
if(target==-1)
_set_message_target_(message,target,true);
else
_set_message_target_(message,target,false);
#else
BMessage::Private(message).SetTarget(target, target == -1);
#endif
ssize_t flatsize=message->FlattenedSize();
char *buffer=new char[flatsize];
if(message->Flatten(buffer,flatsize)==B_OK)
write_port(port, message->what, buffer,flatsize);
delete [] buffer;
delete message;
}
#ifndef USING_MESSAGE4
/*
Below are friend functions for BMessage which currently are not in the Message.cpp
that we need to send messages to BLoopers and such. Placed here to allow compilation.
*/
void _set_message_target_(BMessage *msg, int32 target, bool preferred)
{
if (preferred)
{
msg->fTarget = -1;
msg->fPreferred = true;
}
else
{
msg->fTarget = target;
msg->fPreferred = false;
}
}
int32 _get_message_target_(BMessage *msg)
{
if (msg->fPreferred)
return -1;
else
return msg->fTarget;
}
bool _use_preferred_target_(BMessage *msg)
{
return msg->fPreferred;
}
#endif // !USING_MESSAGE4
const char *MsgCodeToString(int32 code)
{
// Used to translate BMessage message codes back to a character
// format
char string [10];
sprintf(string,"'%x%x%x%x'",(char)((code & 0xFF000000) >> 24),
(char)((code & 0x00FF0000) >> 16),
(char)((code & 0x0000FF00) >> 8),
(char)((code & 0x000000FF)) );
return string;
}
BString MsgCodeToBString(int32 code)
{
// Used to translate BMessage message codes back to a character
// format
char string [10];
sprintf(string,"'%x%x%x%x'",(char)((code & 0xFF000000) >> 24),
(char)((code & 0x00FF0000) >> 16),
(char)((code & 0x0000FF00) >> 8),
(char)((code & 0x000000FF)) );
BString bstring(string);
return bstring;
}
status_t ConvertModeToDisplayMode(uint32 mode, display_mode *dmode)
{
if(!mode)
return B_BAD_VALUE;
switch(mode)
{
case B_8_BIT_640x400:
{
dmode->virtual_width=640;
dmode->virtual_height=400;
dmode->space=B_CMAP8;
break;
}
case B_8_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_640x480:
{
dmode->virtual_width=640;
dmode->virtual_height=480;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_800x600:
{
dmode->virtual_width=800;
dmode->virtual_height=600;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1024x768:
{
dmode->virtual_width=1024;
dmode->virtual_height=768;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1152x900:
{
dmode->virtual_width=1152;
dmode->virtual_height=900;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1280x1024:
{
dmode->virtual_width=1280;
dmode->virtual_height=1024;
dmode->space=B_RGB32;
break;
}
case B_8_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_CMAP8;
break;
}
case B_15_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_RGB15;
break;
}
case B_16_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_RGB16;
break;
}
case B_32_BIT_1600x1200:
{
dmode->virtual_width=1600;
dmode->virtual_height=1200;
dmode->space=B_RGB32;
break;
}
default:
return B_ERROR;
}
return B_OK;
}
BRect CalculatePolygonBounds(BPoint *pts, int32 pointcount)
{
if(!pts)
return BRect(0,0,0,0);
BRect r(0,0,0,0);
// shamelessly stolen from Marc's BPolygon code and tweaked to fit. :P
r = BRect(pts[0], pts[0]);
for (int32 i = 1; i < 4; i++)
{
if (pts[i].x < r.left)
r.left = pts[i].x;
if (pts[i].y < r.top)
r.top = pts[i].y;
if (pts[i].x > r.right)
r.right = pts[i].x;
if (pts[i].y > r.bottom)
r.bottom = pts[i].y;
}
return r;
}
src/tests/apps/fake_app_server/Utils.h
-43
View File
@@ -1,43 +0,0 @@
//------------------------------------------------------------------------------
// Copyright (c) 2001-2002, Haiku
//
// 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: Utils.h
// Author: DarkWyrm <[email protected]>
// Description: Miscellaneous utility functions
//
//------------------------------------------------------------------------------
#ifndef UTILS_H_
#define UTILS_H_
#include <Message.h>
#include <OS.h>
#include <Accelerant.h>
#ifdef USING_MESSAGE4
#include <MessagePrivate.h>
#endif
void SendMessage(port_id port, BMessage *message, int32 target=-1);
const char *MsgCodeToString(int32 code);
BString MsgCodeToBString(int32 code);
status_t ConvertModeToDisplayMode(uint32 mode, display_mode *dmode);
BRect CalculatePolygonBounds(BPoint *pts, int32 pointcount);
#endif
src/tests/servers/app/Jamfile
-1
View File
@@ -62,7 +62,6 @@ SharedLibrary libhaikuappserver.so :
ServerFont.cpp ServerFont.cpp
FontManager.cpp FontManager.cpp
SystemPalette.cpp SystemPalette.cpp
Utils.cpp
# drawing # drawing
PatternHandler.cpp PatternHandler.cpp