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

WindowServer: Support desktop wallpapers.

Browse source 
For now, you don't get to choose the wallpaper, but it's still pretty cool.
This commit is contained in:
Andreas Kling 2019-02-08 08:45:59 +01:00
parent 2736957701
commit 90d3375dc2
5 changed files with 230 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

214
Base/res/wallpapers/gray-wood.rgb Normal file
View file

File diff suppressed because one or more lines are too long

BIN
Kernel/_fs_contents.stock
View file

Binary file not shown.

9
Kernel/sync.sh
View file

@ -1,9 +1,15 @@
rm -vf _fs_contents.lock rm -vf _fs_contents.lock
rm -vf _fs_contents rm -vf _fs_contents
cp -vp _fs_contents.stock _fs_contents dd if=/dev/zero of=_fs_contents bs=1M count=8
mke2fs _fs_contents
chown 1000:1000 _fs_contents
mkdir -vp mnt mkdir -vp mnt
mount -o loop _fs_contents mnt/ mount -o loop _fs_contents mnt/
mkdir -vp mnt/bin
mkdir -vp mnt/etc
mkdir -vp mnt/proc
mkdir -vp mnt/dev mkdir -vp mnt/dev
mkdir -vp mnt/dev/pts
mknod mnt/dev/tty0 c 4 0 mknod mnt/dev/tty0 c 4 0
mknod mnt/dev/tty1 c 4 1 mknod mnt/dev/tty1 c 4 1
mknod mnt/dev/tty2 c 4 2 mknod mnt/dev/tty2 c 4 2
@ -11,7 +17,6 @@ mknod mnt/dev/tty3 c 4 3
mknod mnt/dev/keyboard c 85 1 mknod mnt/dev/keyboard c 85 1
mknod mnt/dev/psaux c 10 1 mknod mnt/dev/psaux c 10 1
mknod mnt/dev/ptmx c 5 2 mknod mnt/dev/ptmx c 5 2
mkdir mnt/dev/pts
mknod mnt/dev/gui_events c 66 1 mknod mnt/dev/gui_events c 66 1
ln -s /proc/self/fd/0 mnt/dev/stdin ln -s /proc/self/fd/0 mnt/dev/stdin
ln -s /proc/self/fd/1 mnt/dev/stdout ln -s /proc/self/fd/1 mnt/dev/stdout

8
WindowServer/WSWindowManager.cpp
View file

@ -426,12 +426,18 @@ void WSWindowManager::compose()
return false; return false;
}; };
if (!m_wallpaper)
m_wallpaper = GraphicsBitmap::load_from_file("/res/wallpapers/gray-wood.rgb", { 1024, 768 });
for (auto& dirty_rect : dirty_rects) { for (auto& dirty_rect : dirty_rects) {
if (any_window_contains_rect(dirty_rect)) { if (any_window_contains_rect(dirty_rect)) {
continue; continue;
} }
//dbgprintf("Repaint root %d,%d %dx%d\n", dirty_rect.x(), dirty_rect.y(), dirty_rect.width(), dirty_rect.height()); //dbgprintf("Repaint root %d,%d %dx%d\n", dirty_rect.x(), dirty_rect.y(), dirty_rect.width(), dirty_rect.height());
m_back_painter->fill_rect(dirty_rect, m_background_color); if (!m_wallpaper)
m_back_painter->fill_rect(dirty_rect, m_background_color);
else
m_back_painter->blit(dirty_rect.location(), *m_wallpaper, dirty_rect);
} }
for (auto* window = m_windows_in_order.head(); window; window = window->next()) { for (auto* window = m_windows_in_order.head(); window; window = window->next()) {
WSWindowLocker locker(*window); WSWindowLocker locker(*window);

2
WindowServer/WSWindowManager.h
View file

@ -105,6 +105,8 @@ private:
RetainPtr<Font> m_font; RetainPtr<Font> m_font;
RetainPtr<GraphicsBitmap> m_wallpaper;
mutable Lock m_lock; mutable Lock m_lock;
bool m_flash_flush { false }; bool m_flash_flush { false };