RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 19:57:41 +00:00
Code Issues Activity Actions

WindowServer: Make various function arguments const.

Browse source
This commit is contained in:
Andreas Kling 2019-04-01 19:14:57 +02:00
parent dcf6726487
commit 0cad4bdc90
13 changed files with 123 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

110
Servers/WindowServer/WSClientConnection.cpp
View file

@ -83,22 +83,22 @@ void WSClientConnection::post_message(const WSAPI_ServerMessage& message)
ASSERT(nwritten == sizeof(message)); ASSERT(nwritten == sizeof(message));
} }
void WSClientConnection::on_message(WSMessage& message) void WSClientConnection::on_message(const WSMessage& message)
{ {
if (message.is_client_request()) { if (message.is_client_request()) {
on_request(static_cast<WSAPIClientRequest&>(message)); on_request(static_cast<const WSAPIClientRequest&>(message));
return; return;
} }
if (message.type() == WSMessage::WM_ClientDisconnected) { if (message.type() == WSMessage::WM_ClientDisconnected) {
int client_id = static_cast<WSClientDisconnectedNotification&>(message).client_id(); int client_id = static_cast<const WSClientDisconnectedNotification&>(message).client_id();
dbgprintf("WSClientConnection: Client disconnected: %d\n", client_id); dbgprintf("WSClientConnection: Client disconnected: %d\n", client_id);
delete this; delete this;
return; return;
} }
} }
void WSClientConnection::handle_request(WSAPICreateMenubarRequest&) void WSClientConnection::handle_request(const WSAPICreateMenubarRequest&)
{ {
int menubar_id = m_next_menubar_id++; int menubar_id = m_next_menubar_id++;
auto menubar = make<WSMenuBar>(*this, menubar_id); auto menubar = make<WSMenuBar>(*this, menubar_id);
@ -109,7 +109,7 @@ void WSClientConnection::handle_request(WSAPICreateMenubarRequest&)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIDestroyMenubarRequest& request) void WSClientConnection::handle_request(const WSAPIDestroyMenubarRequest& request)
{ {
int menubar_id = request.menubar_id(); int menubar_id = request.menubar_id();
auto it = m_menubars.find(menubar_id); auto it = m_menubars.find(menubar_id);
@ -126,7 +126,7 @@ void WSClientConnection::handle_request(WSAPIDestroyMenubarRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPICreateMenuRequest& request) void WSClientConnection::handle_request(const WSAPICreateMenuRequest& request)
{ {
int menu_id = m_next_menu_id++; int menu_id = m_next_menu_id++;
auto menu = make<WSMenu>(this, menu_id, request.text()); auto menu = make<WSMenu>(this, menu_id, request.text());
@ -137,9 +137,9 @@ void WSClientConnection::handle_request(WSAPICreateMenuRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIDestroyMenuRequest& request) void WSClientConnection::handle_request(const WSAPIDestroyMenuRequest& request)
{ {
int menu_id = static_cast<WSAPIDestroyMenuRequest&>(request).menu_id(); int menu_id = static_cast<const WSAPIDestroyMenuRequest&>(request).menu_id();
auto it = m_menus.find(menu_id); auto it = m_menus.find(menu_id);
if (it == m_menus.end()) { if (it == m_menus.end()) {
post_error("Bad menu ID"); post_error("Bad menu ID");
@ -154,7 +154,7 @@ void WSClientConnection::handle_request(WSAPIDestroyMenuRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetApplicationMenubarRequest& request) void WSClientConnection::handle_request(const WSAPISetApplicationMenubarRequest& request)
{ {
int menubar_id = request.menubar_id(); int menubar_id = request.menubar_id();
auto it = m_menubars.find(menubar_id); auto it = m_menubars.find(menubar_id);
@ -171,7 +171,7 @@ void WSClientConnection::handle_request(WSAPISetApplicationMenubarRequest& reque
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIAddMenuToMenubarRequest& request) void WSClientConnection::handle_request(const WSAPIAddMenuToMenubarRequest& request)
{ {
int menubar_id = request.menubar_id(); int menubar_id = request.menubar_id();
int menu_id = request.menu_id(); int menu_id = request.menu_id();
@ -195,7 +195,7 @@ void WSClientConnection::handle_request(WSAPIAddMenuToMenubarRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIAddMenuItemRequest& request) void WSClientConnection::handle_request(const WSAPIAddMenuItemRequest& request)
{ {
int menu_id = request.menu_id(); int menu_id = request.menu_id();
unsigned identifier = request.identifier(); unsigned identifier = request.identifier();
@ -213,7 +213,7 @@ void WSClientConnection::handle_request(WSAPIAddMenuItemRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIAddMenuSeparatorRequest& request) void WSClientConnection::handle_request(const WSAPIAddMenuSeparatorRequest& request)
{ {
int menu_id = request.menu_id(); int menu_id = request.menu_id();
auto it = m_menus.find(menu_id); auto it = m_menus.find(menu_id);
@ -229,7 +229,7 @@ void WSClientConnection::handle_request(WSAPIAddMenuSeparatorRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetWindowOpacityRequest& request) void WSClientConnection::handle_request(const WSAPISetWindowOpacityRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -241,7 +241,7 @@ void WSClientConnection::handle_request(WSAPISetWindowOpacityRequest& request)
window.set_opacity(request.opacity()); window.set_opacity(request.opacity());
} }
void WSClientConnection::handle_request(WSAPISetWallpaperRequest& request) void WSClientConnection::handle_request(const WSAPISetWallpaperRequest& request)
{ {
bool success = WSWindowManager::the().set_wallpaper(request.wallpaper()); bool success = WSWindowManager::the().set_wallpaper(request.wallpaper());
WSAPI_ServerMessage response; WSAPI_ServerMessage response;
@ -250,7 +250,7 @@ void WSClientConnection::handle_request(WSAPISetWallpaperRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIGetWallpaperRequest& request) void WSClientConnection::handle_request(const WSAPIGetWallpaperRequest&)
{ {
auto path = WSWindowManager::the().wallpaper_path(); auto path = WSWindowManager::the().wallpaper_path();
WSAPI_ServerMessage response; WSAPI_ServerMessage response;
@ -261,7 +261,7 @@ void WSClientConnection::handle_request(WSAPIGetWallpaperRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetWindowTitleRequest& request) void WSClientConnection::handle_request(const WSAPISetWindowTitleRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -273,7 +273,7 @@ void WSClientConnection::handle_request(WSAPISetWindowTitleRequest& request)
window.set_title(request.title()); window.set_title(request.title());
} }
void WSClientConnection::handle_request(WSAPIGetWindowTitleRequest& request) void WSClientConnection::handle_request(const WSAPIGetWindowTitleRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -291,7 +291,7 @@ void WSClientConnection::handle_request(WSAPIGetWindowTitleRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetWindowRectRequest& request) void WSClientConnection::handle_request(const WSAPISetWindowRectRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -303,7 +303,7 @@ void WSClientConnection::handle_request(WSAPISetWindowRectRequest& request)
window.set_rect(request.rect()); window.set_rect(request.rect());
} }
void WSClientConnection::handle_request(WSAPIGetWindowRectRequest& request) void WSClientConnection::handle_request(const WSAPIGetWindowRectRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -319,7 +319,7 @@ void WSClientConnection::handle_request(WSAPIGetWindowRectRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetClipboardContentsRequest& request) void WSClientConnection::handle_request(const WSAPISetClipboardContentsRequest& request)
{ {
auto shared_buffer = SharedBuffer::create_from_shared_buffer_id(request.shared_buffer_id()); auto shared_buffer = SharedBuffer::create_from_shared_buffer_id(request.shared_buffer_id());
if (!shared_buffer) { if (!shared_buffer) {
@ -333,7 +333,7 @@ void WSClientConnection::handle_request(WSAPISetClipboardContentsRequest& reques
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIGetClipboardContentsRequest&) void WSClientConnection::handle_request(const WSAPIGetClipboardContentsRequest&)
{ {
WSAPI_ServerMessage response; WSAPI_ServerMessage response;
response.type = WSAPI_ServerMessage::Type::DidGetClipboardContents; response.type = WSAPI_ServerMessage::Type::DidGetClipboardContents;
@ -357,7 +357,7 @@ void WSClientConnection::handle_request(WSAPIGetClipboardContentsRequest&)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPICreateWindowRequest& request) void WSClientConnection::handle_request(const WSAPICreateWindowRequest& request)
{ {
int window_id = m_next_window_id++; int window_id = m_next_window_id++;
auto window = make<WSWindow>(*this, window_id, request.is_modal()); auto window = make<WSWindow>(*this, window_id, request.is_modal());
@ -376,7 +376,7 @@ void WSClientConnection::handle_request(WSAPICreateWindowRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIDestroyWindowRequest& request) void WSClientConnection::handle_request(const WSAPIDestroyWindowRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -389,7 +389,7 @@ void WSClientConnection::handle_request(WSAPIDestroyWindowRequest& request)
m_windows.remove(it); m_windows.remove(it);
} }
void WSClientConnection::handle_request(WSAPIInvalidateRectRequest& request) void WSClientConnection::handle_request(const WSAPIInvalidateRectRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -406,7 +406,7 @@ void WSClientConnection::handle_request(WSAPIInvalidateRectRequest& request)
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPIDidFinishPaintingNotification& request) void WSClientConnection::handle_request(const WSAPIDidFinishPaintingNotification& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -425,7 +425,7 @@ void WSClientConnection::handle_request(WSAPIDidFinishPaintingNotification& requ
WSWindowManager::the().invalidate(window, request.rect()); WSWindowManager::the().invalidate(window, request.rect());
} }
void WSClientConnection::handle_request(WSAPIGetWindowBackingStoreRequest& request) void WSClientConnection::handle_request(const WSAPIGetWindowBackingStoreRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -447,7 +447,7 @@ void WSClientConnection::handle_request(WSAPIGetWindowBackingStoreRequest& reque
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetWindowBackingStoreRequest& request) void WSClientConnection::handle_request(const WSAPISetWindowBackingStoreRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -479,7 +479,7 @@ void WSClientConnection::handle_request(WSAPISetWindowBackingStoreRequest& reque
post_message(response); post_message(response);
} }
void WSClientConnection::handle_request(WSAPISetGlobalCursorTrackingRequest& request) void WSClientConnection::handle_request(const WSAPISetGlobalCursorTrackingRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -491,7 +491,7 @@ void WSClientConnection::handle_request(WSAPISetGlobalCursorTrackingRequest& req
window.set_global_cursor_tracking_enabled(request.value()); window.set_global_cursor_tracking_enabled(request.value());
} }
void WSClientConnection::handle_request(WSAPISetWindowOverrideCursorRequest& request) void WSClientConnection::handle_request(const WSAPISetWindowOverrideCursorRequest& request)
{ {
int window_id = request.window_id(); int window_id = request.window_id();
auto it = m_windows.find(window_id); auto it = m_windows.find(window_id);
@ -503,59 +503,59 @@ void WSClientConnection::handle_request(WSAPISetWindowOverrideCursorRequest& req
window.set_override_cursor(WSCursor::create(request.cursor())); window.set_override_cursor(WSCursor::create(request.cursor()));
} }
void WSClientConnection::on_request(WSAPIClientRequest& request) void WSClientConnection::on_request(const WSAPIClientRequest& request)
{ {
switch (request.type()) { switch (request.type()) {
case WSMessage::APICreateMenubarRequest: case WSMessage::APICreateMenubarRequest:
return handle_request(static_cast<WSAPICreateMenubarRequest&>(request)); return handle_request(static_cast<const WSAPICreateMenubarRequest&>(request));
case WSMessage::APIDestroyMenubarRequest: case WSMessage::APIDestroyMenubarRequest:
return handle_request(static_cast<WSAPIDestroyMenubarRequest&>(request)); return handle_request(static_cast<const WSAPIDestroyMenubarRequest&>(request));
case WSMessage::APICreateMenuRequest: case WSMessage::APICreateMenuRequest:
return handle_request(static_cast<WSAPICreateMenuRequest&>(request)); return handle_request(static_cast<const WSAPICreateMenuRequest&>(request));
case WSMessage::APIDestroyMenuRequest: case WSMessage::APIDestroyMenuRequest:
return handle_request(static_cast<WSAPIDestroyMenuRequest&>(request)); return handle_request(static_cast<const WSAPIDestroyMenuRequest&>(request));
case WSMessage::APISetApplicationMenubarRequest: case WSMessage::APISetApplicationMenubarRequest:
return handle_request(static_cast<WSAPISetApplicationMenubarRequest&>(request)); return handle_request(static_cast<const WSAPISetApplicationMenubarRequest&>(request));
case WSMessage::APIAddMenuToMenubarRequest: case WSMessage::APIAddMenuToMenubarRequest:
return handle_request(static_cast<WSAPIAddMenuToMenubarRequest&>(request)); return handle_request(static_cast<const WSAPIAddMenuToMenubarRequest&>(request));
case WSMessage::APIAddMenuItemRequest: case WSMessage::APIAddMenuItemRequest:
return handle_request(static_cast<WSAPIAddMenuItemRequest&>(request)); return handle_request(static_cast<const WSAPIAddMenuItemRequest&>(request));
case WSMessage::APIAddMenuSeparatorRequest: case WSMessage::APIAddMenuSeparatorRequest:
return handle_request(static_cast<WSAPIAddMenuSeparatorRequest&>(request)); return handle_request(static_cast<const WSAPIAddMenuSeparatorRequest&>(request));
case WSMessage::APISetWindowTitleRequest: case WSMessage::APISetWindowTitleRequest:
return handle_request(static_cast<WSAPISetWindowTitleRequest&>(request)); return handle_request(static_cast<const WSAPISetWindowTitleRequest&>(request));
case WSMessage::APIGetWindowTitleRequest: case WSMessage::APIGetWindowTitleRequest:
return handle_request(static_cast<WSAPIGetWindowTitleRequest&>(request)); return handle_request(static_cast<const WSAPIGetWindowTitleRequest&>(request));
case WSMessage::APISetWindowRectRequest: case WSMessage::APISetWindowRectRequest:
return handle_request(static_cast<WSAPISetWindowRectRequest&>(request)); return handle_request(static_cast<const WSAPISetWindowRectRequest&>(request));
case WSMessage::APIGetWindowRectRequest: case WSMessage::APIGetWindowRectRequest:
return handle_request(static_cast<WSAPIGetWindowRectRequest&>(request)); return handle_request(static_cast<const WSAPIGetWindowRectRequest&>(request));
case WSMessage::APISetClipboardContentsRequest: case WSMessage::APISetClipboardContentsRequest:
return handle_request(static_cast<WSAPISetClipboardContentsRequest&>(request)); return handle_request(static_cast<const WSAPISetClipboardContentsRequest&>(request));
case WSMessage::APIGetClipboardContentsRequest: case WSMessage::APIGetClipboardContentsRequest:
return handle_request(static_cast<WSAPIGetClipboardContentsRequest&>(request)); return handle_request(static_cast<const WSAPIGetClipboardContentsRequest&>(request));
case WSMessage::APICreateWindowRequest: case WSMessage::APICreateWindowRequest:
return handle_request(static_cast<WSAPICreateWindowRequest&>(request)); return handle_request(static_cast<const WSAPICreateWindowRequest&>(request));
case WSMessage::APIDestroyWindowRequest: case WSMessage::APIDestroyWindowRequest:
return handle_request(static_cast<WSAPIDestroyWindowRequest&>(request)); return handle_request(static_cast<const WSAPIDestroyWindowRequest&>(request));
case WSMessage::APIInvalidateRectRequest: case WSMessage::APIInvalidateRectRequest:
return handle_request(static_cast<WSAPIInvalidateRectRequest&>(request)); return handle_request(static_cast<const WSAPIInvalidateRectRequest&>(request));
case WSMessage::APIDidFinishPaintingNotification: case WSMessage::APIDidFinishPaintingNotification:
return handle_request(static_cast<WSAPIDidFinishPaintingNotification&>(request)); return handle_request(static_cast<const WSAPIDidFinishPaintingNotification&>(request));
case WSMessage::APIGetWindowBackingStoreRequest: case WSMessage::APIGetWindowBackingStoreRequest:
return handle_request(static_cast<WSAPIGetWindowBackingStoreRequest&>(request)); return handle_request(static_cast<const WSAPIGetWindowBackingStoreRequest&>(request));
case WSMessage::APISetGlobalCursorTrackingRequest: case WSMessage::APISetGlobalCursorTrackingRequest:
return handle_request(static_cast<WSAPISetGlobalCursorTrackingRequest&>(request)); return handle_request(static_cast<const WSAPISetGlobalCursorTrackingRequest&>(request));
case WSMessage::APISetWindowOpacityRequest: case WSMessage::APISetWindowOpacityRequest:
return handle_request(static_cast<WSAPISetWindowOpacityRequest&>(request)); return handle_request(static_cast<const WSAPISetWindowOpacityRequest&>(request));
case WSMessage::APISetWindowBackingStoreRequest: case WSMessage::APISetWindowBackingStoreRequest:
return handle_request(static_cast<WSAPISetWindowBackingStoreRequest&>(request)); return handle_request(static_cast<const WSAPISetWindowBackingStoreRequest&>(request));
case WSMessage::APISetWallpaperRequest: case WSMessage::APISetWallpaperRequest:
return handle_request(static_cast<WSAPISetWallpaperRequest&>(request)); return handle_request(static_cast<const WSAPISetWallpaperRequest&>(request));
case WSMessage::APIGetWallpaperRequest: case WSMessage::APIGetWallpaperRequest:
return handle_request(static_cast<WSAPIGetWallpaperRequest&>(request)); return handle_request(static_cast<const WSAPIGetWallpaperRequest&>(request));
case WSMessage::APISetWindowOverrideCursorRequest: case WSMessage::APISetWindowOverrideCursorRequest:
return handle_request(static_cast<WSAPISetWindowOverrideCursorRequest&>(request)); return handle_request(static_cast<const WSAPISetWindowOverrideCursorRequest&>(request));
default: default:
break; break;
} }

54
Servers/WindowServer/WSClientConnection.h
View file

@ -37,34 +37,34 @@ public:
template<typename Callback> void for_each_window(Callback); template<typename Callback> void for_each_window(Callback);
private: private:
virtual void on_message(WSMessage&) override; virtual void on_message(const WSMessage&) override;
void on_request(WSAPIClientRequest&); void on_request(const WSAPIClientRequest&);
void handle_request(WSAPICreateMenubarRequest&); void handle_request(const WSAPICreateMenubarRequest&);
void handle_request(WSAPIDestroyMenubarRequest&); void handle_request(const WSAPIDestroyMenubarRequest&);
void handle_request(WSAPICreateMenuRequest&); void handle_request(const WSAPICreateMenuRequest&);
void handle_request(WSAPIDestroyMenuRequest&); void handle_request(const WSAPIDestroyMenuRequest&);
void handle_request(WSAPISetApplicationMenubarRequest&); void handle_request(const WSAPISetApplicationMenubarRequest&);
void handle_request(WSAPIAddMenuToMenubarRequest&); void handle_request(const WSAPIAddMenuToMenubarRequest&);
void handle_request(WSAPIAddMenuItemRequest&); void handle_request(const WSAPIAddMenuItemRequest&);
void handle_request(WSAPIAddMenuSeparatorRequest&); void handle_request(const WSAPIAddMenuSeparatorRequest&);
void handle_request(WSAPISetWindowTitleRequest&); void handle_request(const WSAPISetWindowTitleRequest&);
void handle_request(WSAPIGetWindowTitleRequest&); void handle_request(const WSAPIGetWindowTitleRequest&);
void handle_request(WSAPISetWindowRectRequest&); void handle_request(const WSAPISetWindowRectRequest&);
void handle_request(WSAPIGetWindowRectRequest&); void handle_request(const WSAPIGetWindowRectRequest&);
void handle_request(WSAPISetClipboardContentsRequest&); void handle_request(const WSAPISetClipboardContentsRequest&);
void handle_request(WSAPIGetClipboardContentsRequest&); void handle_request(const WSAPIGetClipboardContentsRequest&);
void handle_request(WSAPICreateWindowRequest&); void handle_request(const WSAPICreateWindowRequest&);
void handle_request(WSAPIDestroyWindowRequest&); void handle_request(const WSAPIDestroyWindowRequest&);
void handle_request(WSAPIInvalidateRectRequest&); void handle_request(const WSAPIInvalidateRectRequest&);
void handle_request(WSAPIDidFinishPaintingNotification&); void handle_request(const WSAPIDidFinishPaintingNotification&);
void handle_request(WSAPIGetWindowBackingStoreRequest&); void handle_request(const WSAPIGetWindowBackingStoreRequest&);
void handle_request(WSAPISetWindowBackingStoreRequest&); void handle_request(const WSAPISetWindowBackingStoreRequest&);
void handle_request(WSAPISetGlobalCursorTrackingRequest&); void handle_request(const WSAPISetGlobalCursorTrackingRequest&);
void handle_request(WSAPISetWindowOpacityRequest&); void handle_request(const WSAPISetWindowOpacityRequest&);
void handle_request(WSAPISetWallpaperRequest&); void handle_request(const WSAPISetWallpaperRequest&);
void handle_request(WSAPIGetWallpaperRequest&); void handle_request(const WSAPIGetWallpaperRequest&);
void handle_request(WSAPISetWindowOverrideCursorRequest&); void handle_request(const WSAPISetWindowOverrideCursorRequest&);
void post_error(const String&); void post_error(const String&);

2
Servers/WindowServer/WSClipboard.cpp
View file

@ -16,7 +16,7 @@ WSClipboard::~WSClipboard()
{ {
} }
void WSClipboard::on_message(WSMessage&) void WSClipboard::on_message(const WSMessage&)
{ {
} }

2
Servers/WindowServer/WSClipboard.h
View file

@ -22,7 +22,7 @@ public:
private: private:
WSClipboard(); WSClipboard();
virtual void on_message(WSMessage&) override; virtual void on_message(const WSMessage&) override;
RetainPtr<SharedBuffer> m_shared_buffer; RetainPtr<SharedBuffer> m_shared_buffer;
int m_contents_size { 0 }; int m_contents_size { 0 };

4
Servers/WindowServer/WSMenu.cpp
View file

@ -107,11 +107,11 @@ void WSMenu::draw()
} }
} }
void WSMenu::on_message(WSMessage& message) void WSMenu::on_message(const WSMessage& message)
{ {
ASSERT(menu_window()); ASSERT(menu_window());
if (message.type() == WSMessage::MouseMove) { if (message.type() == WSMessage::MouseMove) {
auto* item = item_at(static_cast<WSMouseEvent&>(message).position()); auto* item = item_at(static_cast<const WSMouseEvent&>(message).position());
if (!item || m_hovered_item == item) if (!item || m_hovered_item == item)
return; return;
m_hovered_item = item; m_hovered_item = item;

2
Servers/WindowServer/WSMenu.h
View file

@ -73,7 +73,7 @@ public:
void close(); void close();
private: private:
virtual void on_message(WSMessage&) override; virtual void on_message(const WSMessage&) override;
int padding_between_text_and_shortcut() const { return 50; } int padding_between_text_and_shortcut() const { return 50; }
void did_activate(WSMenuItem&); void did_activate(WSMenuItem&);

2
Servers/WindowServer/WSMessageReceiver.h
View file

@ -9,5 +9,5 @@ public:
WSMessageReceiver(); WSMessageReceiver();
virtual ~WSMessageReceiver(); virtual ~WSMessageReceiver();
virtual void on_message(WSMessage&) = 0; virtual void on_message(const WSMessage&) = 0;
}; };

18
Servers/WindowServer/WSWindow.cpp
View file

@ -91,7 +91,7 @@ void WSWindow::handle_mouse_event(const WSMouseEvent& event)
m_client->post_message(server_message); m_client->post_message(server_message);
} }
void WSWindow::on_message(WSMessage& message) void WSWindow::on_message(const WSMessage& message)
{ {
if (m_internal_owner) if (m_internal_owner)
return m_internal_owner->on_message(message); return m_internal_owner->on_message(message);
@ -114,15 +114,15 @@ void WSWindow::on_message(WSMessage& message)
break; break;
case WSMessage::KeyDown: case WSMessage::KeyDown:
server_message.type = WSAPI_ServerMessage::Type::KeyDown; server_message.type = WSAPI_ServerMessage::Type::KeyDown;
server_message.key.character = static_cast<WSKeyEvent&>(message).character(); server_message.key.character = static_cast<const WSKeyEvent&>(message).character();
server_message.key.key = static_cast<WSKeyEvent&>(message).key(); server_message.key.key = static_cast<const WSKeyEvent&>(message).key();
server_message.key.modifiers = static_cast<WSKeyEvent&>(message).modifiers(); server_message.key.modifiers = static_cast<const WSKeyEvent&>(message).modifiers();
break; break;
case WSMessage::KeyUp: case WSMessage::KeyUp:
server_message.type = WSAPI_ServerMessage::Type::KeyUp; server_message.type = WSAPI_ServerMessage::Type::KeyUp;
server_message.key.character = static_cast<WSKeyEvent&>(message).character(); server_message.key.character = static_cast<const WSKeyEvent&>(message).character();
server_message.key.key = static_cast<WSKeyEvent&>(message).key(); server_message.key.key = static_cast<const WSKeyEvent&>(message).key();
server_message.key.modifiers = static_cast<WSKeyEvent&>(message).modifiers(); server_message.key.modifiers = static_cast<const WSKeyEvent&>(message).modifiers();
break; break;
case WSMessage::WindowActivated: case WSMessage::WindowActivated:
server_message.type = WSAPI_ServerMessage::Type::WindowActivated; server_message.type = WSAPI_ServerMessage::Type::WindowActivated;
@ -135,8 +135,8 @@ void WSWindow::on_message(WSMessage& message)
break; break;
case WSMessage::WindowResized: case WSMessage::WindowResized:
server_message.type = WSAPI_ServerMessage::Type::WindowResized; server_message.type = WSAPI_ServerMessage::Type::WindowResized;
server_message.window.old_rect = static_cast<WSResizeEvent&>(message).old_rect(); server_message.window.old_rect = static_cast<const WSResizeEvent&>(message).old_rect();
server_message.window.rect = static_cast<WSResizeEvent&>(message).rect(); server_message.window.rect = static_cast<const WSResizeEvent&>(message).rect();
break; break;
default: default:
break; break;

2
Servers/WindowServer/WSWindow.h
View file

@ -64,7 +64,7 @@ public:
void invalidate(); void invalidate();
virtual void on_message(WSMessage&) override; virtual void on_message(const WSMessage&) override;
GraphicsBitmap* backing_store() { return m_backing_store.ptr(); } GraphicsBitmap* backing_store() { return m_backing_store.ptr(); }
void set_backing_store(RetainPtr<GraphicsBitmap>&& backing_store) void set_backing_store(RetainPtr<GraphicsBitmap>&& backing_store)

24
Servers/WindowServer/WSWindowManager.cpp
View file

@ -402,7 +402,7 @@ static CharacterBitmap* s_close_button_bitmap;
static const int s_close_button_bitmap_width = 8; static const int s_close_button_bitmap_width = 8;
static const int s_close_button_bitmap_height = 9; static const int s_close_button_bitmap_height = 9;
void WSWindowManager::paint_window_frame(WSWindow& window) void WSWindowManager::paint_window_frame(const WSWindow& window)
{ {
//printf("[WM] paint_window_frame {%p}, rect: %d,%d %dx%d\n", &window, window.rect().x(), window.rect().y(), window.rect().width(), window.rect().height()); //printf("[WM] paint_window_frame {%p}, rect: %d,%d %dx%d\n", &window, window.rect().x(), window.rect().y(), window.rect().width(), window.rect().height());
@ -546,7 +546,7 @@ void WSWindowManager::notify_rect_changed(WSWindow& window, const Rect& old_rect
m_switcher.refresh(); m_switcher.refresh();
} }
void WSWindowManager::handle_menu_mouse_event(WSMenu& menu, WSMouseEvent& event) void WSWindowManager::handle_menu_mouse_event(WSMenu& menu, const WSMouseEvent& event)
{ {
bool is_hover_with_any_menu_open = event.type() == WSMouseEvent::MouseMove && m_current_menu; bool is_hover_with_any_menu_open = event.type() == WSMouseEvent::MouseMove && m_current_menu;
bool is_mousedown_with_left_button = event.type() == WSMouseEvent::MouseDown && event.button() == MouseButton::Left; bool is_mousedown_with_left_button = event.type() == WSMouseEvent::MouseDown && event.button() == MouseButton::Left;
@ -577,7 +577,7 @@ void WSWindowManager::close_current_menu()
m_current_menu = nullptr; m_current_menu = nullptr;
} }
void WSWindowManager::handle_menubar_mouse_event(WSMouseEvent& event) void WSWindowManager::handle_menubar_mouse_event(const WSMouseEvent& event)
{ {
for_each_active_menubar_menu([&] (WSMenu& menu) { for_each_active_menubar_menu([&] (WSMenu& menu) {
if (menu.rect_in_menubar().contains(event.position())) { if (menu.rect_in_menubar().contains(event.position())) {
@ -588,7 +588,7 @@ void WSWindowManager::handle_menubar_mouse_event(WSMouseEvent& event)
}); });
} }
void WSWindowManager::handle_close_button_mouse_event(WSWindow& window, WSMouseEvent& event) void WSWindowManager::handle_close_button_mouse_event(WSWindow& window, const WSMouseEvent& event)
{ {
if (event.type() == WSMessage::MouseDown && event.button() == MouseButton::Left) { if (event.type() == WSMessage::MouseDown && event.button() == MouseButton::Left) {
WSMessage message(WSMessage::WindowCloseRequest); WSMessage message(WSMessage::WindowCloseRequest);
@ -597,7 +597,7 @@ void WSWindowManager::handle_close_button_mouse_event(WSWindow& window, WSMouseE
} }
} }
void WSWindowManager::start_window_drag(WSWindow& window, WSMouseEvent& event) void WSWindowManager::start_window_drag(WSWindow& window, const WSMouseEvent& event)
{ {
#ifdef DRAG_DEBUG #ifdef DRAG_DEBUG
printf("[WM] Begin dragging WSWindow{%p}\n", &window); printf("[WM] Begin dragging WSWindow{%p}\n", &window);
@ -609,7 +609,7 @@ void WSWindowManager::start_window_drag(WSWindow& window, WSMouseEvent& event)
invalidate(window); invalidate(window);
} }
void WSWindowManager::start_window_resize(WSWindow& window, WSMouseEvent& event) void WSWindowManager::start_window_resize(WSWindow& window, const WSMouseEvent& event)
{ {
move_to_front_and_make_active(window); move_to_front_and_make_active(window);
constexpr ResizeDirection direction_for_hot_area[3][3] = { constexpr ResizeDirection direction_for_hot_area[3][3] = {
@ -640,7 +640,7 @@ void WSWindowManager::start_window_resize(WSWindow& window, WSMouseEvent& event)
invalidate(window); invalidate(window);
} }
bool WSWindowManager::process_ongoing_window_drag(WSMouseEvent& event, WSWindow*&) bool WSWindowManager::process_ongoing_window_drag(const WSMouseEvent& event, WSWindow*&)
{ {
if (!m_drag_window) if (!m_drag_window)
return false; return false;
@ -667,7 +667,7 @@ bool WSWindowManager::process_ongoing_window_drag(WSMouseEvent& event, WSWindow*
return false; return false;
} }
bool WSWindowManager::process_ongoing_window_resize(WSMouseEvent& event, WSWindow*&) bool WSWindowManager::process_ongoing_window_resize(const WSMouseEvent& event, WSWindow*&)
{ {
if (!m_resize_window) if (!m_resize_window)
return false; return false;
@ -768,7 +768,7 @@ bool WSWindowManager::process_ongoing_window_resize(WSMouseEvent& event, WSWindo
return true; return true;
} }
void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& event_window) void WSWindowManager::process_mouse_event(const WSMouseEvent& event, WSWindow*& event_window)
{ {
event_window = nullptr; event_window = nullptr;
@ -1051,17 +1051,17 @@ void WSWindowManager::draw_cursor()
m_last_cursor_rect = cursor_rect; m_last_cursor_rect = cursor_rect;
} }
void WSWindowManager::on_message(WSMessage& message) void WSWindowManager::on_message(const WSMessage& message)
{ {
if (message.is_mouse_event()) { if (message.is_mouse_event()) {
WSWindow* event_window = nullptr; WSWindow* event_window = nullptr;
process_mouse_event(static_cast<WSMouseEvent&>(message), event_window); process_mouse_event(static_cast<const WSMouseEvent&>(message), event_window);
set_hovered_window(event_window); set_hovered_window(event_window);
return; return;
} }
if (message.is_key_event()) { if (message.is_key_event()) {
auto& key_event = static_cast<WSKeyEvent&>(message); auto& key_event = static_cast<const WSKeyEvent&>(message);
m_keyboard_modifiers = key_event.modifiers(); m_keyboard_modifiers = key_event.modifiers();
if (key_event.type() == WSMessage::KeyDown && key_event.modifiers() == Mod_Logo && key_event.key() == Key_Tab) if (key_event.type() == WSMessage::KeyDown && key_event.modifiers() == Mod_Logo && key_event.key() == Key_Tab)

22
Servers/WindowServer/WSWindowManager.h
View file

@ -88,15 +88,15 @@ public:
Rect current_cursor_rect() const; Rect current_cursor_rect() const;
private: private:
void process_mouse_event(WSMouseEvent&, WSWindow*& event_window); void process_mouse_event(const WSMouseEvent&, WSWindow*& event_window);
bool process_ongoing_window_resize(WSMouseEvent&, WSWindow*& event_window); bool process_ongoing_window_resize(const WSMouseEvent&, WSWindow*& event_window);
bool process_ongoing_window_drag(WSMouseEvent&, WSWindow*& event_window); bool process_ongoing_window_drag(const WSMouseEvent&, WSWindow*& event_window);
void handle_menu_mouse_event(WSMenu&, WSMouseEvent&); void handle_menu_mouse_event(WSMenu&, const WSMouseEvent&);
void handle_menubar_mouse_event(WSMouseEvent&); void handle_menubar_mouse_event(const WSMouseEvent&);
void handle_close_button_mouse_event(WSWindow&, WSMouseEvent&); void handle_close_button_mouse_event(WSWindow&, const WSMouseEvent&);
void start_window_resize(WSWindow&, WSMouseEvent&); void start_window_resize(WSWindow&, const WSMouseEvent&);
void start_window_drag(WSWindow&, WSMouseEvent&); void start_window_drag(WSWindow&, const WSMouseEvent&);
void handle_client_request(WSAPIClientRequest&); void handle_client_request(const WSAPIClientRequest&);
void set_active_window(WSWindow*); void set_active_window(WSWindow*);
void set_hovered_window(WSWindow*); void set_hovered_window(WSWindow*);
template<typename Callback> IterationDecision for_each_visible_window_of_type_from_back_to_front(WSWindowType, Callback); template<typename Callback> IterationDecision for_each_visible_window_of_type_from_back_to_front(WSWindowType, Callback);
@ -105,9 +105,9 @@ private:
template<typename Callback> IterationDecision for_each_visible_window_from_back_to_front(Callback); template<typename Callback> IterationDecision for_each_visible_window_from_back_to_front(Callback);
template<typename Callback> void for_each_active_menubar_menu(Callback); template<typename Callback> void for_each_active_menubar_menu(Callback);
void close_current_menu(); void close_current_menu();
virtual void on_message(WSMessage&) override; virtual void on_message(const WSMessage&) override;
void compose(); void compose();
void paint_window_frame(WSWindow&); void paint_window_frame(const WSWindow&);
void flip_buffers(); void flip_buffers();
void tick_clock(); void tick_clock();

2
Servers/WindowServer/WSWindowSwitcher.cpp
View file

@ -116,6 +116,6 @@ void WSWindowSwitcher::refresh()
draw(); draw();
} }
void WSWindowSwitcher::on_message(WSMessage&) void WSWindowSwitcher::on_message(const WSMessage&)
{ {
} }

2
Servers/WindowServer/WSWindowSwitcher.h
View file

@ -33,7 +33,7 @@ public:
WSWindow* switcher_window() { return m_switcher_window.ptr(); } WSWindow* switcher_window() { return m_switcher_window.ptr(); }
private: private:
virtual void on_message(WSMessage&) override; virtual void on_message(const WSMessage&) override;
OwnPtr<WSWindow> m_switcher_window; OwnPtr<WSWindow> m_switcher_window;
Rect m_rect; Rect m_rect;