WindowServer+LibGUI: Pass window icons as shared buffers rather than …

…paths. Now that we support more than 2 clients per shared buffer, we can use them for window icons. I didn't do that previously since it would have made the Taskbar process unable to access the icons. This opens up some nice possibilities for programmatically generated icons.
cubiclove · Jul 28, 2019 · 841b2e5 · 841b2e5
1 parent 63619b9
commit 841b2e5
Show file tree

Hide file tree

Showing 21 changed files with 193 additions and 19 deletions.
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
@@ -1,6 +1,7 @@
 #include "DirectoryView.h"
 #include <AK/FileSystemPath.h>
 #include <LibCore/CUserInfo.h>
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GActionGroup.h>
 #include <LibGUI/GApplication.h>
@@ -227,7 +228,7 @@ int main(int argc, char** argv)
  window->set_main_widget(widget);
  window->show();
 
- window->set_icon_path("/res/icons/16x16/filetype-folder.png");
+ window->set_icon(load_png("/res/icons/16x16/filetype-folder.png"));
 
  return app.exec();
 }
diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp
@@ -1,4 +1,5 @@
 #include "FontEditor.h"
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GWindow.h>
 #include <stdio.h>
@@ -30,6 +31,6 @@ int main(int argc, char** argv)
  auto* font_editor = new FontEditorWidget(path, move(edited_font));
  window->set_main_widget(font_editor);
  window->show();
- window->set_icon_path("/res/icons/16x16/app-font-editor.png");
+ window->set_icon(load_png("/res/icons/16x16/app-font-editor.png"));
  return app.exec();
 }
diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp
@@ -3,6 +3,7 @@
 #include <LibAudio/AClientConnection.h>
 #include <LibCore/CFile.h>
 #include <LibCore/CThread.h>
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GEventLoop.h>
@@ -23,7 +24,7 @@ int main(int argc, char** argv)
  auto* piano_widget = new PianoWidget;
  window->set_main_widget(piano_widget);
  window->show();
- window->set_icon_path("/res/icons/16x16/app-piano.png");
+ window->set_icon(load_png("/res/icons/16x16/app-piano.png"));
 
  CThread sound_thread([](void* context) -> int {
  auto* piano_widget = (PianoWidget*)context;

diff --git a/Applications/ProcessManager/main.cpp b/Applications/ProcessManager/main.cpp
@@ -3,6 +3,7 @@
 #include "ProcessStacksWidget.h"
 #include "ProcessTableView.h"
 #include <LibCore/CTimer.h>
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
@@ -168,7 +169,7 @@ int main(int argc, char** argv)
 
  window->show();
 
- window->set_icon_path("/res/icons/16x16/app-process-manager.png");
+ window->set_icon(load_png("/res/icons/16x16/app-process-manager.png"));
 
  return app.exec();
 }
diff --git a/Applications/Taskbar/TaskbarWindow.cpp b/Applications/Taskbar/TaskbarWindow.cpp
@@ -1,5 +1,6 @@
 #include "TaskbarWindow.h"
 #include "TaskbarButton.h"
+#include <LibC/SharedBuffer.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
 #include <LibGUI/GDesktop.h>
@@ -100,6 +101,22 @@ void TaskbarWindow::wm_event(GWMEvent& event)
  break;
  }
 
