WindowManager: Respond to volume media keys

bplaat · bplaat · commit 0e2735dcc30f · 2026-03-24T18:23:54.000+01:00
Also add volume overlay which visualizes volume changes
diff --git a/Base/res/icons/themes/Default/16x16/audio-volume-high.png b/Base/res/icons/themes/Default/16x16/audio-volume-high.png
diff --git a/Base/res/icons/themes/Default/16x16/audio-volume-low.png b/Base/res/icons/themes/Default/16x16/audio-volume-low.png
diff --git a/Base/res/icons/themes/Default/16x16/audio-volume-medium.png b/Base/res/icons/themes/Default/16x16/audio-volume-medium.png
diff --git a/Base/res/icons/themes/Default/16x16/audio-volume-muted.png b/Base/res/icons/themes/Default/16x16/audio-volume-muted.png
diff --git a/Base/res/icons/themes/Default/16x16/audio-volume-zero.png b/Base/res/icons/themes/Default/16x16/audio-volume-zero.png
diff --git a/Base/res/themes/Chillychilly.ini b/Base/res/themes/Chillychilly.ini
@@ -105,4 +105,5 @@ MenuShadow=/res/icons/themes/Chillychilly/menu-shadow.png
 TaskBarShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
 TooltipShadow=/res/icons/themes/Chillychilly/frame-shadow-light.png
 TitleButtonIcons=/res/icons/themes/Chillychilly/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
diff --git a/Base/res/themes/Coffee.ini b/Base/res/themes/Coffee.ini
@@ -88,3 +88,4 @@ TitleHeight=20
 [Paths]
 ColorScheme=/res/color-schemes/Monokai.ini
 TitleButtonIcons=/res/icons/themes/Coffee/16x16/
+OverlayAudioVolumeIcons=/res/icons/16x16/
diff --git a/Base/res/themes/Contrast.ini b/Base/res/themes/Contrast.ini
@@ -18,6 +18,7 @@ ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
 InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
 TitleButtonIcons=/res/icons/themes/Contrast/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
 
 [Colors]
diff --git a/Base/res/themes/Cupertino.ini b/Base/res/themes/Cupertino.ini
@@ -90,6 +90,7 @@ TitleButtonHeight=16
 [Paths]
 ColorScheme=/res/color-schemes/Default.ini
 TitleButtonIcons=/res/icons/themes/Cupertino/16x16/
+OverlayAudioVolumeIcons=/res/icons/16x16/
 ActiveWindowShadow=
 InactiveWindowShadow=
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
diff --git a/Base/res/themes/Default.ini b/Base/res/themes/Default.ini
@@ -104,4 +104,5 @@ InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
 TaskBarShadow=/res/icons/themes/Default/frame-shadow-light.png
 TooltipShadow=/res/icons/themes/Default/frame-shadow-light.png
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
diff --git a/Base/res/themes/Durrque.ini b/Base/res/themes/Durrque.ini
@@ -22,6 +22,7 @@ ActiveWindowShadow=/res/icons/themes/Durrque/frame-shadow-dark.png
 MenuShadow=/res/icons/themes/Durrque/frame-shadow-light.png
 TaskbarShadow=
 TitleButtonIcons=/res/icons/themes/Durrque/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
 
 [Colors]
diff --git a/Base/res/themes/Gruvbox Dark.ini b/Base/res/themes/Gruvbox Dark.ini
@@ -85,6 +85,7 @@ TitleButtonHeight=15
 
 [Paths]
 TitleButtonIcons=/res/icons/themes/Gruvbox-Dark/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
 InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
