Add API's and plumbing for WindowServer clients to make menus.

awesomekling · awesomekling · commit 133706d697b7 · 2019-02-12T00:52:19.000+01:00
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
@@ -81,7 +81,7 @@ int main(int argc, char** argv)
 
     auto help_menu = make<GMenu>("?");
     help_menu->add_item(2, "About");
-    menubar->add_menu(move(app_menu));
+    menubar->add_menu(move(help_menu));
 
     app.set_menubar(move(menubar));
 
diff --git a/Kernel/Process.h b/Kernel/Process.h
@@ -230,6 +230,14 @@ class Process : public InlineLinkedListNode<Process>, public Weakable<Process> {
     int gui$get_window_rect(int window_id, GUI_Rect*);
     int gui$set_window_rect(int window_id, const GUI_Rect*);
     int gui$set_global_cursor_tracking_enabled(int window_id, bool enabled);
+    int gui$menubar_create();
+    int gui$menubar_destroy(int menubar_id);
+    int gui$menubar_add_menu(int menubar_id, int menu_id);
+    int gui$menu_create(const char* name);
+    int gui$menu_destroy(int menu_id);
+    int gui$menu_add_separator(int menu_id);
+    int gui$menu_add_item(int menu_id, unsigned identifier, const char* text);
+    int gui$set_menubar(int menubar_id);
 
     DisplayInfo set_video_resolution(int width, int height);
 
diff --git a/Kernel/ProcessGUI.cpp b/Kernel/ProcessGUI.cpp
@@ -6,6 +6,7 @@
 #include <WindowServer/WSMessageLoop.h>
 #include <WindowServer/WSWindow.h>
 #include <WindowServer/WSWindowManager.h>
+#include <WindowServer/WSMenuBar.h>
 #include <Kernel/BochsVGADevice.h>
 
 //#define LOG_GUI_SYSCALLS
@@ -284,3 +285,48 @@ DisplayInfo Process::set_video_resolution(int width, int height)
     BochsVGADevice::the().set_resolution(width, height);
     return info;
 }
