From d3b71f556235f92eed4a6f8fc2910e5f9b4b0d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 18 Mar 2006 14:43:29 +0000 Subject: [PATCH] Who said I couldn't break the build? git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16827 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/app/Application.h | 41 ++++---- headers/os/interface/Bitmap.h | 175 ++++++++++++++++------------------ 2 files changed, 99 insertions(+), 117 deletions(-) diff --git a/headers/os/app/Application.h b/headers/os/app/Application.h index 5816e99cf2..222fbaba31 100644 --- a/headers/os/app/Application.h +++ b/headers/os/app/Application.h @@ -1,5 +1,5 @@ /* - * Copyright 2001-2005, Haiku. + * Copyright 2001-2006, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -21,15 +21,13 @@ class BCursor; class BList; class BWindow; -class _BSession_; class BResources; class BMessageRunner; class BServer; -struct _server_heap_; -struct _drag_data_; namespace BPrivate { class PortLink; + class ServerMemoryAllocator; } @@ -89,7 +87,7 @@ public: virtual status_t GetSupportedSuites(BMessage* data); -// Private or reserved --------------------------------------------------------- + // Private or reserved virtual status_t Perform(perform_code d, void* arg); class Private; @@ -98,7 +96,6 @@ private: typedef BLooper _inherited; friend class Private; - friend class BServer; BApplication(const char* signature, bool initGUI, @@ -119,17 +116,14 @@ private: virtual bool ScriptReceived(BMessage* msg, int32 index, BMessage* specifier, int32 form, const char* property); - void InitData(const char* signature, bool initGUI, + void _InitData(const char* signature, bool initGUI, status_t* error); void BeginRectTracking(BRect r, bool trackWhole); void EndRectTracking(); - status_t setup_server_heaps(); - void* rw_offs_to_ptr(uint32 offset); - void* ro_offs_to_ptr(uint32 offset); - void* global_ro_offs_to_ptr(uint32 offset); + status_t _SetupServerAllocator(); status_t _InitGUIContext(); - status_t connect_to_app_server(); - void send_drag( BMessage* msg, + status_t _ConnectToServer(); +/* void send_drag( BMessage* msg, int32 vs_token, BPoint offset, BRect drag_rect, @@ -141,31 +135,30 @@ private: drawing_mode dragMode, BHandler* reply_to); void write_drag(_BSession_* session, BMessage* a_message); - bool quit_all_windows(bool force); - bool window_quit_loop(bool, bool); - void do_argv(BMessage* msg); +*/ bool _QuitAllWindows(bool force); + bool _WindowQuitLoop(bool quitFilePanels, bool force); + void _ArgvReceived(BMessage* message); void SetAppCursor(); uint32 InitialWorkspace(); - int32 count_windows(bool incl_menus) const; - BWindow* window_at(uint32 index, bool incl_menus) const; - status_t get_window_list(BList* list, bool incl_menus) const; - static int32 async_quit_entry(void*); + int32 _CountWindows(bool includeMenus) const; + BWindow* _WindowAt(uint32 index, bool includeMenus) const; + status_t _GetWindowList(BList* list, bool includeMenus) const; + static BResources* sAppResources; static BLocker sAppResourcesLock; const char* fAppName; BPrivate::PortLink* fServerLink; - uint32 _unused0; + BPrivate::ServerMemoryAllocator* fServerAllocator; void* fCursorData; - _server_heap_* fServerHeap; bigtime_t fPulseRate; uint32 fInitialWorkspace; - _drag_data_* fDraggedMessage; + //_drag_data_* fDraggedMessage; BMessageRunner* fPulseRunner; status_t fInitError; - uint32 _reserved[11]; + uint32 _reserved[13]; bool fReadyToRunCalled; }; diff --git a/headers/os/interface/Bitmap.h b/headers/os/interface/Bitmap.h index ec8b224b1a..8f2106b2b8 100644 --- a/headers/os/interface/Bitmap.h +++ b/headers/os/interface/Bitmap.h @@ -1,17 +1,14 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2005, Haiku, Inc. -// -// Distributed under the terms of the MIT license. -// -// File Name: Bitmap.h -// Author: Ingo Weinhold (bonefish@users.sf.net) -// Description: BBitmap objects represent off-screen windows that -// contain bitmap data. -//------------------------------------------------------------------------------ - +/* + * Copyright 2001-2006, Haiku. + * Distributed under the terms of the MIT License. + * + * Authors: + * Ingo Weinhold (bonefish@users.sf.net) + */ #ifndef _BITMAP_H #define _BITMAP_H + #include #include #include @@ -33,105 +30,97 @@ enum { #define B_ANY_BYTES_PER_ROW -1 -//----------------------------------------------------------------// -//----- BBitmap class --------------------------------------------// class BBitmap : public BArchivable { -public: - BBitmap(BRect bounds, uint32 flags, color_space colorSpace, - int32 bytesPerRow = B_ANY_BYTES_PER_ROW, - screen_id screenID = B_MAIN_SCREEN_ID); - BBitmap(BRect bounds, color_space colorSpace, bool acceptsViews = false, - bool needsContiguous = false); - BBitmap(const BBitmap *source, bool acceptsViews = false, - bool needsContiguous = false); - virtual ~BBitmap(); + public: + BBitmap(BRect bounds, uint32 flags, color_space colorSpace, + int32 bytesPerRow = B_ANY_BYTES_PER_ROW, + screen_id screenID = B_MAIN_SCREEN_ID); + BBitmap(BRect bounds, color_space colorSpace, bool acceptsViews = false, + bool needsContiguous = false); + BBitmap(const BBitmap *source, bool acceptsViews = false, + bool needsContiguous = false); + virtual ~BBitmap(); - // Archiving - BBitmap(BMessage *data); - static BArchivable *Instantiate(BMessage *data); - virtual status_t Archive(BMessage *data, bool deep = true) const; + // Archiving + BBitmap(BMessage *data); + static BArchivable *Instantiate(BMessage *data); + virtual status_t Archive(BMessage *data, bool deep = true) const; - status_t InitCheck() const; - bool IsValid() const; + status_t InitCheck() const; + bool IsValid() const; - status_t LockBits(uint32 *state = NULL); - void UnlockBits(); + status_t LockBits(uint32 *state = NULL); + void UnlockBits(); - area_id Area() const; - void *Bits() const; - int32 BitsLength() const; - int32 BytesPerRow() const; - color_space ColorSpace() const; - BRect Bounds() const; + area_id Area() const; + void *Bits() const; + int32 BitsLength() const; + int32 BytesPerRow() const; + color_space ColorSpace() const; + BRect Bounds() const; - void SetBits(const void *data, int32 length, int32 offset, - color_space colorSpace); + void SetBits(const void *data, int32 length, int32 offset, + color_space colorSpace); - // not part of the R5 API - status_t ImportBits(const void *data, int32 length, int32 bpr, - int32 offset, color_space colorSpace); - status_t ImportBits(const void *data, int32 length, int32 bpr, - color_space colorSpace, BPoint from, BPoint to, - int32 width, int32 height); - status_t ImportBits(const BBitmap *bitmap); - status_t ImportBits(const BBitmap *bitmap, BPoint from, BPoint to, - int32 width, int32 height); + // not part of the R5 API + status_t ImportBits(const void *data, int32 length, int32 bpr, + int32 offset, color_space colorSpace); + status_t ImportBits(const void *data, int32 length, int32 bpr, + color_space colorSpace, BPoint from, BPoint to, + int32 width, int32 height); + status_t ImportBits(const BBitmap *bitmap); + status_t ImportBits(const BBitmap *bitmap, BPoint from, BPoint to, + int32 width, int32 height); - status_t GetOverlayRestrictions(overlay_restrictions *restrictions) const; + status_t GetOverlayRestrictions(overlay_restrictions *restrictions) const; - // to mimic a BWindow - virtual void AddChild(BView *view); - virtual bool RemoveChild(BView *view); - int32 CountChildren() const; - BView *ChildAt(int32 index) const; - BView *FindView(const char *viewName) const; - BView *FindView(BPoint point) const; - bool Lock(); - void Unlock(); - bool IsLocked() const; + // to mimic a BWindow + virtual void AddChild(BView *view); + virtual bool RemoveChild(BView *view); + int32 CountChildren() const; + BView *ChildAt(int32 index) const; + BView *FindView(const char *viewName) const; + BView *FindView(BPoint point) const; + bool Lock(); + void Unlock(); + bool IsLocked() const; -//----- Private or reserved -----------------------------------------// + //----- Private or reserved -----------------------------------------// - virtual status_t Perform(perform_code d, void *arg); + virtual status_t Perform(perform_code d, void *arg); -private: - friend class BView; - friend class BApplication; - friend class BPrivateScreen; - //friend void _get_screen_bitmap_(BBitmap *, BRect, bool); + private: + friend class BView; + friend class BApplication; + friend class BPrivateScreen; - virtual void _ReservedBitmap1(); - virtual void _ReservedBitmap2(); - virtual void _ReservedBitmap3(); + virtual void _ReservedBitmap1(); + virtual void _ReservedBitmap2(); + virtual void _ReservedBitmap3(); - BBitmap(const BBitmap &); - BBitmap &operator=(const BBitmap &); + BBitmap(const BBitmap &); + BBitmap &operator=(const BBitmap &); - char *get_shared_pointer() const; - int32 get_server_token() const; - void InitObject(BRect bounds, color_space colorSpace, uint32 flags, - int32 bytesPerRow, screen_id screenID); - void CleanUp(); + int32 _ServerToken() const; + void _InitObject(BRect bounds, color_space colorSpace, uint32 flags, + int32 bytesPerRow, screen_id screenID); + void _CleanUp(); + void _AssertPointer(); - void AssertPtr(); - - void *fBasePtr; - int32 fSize; - color_space fColorSpace; - BRect fBounds; - int32 fBytesPerRow; - BWindow *fWindow; - int32 fServerToken; - int32 fAreaOffset; - uint8 unused; - area_id fArea; - area_id fOrigArea; - uint32 fFlags; - status_t fInitError; + uint8 *fBasePointer; + int32 fSize; + color_space fColorSpace; + BRect fBounds; + int32 fBytesPerRow; + BWindow *fWindow; + int32 fServerToken; + int32 fAreaOffset; + uint8 unused; + area_id fArea; + area_id fServerArea; + uint32 fFlags; + status_t fInitError; }; -/*-------------------------------------------------------------*/ -/*-------------------------------------------------------------*/ - #endif // _BITMAP_H