diff --git a/Base/res/themes/Light.ini b/Base/res/themes/Light.ini
@@ -90,6 +90,7 @@ ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
 ColorScheme=/res/color-schemes/Octopus Cat.ini
 InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 TitleButtonIcons=/res/icons/themes/Light/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 MenuShadow=/res/icons/themes/Redmond/menu-shadow.png
 TooltipShadow=/res/icons/themes/Redmond/menu-shadow.png
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
diff --git a/Base/res/themes/Olive.ini b/Base/res/themes/Olive.ini
@@ -18,6 +18,7 @@ ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
 InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
 TitleButtonIcons=/res/icons/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
 
 [Colors]
diff --git a/Base/res/themes/Pumpkin.ini b/Base/res/themes/Pumpkin.ini
@@ -18,6 +18,7 @@ ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
 InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
 TitleButtonIcons=/res/icons/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
 
 [Colors]
diff --git a/Base/res/themes/Redmond 2000.ini b/Base/res/themes/Redmond 2000.ini
@@ -89,4 +89,5 @@ TitleHeight=18
 ColorScheme=/res/color-schemes/Default.ini
 MenuShadow=/res/icons/themes/Redmond/menu-shadow.png
 TitleButtonIcons=/res/icons/themes/Redmond/16x16/
+OverlayAudioVolumeIcons=/res/icons/16x16/
 TooltipShadow=/res/icons/themes/Redmond/menu-shadow.png
diff --git a/Base/res/themes/Redmond Glass.ini b/Base/res/themes/Redmond Glass.ini
@@ -110,4 +110,5 @@ MenuShadow=
 TaskBarShadow=
 TooltipShadow=
 TitleButtonIcons=/res/icons/themes/RedmondGlass/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
diff --git a/Base/res/themes/Redmond Plastic.ini b/Base/res/themes/Redmond Plastic.ini
@@ -111,4 +111,5 @@ MenuShadow=
 TaskBarShadow=
 TooltipShadow=
 TitleButtonIcons=/res/icons/themes/RedmondPlastic/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
diff --git a/Base/res/themes/Redmond.ini b/Base/res/themes/Redmond.ini
@@ -88,3 +88,4 @@ TitleHeight=18
 [Paths]
 ColorScheme=/res/color-schemes/Default.ini
 TitleButtonIcons=/res/icons/themes/Redmond/16x16/
+OverlayAudioVolumeIcons=/res/icons/16x16/
diff --git a/Base/res/themes/Scarlett.ini b/Base/res/themes/Scarlett.ini
@@ -18,6 +18,7 @@ ActiveWindowShadow=/res/icons/themes/Default/frame-shadow-dark.png
 InactiveWindowShadow=/res/icons/themes/Default/frame-shadow-light.png
 MenuShadow=/res/icons/themes/Default/frame-shadow-light.png
 TitleButtonIcons=/res/icons/16x16/
+OverlayAudioVolumeIcons=/res/icons/themes/Default/16x16/
 OverlayRectShadow=/res/icons/themes/Default/overlay-rect-shadow.png
 
 [Colors]
diff --git a/Base/res/themes/Silver.ini b/Base/res/themes/Silver.ini
@@ -21,6 +21,7 @@ ActiveWindowShadow=
 InactiveWindowShadow=
 MenuShadow=
 TitleButtonIcons=/res/icons/themes/Silver/16x16/
+OverlayAudioVolumeIcons=/res/icons/16x16/
 OverlayRectShadow=
 
 [Colors]
diff --git a/Base/res/themes/Sunshine.ini b/Base/res/themes/Sunshine.ini
@@ -87,3 +87,4 @@ IsDark=false
 [Paths]
 ColorScheme=/res/color-schemes/Dracula.ini
 TitleButtonIcons=/res/icons/themes/Sunshine/16x16/
+OverlayAudioVolumeIcons=/res/icons/16x16/
diff --git a/Meta/run.py b/Meta/run.py
@@ -751,7 +751,7 @@ def set_up_machine_devices(config: Configuration):
     if config.qemu_kind != QEMUKind.NativeWindows:
         config.extra_arguments.extend(["-qmp", "unix:qmp-sock,server,nowait"])
 