+ case GEvent::WM_WindowIconBitmapChanged: {
+ auto& changed_event = static_cast<GWMWindowIconBitmapChangedEvent&>(event);
+#ifdef EVENT_DEBUG
+ dbgprintf("WM_WindowIconChanged: client_id=%d, window_id=%d, icon_buffer_id=%d\n",
+ changed_event.client_id(),
+ changed_event.window_id(),
+ changed_event.icon_buffer_id());
+#endif
+ if (auto* window = WindowList::the().window(identifier)) {
+ auto buffer = SharedBuffer::create_from_shared_buffer_id(changed_event.icon_buffer_id());
+ ASSERT(buffer);
+ window->button()->set_icon(GraphicsBitmap::create_with_shared_buffer(GraphicsBitmap::Format::RGBA32, *buffer, changed_event.icon_size()));
+ }
+ break;
+ }
+
  case GEvent::WM_WindowStateChanged: {
  auto& changed_event = static_cast<GWMWindowStateChangedEvent&>(event);
 #ifdef EVENT_DEBUG

diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
@@ -1,6 +1,7 @@
 #include "Terminal.h"
 #include <Kernel/KeyCode.h>
 #include <LibCore/CUserInfo.h>
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
@@ -154,7 +155,7 @@ int main(int argc, char** argv)
  window->move_to(300, 300);
  terminal.apply_size_increments_to_window(*window);
  window->show();
- window->set_icon_path("/res/icons/16x16/app-terminal.png");
+ window->set_icon(load_png("/res/icons/16x16/app-terminal.png"));
  terminal.set_should_beep(config->read_bool_entry("Window", "AudibleBeep", false));
 
  WeakPtr<GWindow> settings_window;

diff --git a/Applications/TextEditor/main.cpp b/Applications/TextEditor/main.cpp
@@ -1,4 +1,5 @@
 #include "TextEditorWidget.h"
+#include <LibDraw/PNGLoader.h>
 
 int main(int argc, char** argv)
 {
@@ -15,7 +16,7 @@ int main(int argc, char** argv)
  text_widget->open_sesame(argv[1]);
 
  window->show();
- window->set_icon_path("/res/icons/TextEditor16.png");
+ window->set_icon(load_png("/res/icons/TextEditor16.png"));
 
  return app.exec();
 }
diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp
@@ -17,6 +17,7 @@
 */
 
 #include <LibDraw/GraphicsBitmap.h>
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
@@ -229,7 +230,7 @@ int main(int argc, char** argv)
  fire->set_stat_label(time);
 
  window->show();
- window->set_icon_path("/res/icons/16x16/app-demo.png");
+ window->set_icon(load_png("/res/icons/16x16/app-demo.png"));
 
  return app.exec();
 }
diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp
@@ -1,5 +1,6 @@
 #include "Field.h"
 #include <LibCore/CConfigFile.h>
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
@@ -93,7 +94,7 @@ int main(int argc, char** argv)
 
  window->show();
 
- window->set_icon_path("/res/icons/minesweeper/mine.png");
+ window->set_icon(load_png("/res/icons/minesweeper/mine.png"));
 
  return app.exec();
 }
diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp
@@ -1,4 +1,5 @@
 #include "SnakeGame.h"
+#include <LibDraw/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
@@ -45,7 +46,7 @@ int main(int argc, char** argv)
 
  window->show();
 
- window->set_icon_path("/res/icons/16x16/app-snake.png");
+ window->set_icon(load_png("/res/icons/16x16/app-snake.png"));
 
  return app.exec();
 }
diff --git a/Libraries/LibGUI/GEvent.h b/Libraries/LibGUI/GEvent.h
@@ -40,6 +40,7 @@ class GEvent : public CEvent {
  WM_WindowStateChanged,
  WM_WindowRectChanged,
  WM_WindowIconChanged,
+ WM_WindowIconBitmapChanged,
  __End_WM_Events,
  };
 
@@ -133,6 +134,23 @@ class GWMWindowIconChangedEvent : public GWMEvent {
  String m_icon_path;
 };
 
