mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 23:17:46 +00:00
Let userland retain the window backing store while drawing into it.
To start painting, call: gui$get_window_backing_store() Then finish up with: gui$release_window_backing_store() Process will retain the underlying GraphicsBitmap behind the scenes. This fixes racing between the WindowServer and GUI clients. This patch also adds a WSWindowLocker that is exactly what it sounds like.
This commit is contained in:
Andreas Kling
parent
ccf3fc4618
commit
86eae0f8df
22 changed files with 244 additions and 102 deletions
|
|
@ -34,6 +34,7 @@ struct GUI_WindowParameters {
|
|||
};
|
||||
|
||||
struct GUI_WindowBackingStoreInfo {
|
||||
void* backing_store_id;
|
||||
GUI_Size size;
|
||||
size_t bpp;
|
||||
size_t pitch;
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ class Region;
|
|||
class VMObject;
|
||||
class Zone;
|
||||
class WSWindow;
|
||||
class GraphicsBitmap;
|
||||
|
||||
#define COOL_GLOBALS
|
||||
#ifdef COOL_GLOBALS
|
||||
|
|
@ -197,9 +198,12 @@ public:
|
|||
int gui$create_window(const GUI_WindowParameters*);
|
||||
int gui$destroy_window(int window_id);
|
||||
int gui$get_window_backing_store(int window_id, GUI_WindowBackingStoreInfo*);
|
||||
int gui$release_window_backing_store(void* backing_store_id);
|
||||
int gui$invalidate_window(int window_id, const GUI_Rect*);
|
||||
int gui$get_window_parameters(int window_id, GUI_WindowParameters*);
|
||||
int gui$set_window_parameters(int window_id, const GUI_WindowParameters*);
|
||||
int gui$get_window_title(int window_id, char* buffer, size_t size);
|
||||
int gui$set_window_title(int window_id, const char* title, size_t size);
|
||||
int gui$get_window_rect(int window_id, GUI_Rect*);
|
||||
int gui$set_window_rect(int window_id, const GUI_Rect*);
|
||||
|
||||
DisplayInfo get_display_info();
|
||||
|
||||
|
|
@ -360,6 +364,7 @@ private:
|
|||
RetainPtr<Region> m_display_framebuffer_region;
|
||||
|
||||
HashMap<int, OwnPtr<WSWindow>> m_windows;
|
||||
Vector<RetainPtr<GraphicsBitmap>> m_retained_backing_stores;
|
||||
|
||||
Vector<GUI_Event> m_gui_events;
|
||||
Lock m_gui_events_lock;
|
||||
|
|
|
|||
|
|
@ -97,13 +97,28 @@ int Process::gui$get_window_backing_store(int window_id, GUI_WindowBackingStoreI
|
|||
if (it == m_windows.end())
|
||||
return -EBADWINDOW;
|
||||
auto& window = *(*it).value;
|
||||
WSWindowLocker locker(window);
|
||||
auto* backing_store = window.backing();
|
||||
m_retained_backing_stores.append(backing_store);
|
||||
info->backing_store_id = backing_store;
|
||||
info->bpp = sizeof(RGBA32);
|
||||
info->pitch = window.backing()->pitch();
|
||||
info->size = window.backing()->size();
|
||||
info->pixels = reinterpret_cast<RGBA32*>(window.backing()->client_region()->laddr().as_ptr());
|
||||
info->pitch = backing_store->pitch();
|
||||
info->size = backing_store->size();
|
||||
info->pixels = reinterpret_cast<RGBA32*>(backing_store->client_region()->laddr().as_ptr());
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Process::gui$release_window_backing_store(void* backing_store_id)
|
||||
{
|
||||
for (size_t i = 0; i < m_retained_backing_stores.size(); ++i) {
|
||||
if (m_retained_backing_stores[i].ptr() == backing_store_id) {
|
||||
m_retained_backing_stores.remove(i);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -EBADBACKING;
|
||||
}
|
||||
|
||||
int Process::gui$invalidate_window(int window_id, const GUI_Rect* rect)
|
||||
{
|
||||
if (window_id < 0)
|
||||
|
|
@ -121,39 +136,82 @@ int Process::gui$invalidate_window(int window_id, const GUI_Rect* rect)
|
|||
#endif
|
||||
auto& window = *(*it).value;
|
||||
Rect invalidation_rect;
|
||||
if (rect)
|
||||
if (rect) {
|
||||
WSWindowLocker locker(window);
|
||||
invalidation_rect = *rect;
|
||||
}
|
||||
WSEventLoop::the().post_event(&window, make<WSWindowInvalidationEvent>(invalidation_rect));
|
||||
WSEventLoop::the().server_process().request_wakeup();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Process::gui$get_window_parameters(int window_id, GUI_WindowParameters* params)
|
||||
int Process::gui$get_window_title(int window_id, char* buffer, size_t size)
|
||||
{
|
||||
if (window_id < 0)
|
||||
return -EINVAL;
|
||||
if (!validate_write_typed(params))
|
||||
if (!validate_write(buffer, size))
|
||||
return -EFAULT;
|
||||
auto it = m_windows.find(window_id);
|
||||
if (it == m_windows.end())
|
||||
return -EBADWINDOW;
|
||||
auto& window = *(*it).value;
|
||||
params->rect = window.rect();
|
||||
strcpy(params->title, window.title().characters());
|
||||
String title;
|
||||
{
|
||||
WSWindowLocker locker(window);
|
||||
title = window.title();
|
||||
}
|
||||
if (title.length() > size)
|
||||
return -ERANGE;
|
||||
memcpy(buffer, title.characters(), title.length());
|
||||
return title.length();
|
||||
|
||||
}
|
||||
|
||||
int Process::gui$set_window_title(int window_id, const char* title, size_t size)
|
||||
{
|
||||
if (window_id < 0)
|
||||
return -EINVAL;
|
||||
if (!validate_read(title, size))
|
||||
return -EFAULT;
|
||||
auto it = m_windows.find(window_id);
|
||||
if (it == m_windows.end())
|
||||
return -EBADWINDOW;
|
||||
auto& window = *(*it).value;
|
||||
String new_title(title, size);
|
||||
WSEventLoop::the().post_event(&window, make<WSSetWindowTitle>(move(new_title)));
|
||||
WSEventLoop::the().server_process().request_wakeup();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Process::gui$set_window_parameters(int window_id, const GUI_WindowParameters* params)
|
||||
int Process::gui$get_window_rect(int window_id, GUI_Rect* rect)
|
||||
{
|
||||
if (window_id < 0)
|
||||
return -EINVAL;
|
||||
if (!validate_read_typed(params))
|
||||
if (!validate_write_typed(rect))
|
||||
return -EFAULT;
|
||||
auto it = m_windows.find(window_id);
|
||||
if (it == m_windows.end())
|
||||
return -EBADWINDOW;
|
||||
auto& window = *(*it).value;
|
||||
window.set_rect(params->rect);
|
||||
window.set_title(params->title);
|
||||
{
|
||||
WSWindowLocker locker(window);
|
||||
*rect = window.rect();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int Process::gui$set_window_rect(int window_id, const GUI_Rect* rect)
|
||||
{
|
||||
if (window_id < 0)
|
||||
return -EINVAL;
|
||||
if (!validate_read_typed(rect))
|
||||
return -EFAULT;
|
||||
auto it = m_windows.find(window_id);
|
||||
if (it == m_windows.end())
|
||||
return -EBADWINDOW;
|
||||
auto& window = *(*it).value;
|
||||
Rect new_rect = *rect;
|
||||
WSEventLoop::the().post_event(&window, make<WSSetWindowRect>(new_rect));
|
||||
WSEventLoop::the().server_process().request_wakeup();
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,12 +201,18 @@ static dword handle(RegisterDump& regs, dword function, dword arg1, dword arg2,
|
|||
return current->gui$destroy_window((int)arg1);
|
||||
case Syscall::SC_gui_get_window_backing_store:
|
||||
return current->gui$get_window_backing_store((int)arg1, (GUI_WindowBackingStoreInfo*)arg2);
|
||||
case Syscall::SC_gui_release_window_backing_store:
|
||||
return current->gui$release_window_backing_store((void*)arg1);
|
||||
case Syscall::SC_gui_invalidate_window:
|
||||
return current->gui$invalidate_window((int)arg1, (const GUI_Rect*)arg2);
|
||||
case Syscall::SC_gui_set_window_parameters:
|
||||
return current->gui$set_window_parameters((int)arg1, (const GUI_WindowParameters*)arg2);
|
||||
case Syscall::SC_gui_get_window_parameters:
|
||||
return current->gui$get_window_parameters((int)arg1, (GUI_WindowParameters*)arg2);
|
||||
case Syscall::SC_gui_set_window_title:
|
||||
return current->gui$set_window_title((int)arg1, (const char*)arg2, (size_t)arg3);
|
||||
case Syscall::SC_gui_get_window_title:
|
||||
return current->gui$get_window_title((int)arg1, (char*)arg2, (size_t)arg3);
|
||||
case Syscall::SC_gui_set_window_rect:
|
||||
return current->gui$set_window_rect((int)arg1, (const GUI_Rect*)arg2);
|
||||
case Syscall::SC_gui_get_window_rect:
|
||||
return current->gui$get_window_rect((int)arg1, (GUI_Rect*)arg2);
|
||||
default:
|
||||
kprintf("<%u> int0x80: Unknown function %u requested {%x, %x, %x}\n", current->pid(), function, arg1, arg2, arg3);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -67,15 +67,18 @@
|
|||
__ENUMERATE_SYSCALL(utime) \
|
||||
__ENUMERATE_SYSCALL(sync) \
|
||||
__ENUMERATE_SYSCALL(ptsname_r) \
|
||||
__ENUMERATE_SYSCALL(select) \
|
||||
__ENUMERATE_SYSCALL(unlink) \
|
||||
__ENUMERATE_SYSCALL(poll) \
|
||||
__ENUMERATE_SYSCALL(gui_create_window) \
|
||||
__ENUMERATE_SYSCALL(gui_destroy_window) \
|
||||
__ENUMERATE_SYSCALL(gui_get_window_backing_store) \
|
||||
__ENUMERATE_SYSCALL(gui_release_window_backing_store) \
|
||||
__ENUMERATE_SYSCALL(gui_invalidate_window) \
|
||||
__ENUMERATE_SYSCALL(select) \
|
||||
__ENUMERATE_SYSCALL(gui_get_window_parameters) \
|
||||
__ENUMERATE_SYSCALL(gui_set_window_parameters) \
|
||||
__ENUMERATE_SYSCALL(unlink) \
|
||||
__ENUMERATE_SYSCALL(poll) \
|
||||
__ENUMERATE_SYSCALL(gui_get_window_title) \
|
||||
__ENUMERATE_SYSCALL(gui_set_window_title) \
|
||||
__ENUMERATE_SYSCALL(gui_get_window_rect) \
|
||||
__ENUMERATE_SYSCALL(gui_set_window_rect) \
|
||||
|
||||
|
||||
struct fd_set;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue