RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:47:45 +00:00
Code Issues Activity Actions

WindowServer: Start implementing a menu system.

Browse source 
I'm going with a global top-of-the-screen menu instead of per-window menus.
The basic idea is that menus will live in the WindowServer and clients can
create menus via WindowServer requests.
This commit is contained in:
Andreas Kling 2019-02-11 09:47:10 +01:00
parent 7abef6ba9e
commit 443b043b49
14 changed files with 487 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WindowServer/WSWindowManager.h
View file

@ -7,10 +7,12 @@
#include <AK/InlineLinkedList.h>
#include <AK/WeakPtr.h>
#include <AK/Lock.h>
#include <AK/CircularQueue.h>
#include <AK/HashMap.h>
#include "WSMessageReceiver.h"
#include "WSMenuBar.h"
class WSScreen;
class WSMenuBar;
class WSMouseEvent;
class WSClientWantsToPaintMessage;
class WSWindow;
@ -32,6 +34,13 @@ public:
void invalidate_cursor();
void draw_cursor();
void draw_menubar();
Rect menubar_rect() const;
WSMenuBar* current_menubar() { return m_current_menubar; }
void set_current_menubar(WSMenuBar*);
WSMenu* current_menu() { return m_current_menu; }
void set_current_menu(WSMenu*);
void invalidate(const WSWindow&);
void invalidate(const WSWindow&, const Rect&);
@ -47,10 +56,14 @@ private:
virtual ~WSWindowManager() override;
void process_mouse_event(WSMouseEvent&);
void handle_menu_mouse_event(WSMenu&, WSMouseEvent&);
void handle_menubar_mouse_event(WSMenuBar&, WSMouseEvent&);
void handle_titlebar_mouse_event(WSWindow&, WSMouseEvent&);
void handle_close_button_mouse_event(WSWindow&, WSMouseEvent&);
void set_active_window(WSWindow*);
void close_current_menu();
virtual void on_message(WSMessage&) override;
@ -112,4 +125,8 @@ private:
Lockable<bool> m_flash_flush;
bool m_buffers_are_flipped { false };
WSMenuBar* m_current_menubar { nullptr };
WSMenu* m_current_menu { nullptr };
HashMap<int, OwnPtr<WSMenuBar>> m_menubars;
};