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

Rename GUI_Event to GUI_ServerMessage.

Browse source 
Now that communication is becoming bidirectional, "event" is no longer right.
This commit is contained in:
Andreas Kling 2019-02-13 17:59:38 +01:00
parent 4f98a35beb
commit fbbf57b61c
12 changed files with 92 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WindowServer/WSMenu.cpp
View file

@ -140,8 +140,8 @@ void WSMenu::did_activate(WSMenuItem& item)
close();
GUI_Event gui_event;
gui_event.type = GUI_Event::Type::MenuItemActivated;
GUI_ServerMessage gui_event;
gui_event.type = GUI_ServerMessage::Type::MenuItemActivated;
gui_event.menu.menu_id = m_menu_id;
gui_event.menu.identifier = item.identifier();

2
WindowServer/WSMessageLoop.cpp
View file

@ -73,7 +73,7 @@ Process* WSMessageLoop::process_from_client_id(int client_id)
return (Process*)client_id;
}
void WSMessageLoop::post_message_to_client(int client_id, const GUI_Event& message)
void WSMessageLoop::post_message_to_client(int client_id, const GUI_ServerMessage& message)
{
auto* process = process_from_client_id(client_id);
if (!process)

4
WindowServer/WSMessageLoop.h
View file

@ -9,7 +9,7 @@
class WSMessageReceiver;
class Process;
struct GUI_Event;
struct GUI_ServerMessage;
class WSMessageLoop {
public:
@ -30,7 +30,7 @@ public:
int start_timer(int ms, Function<void()>&&);
int stop_timer(int timer_id);
void post_message_to_client(int client_id, const GUI_Event&);
void post_message_to_client(int client_id, const GUI_ServerMessage&);
ssize_t on_receive_from_client(int client_id, const byte*, size_t);
static Process* process_from_client_id(int client_id);

22
WindowServer/WSWindow.cpp
View file

@ -79,34 +79,34 @@ void WSWindow::on_message(WSMessage& message)
return;
}
GUI_Event gui_event;
GUI_ServerMessage gui_event;
gui_event.window_id = window_id();
switch (message.type()) {
case WSMessage::WM_ClientWantsToPaint:
gui_event.type = GUI_Event::Type::Paint;
gui_event.type = GUI_ServerMessage::Type::Paint;
gui_event.paint.rect = static_cast<WSClientWantsToPaintMessage&>(message).rect();
break;
case WSMessage::MouseMove:
gui_event.type = GUI_Event::Type::MouseMove;
gui_event.type = GUI_ServerMessage::Type::MouseMove;
gui_event.mouse.position = static_cast<WSMouseEvent&>(message).position();
gui_event.mouse.button = GUI_MouseButton::NoButton;
gui_event.mouse.buttons = static_cast<WSMouseEvent&>(message).buttons();
break;
case WSMessage::MouseDown:
gui_event.type = GUI_Event::Type::MouseDown;
gui_event.type = GUI_ServerMessage::Type::MouseDown;
gui_event.mouse.position = static_cast<WSMouseEvent&>(message).position();
gui_event.mouse.button = to_api(static_cast<WSMouseEvent&>(message).button());
gui_event.mouse.buttons = static_cast<WSMouseEvent&>(message).buttons();
break;
case WSMessage::MouseUp:
gui_event.type = GUI_Event::Type::MouseUp;
gui_event.type = GUI_ServerMessage::Type::MouseUp;
gui_event.mouse.position = static_cast<WSMouseEvent&>(message).position();
gui_event.mouse.button = to_api(static_cast<WSMouseEvent&>(message).button());
gui_event.mouse.buttons = static_cast<WSMouseEvent&>(message).buttons();
break;
case WSMessage::KeyDown:
gui_event.type = GUI_Event::Type::KeyDown;
gui_event.type = GUI_ServerMessage::Type::KeyDown;
gui_event.key.character = static_cast<WSKeyEvent&>(message).character();
gui_event.key.key = static_cast<WSKeyEvent&>(message).key();
gui_event.key.alt = static_cast<WSKeyEvent&>(message).alt();
@ -114,7 +114,7 @@ void WSWindow::on_message(WSMessage& message)
gui_event.key.shift = static_cast<WSKeyEvent&>(message).shift();
break;
case WSMessage::KeyUp:
gui_event.type = GUI_Event::Type::KeyUp;
gui_event.type = GUI_ServerMessage::Type::KeyUp;
gui_event.key.character = static_cast<WSKeyEvent&>(message).character();
gui_event.key.key = static_cast<WSKeyEvent&>(message).key();
gui_event.key.alt = static_cast<WSKeyEvent&>(message).alt();
@ -134,19 +134,19 @@ void WSWindow::on_message(WSMessage& message)
delete this;
return;
case WSMessage::WindowActivated:
gui_event.type = GUI_Event::Type::WindowActivated;
gui_event.type = GUI_ServerMessage::Type::WindowActivated;
break;
case WSMessage::WindowDeactivated:
gui_event.type = GUI_Event::Type::WindowDeactivated;
gui_event.type = GUI_ServerMessage::Type::WindowDeactivated;
break;
case WSMessage::WindowCloseRequest:
gui_event.type = GUI_Event::Type::WindowCloseRequest;
gui_event.type = GUI_ServerMessage::Type::WindowCloseRequest;
break;
default:
break;
}
if (gui_event.type == GUI_Event::Type::Invalid)
if (gui_event.type == GUI_ServerMessage::Type::Invalid)
return;
{

16
WindowServer/WSWindowManager.cpp
View file

@ -741,10 +741,10 @@ void WSWindowManager::on_message(WSMessage& message)
int menubar_id = m_next_menubar_id++;
auto menubar = make<WSMenuBar>(menubar_id, *WSMessageLoop::process_from_client_id(request.client_id()));
m_menubars.set(menubar_id, move(menubar));
GUI_Event event;
event.type = GUI_Event::Type::DidCreateMenubar;
event.menu.menubar_id = menubar_id;
WSMessageLoop::the().post_message_to_client(request.client_id(), event);
GUI_ServerMessage response;
response.type = GUI_ServerMessage::Type::DidCreateMenubar;
response.menu.menubar_id = menubar_id;
WSMessageLoop::the().post_message_to_client(request.client_id(), response);
break;
}
case WSMessage::APIDestroyMenubarRequest: {
@ -759,10 +759,10 @@ void WSWindowManager::on_message(WSMessage& message)
if (&menubar == m_current_menubar)
set_current_menubar(nullptr);
m_menubars.remove(it);
GUI_Event event;
event.type = GUI_Event::Type::DidDestroyMenubar;
event.menu.menubar_id = menubar_id;
WSMessageLoop::the().post_message_to_client(request.client_id(), event);
GUI_ServerMessage response;
response.type = GUI_ServerMessage::Type::DidDestroyMenubar;
response.menu.menubar_id = menubar_id;
WSMessageLoop::the().post_message_to_client(request.client_id(), response);
}
default:
break;