Checkin for Adrian Oanca

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3069 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm 2003-04-17 20:41:54 +00:00
parent 255a01c76a
commit 1b7390044f
4 changed files with 1532 additions and 1016 deletions

View File

@ -20,7 +20,7 @@
// DEALINGS IN THE SOFTWARE.
//
// File Name: Window.h
// Author: Erik Jaesler (erik@cgsoftware.com)
// Author: Adrian Oanca (e2joseph@hotpop.com)
// Description: BWindow is the base class for all windows (graphic areas
// displayed on-screen).
//
@ -48,6 +48,8 @@
// Project Includes ------------------------------------------------------------
// Local Includes --------------------------------------------------------------
//#include <PortLink.h>
class PortLink; // tweak for compatibility with our build system --DW
// Local Defines ---------------------------------------------------------------
@ -137,142 +139,142 @@ struct _view_attr_;
class BWindow : public BLooper {
public:
BWindow(BRect frame, //done
BWindow(BRect frame,
const char* title,
window_type type,
uint32 flags,
uint32 workspace = B_CURRENT_WORKSPACE);
BWindow(BRect frame, //done, but must be maintained - call InitData(...)
BWindow(BRect frame,
const char* title,
window_look look,
window_feel feel,
uint32 flags,
uint32 workspace = B_CURRENT_WORKSPACE);
virtual ~BWindow(); //done
virtual ~BWindow();
BWindow(BMessage* data); //done
static BArchivable *Instantiate(BMessage* data); //done
virtual status_t Archive(BMessage* data, bool deep = true) const; //done
BWindow(BMessage* data);
static BArchivable *Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data, bool deep = true) const;
virtual void Quit(); //done
virtual void Quit();
void Close(); // Synonym of Quit()
void AddChild(BView* child, BView* before = NULL); //done
bool RemoveChild(BView* child); //done
int32 CountChildren() const; //done
BView *ChildAt(int32 index) const; //done
void AddChild(BView* child, BView* before = NULL);
bool RemoveChild(BView* child);
int32 CountChildren() const;
BView *ChildAt(int32 index) const;
virtual void DispatchMessage(BMessage* message, BHandler* handler); //done
virtual void MessageReceived(BMessage* message); //done
virtual void FrameMoved(BPoint new_position); //done
virtual void WorkspacesChanged(uint32 old_ws, uint32 new_ws); //done
virtual void WorkspaceActivated(int32 ws, bool state); //done
virtual void FrameResized(float new_width, float new_height); //done
virtual void Minimize(bool minimize); //done
virtual void Zoom( BPoint rec_position, //done
virtual void DispatchMessage(BMessage* message, BHandler* handler);
virtual void MessageReceived(BMessage* message);
virtual void FrameMoved(BPoint new_position);
virtual void WorkspacesChanged(uint32 old_ws, uint32 new_ws);
virtual void WorkspaceActivated(int32 ws, bool state);
virtual void FrameResized(float new_width, float new_height);
virtual void Minimize(bool minimize);
virtual void Zoom( BPoint rec_position,
float rec_width,
float rec_height);
void Zoom(); //done
void SetZoomLimits(float maxWidth, float maxHeight); //done // changed from: SetZoomLimits(float max_h, float max_v);
virtual void ScreenChanged(BRect screen_size, color_space depth); //done
void SetPulseRate(bigtime_t rate); //done
bigtime_t PulseRate() const; //done
void AddShortcut( uint32 key, //done
void Zoom();
void SetZoomLimits(float maxWidth, float maxHeight); // changed from: SetZoomLimits(float max_h, float max_v);
virtual void ScreenChanged(BRect screen_size, color_space depth);
void SetPulseRate(bigtime_t rate);
bigtime_t PulseRate() const;
void AddShortcut( uint32 key,
uint32 modifiers,
BMessage* msg);
void AddShortcut( uint32 key, //done
void AddShortcut( uint32 key,
uint32 modifiers,
BMessage* msg,
BHandler* target);
void RemoveShortcut(uint32 key, uint32 modifiers); //done
void SetDefaultButton(BButton* button); //done
BButton *DefaultButton() const; //done
virtual void MenusBeginning(); //done
virtual void MenusEnded(); //done
bool NeedsUpdate() const; //done
void UpdateIfNeeded(); //done
BView *FindView(const char* viewName) const; //done // changed from: FindView( const char* view_name );
BView *FindView(BPoint) const; //done
BView *CurrentFocus() const; //done
void Activate(bool = true); //done
virtual void WindowActivated(bool state); //done
void ConvertToScreen(BPoint* pt) const; //done
BPoint ConvertToScreen(BPoint pt) const; //done
void ConvertFromScreen(BPoint* pt) const; //done
BPoint ConvertFromScreen(BPoint pt) const; //done
void ConvertToScreen(BRect* rect) const; //done
BRect ConvertToScreen(BRect rect) const; //done
void ConvertFromScreen(BRect* rect) const; //done
BRect ConvertFromScreen(BRect rect) const; //done
void MoveBy(float dx, float dy); //done
void MoveTo(BPoint); //done
void MoveTo(float x, float y); //done
void ResizeBy(float dx, float dy); //done
void ResizeTo(float width, float height); //done
virtual void Show(); //done
virtual void Hide(); //done
bool IsHidden() const; //done
bool IsMinimized() const; //done
void RemoveShortcut(uint32 key, uint32 modifiers);
void SetDefaultButton(BButton* button);
BButton *DefaultButton() const;
virtual void MenusBeginning();
virtual void MenusEnded();
bool NeedsUpdate() const;
void UpdateIfNeeded();
BView *FindView(const char* viewName) const; // changed from: FindView( const char* view_name );
BView *FindView(BPoint) const;
BView *CurrentFocus() const;
void Activate(bool = true);
virtual void WindowActivated(bool state);
void ConvertToScreen(BPoint* pt) const;
BPoint ConvertToScreen(BPoint pt) const;
void ConvertFromScreen(BPoint* pt) const;
BPoint ConvertFromScreen(BPoint pt) const;
void ConvertToScreen(BRect* rect) const;
BRect ConvertToScreen(BRect rect) const;
void ConvertFromScreen(BRect* rect) const;
BRect ConvertFromScreen(BRect rect) const;
void MoveBy(float dx, float dy);
void MoveTo(BPoint);
void MoveTo(float x, float y);
void ResizeBy(float dx, float dy);
void ResizeTo(float width, float height);
virtual void Show();
virtual void Hide();
bool IsHidden() const;
bool IsMinimized() const;
void Flush() const; //done
void Sync() const; //done
void Flush() const;
void Sync() const;
status_t SendBehind(const BWindow* window); //done
status_t SendBehind(const BWindow* window);
void DisableUpdates(); //done
void EnableUpdates(); //done
void DisableUpdates();
void EnableUpdates();
void BeginViewTransaction(); //done // referred as OpenViewTransaction() in BeBook
void EndViewTransaction(); //done // referred as CommitViewTransaction() in BeBook
void BeginViewTransaction(); // referred as OpenViewTransaction() in BeBook
void EndViewTransaction(); // referred as CommitViewTransaction() in BeBook
BRect Bounds() const; //done
BRect Frame() const; //done
const char *Title() const; //done
void SetTitle(const char* title); //done
bool IsFront() const; //done
bool IsActive() const; //done
void SetKeyMenuBar(BMenuBar* bar); //done
BMenuBar *KeyMenuBar() const; //done
void SetSizeLimits( float minWidth, //done // changed from: SetSizeLimits(float min_h, float max_h, float min_v, float max_v);
BRect Bounds() const;
BRect Frame() const;
const char *Title() const;
void SetTitle(const char* title);
bool IsFront() const;
bool IsActive() const;
void SetKeyMenuBar(BMenuBar* bar);
BMenuBar *KeyMenuBar() const;
void SetSizeLimits( float minWidth, // changed from: SetSizeLimits(float min_h, float max_h, float min_v, float max_v);
float maxWidth,
float minHeight,
float maxHeight);
void GetSizeLimits( float *minWidth, //done // changed from: SetSizeLimits(float* min_h, float* max_h, float* min_v, float* max_v);
void GetSizeLimits( float *minWidth, // changed from: SetSizeLimits(float* min_h, float* max_h, float* min_v, float* max_v);
float *maxWidth,
float *minHeight,
float *maxHeight);
uint32 Workspaces() const; //done
void SetWorkspaces(uint32); //done
BView *LastMouseMovedView() const; //done
uint32 Workspaces() const;
void SetWorkspaces(uint32);
BView *LastMouseMovedView() const;
virtual BHandler *ResolveSpecifier(BMessage* msg, //done
virtual BHandler *ResolveSpecifier(BMessage* msg,
int32 index,
BMessage* specifier,
int32 form,
const char* property);
virtual status_t GetSupportedSuites(BMessage* data); //done
virtual status_t GetSupportedSuites(BMessage* data);
status_t AddToSubset(BWindow* window); //done
status_t RemoveFromSubset(BWindow* window); //done
status_t AddToSubset(BWindow* window);
status_t RemoveFromSubset(BWindow* window);
virtual status_t Perform(perform_code d, void* arg); //done
virtual status_t Perform(perform_code d, void* arg);
status_t SetType(window_type type); //done
window_type Type() const; //done
status_t SetType(window_type type);
window_type Type() const;
status_t SetLook(window_look look); //done
window_look Look() const; //done
status_t SetLook(window_look look);
window_look Look() const;
status_t SetFeel(window_feel feel); //done
window_feel Feel() const; //done
status_t SetFeel(window_feel feel);
window_feel Feel() const;
status_t SetFlags(uint32); //done
uint32 Flags() const; //done
status_t SetFlags(uint32);
uint32 Flags() const;
bool IsModal() const; //done
bool IsFloating() const; //done
bool IsModal() const;
bool IsFloating() const;
status_t SetWindowAlignment(window_alignment mode, //done
status_t SetWindowAlignment(window_alignment mode,
int32 h,
int32 hOffset = 0,
int32 width = 0,
@ -281,7 +283,7 @@ virtual status_t Perform(perform_code d, void* arg); //done
int32 vOffset = 0,
int32 height = 0,
int32 heightOffset = 0);
status_t GetWindowAlignment(window_alignment* mode = NULL, //done
status_t GetWindowAlignment(window_alignment* mode = NULL,
int32* h = NULL,
int32* hOffset = NULL,
int32* width = NULL,
@ -291,8 +293,8 @@ virtual status_t Perform(perform_code d, void* arg); //done
int32* height = NULL,
int32* heightOffset = NULL) const;
virtual bool QuitRequested(); //done
virtual thread_id Run(); //done
virtual bool QuitRequested();
virtual thread_id Run();
// Private or reserved ---------------------------------------------------------
private:
@ -308,7 +310,7 @@ friend class BWindowScreen;
friend class BDirectWindow;
friend class BFilePanel;
friend class BHandler;
friend class _BEventMask_;
friend class _BEventMask;
friend void _set_menu_sem_(BWindow* w, sem_id sem);
friend status_t _safe_get_server_token_(const BLooper* , int32* );
@ -325,8 +327,8 @@ virtual void _ReservedWindow8();
BWindow(BWindow&);
BWindow &operator=(BWindow&);
BWindow(BRect frame, color_space depth, // I'm realllly curious in the things that this funtion does
uint32 bitmapFlags, int32 rowBytes); // I think it's called from every constructor and sends its server counterpart (ServerWindow) the message for creating a surface(BBitmap) with certain parameters.
BWindow(BRect frame, color_space depth, // to be implemented
uint32 bitmapFlags, int32 rowBytes);
void InitData(BRect frame,
const char* title,
window_look look,
@ -335,9 +337,9 @@ virtual void _ReservedWindow8();
uint32 workspace);
status_t ArchiveChildren(BMessage* data, bool deep) const; // call made from within Archive
status_t UnarchiveChildren(BMessage* data); // Instantiate(BMessage* data)->BWindow(BMessage)->UnarchiveChildren(BMessage* data)
void BitmapClose();
virtual void task_looper(); // thread function - it's here where app_server messages are received and converted to BMessages
void start_drag( BMessage* msg,
void BitmapClose(); // to be implemented
virtual void task_looper(); // thread function - it's here where app_server messages are received
/* void start_drag( BMessage* msg,
int32 token,
BPoint offset,
BRect track_rect,
@ -348,43 +350,42 @@ virtual void task_looper(); // thread function - it's here where app_serv
int32 bitmap_token,
drawing_mode dragMode,
BHandler* reply_to);
void view_builder(BView* a_view); // It passes needed parameters to a BView allready created.
void attach_builder(BView* a_view); // Attaches the view
void detach_builder(BView* a_view); // Detaches the view
int32 get_server_token() const;
*/
void prepareView(BView* aView); // changed from view_builder(BView* a_view);
void attachView(BView* aView); // changed from attach_builder(BView* a_view);
void detachView(BView* aView); // changed from detach_builder(BView* a_view);
//int32 get_server_token() const;
BMessage *extract_drop(BMessage* an_event, BHandler* *target);
void movesize(uint32 opcode, float h, float v);
//void movesize(uint32 opcode, float h, float v);
BMessage* ReadMessageFromPort(bigtime_t tout = B_INFINITE_TIMEOUT); // reads a message from receive_port and passes it along with the message body to CreateMessage(void*, int32) function
int32 MessagesWaiting(); // (?)# of messages waiting in the port queue
BMessage* ReadMessageFromPort(bigtime_t tout = B_INFINITE_TIMEOUT);
//int32 MessagesWaiting();
void handle_activate(BMessage* an_event);
void do_view_frame(BMessage* an_event);
void do_value_change(BMessage* an_event, BHandler* handler);
void do_mouse_down(BMessage* an_event, BView* target);
void do_mouse_moved(BMessage* an_event, BView* target);
void do_key_down(BMessage* an_event, BHandler* handler);
void do_key_up(BMessage* an_event, BHandler* handler);
//void do_view_frame(BMessage* an_event);
//void do_value_change(BMessage* an_event, BHandler* handler);
//void do_mouse_down(BMessage* an_event, BView* target);
//void do_mouse_moved(BMessage* an_event, BView* target);
//void do_key_down(BMessage* an_event, BHandler* handler);
//void do_key_up(BMessage* an_event, BHandler* handler);
void do_menu_event(BMessage* an_event);
void do_draw_views();
virtual BMessage *ConvertToMessage(void* raw, int32 code); // HUGE function - it convers PortLink messages into BMessage messages
_cmd_key_ *allocShortcut(uint32 key, uint32 modifiers);
_cmd_key_ *FindShortcut(uint32 key, uint32 modifiers);
//void do_draw_views();
virtual BMessage *ConvertToMessage(void* raw, int32 code); // HUGE function - it converts PortLink messages into BMessages
//_cmd_key_ *allocShortcut(uint32 key, uint32 modifiers);
//_cmd_key_ *FindShortcut(uint32 key, uint32 modifiers);
void AddShortcut(uint32 key, // !!! - and menu shortcuts to list when a menu is added
uint32 modifiers,
BMenuItem* item);
void post_message(BMessage* message);
void SetLocalTitle(const char* new_title);
void enable_pulsing(bool enable);
//void post_message(BMessage* message);
//void SetLocalTitle(const char* new_title);
//void enable_pulsing(bool enable);
BHandler *determine_target(BMessage* msg, BHandler* target, bool pref);
void kb_navigate();
void navigate_to_next(int32 direction, bool group = false);
void set_focus(BView* focus, bool notify_input_server); // what does notify_input_server mean??? why???
//void kb_navigate();
//void navigate_to_next(int32 direction, bool group = false);
//void set_focus(BView* focus, bool notify_input_server); // what does notify_input_server mean??? why???
bool InUpdate();
void DequeueAll();
bool find_token_and_handler(BMessage* msg,
int32* token,
BHandler* *handler);
//bool find_token_and_handler(BMessage* msg, int32* token, BHandler* *handler);
window_type composeType(window_look look, // changed from: compose_type(...)
window_feel feel) const;
void decomposeType(window_type type, // changed from: decompose_type(...)
@ -399,70 +400,84 @@ virtual BMessage *ConvertToMessage(void* raw, int32 code); // HUGE function
BView* buildTopView();
void attachTopView();
void detachTopView();
void setFocus(BView *focusView, bool notifyIputServer);
void stopConnection();
void setFocus(BView *focusView, bool notifyIputServer=false);
bool handleBWindowKeys( BString, uint32);
bool handleKeyDown( uint32 key, uint32 modifiers);
// message: B_MOUSE_UP, B_MOUSE_DOWN, B_MOUSE_MOVED
void sendMessageUsingEventMask( int32 message, BPoint where );
void sendWillingBViewsPulseMsg( BView* );
int32 findShortcut(int32 key, int32 modifiers);
BView* sendMessageUsingEventMask2( BView* aView, int32 message, BPoint where );
void sendPulse( BView* );
int32 findShortcut(uint32 key, int32 modifiers);
bool findHandler( BView* start, BHandler* handler );
BView* findView(BView* aView, const char* viewName) const;
BView* findView(BView* aView, BPoint point) const;
BView* findView(BView* aView, int32 token);
BView* findNextView( BView *focus, uint32 flags);
BView* findPrevView( BView *focus, uint32 flags);
BView* findLastChild(BView *parent);
bool handleKeyDown( int32 raw_char, uint32 modifiers);
void handleActivation( bool active );
void activateView( BView *aView, bool active );
void drawAllViews(BView* aView);
void drawView(BView* aView, BRect area);
uint8* ReadRawFromPort(int32* code,
bigtime_t tout = B_INFINITE_TIMEOUT);
// END: OBOS addon functions
// 3 deprecated calls
void AddFloater(BWindow* a_floating_window);
void RemoveFloater(BWindow* a_floating_window);
window_type WindowType() const;
//void AddFloater(BWindow* a_floating_window);
//void RemoveFloater(BWindow* a_floating_window);
//window_type WindowType() const;
char *fTitle; // set
char *fTitle; // used
int32 server_token;
bool fInTransaction; // set // changed from: char fInUpdate;
bool fActive; // changed from: char f_active;
short fShowLevel;
uint32 fFlags; // set
bool fInTransaction; // used // changed from: char fInUpdate;
bool fActive; // used // changed from: char f_active;
short fShowLevel; // used
uint32 fFlags; // used
port_id send_port; // set
port_id receive_port; // set
port_id send_port; // used
port_id receive_port; // used
BView *top_view;
BView *fFocus;
BView *fLastMouseMovedView; // set
PortLink *serverLink;
BMenuBar *fKeyMenuBar; // set
BButton *fDefaultButton; // set
BList accelList; // set
BView *top_view; // used
BView *fFocus; // used
BView *fLastMouseMovedView; // used
PortLink *serverLink; // used
BMenuBar *fKeyMenuBar; // used
BButton *fDefaultButton; // used
BList accelList; // used
int32 fTopViewToken; // // changed from: int32 top_view_token;
bool fPulseEnabled; // // changed from: bool pulse_enabled;
bool fPulseEnabled; // used // changed from: bool pulse_enabled;
bool fViewsNeedPulse;
bool fIsFilePanel;
bool fUnused1;
bigtime_t fPulseRate; // // changed from: bigtime_t pulse_rate;
bool fIsFilePanel; // used
bool fMaskActivated;
bigtime_t fPulseRate; // used // changed from: bigtime_t pulse_rate;
bool fWaitingForMenu;
bool fMinimized; // // changed from: bool fOffscreen;
bool fMinimized; // used // changed from: bool fOffscreen;
sem_id fMenuSem;
float fMaxZoomHeight; // set // changed from: float fMaxZoomH;
float fMaxZoomWidth; // set // changed from: float fMaxZoomV;
float fMinWindHeight; // set // changed from: float fMinWindH;
float fMinWindWidth; // set // changed from: float fMinWindV;
float fMaxWindHeight; // set // changed from: float fMaxWindH;
float fMaxWindWidth; // set // changed from: float fMaxWindV;
BRect fFrame; // set
window_look fLook; // set
float fMaxZoomHeight; // used // changed from: float fMaxZoomH;
float fMaxZoomWidth; // used // changed from: float fMaxZoomV;
float fMinWindHeight; // used // changed from: float fMinWindH;
float fMinWindWidth; // used // changed from: float fMinWindV;
float fMaxWindHeight; // used // changed from: float fMaxWindH;
float fMaxWindWidth; // used // changed from: float fMaxWindV;
BRect fFrame; // used
window_look fLook; // used
_view_attr_ *fCurDrawViewState;
window_feel fFeel; // set
window_feel fFeel; // used
int32 fLastViewToken;
_BEventMask_* fEventMask; // changed from: _CEventPort_* fEventPort;
BMessageRunner *fPulseRunner;
uint32 fUnused1; // changed from: _CEventPort_* fEventPort;
BMessageRunner *fPulseRunner; // used
BRect fCurrentFrame;
// dedicated for graphic calls
PortLink *srvGfxLink; // set
PortLink *srvGfxLink; // used
uint32 _reserved;
// uint32 _reserved[2]; // was 8

View File

@ -49,6 +49,7 @@ struct _BCmdKey{
uint32 modifiers;
BMessage* message;
BHandler* target;
int32 targetToken;
};
#endif // _WINDOWAUX_H

View File

@ -56,8 +56,14 @@ AS_SET_ALIGNMENT,
AS_GET_ALIGNMENT,
AS_GET_WORKSPACES,
AS_SET_WORKSPACES,
AS_WINDOW_RESIZEBY,
AS_WINDOW_RESIZETO,
AS_WINDOW_RESIZE,
AS_WINDOW_MOVE,
AS_SET_SIZE_LIMITS,
AS_ACTIVATE_WINDOW,
AS_WINDOW_MINIMIZE,
AS_UPDATE_IF_NEEDED,
_ALL_UPDATED_, // this should be moved in place of _UPDATE_IF_NEEDED_ in AppDefs.h
// BPicture definitions
AS_CREATE_PICTURE,
@ -139,6 +145,8 @@ AS_SYNC,
AS_LAYER_CREATE,
AS_LAYER_DELETE,
AS_LAYER_CREATE_ROOT,
AS_LAYER_DELETE_ROOT,
AS_LAYER_ADD_CHILD,
AS_LAYER_REMOVE_CHILD,
AS_LAYER_REMOVE_SELF,

File diff suppressed because it is too large Load Diff