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

* Rewrote BeBuild.h which had "a few" consequences (got rid of all those class

Browse Source 
definitions).
* Minor cleanup here and there.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22577 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-10-15 20:13:55 +00:00
parent 4f6e481644
commit f6e4cbb952
135 changed files with 844 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Deskbar.h
+2 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _DESKBAR_H
@@ -11,6 +11,7 @@
class BMessenger;
class BView;
struct entry_ref;
enum deskbar_location {
headers/os/interface/Dragger.h
+2 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _DRAGGER_H
@@ -12,6 +12,7 @@
class BBitmap;
class BMessage;
class BPopUpMenu;
class BShelf;
namespace BPrivate {
headers/os/interface/Font.h
+3 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2005, Haiku, Inc. All Rights Reserved.
* Copyright 2005-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _FONT_H_
@@ -9,6 +9,8 @@
#include <SupportDefs.h>
#include <InterfaceDefs.h>
class BPoint;
#define B_FONT_FAMILY_LENGTH 63
#define B_FONT_STYLE_LENGTH 63
headers/os/interface/GraphicsDefs.h
+14 -14
View File
@@ -65,9 +65,9 @@ operator!=(const pattern& a, const pattern& b)
#endif // __cplusplus
extern _IMPEXP_BE const pattern B_SOLID_HIGH;
extern _IMPEXP_BE const pattern B_MIXED_COLORS;
extern _IMPEXP_BE const pattern B_SOLID_LOW;
extern const pattern B_SOLID_HIGH;
extern const pattern B_MIXED_COLORS;
extern const pattern B_SOLID_LOW;
//------------------------------------------------------------------------------
@@ -115,15 +115,15 @@ make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha = 255)
//------------------------------------------------------------------------------
extern _IMPEXP_BE const rgb_color B_TRANSPARENT_COLOR;
extern _IMPEXP_BE const uint8 B_TRANSPARENT_MAGIC_CMAP8;
extern _IMPEXP_BE const uint16 B_TRANSPARENT_MAGIC_RGBA15;
extern _IMPEXP_BE const uint16 B_TRANSPARENT_MAGIC_RGBA15_BIG;
extern _IMPEXP_BE const uint32 B_TRANSPARENT_MAGIC_RGBA32;
extern _IMPEXP_BE const uint32 B_TRANSPARENT_MAGIC_RGBA32_BIG;
extern const rgb_color B_TRANSPARENT_COLOR;
extern const uint8 B_TRANSPARENT_MAGIC_CMAP8;
extern const uint16 B_TRANSPARENT_MAGIC_RGBA15;
extern const uint16 B_TRANSPARENT_MAGIC_RGBA15_BIG;
extern const uint32 B_TRANSPARENT_MAGIC_RGBA32;
extern const uint32 B_TRANSPARENT_MAGIC_RGBA32_BIG;
extern _IMPEXP_BE const uint8 B_TRANSPARENT_8_BIT;
extern _IMPEXP_BE const rgb_color B_TRANSPARENT_32_BIT;
extern const uint8 B_TRANSPARENT_8_BIT;
extern const rgb_color B_TRANSPARENT_32_BIT;
//------------------------------------------------------------------------------
@@ -160,7 +160,7 @@ typedef struct overlay_restrictions {
struct screen_id { int32 id; };
extern _IMPEXP_BE const struct screen_id B_MAIN_SCREEN_ID;
extern const struct screen_id B_MAIN_SCREEN_ID;
//------------------------------------------------------------------------------
@@ -272,7 +272,7 @@ enum {
B_VIEWS_SUPPORT_DRAW_BITMAP = 0x1,
B_BITMAPS_SUPPORT_ATTACHED_VIEWS = 0x2
};
_IMPEXP_BE bool bitmaps_support_space(color_space space, uint32 * support_flags);
bool bitmaps_support_space(color_space space, uint32 * support_flags);
//------------------------------------------------------------------------------
// "pixel_chunk" is the native increment from one pixel starting on an integral byte
@@ -281,7 +281,7 @@ _IMPEXP_BE bool bitmaps_support_space(color_space space, uint32 * support_flags)
// sets pixel_chunk to 1, row_alignment to 4 and pixels_per_chunk to 8, whereas
// B_RGB24 sets pixel_chunk to 3, row_alignment to 4 and pixels_per_chunk to 1.
//------------------------------------------------------------------------------
_IMPEXP_BE status_t get_pixel_size_for(color_space space, size_t * pixel_chunk,
status_t get_pixel_size_for(color_space space, size_t * pixel_chunk,
size_t * row_alignment, size_t * pixels_per_chunk);
headers/os/interface/Input.h
+5 -3
View File
@@ -15,6 +15,8 @@
#include <Messenger.h>
#include <SupportDefs.h>
class BList;
enum input_method_op {
B_INPUT_METHOD_STARTED = 0,
@@ -47,9 +49,9 @@ enum input_device_notification {
class BInputDevice;
_IMPEXP_BE BInputDevice* find_input_device(const char *name);
_IMPEXP_BE status_t get_input_devices(BList *list);
_IMPEXP_BE status_t watch_input_devices(BMessenger target, bool start);
BInputDevice* find_input_device(const char *name);
status_t get_input_devices(BList *list);
status_t watch_input_devices(BMessenger target, bool start);
class BInputDevice {
headers/os/interface/InterfaceDefs.h
+42 -42
View File
@@ -251,54 +251,54 @@ enum overlay_options {
/*----------------------------------------------------------------*/
_IMPEXP_BE status_t get_deskbar_frame(BRect *frame);
status_t get_deskbar_frame(BRect *frame);
_IMPEXP_BE const color_map *system_colors();
const color_map *system_colors();
_IMPEXP_BE status_t set_screen_space(int32 index, uint32 res,
bool stick = true);
status_t set_screen_space(int32 index, uint32 res,
bool stick = true);
_IMPEXP_BE status_t get_scroll_bar_info(scroll_bar_info *info);
_IMPEXP_BE status_t set_scroll_bar_info(scroll_bar_info *info);
status_t get_scroll_bar_info(scroll_bar_info *info);
status_t set_scroll_bar_info(scroll_bar_info *info);
_IMPEXP_BE status_t get_mouse_type(int32 *type);
_IMPEXP_BE status_t set_mouse_type(int32 type);
_IMPEXP_BE status_t get_mouse_map(mouse_map *map);
_IMPEXP_BE status_t set_mouse_map(mouse_map *map);
_IMPEXP_BE status_t get_click_speed(bigtime_t *speed);
_IMPEXP_BE status_t set_click_speed(bigtime_t speed);
_IMPEXP_BE status_t get_mouse_speed(int32 *speed);
_IMPEXP_BE status_t set_mouse_speed(int32 speed);
_IMPEXP_BE status_t get_mouse_acceleration(int32 *speed);
_IMPEXP_BE status_t set_mouse_acceleration(int32 speed);
status_t get_mouse_type(int32 *type);
status_t set_mouse_type(int32 type);
status_t get_mouse_map(mouse_map *map);
status_t set_mouse_map(mouse_map *map);
status_t get_click_speed(bigtime_t *speed);
status_t set_click_speed(bigtime_t speed);
status_t get_mouse_speed(int32 *speed);
status_t set_mouse_speed(int32 speed);
status_t get_mouse_acceleration(int32 *speed);
status_t set_mouse_acceleration(int32 speed);
_IMPEXP_BE status_t get_key_repeat_rate(int32 *rate);
_IMPEXP_BE status_t set_key_repeat_rate(int32 rate);
_IMPEXP_BE status_t get_key_repeat_delay(bigtime_t *delay);
_IMPEXP_BE status_t set_key_repeat_delay(bigtime_t delay);
status_t get_key_repeat_rate(int32 *rate);
status_t set_key_repeat_rate(int32 rate);
status_t get_key_repeat_delay(bigtime_t *delay);
status_t set_key_repeat_delay(bigtime_t delay);
_IMPEXP_BE uint32 modifiers();
_IMPEXP_BE status_t get_key_info(key_info *info);
_IMPEXP_BE void get_key_map(key_map **map, char **key_buffer);
_IMPEXP_BE status_t get_keyboard_id(uint16 *id);
_IMPEXP_BE void set_modifier_key(uint32 modifier, uint32 key);
_IMPEXP_BE void set_keyboard_locks(uint32 modifiers);
uint32 modifiers();
status_t get_key_info(key_info *info);
void get_key_map(key_map **map, char **key_buffer);
status_t get_keyboard_id(uint16 *id);
void set_modifier_key(uint32 modifier, uint32 key);
void set_keyboard_locks(uint32 modifiers);
_IMPEXP_BE rgb_color keyboard_navigation_color();
rgb_color keyboard_navigation_color();
_IMPEXP_BE int32 count_workspaces();
_IMPEXP_BE void set_workspace_count(int32 count);
_IMPEXP_BE int32 current_workspace();
_IMPEXP_BE void activate_workspace(int32 workspace);
int32 count_workspaces();
void set_workspace_count(int32 count);
int32 current_workspace();
void activate_workspace(int32 workspace);
_IMPEXP_BE bigtime_t idle_time();
bigtime_t idle_time();
_IMPEXP_BE void run_select_printer_panel();
_IMPEXP_BE void run_add_printer_panel();
_IMPEXP_BE void run_be_about();
void run_select_printer_panel();
void run_add_printer_panel();
void run_be_about();
_IMPEXP_BE void set_focus_follows_mouse(bool follow);
_IMPEXP_BE bool focus_follows_mouse();
void set_focus_follows_mouse(bool follow);
bool focus_follows_mouse();
enum mode_mouse {
B_NORMAL_MOUSE = 0,
@@ -307,8 +307,8 @@ enum mode_mouse {
B_INSTANT_WARP_MOUSE = 7
};
_IMPEXP_BE void set_mouse_mode(mode_mouse mode);
_IMPEXP_BE mode_mouse mouse_mode();
void set_mouse_mode(mode_mouse mode);
mode_mouse mouse_mode();
enum color_which {
B_PANEL_BACKGROUND_COLOR = 1,
@@ -350,10 +350,10 @@ enum color_which {
B_WINDOW_INACTIVE_TEXT_COLOR = 24
};
_IMPEXP_BE rgb_color ui_color(color_which which);
_IMPEXP_BE void set_ui_color(const color_which &which,
rgb_color ui_color(color_which which);
void set_ui_color(const color_which &which,
const rgb_color &color);
_IMPEXP_BE rgb_color tint_color(rgb_color color, float tint);
rgb_color tint_color(rgb_color color, float tint);
extern "C" status_t _init_interface_kit_();
/* effects on standard gray level */
headers/os/interface/ListItem.h
+2 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _LIST_ITEM_H
@@ -10,6 +10,7 @@
#include <Rect.h>
class BFont;
class BList;
class BMessage;
class BOutlineListView;
class BView;
headers/os/interface/Menu.h
+2 -1
View File
@@ -10,8 +10,9 @@
#include <List.h>
#include <View.h>
class BMenuItem;
class BMenu;
class BMenuBar;
class BMenuItem;
namespace BPrivate {
headers/os/interface/Picture.h
+1 -1
View File
@@ -33,7 +33,7 @@
#include <Rect.h>
#include <Archivable.h>
class BDataIO;
class BView;
struct _BPictureExtent_;
headers/os/interface/PrintJob.h
+1
View File
@@ -15,6 +15,7 @@
#include <Picture.h> /* For convenience */
#include <Rect.h>
class BFile;
class BView;
/*----------------------------------------------------------------*/
headers/os/interface/Screen.h
+1
View File
@@ -12,6 +12,7 @@
#include <OS.h>
class BBitmap;
class BWindow;
namespace BPrivate {
headers/os/interface/Shape.h
+47 -53
View File
@@ -1,96 +1,90 @@
/*
* Copyright 2006, Haiku, Inc. All Rights Reserved.
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _SHAPE_H
#define _SHAPE_H
#include <BeBuild.h>
#include <Archivable.h>
class BPoint;
class BRect;
class BShape;
namespace BPrivate {
class ServerLink;
class PicturePlayer;
};
/*----------------------------------------------------------------*/
/*----- BShapeIterator class -------------------------------------*/
class BShapeIterator {
public:
BShapeIterator();
virtual ~BShapeIterator();
virtual ~BShapeIterator();
virtual status_t IterateMoveTo(BPoint *point);
virtual status_t IterateLineTo(int32 lineCount, BPoint *linePts);
virtual status_t IterateBezierTo(int32 bezierCount, BPoint *bezierPts);
virtual status_t IterateClose();
virtual status_t IterateMoveTo(BPoint *point);
virtual status_t IterateLineTo(int32 lineCount, BPoint *linePts);
virtual status_t IterateBezierTo(int32 bezierCount, BPoint *bezierPts);
virtual status_t IterateClose();
status_t Iterate(BShape *shape);
status_t Iterate(BShape *shape);
private:
virtual void _ReservedShapeIterator1();
virtual void _ReservedShapeIterator2();
virtual void _ReservedShapeIterator3();
virtual void _ReservedShapeIterator4();
virtual void _ReservedShapeIterator1();
virtual void _ReservedShapeIterator2();
virtual void _ReservedShapeIterator3();
virtual void _ReservedShapeIterator4();
uint32 reserved[4];
uint32 reserved[4];
};
/*----------------------------------------------------------------*/
/*----- BShape class ---------------------------------------------*/
class BShape : public BArchivable {
public:
BShape();
BShape(const BShape &copyFrom);
BShape(BMessage *data);
virtual ~BShape();
virtual ~BShape();
virtual status_t Archive(BMessage *into, bool deep = true) const;
static BArchivable *Instantiate(BMessage *data);
virtual status_t Archive(BMessage *into, bool deep = true) const;
static BArchivable *Instantiate(BMessage *data);
void Clear();
BRect Bounds() const;
void Clear();
BRect Bounds() const;
status_t AddShape(const BShape *other);
status_t AddShape(const BShape *other);
status_t MoveTo(BPoint point);
status_t LineTo(BPoint linePoint);
status_t BezierTo(BPoint controlPoints[3]);
status_t Close();
/*----- Private or reserved ---------------*/
virtual status_t Perform(perform_code d, void *arg);
status_t MoveTo(BPoint point);
status_t LineTo(BPoint linePoint);
status_t BezierTo(BPoint controlPoints[3]);
status_t Close();
private:
virtual status_t Perform(perform_code d, void *arg);
virtual void _ReservedShape1();
virtual void _ReservedShape2();
virtual void _ReservedShape3();
virtual void _ReservedShape4();
virtual void _ReservedShape1();
virtual void _ReservedShape2();
virtual void _ReservedShape3();
virtual void _ReservedShape4();
friend class BShapeIterator;
friend class BView;
friend class BFont;
friend class BPrivate::PicturePlayer;
friend class BPrivate::ServerLink;
friend class BShapeIterator;
friend class BView;
friend class BFont;
friend class BPrivate::PicturePlayer;
friend class BPrivate::ServerLink;
void GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList);
void SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList);
void InitData();
bool AllocatePts(int32 count);
bool AllocateOps(int32 count);
void GetData(int32 *opCount, int32 *ptCount, uint32 **opList, BPoint **ptList);
void SetData(int32 opCount, int32 ptCount, const uint32 *opList, const BPoint *ptList);
void InitData();
bool AllocatePts(int32 count);
bool AllocateOps(int32 count);
uint32 fState;
uint32 fBuildingOp;
void * fPrivateData;
uint32 reserved[4];
uint32 fState;
uint32 fBuildingOp;
void* fPrivateData;
uint32 reserved[4];
};
#endif
#endif // _SHAPE_H
headers/os/interface/Shelf.h
+2 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2006, Haiku Inc.
* Copyright 2001-2007, Haiku Inc.
* Distributed under the terms of the MIT License.
*/
#ifndef _SHELF_H
@@ -10,6 +10,7 @@
#include <List.h>
class BDataIO;
class BPoint;
class BView;
class BEntry;
struct entry_ref;
headers/os/interface/TabView.h
-6
View File
@@ -158,11 +158,7 @@ virtual BHandler *ResolveSpecifier(BMessage *message, int32 index,
virtual status_t GetSupportedSuites(BMessage *message);
virtual void AddTab(BView *target, BTab *tab = NULL);
#if !_PR3_COMPATIBLE_
virtual BTab *RemoveTab(int32 tabIndex);
#else
virtual BTab *RemoveTab(int32 tabIndex) const;
#endif
virtual BTab *TabAt ( int32 tab_index ) const;
@@ -208,6 +204,4 @@ virtual void _ReservedTabView12();
uint32 _reserved[11];
};
#endif // _TAB_VIEW_H
headers/os/interface/TextView.h
+9 -31
View File
@@ -14,6 +14,8 @@
#include <BeBuild.h>
#include <View.h>
class BMessageRunner;
/*----------------------------------------------------------------*/
/*----- BTextView structures and definitions ---------------------*/
@@ -37,16 +39,6 @@ enum undo_state {
B_UNDO_DROP
};
#if _PR2_COMPATIBLE_
extern "C" void _ReservedTextView2__9BTextViewFv(BTextView *object,
BMessage *drag,
BBitmap **bitmap,
BPoint *point,
BHandler **handler);
#endif
class BBitmap;
class BClipboard;
class BFile;
@@ -266,27 +258,16 @@ private:
friend status_t _init_interface_kit_();
friend class _BTextTrackState_;
#if _PR2_COMPATIBLE_
friend void _ReservedTextView2__9BTextViewFv(BTextView *object,
BMessage *drag,
BBitmap **bitmap,
BPoint *point,
BHandler **handler);
#endif
virtual void _ReservedTextView3();
virtual void _ReservedTextView4();
virtual void _ReservedTextView5();
virtual void _ReservedTextView6();
virtual void _ReservedTextView7();
virtual void _ReservedTextView8();
#if !_PR3_COMPATIBLE_
virtual void _ReservedTextView9();
virtual void _ReservedTextView10();
virtual void _ReservedTextView11();
virtual void _ReservedTextView12();
#endif
void InitObject(BRect textRect,
const BFont *initialFont,
@@ -423,17 +404,14 @@ static void UnlockWidthBuffer();
color_space fColorSpace;
bool fResizable;
BView* fContainerView;
_BUndoBuffer_* fUndo; /* was _reserved[0] */
_BInlineInput_* fInline; /* was _reserved[1] */
BMessageRunner * fDragRunner; /* was _reserved[2] */
BMessageRunner * fClickRunner; /* was _reserved[3] */
_BUndoBuffer_* fUndo;
_BInlineInput_* fInline;
BMessageRunner * fDragRunner;
BMessageRunner * fClickRunner;
BPoint fWhere;
_BTextTrackState_* fTrackingMouse; /* was _reserved[6] */
_BTextChangeResult_* fTextChange; /* was _reserved[7] */
uint32 _reserved[1]; /* was 8 */
#if !_PR3_COMPATIBLE_
uint32 _more_reserved[8];
#endif
_BTextTrackState_* fTrackingMouse;
_BTextChangeResult_* fTextChange;
uint32 _reserved[9];
static _BWidthBuffer_* sWidths;
static sem_id sWidthSem;
headers/os/interface/View.h
-4
View File
@@ -422,11 +422,7 @@ public:
virtual void SetFont(const BFont* font, uint32 mask = B_FONT_ALL);
#if !_PR3_COMPATIBLE_
void GetFont(BFont* font) const;
#else
void GetFont(BFont* font);
#endif
void TruncateString(BString* in_out,
uint32 mode,
float width) const;