+class GWMWindowIconBitmapChangedEvent : public GWMEvent {
+public:
+ GWMWindowIconBitmapChangedEvent(int client_id, int window_id, int icon_buffer_id, const Size& icon_size)
+ : GWMEvent(GEvent::Type::WM_WindowIconBitmapChanged, client_id, window_id)
+ , m_icon_buffer_id(icon_buffer_id)
+ , m_icon_size(icon_size)
+ {
+ }
+
+ int icon_buffer_id() const { return m_icon_buffer_id; }
+ const Size& icon_size() const { return m_icon_size; }
+
+private:
+ int m_icon_buffer_id;
+ Size m_icon_size;
+};
+
 class GMultiPaintEvent final : public GEvent {
 public:
  explicit GMultiPaintEvent(const Vector<Rect, 32>& rects, const Size& window_size)

diff --git a/Libraries/LibGUI/GEventLoop.cpp b/Libraries/LibGUI/GEventLoop.cpp
@@ -194,6 +194,8 @@ void GWindowServerConnection::handle_wm_event(const WSAPI_ServerMessage& event,
  CEventLoop::current().post_event(window, make<GWMWindowRectChangedEvent>(event.wm.client_id, event.wm.window_id, event.wm.rect));
  else if (event.type == WSAPI_ServerMessage::WM_WindowIconChanged)
  CEventLoop::current().post_event(window, make<GWMWindowIconChangedEvent>(event.wm.client_id, event.wm.window_id, String(event.text, event.text_length)));
+ else if (event.type == WSAPI_ServerMessage::WM_WindowIconBitmapChanged)
+ CEventLoop::current().post_event(window, make<GWMWindowIconBitmapChangedEvent>(event.wm.client_id, event.wm.window_id, event.wm.icon_buffer_id, event.wm.icon_size));
  else if (event.type == WSAPI_ServerMessage::WM_WindowRemoved)
  CEventLoop::current().post_event(window, make<GWMWindowRemovedEvent>(event.wm.client_id, event.wm.window_id));
  else
@@ -301,12 +303,9 @@ void GWindowServerConnection::postprocess_bundles(Vector<IncomingMessageBundle>&
  }
  handle_resize_event(event, *window);
  break;
- case WSAPI_ServerMessage::Type::WM_WindowRemoved:
- case WSAPI_ServerMessage::Type::WM_WindowStateChanged:
- case WSAPI_ServerMessage::Type::WM_WindowIconChanged:
- handle_wm_event(event, *window);
- break;
  default:
+ if (event.type > WSAPI_ServerMessage::__Begin_WM_Events__ && event.type < WSAPI_ServerMessage::Type::__End_WM_Events__)
+ handle_wm_event(event, *window);
  break;
  }
  }

diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp
@@ -1,5 +1,6 @@
 #include <AK/HashMap.h>
 #include <AK/StringBuilder.h>
+#include <LibC/SharedBuffer.h>
 #include <LibC/stdio.h>
 #include <LibC/stdlib.h>
 #include <LibC/unistd.h>
@@ -593,7 +594,7 @@ void GWindow::flip(const Vector<Rect, 32>& dirty_rects)
  painter.blit(dirty_rect.location(), *m_front_bitmap, dirty_rect);
 }
 
-NonnullRefPtr<GraphicsBitmap> GWindow::create_backing_bitmap(const Size& size)
+NonnullRefPtr<GraphicsBitmap> GWindow::create_shared_bitmap(GraphicsBitmap::Format format, const Size& size)
 {
  ASSERT(GWindowServerConnection::the().server_pid());
  ASSERT(!size.is_empty());
@@ -602,10 +603,15 @@ NonnullRefPtr<GraphicsBitmap> GWindow::create_backing_bitmap(const Size& size)
  auto shared_buffer = SharedBuffer::create_with_size(size_in_bytes);
  ASSERT(shared_buffer);
  shared_buffer->share_with(GWindowServerConnection::the().server_pid());
- auto format = m_has_alpha_channel ? GraphicsBitmap::Format::RGBA32 : GraphicsBitmap::Format::RGB32;
  return GraphicsBitmap::create_with_shared_buffer(format, *shared_buffer, size);
 }
 