-    config.extra_arguments.extend(["-name", "SerenityOS", "-d", "guest_errors"])
+    config.extra_arguments.extend(["-name", "SerenityOS", "-d", "guest_errors", "-monitor", "tcp:127.0.0.1:4444,server,nowait"])
 
     # Machine/Architecture specifics.
     if config.machine_type.is_raspberry_pi():
diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp
@@ -90,7 +90,8 @@ static PropertyTab const window_tab {
         { "Overlays",
             { { Gfx::ColorRole::OverlayBackground },
                 { Gfx::ColorRole::OverlayText },
-                { Gfx::PathRole::OverlayRectShadow } } },
+                { Gfx::PathRole::OverlayRectShadow },
+                { Gfx::PathRole::OverlayAudioVolumeIcons } } },
 
         { "Desktop",
             { { Gfx::ColorRole::DesktopBackground },
@@ -460,6 +461,7 @@ ErrorOr<Core::AnonymousBuffer> MainWidget::encode()
     ENCODE_PATH(MenuShadow, true);
     ENCODE_PATH(TooltipShadow, true);
     ENCODE_PATH(OverlayRectShadow, true);
+    ENCODE_PATH(OverlayAudioVolumeIcons, true);
 
     return buffer;
 }
diff --git a/Userland/Libraries/LibAudio/ConnectionToManagerServer.h b/Userland/Libraries/LibAudio/ConnectionToManagerServer.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <AK/NonnullOwnPtr.h>
+#include <LibCore/Socket.h>
 #include <LibIPC/ConnectionToServer.h>
 #include <Userland/Services/AudioServer/AudioManagerClientEndpoint.h>
 #include <Userland/Services/AudioServer/AudioManagerServerEndpoint.h>
@@ -18,6 +19,8 @@ class ConnectionToManagerServer final
     , public AudioManagerClientEndpoint {
     IPC_CLIENT_CONNECTION(ConnectionToManagerServer, "/tmp/session/%sid/portal/audiomanager"sv)
 public:
+    explicit ConnectionToManagerServer(NonnullOwnPtr<Core::LocalSocket>);
+
     virtual ~ConnectionToManagerServer() override;
     virtual void die() override;
 
@@ -28,9 +31,6 @@ class ConnectionToManagerServer final
     Function<void(bool muted)> on_main_mix_muted_state_change;
     Function<void(double volume)> on_main_mix_volume_change;
     Function<void(u32 sample_rate)> on_device_sample_rate_change;
-
-private:
-    ConnectionToManagerServer(NonnullOwnPtr<Core::LocalSocket>);
 };
 
 }
