Skip to content

Commit

Permalink
WindowServer: Populate system menu with app launchers from /res/apps
Browse files Browse the repository at this point in the history
The new system directory /res/apps now contains ".af" files describing
applications (name, category, executable path, and icon.)
These are used to populate the system menu with application shortcuts.

This will replace the Launcher app. :^)
  • Loading branch information
awesomekling committed Nov 11, 2019
1 parent 37329f8 commit b6a6f34
Show file tree
Hide file tree
Showing 13 changed files with 114 additions and 9 deletions.
8 changes: 8 additions & 0 deletions Base/res/apps/Browser.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=Browser
Executable=/bin/Browser
Category=Internet

[Icons]
16x16=/res/icons/16x16/filetype-html.png
32x32=/res/icons/32x32/filetype-html.png
8 changes: 8 additions & 0 deletions Base/res/apps/Calculator.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=Calculator
Executable=/bin/Calculator
Category=Utilities

[Icons]
16x16=
32x32=
8 changes: 8 additions & 0 deletions Base/res/apps/ChanViewer.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=ChanViewer
Executable=/bin/ChanViewer
Category=Internet

[Icons]
16x16=/res/icons/16x16/app-chanviewer.png
32x32=/res/icons/32x32/app-chanviewer.png
8 changes: 8 additions & 0 deletions Base/res/apps/DisplayProperties.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=DisplayProperties
Executable=/bin/DisplayProperties
Category=Utilities

[Icons]
16x16=/res/icons/16x16/app-display-properties.png
32x32=/res/icons/32x32/app-display-properties.png
8 changes: 8 additions & 0 deletions Base/res/apps/FileManager.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=FileManager
Executable=/bin/FileManager
Category=Utilities

[Icons]
16x16=/res/icons/16x16/filetype-folder.png
32x32=/res/icons/32x32/filetype-folder.png
8 changes: 8 additions & 0 deletions Base/res/apps/FontEditor.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=FontEditor
Executable=/bin/FontEditor
Category=FontEditor

[Icons]
16x16=/res/icons/16x16/app-font-editor.png
32x32=/res/icons/FontEditor.png
8 changes: 8 additions & 0 deletions Base/res/apps/HackStudio.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=HackStudio
Executable=/bin/HackStudio
Category=Development

[Icons]
16x16=/res/icons/16x16/app-hack-studio.png
32x32=/res/icons/32x32/app-hack-studio.png
8 changes: 8 additions & 0 deletions Base/res/apps/HexEditor.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=HexEditor
Executable=/bin/HexEditor
Category=Development

[Icons]
16x16=/res/icons/16x16/app-hexeditor.png
32x32=/res/icons/32x32/app-hexeditor.png
8 changes: 8 additions & 0 deletions Base/res/apps/IRCClient.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=IRCClient
Executable=/bin/IRCClient
Category=Internet

[Icons]
16x16=/res/icons/16x16/app-irc-client.png
32x32=/res/icons/32x32/app-irc-client.png
7 changes: 7 additions & 0 deletions Base/res/apps/PaintBrush.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[App]
Name=PaintBrush
Executable=/bin/PaintBrush

[Icons]
16x16=/res/icons/16x16/app-paintbrush.png
32x32=/res/icons/32x32/app-paintbrush.png
8 changes: 8 additions & 0 deletions Base/res/apps/SystemMonitor.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=SystemMonitor
Executable=/bin/SystemMonitor
Category=Utilities

[Icons]
16x16=/res/icons/16x16/app-system-monitor.png
32x32=/res/icons/32x32/app-system-monitor.png
8 changes: 8 additions & 0 deletions Base/res/apps/Terminal.af
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[App]
Name=Terminal
Executable=/bin/Terminal
Category=Utilities

[Icons]
16x16=/res/icons/16x16/app-terminal.png
32x32=/res/icons/32x32/app-terminal.png
28 changes: 19 additions & 9 deletions Servers/WindowServer/WSWindowManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <AK/StdLibExtras.h>
#include <AK/Vector.h>
#include <LibCore/CTimer.h>
#include <LibCore/CDirIterator.h>
#include <LibDraw/CharacterBitmap.h>
#include <LibDraw/Font.h>
#include <LibDraw/PNGLoader.h>
Expand Down Expand Up @@ -45,16 +46,25 @@ WSWindowManager::WSWindowManager()
reload_config(false);

struct AppMenuItem {
const char* binary_name;
const char* description;
const char* icon_path;
String binary_name;
String description;
String icon_path;
};

Vector<AppMenuItem> apps = {
{ "/bin/Terminal", "Open Terminal...", "/res/icons/16x16/app-terminal.png" },
{ "/bin/FileManager", "Open FileManager...", "/res/icons/16x16/filetype-folder.png" },
{ "/bin/SystemMonitor", "Open SystemMonitor...", "/res/icons/16x16/app-system-monitor.png" }
};
Vector<AppMenuItem> apps;

CDirIterator dt("/res/apps", CDirIterator::SkipDots);
while (dt.has_next()) {
auto af_name = dt.next_path();
auto af_path = String::format("/res/apps/%s", af_name.characters());
auto af = CConfigFile::open(af_path);
if (!af->has_key("App", "Name") || !af->has_key("App", "Executable"))
continue;
auto app_name = af->read_entry("App", "Name");
auto app_executable = af->read_entry("App", "Executable");
auto app_icon_path = af->read_entry("Icons", "16x16");
apps.append({ app_executable, app_name, app_icon_path });
}

u8 system_menu_name[] = { 0xc3, 0xb8, 0 };
m_system_menu = WSMenu::construct(nullptr, -1, String((const char*)system_menu_name));
Expand All @@ -74,7 +84,7 @@ WSWindowManager::WSWindowManager()
if (item.identifier() >= 1 && item.identifier() <= 1u + apps.size() - 1) {
if (fork() == 0) {
const auto& bin = apps[item.identifier() - 1].binary_name;
execl(bin, bin, nullptr);
execl(bin.characters(), bin.characters(), nullptr);
ASSERT_NOT_REACHED();
}
}
Expand Down

0 comments on commit b6a6f34

Please sign in to comment.