+NonnullRefPtr<GraphicsBitmap> GWindow::create_backing_bitmap(const Size& size)
+{
+ auto format = m_has_alpha_channel ? GraphicsBitmap::Format::RGBA32 : GraphicsBitmap::Format::RGB32;
+ return create_shared_bitmap(format, size);
+}
+
 void GWindow::set_modal(bool modal)
 {
  ASSERT(!m_window_id);
@@ -616,6 +622,27 @@ void GWindow::wm_event(GWMEvent&)
 {
 }
 
+void GWindow::set_icon(const GraphicsBitmap* icon)
+{
+ if (m_icon == icon)
+ return;
+ if (!m_window_id)
+ return;
+
+ m_icon = create_shared_bitmap(GraphicsBitmap::Format::RGBA32, icon->size());
+ {
+ GPainter painter(*m_icon);
+ painter.blit({ 0, 0 }, *icon, icon->rect());
+ }
+
+ WSAPI_ClientMessage message;
+ message.type = WSAPI_ClientMessage::Type::SetWindowIconBitmap;
+ message.window_id = m_window_id;
+ message.window.icon_buffer_id = m_icon->shared_buffer_id();
+ message.window.icon_size = icon->size();
+ GWindowServerConnection::the().post_message_to_server(message);
+}
+
 void GWindow::set_icon_path(const StringView& path)
 {
  if (m_icon_path == path)

diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h
@@ -122,6 +122,9 @@ class GWindow : public CObject {
  String icon_path() const { return m_icon_path; }
  void set_icon_path(const StringView&);
 
+ void set_icon(const GraphicsBitmap*);
+ const GraphicsBitmap* icon() const { return m_icon.ptr(); }
+
  Vector<GWidget*> focusable_widgets() const;
 
 protected:
@@ -135,11 +138,13 @@ class GWindow : public CObject {
  void collect_keyboard_activation_targets();
 
  NonnullRefPtr<GraphicsBitmap> create_backing_bitmap(const Size&);
+ NonnullRefPtr<GraphicsBitmap> create_shared_bitmap(GraphicsBitmap::Format, const Size&);
  void set_current_backing_bitmap(GraphicsBitmap&, bool flush_immediately = false);
  void flip(const Vector<Rect, 32>& dirty_rects);
 
  RefPtr<GraphicsBitmap> m_front_bitmap;
  RefPtr<GraphicsBitmap> m_back_bitmap;
+ RefPtr<GraphicsBitmap> m_icon;
  int m_window_id { 0 };
  float m_opacity_when_windowless { 1.0f };
  GWidget* m_main_widget { nullptr };

diff --git a/Servers/WindowServer/WSAPITypes.h b/Servers/WindowServer/WSAPITypes.h
@@ -111,10 +111,14 @@ struct WSAPI_ServerMessage {
  DidGetWallpaper,
  DidSetWindowHasAlphaChannel,
  ScreenRectChanged,
+
+ __Begin_WM_Events__,
  WM_WindowRemoved,
  WM_WindowStateChanged,
  WM_WindowRectChanged,
  WM_WindowIconChanged,
+ WM_WindowIconBitmapChanged,
+ __End_WM_Events__,
  };
  Type type { Invalid };
  int window_id { -1 };
@@ -145,6 +149,8 @@ struct WSAPI_ServerMessage {
  bool is_active;
  bool is_minimized;
  WSAPI_WindowType window_type;
+ int icon_buffer_id;
+ WSAPI_Size icon_size;
  } wm;
  struct {
  WSAPI_Rect rect;
@@ -229,6 +235,7 @@ struct WSAPI_ClientMessage {
  SetWindowIcon,
  SetWindowHasAlphaChannel,
  MoveWindowToFront,
+ SetWindowIconBitmap,
  };
  Type type { Invalid };
  int window_id { -1 };
@@ -278,6 +285,8 @@ struct WSAPI_ClientMessage {
  WSAPI_Size base_size;
  WSAPI_Size size_increment;
  WSAPI_Color background_color;
+ int icon_buffer_id;
+ WSAPI_Size icon_size;
  } window;
  struct {
  WSAPI_Size size;