diff --git a/Userland/Libraries/LibGfx/Palette.h b/Userland/Libraries/LibGfx/Palette.h
@@ -194,6 +194,7 @@ class Palette {
     ByteString tooltip_shadow_path() const { return path(PathRole::TooltipShadow); }
     ByteString color_scheme_path() const { return path(PathRole::ColorScheme); }
     ByteString overlay_rect_shadow_path() const { return path(PathRole::OverlayRectShadow); }
+    ByteString overlay_audio_volume_icons_path() const { return path(PathRole::OverlayAudioVolumeIcons); }
 
     Color color(ColorRole role) const { return m_impl->color(role); }
     Gfx::TextAlignment alignment(AlignmentRole role) const { return m_impl->alignment(role); }
diff --git a/Userland/Libraries/LibGfx/SystemTheme.cpp b/Userland/Libraries/LibGfx/SystemTheme.cpp
@@ -146,6 +146,8 @@ ErrorOr<Core::AnonymousBuffer> load_system_theme(Core::ConfigFile const& file, O
             switch (role) {
             case (int)PathRole::TitleButtonIcons:
                 return "/res/icons/16x16/";
+            case (int)PathRole::OverlayAudioVolumeIcons:
+                return "/res/icons/16x16/";
             default:
                 return allow_empty ? "" : "/res/";
             }
@@ -169,6 +171,7 @@ ErrorOr<Core::AnonymousBuffer> load_system_theme(Core::ConfigFile const& file, O
     if (!color_scheme.has_value())
         ENCODE_PATH(ColorScheme, true);
     ENCODE_PATH(OverlayRectShadow, true);
+    ENCODE_PATH(OverlayAudioVolumeIcons, true);
 
 #undef __ENUMERATE_COLOR_ROLE
 #define __ENUMERATE_COLOR_ROLE(role)                                    \
diff --git a/Userland/Libraries/LibGfx/SystemTheme.h b/Userland/Libraries/LibGfx/SystemTheme.h
@@ -148,7 +148,8 @@ namespace Gfx {
     C(MenuShadow)               \
     C(TooltipShadow)            \
     C(ColorScheme)              \
-    C(OverlayRectShadow)
+    C(OverlayRectShadow)        \
+    C(OverlayAudioVolumeIcons)
 
 enum class ColorRole {
     NoRole,
diff --git a/Userland/Services/WindowServer/CMakeLists.txt b/Userland/Services/WindowServer/CMakeLists.txt
@@ -45,5 +45,5 @@ set(GENERATED_SOURCES
 )
 
 serenity_bin(WindowServer)
-target_link_libraries(WindowServer PRIVATE LibCore LibFileSystem LibKeyboard LibGfx LibThreading LibIPC LibMain)
+target_link_libraries(WindowServer PRIVATE LibCore LibFileSystem LibKeyboard LibGfx LibThreading LibIPC LibMain LibAudio)
 serenity_install_headers(Services/WindowServer)
diff --git a/Userland/Services/WindowServer/Overlays.cpp b/Userland/Services/WindowServer/Overlays.cpp
@@ -432,6 +432,73 @@ WindowStackSwitchOverlay::WindowStackSwitchOverlay(Screen& screen, WindowStack&
     set_rect(calculate_frame_rect(Gfx::IntRect({}, m_content_size).inflated(2 * default_screen_rect_margin, 2 * default_screen_rect_margin)).centered_within(screen.rect()));
 }
 
+static ByteString volume_icon_path(StringView base_dir, double volume, bool muted)
+{
+    StringView icon_name;
+    if (muted)
+        icon_name = "audio-volume-muted.png"sv;
+    else if (volume > 0.66)
+        icon_name = "audio-volume-high.png"sv;
+    else if (volume > 0.33)
+        icon_name = "audio-volume-medium.png"sv;
+    else
+        icon_name = "audio-volume-low.png"sv;
+    return ByteString::formatted("{}{}", base_dir, icon_name);
+}
+
+VolumeOverlay::VolumeOverlay(double volume, bool muted)
+    : m_volume(volume)
+    , m_muted(muted)
+{
+}
+
+ErrorOr<NonnullOwnPtr<VolumeOverlay>> VolumeOverlay::create(Screen& screen, double volume, bool muted)
+{
+    auto overlay = TRY(adopt_nonnull_own_or_enomem(new (nothrow) VolumeOverlay(volume, muted)));
+    auto base_dir = WindowManager::the().palette().overlay_audio_volume_icons_path();
+    overlay->m_icon = TRY(Gfx::Bitmap::load_from_file(volume_icon_path(base_dir, volume, muted)));
+    overlay->set_rect(calculate_frame_rect(Gfx::IntRect({}, { content_width, content_height })).centered_within(screen.rect()));
+    return overlay;
+}
+
+ErrorOr<void> VolumeOverlay::update(double volume, bool muted)
+{
+    auto base_dir = WindowManager::the().palette().overlay_audio_volume_icons_path();
+    auto new_icon_path = volume_icon_path(base_dir, volume, muted);
+    auto old_icon_path = volume_icon_path(base_dir, m_volume, m_muted);
+    m_volume = volume;
+    m_muted = muted;
+    if (new_icon_path != old_icon_path)
+        m_icon = TRY(Gfx::Bitmap::load_from_file(new_icon_path));
+    invalidate_content();
+    return {};
+}
+
+void VolumeOverlay::render_overlay_bitmap(Gfx::Painter& painter)
+{
+    auto content_rect = Gfx::IntRect({}, { content_width, content_height }).centered_within({ {}, rect().size() });
+
+    Gfx::IntRect icon_dest {
+        content_rect.x() + padding,
+        content_rect.y() + padding,
+        icon_size,
+        icon_size,
+    };
+    if (m_icon)
+        painter.draw_scaled_bitmap(icon_dest, *m_icon, m_icon->rect(), 1.0f, Gfx::ScalingMode::NearestNeighbor);
+
+    auto text_color = WindowManager::the().palette().overlay_text();
+    int bar_x = content_rect.x() + padding;
+    int bar_y = content_rect.y() + padding + icon_size + bar_margin;
+    int bar_width = content_width - 2 * padding;
+    Gfx::IntRect bar_background { bar_x, bar_y, bar_width, bar_height };
+    Gfx::IntRect bar_fill { bar_x, bar_y, static_cast<int>(bar_width * (m_muted ? 0.0 : m_volume)), bar_height };
+    painter.fill_rect(bar_background, text_color.with_alpha(60));
+    if (bar_fill.width() > 0)
+        painter.fill_rect(bar_fill, m_muted ? WindowManager::the().palette().disabled_text_front() : WindowManager::the().palette().selection());
+    painter.draw_rect(bar_background, text_color.with_alpha(120));
+}
+
 TileWindowOverlay::TileWindowOverlay(Window& window, Gfx::IntRect const& tiled_frame_rect, Gfx::Palette&& palette)
     : m_window(window)
     , m_tiled_frame_rect(tiled_frame_rect)
diff --git a/Userland/Services/WindowServer/Overlays.h b/Userland/Services/WindowServer/Overlays.h
@@ -7,9 +7,12 @@
 
 #pragma once
 
+#include <AK/Error.h>
 #include <AK/IntrusiveList.h>
+#include <AK/NonnullOwnPtr.h>
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <WindowServer/MultiScaleBitmaps.h>
@@ -34,6 +37,7 @@ class Overlay {
         WindowGeometry,
         Dnd,
         WindowStackSwitch,
+        VolumeOverlay,
         ScreenNumber,
     };
     [[nodiscard]] virtual ZOrder zorder() const = 0;
@@ -220,6 +224,30 @@ class WindowStackSwitchOverlay : public RectangularOverlay {
     int const m_target_column;
 };
 
+class VolumeOverlay : public RectangularOverlay {
+public:
+    static constexpr int icon_size = 64;
+    static constexpr int bar_height = 10;
+    static constexpr int bar_margin = 12;
+    static constexpr int padding = 16;
+    static constexpr int content_width = icon_size + 2 * padding;
+    static constexpr int content_height = icon_size + bar_margin + bar_height + 2 * padding;
+
+    static ErrorOr<NonnullOwnPtr<VolumeOverlay>> create(Screen&, double volume, bool muted);
+
+    ErrorOr<void> update(double volume, bool muted);
+
+    virtual ZOrder zorder() const override { return ZOrder::VolumeOverlay; }
+    virtual void render_overlay_bitmap(Gfx::Painter&) override;
+
+private:
+    VolumeOverlay(double volume, bool muted);
+
+    double m_volume { 1.0 };
+    bool m_muted { false };
+    RefPtr<Gfx::Bitmap const> m_icon;
+};
+
 class TileWindowOverlay : public Overlay {
 public:
     TileWindowOverlay(Window&, Gfx::IntRect const&, Gfx::Palette&&);
diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h
diff --git a/Userland/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp
