John Scipione
5ee786c31f
The shortcut detection was working, just not the display of the modifiers in the menu. I've added back the necessary code to fix this in BMenuItem. BWindow does the heavy lifting of preparing the keys and modifiers. I have changes _FindShortcut() used by BMenuItem to send the prepared modifiers back to BMenuItem. Set the parameters raw in the constructor, they will get fixed up in Install(). I also make sure to use the prepped version of the key and mods in BWindow::AddShortcut() to remove the old one. This is a minor update that eliminates an edge failure case of malformed input. Fixes #19395 a regression from hrev58589. Change-Id: I4333f89149ff843f92dbffbd53d58ffc2def6760 Reviewed-on: https://review.haiku-os.org/c/haiku/+/8943 Tested-by: Commit checker robot <[email protected]> Reviewed-by: John Scipione <[email protected]>
415 lines
12 KiB
C++
415 lines
12 KiB
C++
/*
|
|
* Copyright 2001-2025 Haiku, Inc. All rights reserved.
|
|
* Distributed under the terms of the MIT License.
|
|
*/
|
|
#ifndef _WINDOW_H
|
|
#define _WINDOW_H
|
|
|
|
|
|
#include <Looper.h>
|
|
#include <StorageDefs.h>
|
|
#include <View.h>
|
|
|
|
|
|
class BButton;
|
|
class BMenuBar;
|
|
class BMenuItem;
|
|
class BMessage;
|
|
class BMessageRunner;
|
|
class BMessenger;
|
|
class BView;
|
|
|
|
namespace BPrivate {
|
|
class PortLink;
|
|
};
|
|
|
|
|
|
enum window_type {
|
|
B_UNTYPED_WINDOW = 0,
|
|
B_TITLED_WINDOW = 1,
|
|
B_MODAL_WINDOW = 3,
|
|
B_DOCUMENT_WINDOW = 11,
|
|
B_BORDERED_WINDOW = 20,
|
|
B_FLOATING_WINDOW = 21
|
|
};
|
|
|
|
enum window_look {
|
|
B_BORDERED_WINDOW_LOOK = 20,
|
|
B_NO_BORDER_WINDOW_LOOK = 19,
|
|
B_TITLED_WINDOW_LOOK = 1,
|
|
B_DOCUMENT_WINDOW_LOOK = 11,
|
|
B_MODAL_WINDOW_LOOK = 3,
|
|
B_FLOATING_WINDOW_LOOK = 7
|
|
};
|
|
|
|
enum window_feel {
|
|
B_NORMAL_WINDOW_FEEL = 0,
|
|
B_MODAL_SUBSET_WINDOW_FEEL = 2,
|
|
B_MODAL_APP_WINDOW_FEEL = 1,
|
|
B_MODAL_ALL_WINDOW_FEEL = 3,
|
|
B_FLOATING_SUBSET_WINDOW_FEEL = 5,
|
|
B_FLOATING_APP_WINDOW_FEEL = 4,
|
|
B_FLOATING_ALL_WINDOW_FEEL = 6
|
|
};
|
|
|
|
enum window_alignment {
|
|
B_BYTE_ALIGNMENT = 0,
|
|
B_PIXEL_ALIGNMENT = 1
|
|
};
|
|
|
|
// window flags
|
|
enum {
|
|
B_NOT_MOVABLE = 0x00000001,
|
|
B_NOT_CLOSABLE = 0x00000020,
|
|
B_NOT_ZOOMABLE = 0x00000040,
|
|
B_NOT_MINIMIZABLE = 0x00004000,
|
|
B_NOT_RESIZABLE = 0x00000002,
|
|
B_NOT_H_RESIZABLE = 0x00000004,
|
|
B_NOT_V_RESIZABLE = 0x00000008,
|
|
B_AVOID_FRONT = 0x00000080,
|
|
B_AVOID_FOCUS = 0x00002000,
|
|
B_WILL_ACCEPT_FIRST_CLICK = 0x00000010,
|
|
B_OUTLINE_RESIZE = 0x00001000,
|
|
B_NO_WORKSPACE_ACTIVATION = 0x00000100,
|
|
B_NOT_ANCHORED_ON_ACTIVATE = 0x00020000,
|
|
B_ASYNCHRONOUS_CONTROLS = 0x00080000,
|
|
B_QUIT_ON_WINDOW_CLOSE = 0x00100000,
|
|
B_SAME_POSITION_IN_ALL_WORKSPACES = 0x00200000,
|
|
B_AUTO_UPDATE_SIZE_LIMITS = 0x00400000,
|
|
B_CLOSE_ON_ESCAPE = 0x00800000,
|
|
B_NO_SERVER_SIDE_WINDOW_MODIFIERS = 0x00000200
|
|
};
|
|
|
|
#define B_CURRENT_WORKSPACE 0
|
|
#define B_ALL_WORKSPACES 0xffffffff
|
|
|
|
// MoveOnScreen() flags
|
|
enum {
|
|
B_DO_NOT_RESIZE_TO_FIT = 0x0001,
|
|
B_MOVE_IF_PARTIALLY_OFFSCREEN = 0x0002
|
|
};
|
|
|
|
|
|
class BWindow : public BLooper {
|
|
public:
|
|
BWindow(BRect frame, const char* title,
|
|
window_type type, uint32 flags,
|
|
uint32 workspace = B_CURRENT_WORKSPACE);
|
|
BWindow(BRect frame, const char* title,
|
|
window_look look, window_feel feel,
|
|
uint32 flags, uint32 workspace
|
|
= B_CURRENT_WORKSPACE);
|
|
virtual ~BWindow();
|
|
|
|
BWindow(BMessage* archive);
|
|
static BArchivable* Instantiate(BMessage* archive);
|
|
virtual status_t Archive(BMessage* archive,
|
|
bool deep = true) const;
|
|
|
|
virtual void Quit();
|
|
void Close() { Quit(); }
|
|
|
|
void AddChild(BView* child, BView* before = NULL);
|
|
void AddChild(BLayoutItem* child);
|
|
bool RemoveChild(BView* child);
|
|
int32 CountChildren() const;
|
|
BView* ChildAt(int32 index) const;
|
|
|
|
virtual void DispatchMessage(BMessage* message,
|
|
BHandler* handler);
|
|
virtual void MessageReceived(BMessage* message);
|
|
virtual void FrameMoved(BPoint newPosition);
|
|
virtual void WorkspacesChanged(uint32 oldWorkspaces,
|
|
uint32 newWorkspaces);
|
|
virtual void WorkspaceActivated(int32 workspace,
|
|
bool state);
|
|
virtual void FrameResized(float newWidth, float newHeight);
|
|
virtual void Minimize(bool minimize);
|
|
virtual void Zoom(BPoint origin, float width, float height);
|
|
void Zoom();
|
|
void SetZoomLimits(float maxWidth, float maxHeight);
|
|
virtual void ScreenChanged(BRect screenSize,
|
|
color_space depth);
|
|
|
|
void SetPulseRate(bigtime_t rate);
|
|
bigtime_t PulseRate() const;
|
|
|
|
void AddShortcut(uint32 key, uint32 modifiers,
|
|
BMessage* message);
|
|
void AddShortcut(uint32 key, uint32 modifiers,
|
|
BMessage* message, BHandler* target);
|
|
bool HasShortcut(uint32 key, uint32 modifiers);
|
|
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;
|
|
BView* FindView(BPoint) const;
|
|
BView* CurrentFocus() const;
|
|
|
|
void Activate(bool = true);
|
|
virtual void WindowActivated(bool focus);
|
|
|
|
void ConvertToScreen(BPoint* point) const;
|
|
BPoint ConvertToScreen(BPoint point) const;
|
|
void ConvertFromScreen(BPoint* point) const;
|
|
BPoint ConvertFromScreen(BPoint point) 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);
|
|
void ResizeToPreferred();
|
|
|
|
void CenterIn(const BRect& rect);
|
|
void CenterOnScreen();
|
|
void CenterOnScreen(screen_id id);
|
|
void MoveOnScreen(uint32 flags = 0);
|
|
|
|
virtual void Show();
|
|
virtual void Hide();
|
|
bool IsHidden() const;
|
|
bool IsMinimized() const;
|
|
|
|
void Flush() const;
|
|
void Sync() const;
|
|
|
|
status_t SendBehind(const BWindow* window);
|
|
|
|
void DisableUpdates();
|
|
void EnableUpdates();
|
|
|
|
void BeginViewTransaction();
|
|
// referred as OpenViewTransaction()
|
|
// in BeBook
|
|
void EndViewTransaction();
|
|
// referred as CommitViewTransaction()
|
|
// in BeBook
|
|
bool InViewTransaction() const;
|
|
|
|
BRect Bounds() const;
|
|
BRect Frame() const;
|
|
BRect DecoratorFrame() const;
|
|
BSize Size() 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, float maxWidth,
|
|
float minHeight, float maxHeight);
|
|
void GetSizeLimits(float* minWidth, float* maxWidth,
|
|
float* minHeight, float* maxHeight);
|
|
void UpdateSizeLimits();
|
|
|
|
status_t SetDecoratorSettings(const BMessage& settings);
|
|
status_t GetDecoratorSettings(BMessage* settings) const;
|
|
|
|
uint32 Workspaces() const;
|
|
void SetWorkspaces(uint32);
|
|
|
|
BView* LastMouseMovedView() const;
|
|
|
|
virtual BHandler* ResolveSpecifier(BMessage* message,
|
|
int32 index, BMessage* specifier,
|
|
int32 what, const char* property);
|
|
virtual status_t GetSupportedSuites(BMessage* data);
|
|
|
|
status_t AddToSubset(BWindow* window);
|
|
status_t RemoveFromSubset(BWindow* window);
|
|
|
|
virtual status_t Perform(perform_code code, void* data);
|
|
|
|
status_t SetType(window_type type);
|
|
window_type Type() const;
|
|
|
|
status_t SetLook(window_look look);
|
|
window_look Look() const;
|
|
|
|
status_t SetFeel(window_feel feel);
|
|
window_feel Feel() const;
|
|
|
|
status_t SetFlags(uint32);
|
|
uint32 Flags() const;
|
|
|
|
bool IsModal() const;
|
|
bool IsFloating() const;
|
|
|
|
status_t SetWindowAlignment(window_alignment mode,
|
|
int32 h, int32 hOffset = 0,
|
|
int32 width = 0, int32 widthOffset = 0,
|
|
int32 v = 0, int32 vOffset = 0,
|
|
int32 height = 0, int32 heightOffset = 0);
|
|
status_t GetWindowAlignment(
|
|
window_alignment* mode = NULL,
|
|
int32* h = NULL, int32* hOffset = NULL,
|
|
int32* width = NULL,
|
|
int32* widthOffset = NULL,
|
|
int32* v = NULL, int32* vOffset = NULL,
|
|
int32* height = NULL,
|
|
int32* heightOffset = NULL) const;
|
|
|
|
virtual bool QuitRequested();
|
|
virtual thread_id Run();
|
|
|
|
virtual void SetLayout(BLayout* layout);
|
|
BLayout* GetLayout() const;
|
|
|
|
void InvalidateLayout(bool descendants = false);
|
|
void Layout(bool force);
|
|
bool IsOffscreenWindow() const;
|
|
private:
|
|
// FBC padding and forbidden methods
|
|
virtual void _ReservedWindow2();
|
|
virtual void _ReservedWindow3();
|
|
virtual void _ReservedWindow4();
|
|
virtual void _ReservedWindow5();
|
|
virtual void _ReservedWindow6();
|
|
virtual void _ReservedWindow7();
|
|
virtual void _ReservedWindow8();
|
|
|
|
BWindow();
|
|
BWindow(BWindow&);
|
|
BWindow& operator=(BWindow&);
|
|
|
|
private:
|
|
typedef BLooper inherited;
|
|
struct unpack_cookie;
|
|
class Shortcut;
|
|
|
|
friend class BAlert;
|
|
friend class BApplication;
|
|
friend class BBitmap;
|
|
friend class BView;
|
|
friend class BMenuItem;
|
|
friend class BWindowScreen;
|
|
friend class BDirectWindow;
|
|
friend class BFilePanel;
|
|
friend class BWindowStack;
|
|
|
|
friend void _set_menu_sem_(BWindow* w, sem_id sem);
|
|
friend status_t _safe_get_server_token_(const BLooper*, int32*);
|
|
|
|
BWindow(BRect frame, int32 bitmapToken);
|
|
void _InitData(BRect frame, const char* title,
|
|
window_look look, window_feel feel,
|
|
uint32 flags, uint32 workspace,
|
|
int32 bitmapToken = -1);
|
|
|
|
virtual void task_looper();
|
|
|
|
BPoint AlertPosition(const BRect& frame);
|
|
virtual BMessage* ConvertToMessage(void* raw, int32 code);
|
|
|
|
void _AddShortcut(uint32* _key, uint32* _modifiers,
|
|
BMenuItem* item);
|
|
BHandler* _DetermineTarget(BMessage* message,
|
|
BHandler* target);
|
|
bool _IsFocusMessage(BMessage* message);
|
|
bool _UnpackMessage(unpack_cookie& state,
|
|
BMessage** _message, BHandler** _target,
|
|
bool* _usePreferred);
|
|
void _SanitizeMessage(BMessage* message,
|
|
BHandler* target, bool usePreferred);
|
|
bool _StealMouseMessage(BMessage* message,
|
|
bool& deleteMessage);
|
|
uint32 _TransitForMouseMoved(BView* view,
|
|
BView* viewUnderMouse) const;
|
|
|
|
bool InUpdate();
|
|
void _DequeueAll();
|
|
window_type _ComposeType(window_look look,
|
|
window_feel feel) const;
|
|
void _DecomposeType(window_type type,
|
|
window_look* look,
|
|
window_feel* feel) const;
|
|
|
|
void SetIsFilePanel(bool yes);
|
|
bool IsFilePanel() const;
|
|
|
|
void _CreateTopView();
|
|
void _AdoptResize();
|
|
void _SetFocus(BView* focusView,
|
|
bool notifyIputServer = false);
|
|
void _SetName(const char* title);
|
|
|
|
Shortcut* _FindShortcut(uint32 key, uint32 modifiers);
|
|
BView* _FindView(BView* view, BPoint point) const;
|
|
BView* _FindView(int32 token);
|
|
BView* _LastViewChild(BView* parent);
|
|
|
|
BView* _FindNextNavigable(BView* focus, uint32 flags);
|
|
BView* _FindPreviousNavigable(BView* focus,
|
|
uint32 flags);
|
|
void _Switcher(int32 rawKey, uint32 modifiers,
|
|
bool repeat);
|
|
bool _HandleKeyDown(BMessage* event);
|
|
bool _HandleUnmappedKeyDown(BMessage* event);
|
|
void _KeyboardNavigation();
|
|
|
|
void _GetDecoratorSize(float* _borderWidth,
|
|
float* _tabHeight) const;
|
|
void _SendShowOrHideMessage();
|
|
void _PropagateMessageToChildViews(BMessage*);
|
|
|
|
private:
|
|
char* fTitle;
|
|
int32 _unused0;
|
|
bool fInTransaction;
|
|
bool fActive;
|
|
short fShowLevel;
|
|
uint32 fFlags;
|
|
|
|
BView* fTopView;
|
|
BView* fFocus;
|
|
BView* fLastMouseMovedView;
|
|
uint32 _unused1;
|
|
BMenuBar* fKeyMenuBar;
|
|
BButton* fDefaultButton;
|
|
BList fShortcuts;
|
|
int32 fTopViewToken;
|
|
bool fUpdateRequested;
|
|
bool fOffscreen;
|
|
bool fIsFilePanel;
|
|
bool _unused4;
|
|
bigtime_t fPulseRate;
|
|
bool _unused5;
|
|
bool fMinimized;
|
|
bool fNoQuitShortcut;
|
|
bool _unused6;
|
|
sem_id fMenuSem;
|
|
float fMaxZoomHeight;
|
|
float fMaxZoomWidth;
|
|
float fMinHeight;
|
|
float fMinWidth;
|
|
float fMaxHeight;
|
|
float fMaxWidth;
|
|
BRect fFrame;
|
|
window_look fLook;
|
|
window_feel fFeel;
|
|
int32 fLastViewToken;
|
|
::BPrivate::PortLink* fLink;
|
|
BMessageRunner* fPulseRunner;
|
|
BRect fPreviousFrame;
|
|
|
|
uint32 _reserved[9];
|
|
};
|
|
|
|
|
|
#endif // _WINDOW_H
|