+
+int Process::gui$menubar_create()
+{
+    return WSWindowManager::the().api$menubar_create();
+}
+
+int Process::gui$menubar_destroy(int menubar_id)
+{
+    return WSWindowManager::the().api$menubar_destroy(menubar_id);
+}
+
+int Process::gui$menubar_add_menu(int menubar_id, int menu_id)
+{
+    return WSWindowManager::the().api$menubar_add_menu(menubar_id, menu_id);
+}
+
+int Process::gui$menu_create(const char* name)
+{
+    if (!validate_read_str(name))
+        return -EFAULT;
+    return WSWindowManager::the().api$menu_create(String(name));
+}
+
+int Process::gui$menu_destroy(int menu_id)
+{
+    return WSWindowManager::the().api$menu_destroy(menu_id);
+}
+
+int Process::gui$menu_add_separator(int menu_id)
+{
+    return WSWindowManager::the().api$menu_add_separator(menu_id);
+}
+
+int Process::gui$menu_add_item(int menu_id, unsigned identifier, const char* text)
+{
+    if (!validate_read_str(text))
+        return -EFAULT;
+    return WSWindowManager::the().api$menu_add_item(menu_id, identifier, String(text));
+}
+
+int Process::gui$set_menubar(int menubar_id)
+{
+    kprintf("gui$set_menubar %d\n", menubar_id);
+    return WSWindowManager::the().api$app_set_menubar(menubar_id);
+}
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp
@@ -223,6 +223,22 @@ static dword handle(RegisterDump& regs, dword function, dword arg1, dword arg2,
         return current->sys$rmdir((const char*)arg1);
     case Syscall::SC_chmod:
         return current->sys$chmod((const char*)arg1, (mode_t)arg2);
+    case Syscall::SC_gui_menubar_create:
+        return current->gui$menubar_create();
+    case Syscall::SC_gui_menubar_destroy:
+        return current->gui$menubar_destroy((int)arg1);
+    case Syscall::SC_gui_menubar_add_menu:
+        return current->gui$menubar_add_menu((int)arg1, (int)arg2);
+    case Syscall::SC_gui_menu_create:
+        return current->gui$menu_create((const char*)arg1);
+    case Syscall::SC_gui_menu_destroy:
+        return current->gui$menu_destroy((int)arg1);
+    case Syscall::SC_gui_menu_add_separator:
+        return current->gui$menu_add_separator((int)arg1);
+    case Syscall::SC_gui_menu_add_item:
+        return current->gui$menu_add_item((int)arg1, (unsigned)arg2, (const char*)arg3);
+    case Syscall::SC_gui_app_set_menubar:
+        return current->gui$set_menubar((int)arg1);
     default:
         kprintf("<%u> int0x80: Unknown function %u requested {%x, %x, %x}\n", current->pid(), function, arg1, arg2, arg3);
         break;
diff --git a/Kernel/Syscall.h b/Kernel/Syscall.h
@@ -85,6 +85,14 @@
     __ENUMERATE_SYSCALL(rmdir) \
     __ENUMERATE_SYSCALL(chmod) \
     __ENUMERATE_SYSCALL(usleep) \
+    __ENUMERATE_SYSCALL(gui_menubar_create) \
+    __ENUMERATE_SYSCALL(gui_menubar_destroy) \
+    __ENUMERATE_SYSCALL(gui_menubar_add_menu) \
+    __ENUMERATE_SYSCALL(gui_menu_create) \
+    __ENUMERATE_SYSCALL(gui_menu_destroy) \
+    __ENUMERATE_SYSCALL(gui_menu_add_separator) \
+    __ENUMERATE_SYSCALL(gui_menu_add_item) \
+    __ENUMERATE_SYSCALL(gui_app_set_menubar) \
 
 
 #ifdef SERENITY
diff --git a/LibC/errno_numbers.h b/LibC/errno_numbers.h
@@ -46,6 +46,8 @@
     __ERROR(EBADWINDOW,     "Bad window ID") \
     __ERROR(EBADBACKING,    "Bad backing store ID") \
     __ERROR(ENOTEMPTY,      "Directory not empty") \
+    __ERROR(EBADMENUBAR,    "Bad menubar ID") \
+    __ERROR(EBADMENU,       "Bad menu ID") \
 
 
 enum __errno_values {
diff --git a/LibC/gui.cpp b/LibC/gui.cpp
@@ -68,3 +68,51 @@ int gui_set_global_cursor_tracking_enabled(int window_id, bool enabled)
     int rc = syscall(SC_gui_set_global_cursor_tracking_enabled, window_id, enabled);
     __RETURN_WITH_ERRNO(rc, rc, -1);
 }
+
+int gui_menubar_create()
+{
+    int rc = syscall(SC_gui_menubar_create);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_menubar_destroy(int menubar_id)
+{
+    int rc = syscall(SC_gui_menubar_destroy, menubar_id);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_menubar_add_menu(int menubar_id, int menu_id)
+{
+    int rc = syscall(SC_gui_menubar_add_menu, menubar_id, menu_id);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_menu_create(const char* name)
+{
+    int rc = syscall(SC_gui_menu_create, name);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_menu_destroy(int menu_id)
+{
+    int rc = syscall(SC_gui_menu_destroy, menu_id);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_menu_add_separator(int menu_id)
+{
+    int rc = syscall(SC_gui_menu_add_separator, menu_id);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_menu_add_item(int menu_id, unsigned identifier, const char* text)
+{
+    int rc = syscall(SC_gui_menu_add_item, menu_id, identifier, text);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
+
+int gui_app_set_menubar(int menubar_id)
+{
+    int rc = syscall(SC_gui_app_set_menubar, menubar_id);
+    __RETURN_WITH_ERRNO(rc, rc, -1);
+}
diff --git a/LibC/gui.h b/LibC/gui.h
@@ -16,6 +16,14 @@ int gui_set_window_title(int window_id, const char*, size_t);
 int gui_get_window_rect(int window_id, GUI_Rect*);
 int gui_set_window_rect(int window_id, const GUI_Rect*);
 int gui_set_global_cursor_tracking_enabled(int window_id, bool);
+int gui_menubar_create();
+int gui_menubar_destroy(int menubar_id);
+int gui_menubar_add_menu(int menubar_id, int menu_id);
+int gui_menu_create(const char* name);
+int gui_menu_destroy(int menu_id);
+int gui_menu_add_separator(int menu_id);
+int gui_menu_add_item(int menu_id, unsigned identifier, const char* text);
+int gui_app_set_menubar(int menubar_id);
 
 __END_DECLS
 
diff --git a/LibGUI/GMenu.cpp b/LibGUI/GMenu.cpp
@@ -1,4 +1,5 @@
 #include <LibGUI/GMenu.h>
+#include <LibC/gui.h>
 
 GMenu::GMenu(const String& name)
     : m_name(name)
@@ -7,6 +8,10 @@ GMenu::GMenu(const String& name)
 
 GMenu::~GMenu()
 {
+    if (m_menu_id) {
+        gui_menu_destroy(m_menu_id);
+        m_menu_id = 0;
+    }
 }
 
 void GMenu::add_item(unsigned identifier, const String& text)
@@ -18,3 +23,16 @@ void GMenu::add_separator()
 {
     m_items.append(GMenuItem(GMenuItem::Separator));
 }
+
+int GMenu::realize_menu()
+{
+    m_menu_id = gui_menu_create(m_name.characters());
+    ASSERT(m_menu_id > 0);
+    for (auto& item : m_items) {
+        if (item.type() == GMenuItem::Separator)
+            gui_menu_add_separator(m_menu_id);
+        else if (item.type() == GMenuItem::Text)
+            gui_menu_add_item(m_menu_id, item.identifier(), item.text().characters());
+    }
+    return m_menu_id;
+}
diff --git a/LibGUI/GMenu.h b/LibGUI/GMenu.h
@@ -12,6 +12,11 @@ class GMenu {
     void add_separator();
 
 private:
+    friend class GMenuBar;
+    int menu_id() const { return m_menu_id; }
+    int realize_menu();
+
+    int m_menu_id { 0 };
     String m_name;
     Vector<GMenuItem> m_items;
 };
diff --git a/LibGUI/GMenuBar.cpp b/LibGUI/GMenuBar.cpp
@@ -1,4 +1,5 @@
 #include <LibGUI/GMenuBar.h>
+#include <LibC/gui.h>
 
 GMenuBar::GMenuBar()
 {
@@ -15,8 +16,22 @@ void GMenuBar::add_menu(OwnPtr<GMenu>&& menu)
 
 void GMenuBar::notify_added_to_application(Badge<GApplication>)
 {
+    ASSERT(!m_menubar_id);
+    m_menubar_id = gui_menubar_create();
+    ASSERT(m_menubar_id > 0);
+    for (auto& menu : m_menus) {
+        ASSERT(menu);
+        int menu_id = menu->realize_menu();
+        ASSERT(menu_id > 0);
+        int rc = gui_menubar_add_menu(m_menubar_id, menu_id);
+        ASSERT(rc == 0);
+    }
+    gui_app_set_menubar(m_menubar_id);
 }
 
 void GMenuBar::notify_removed_from_application(Badge<GApplication>)
 {
+    ASSERT(m_menubar_id);
+    gui_menubar_destroy(m_menubar_id);
+    m_menubar_id = 0;
 }
diff --git a/LibGUI/GMenuBar.h b/LibGUI/GMenuBar.h
@@ -18,5 +18,6 @@ class GMenuBar {
     void notify_removed_from_application(Badge<GApplication>);
 
 private:
+    int m_menubar_id { 0 };
     Vector<OwnPtr<GMenu>> m_menus;
 };
diff --git a/WindowServer/WSMenu.cpp b/WindowServer/WSMenu.cpp
@@ -7,8 +7,9 @@
 #include <SharedGraphics/Painter.h>
 #include <SharedGraphics/Font.h>
 
-WSMenu::WSMenu(const String& name)
-    : m_name(name)
+WSMenu::WSMenu(int menu_id, String&& name)
+    : m_menu_id(menu_id)
+    , m_name(move(name))
 {
 }
 
diff --git a/WindowServer/WSMenu.h b/WindowServer/WSMenu.h
@@ -12,9 +12,11 @@ class Font;
 
 class WSMenu {
 public:
-    WSMenu(const String& name);
+    WSMenu(int menu_id, String&& name);
     ~WSMenu();
 
+    int menu_id() const { return m_menu_id; }
+
     WSMenuBar* menu_bar() { return m_menubar; }
     const WSMenuBar* menu_bar() const { return m_menubar; }
 
@@ -70,6 +72,7 @@ class WSMenu {
 private:
     void did_activate(WSMenuItem&);
 
+    int m_menu_id { 0 };
     String m_name;
     Rect m_rect_in_menubar;
     Rect m_text_rect_in_menubar;
diff --git a/WindowServer/WSMenuBar.h b/WindowServer/WSMenuBar.h
@@ -8,7 +8,7 @@ class WSMenuBar {
     WSMenuBar();
     ~WSMenuBar();
 
-    void add_menu(OwnPtr<WSMenu>&& menu) { m_menus.append(move(menu)); }
+    void add_menu(WSMenu* menu) { m_menus.append(menu); }
 
     template<typename Callback>
     void for_each_menu(Callback callback)
@@ -20,5 +20,5 @@ class WSMenuBar {
     }
 
 private:
-    Vector<OwnPtr<WSMenu>> m_menus;
+    Vector<WSMenu*> m_menus;
 };
diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp
diff --git a/WindowServer/WSWindowManager.h b/WindowServer/WSWindowManager.h
