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

WindowServer: Clean up any menu objects on process exit.

Browse source 
..and now that this works, implement the Quit menu action in Terminal. :^)
This commit is contained in:
Andreas Kling 2019-02-12 10:41:09 +01:00
parent f311d0f353
commit 4b8133e925
10 changed files with 76 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WindowServer/WSMenu.h
View file

@ -18,6 +18,7 @@ public:
~WSMenu();
int menu_id() const { return m_menu_id; }
const Process* process() const { return m_process.ptr(); }
WSMenuBar* menu_bar() { return m_menubar; }
const WSMenuBar* menu_bar() const { return m_menubar; }

5
WindowServer/WSMenuBar.cpp
View file

@ -3,8 +3,9 @@
#include "WSMenuItem.h"
#include <Kernel/Process.h>
WSMenuBar::WSMenuBar(Process& process)
: m_process(process.make_weak_ptr())
WSMenuBar::WSMenuBar(int menubar_id, Process& process)
: m_menubar_id(menubar_id)
, m_process(process.make_weak_ptr())
{
}

5
WindowServer/WSMenuBar.h
View file

@ -8,9 +8,11 @@ class Process;
class WSMenuBar {
public:
explicit WSMenuBar(Process&);
WSMenuBar(int menubar_id, Process&);
~WSMenuBar();
int menubar_id() const { return m_menubar_id; }
const Process* process() const { return m_process.ptr(); }
void add_menu(WSMenu* menu) { m_menus.append(menu); }
template<typename Callback>
@ -23,6 +25,7 @@ public:
}
private:
int m_menubar_id { 0 };
WeakPtr<Process> m_process;
Vector<WSMenu*> m_menus;
};

40
WindowServer/WSWindowManager.cpp
View file

@ -761,8 +761,8 @@ void WSWindowManager::flush(const Rect& a_rect)
void WSWindowManager::close_menu(WSMenu& menu)
{
LOCKER(m_lock);
ASSERT(m_current_menu == &menu);
close_current_menu();
if (m_current_menu == &menu)
close_current_menu();
}
WSMenu& WSWindowManager::create_menu(String&& name)
@ -779,8 +779,8 @@ WSMenu& WSWindowManager::create_menu(String&& name)
int WSWindowManager::api$menubar_create()
{
LOCKER(m_lock);
auto menubar = make<WSMenuBar>(*current);
int menubar_id = m_next_menubar_id++;
auto menubar = make<WSMenuBar>(menubar_id, *current);
m_menubars.set(menubar_id, move(menubar));
return menubar_id;
}
@ -793,7 +793,7 @@ int WSWindowManager::api$menubar_destroy(int menubar_id)
return -EBADMENUBAR;
auto& menubar = *(*it).value;
if (&menubar == m_current_menubar)
ASSERT_NOT_REACHED();
set_current_menubar(nullptr);
m_menubars.remove(it);
return 0;
}
@ -827,6 +827,8 @@ int WSWindowManager::api$menu_destroy(int menu_id)
auto it = m_menus.find(menu_id);
if (it == m_menus.end())
return -EBADMENU;
auto& menu = *(*it).value;
close_menu(menu);
m_menus.remove(it);
return 0;
}
@ -868,3 +870,33 @@ int WSWindowManager::api$app_set_menubar(int menubar_id)
invalidate();
return 0;
}
void WSWindowManager::destroy_all_menus(Process& process)
{
LOCKER(m_lock);
Vector<int> menu_ids;
bool should_close_current_menu = false;
for (auto& it : m_menus) {
if (it.value->process() == &process)
menu_ids.append(it.value->menu_id());
if (m_current_menu == it.value.ptr())
should_close_current_menu = true;
}
if (should_close_current_menu)
close_current_menu();
for (int menu_id : menu_ids)
m_menus.remove(menu_id);
Vector<int> menubar_ids;
bool should_close_current_menubar = false;
for (auto& it : m_menubars) {
if (it.value->process() == &process)
menubar_ids.append(it.value->menubar_id());
if (m_current_menubar == it.value.ptr())
should_close_current_menubar = true;
}
if (should_close_current_menubar)
set_current_menubar(nullptr);
for (int menubar_id : menubar_ids)
m_menubars.remove(menubar_id);
}

1
WindowServer/WSWindowManager.h
View file

@ -62,6 +62,7 @@ public:
int api$menu_add_separator(int menu_id);
int api$menu_add_item(int menu_id, unsigned identifier, String&& text);
int api$app_set_menubar(int menubar_id);
void destroy_all_menus(Process&);
private:
WSWindowManager();