mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 16:22:43 +00:00 
			
		
		
		
	LibIPC: Stop sending client ID to clients
The client ID is not useful to normal clients anymore, so stop telling everyone what their ID is.
This commit is contained in:
		
							parent
							
								
									a5bbe3280d
								
							
						
					
					
						commit
						1ce03f4f34
					
				
					 29 changed files with 27 additions and 42 deletions
				
			
		|  | @ -62,8 +62,7 @@ public: | ||||||
| 
 | 
 | ||||||
|     virtual void handshake() override |     virtual void handshake() override | ||||||
|     { |     { | ||||||
|         auto response = send_sync<Messages::LanguageServer::Greet>(); |         send_sync<Messages::LanguageServer::Greet>(); | ||||||
|         set_my_client_id(response->client_id()); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     WeakPtr<LanguageClient> language_client() { return m_language_client; } |     WeakPtr<LanguageClient> language_client() { return m_language_client; } | ||||||
|  |  | ||||||
|  | @ -54,7 +54,7 @@ void ClientConnection::die() | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::LanguageServer::GreetResponse> ClientConnection::handle(const Messages::LanguageServer::Greet&) | OwnPtr<Messages::LanguageServer::GreetResponse> ClientConnection::handle(const Messages::LanguageServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::LanguageServer::GreetResponse>(client_id()); |     return make<Messages::LanguageServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| class DefaultDocumentClient final : public GUI::TextDocument::Client { | class DefaultDocumentClient final : public GUI::TextDocument::Client { | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| endpoint LanguageServer = 8001 | endpoint LanguageServer = 8001 | ||||||
| { | { | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     FileOpened(String file_name, IPC::File file) =| |     FileOpened(String file_name, IPC::File file) =| | ||||||
|     FileEditInsertText(String file_name, String text, i32 start_line, i32 start_column) =| |     FileEditInsertText(String file_name, String text, i32 start_line, i32 start_column) =| | ||||||
|  |  | ||||||
|  | @ -53,7 +53,7 @@ void ClientConnection::die() | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::LanguageServer::GreetResponse> ClientConnection::handle(const Messages::LanguageServer::Greet&) | OwnPtr<Messages::LanguageServer::GreetResponse> ClientConnection::handle(const Messages::LanguageServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::LanguageServer::GreetResponse>(client_id()); |     return make<Messages::LanguageServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| class DefaultDocumentClient final : public GUI::TextDocument::Client { | class DefaultDocumentClient final : public GUI::TextDocument::Client { | ||||||
|  |  | ||||||
|  | @ -36,8 +36,7 @@ ClientConnection::ClientConnection() | ||||||
| 
 | 
 | ||||||
| void ClientConnection::handshake() | void ClientConnection::handshake() | ||||||
| { | { | ||||||
|     auto response = send_sync<Messages::AudioServer::Greet>(); |     send_sync<Messages::AudioServer::Greet>(); | ||||||
|     set_my_client_id(response->client_id()); |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void ClientConnection::enqueue(const Buffer& buffer) | void ClientConnection::enqueue(const Buffer& buffer) | ||||||
|  |  | ||||||
|  | @ -60,8 +60,7 @@ class LaunchServerConnection : public IPC::ServerConnection<LaunchClientEndpoint | ||||||
| public: | public: | ||||||
|     virtual void handshake() override |     virtual void handshake() override | ||||||
|     { |     { | ||||||
|         auto response = send_sync<Messages::LaunchServer::Greet>(); |         send_sync<Messages::LaunchServer::Greet>(); | ||||||
|         set_my_client_id(response->client_id()); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
|  |  | ||||||
|  | @ -39,8 +39,7 @@ class ClipboardServerConnection : public IPC::ServerConnection<ClipboardClientEn | ||||||
| public: | public: | ||||||
|     virtual void handshake() override |     virtual void handshake() override | ||||||
|     { |     { | ||||||
|         auto response = send_sync<Messages::ClipboardServer::Greet>(); |         send_sync<Messages::ClipboardServer::Greet>(); | ||||||
|         set_my_client_id(response->client_id()); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
|  |  | ||||||
|  | @ -37,8 +37,7 @@ class NotificationServerConnection : public IPC::ServerConnection<NotificationCl | ||||||
| public: | public: | ||||||
|     virtual void handshake() override |     virtual void handshake() override | ||||||
|     { |     { | ||||||
|         auto response = send_sync<Messages::NotificationServer::Greet>(); |         send_sync<Messages::NotificationServer::Greet>(); | ||||||
|         set_my_client_id(response->client_id()); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| private: | private: | ||||||
|  |  | ||||||
|  | @ -63,7 +63,6 @@ static void set_system_theme_from_anonymous_buffer(Core::AnonymousBuffer buffer) | ||||||
| void WindowServerConnection::handshake() | void WindowServerConnection::handshake() | ||||||
| { | { | ||||||
|     auto response = send_sync<Messages::WindowServer::Greet>(); |     auto response = send_sync<Messages::WindowServer::Greet>(); | ||||||
|     set_my_client_id(response->client_id()); |  | ||||||
|     set_system_theme_from_anonymous_buffer(response->theme_buffer()); |     set_system_theme_from_anonymous_buffer(response->theme_buffer()); | ||||||
|     Desktop::the().did_receive_screen_rect({}, response->screen_rect()); |     Desktop::the().did_receive_screen_rect({}, response->screen_rect()); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -49,17 +49,11 @@ public: | ||||||
| 
 | 
 | ||||||
|     virtual void handshake() = 0; |     virtual void handshake() = 0; | ||||||
| 
 | 
 | ||||||
|     void set_my_client_id(int id) { m_my_client_id = id; } |  | ||||||
|     int my_client_id() const { return m_my_client_id; } |  | ||||||
| 
 |  | ||||||
|     virtual void die() override |     virtual void die() override | ||||||
|     { |     { | ||||||
|         // Override this function if you don't want your app to exit if it loses the connection.
 |         // Override this function if you don't want your app to exit if it loses the connection.
 | ||||||
|         exit(0); |         exit(0); | ||||||
|     } |     } | ||||||
| 
 |  | ||||||
| private: |  | ||||||
|     int m_my_client_id { -1 }; |  | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -37,8 +37,7 @@ Client::Client() | ||||||
| 
 | 
 | ||||||
| void Client::handshake() | void Client::handshake() | ||||||
| { | { | ||||||
|     auto response = send_sync<Messages::ImageDecoderServer::Greet>(); |     send_sync<Messages::ImageDecoderServer::Greet>(); | ||||||
|     set_my_client_id(response->client_id()); |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void Client::handle(const Messages::ImageDecoderClient::Dummy&) | void Client::handle(const Messages::ImageDecoderClient::Dummy&) | ||||||
|  |  | ||||||
|  | @ -38,8 +38,7 @@ Client::Client() | ||||||
| 
 | 
 | ||||||
| void Client::handshake() | void Client::handshake() | ||||||
| { | { | ||||||
|     auto response = send_sync<Messages::ProtocolServer::Greet>(); |     send_sync<Messages::ProtocolServer::Greet>(); | ||||||
|     set_my_client_id(response->client_id()); |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| bool Client::is_supported_protocol(const String& protocol) | bool Client::is_supported_protocol(const String& protocol) | ||||||
|  |  | ||||||
|  | @ -45,8 +45,7 @@ void WebContentClient::die() | ||||||
| 
 | 
 | ||||||
| void WebContentClient::handshake() | void WebContentClient::handshake() | ||||||
| { | { | ||||||
|     auto response = send_sync<Messages::WebContentServer::Greet>(); |     send_sync<Messages::WebContentServer::Greet>(); | ||||||
|     set_my_client_id(response->client_id()); |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void WebContentClient::handle(const Messages::WebContentClient::DidPaint& message) | void WebContentClient::handle(const Messages::WebContentClient::DidPaint& message) | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| endpoint AudioServer = 85 | endpoint AudioServer = 85 | ||||||
| { | { | ||||||
|     // Basic protocol |     // Basic protocol | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     // Mixer functions |     // Mixer functions | ||||||
|     SetMuted(bool muted) => () |     SetMuted(bool muted) => () | ||||||
|  |  | ||||||
|  | @ -81,7 +81,7 @@ void ClientConnection::did_change_main_mix_volume(Badge<Mixer>, int volume) | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::AudioServer::GreetResponse> ClientConnection::handle(const Messages::AudioServer::Greet&) | OwnPtr<Messages::AudioServer::GreetResponse> ClientConnection::handle(const Messages::AudioServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::AudioServer::GreetResponse>(client_id()); |     return make<Messages::AudioServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::AudioServer::GetMainMixVolumeResponse> ClientConnection::handle(const Messages::AudioServer::GetMainMixVolume&) | OwnPtr<Messages::AudioServer::GetMainMixVolumeResponse> ClientConnection::handle(const Messages::AudioServer::GetMainMixVolume&) | ||||||
|  |  | ||||||
|  | @ -57,7 +57,7 @@ void ClientConnection::die() | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::ClipboardServer::GreetResponse> ClientConnection::handle(const Messages::ClipboardServer::Greet&) | OwnPtr<Messages::ClipboardServer::GreetResponse> ClientConnection::handle(const Messages::ClipboardServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::ClipboardServer::GreetResponse>(client_id()); |     return make<Messages::ClipboardServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::ClipboardServer::SetClipboardDataResponse> ClientConnection::handle(const Messages::ClipboardServer::SetClipboardData& message) | OwnPtr<Messages::ClipboardServer::SetClipboardDataResponse> ClientConnection::handle(const Messages::ClipboardServer::SetClipboardData& message) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| endpoint ClipboardServer = 802 | endpoint ClipboardServer = 802 | ||||||
| { | { | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     GetClipboardData() => (Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata) |     GetClipboardData() => (Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata) | ||||||
|     SetClipboardData(Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata) => () |     SetClipboardData(Core::AnonymousBuffer data, [UTF8] String mime_type, IPC::Dictionary metadata) => () | ||||||
|  |  | ||||||
|  | @ -53,7 +53,7 @@ void ClientConnection::die() | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::ImageDecoderServer::GreetResponse> ClientConnection::handle(const Messages::ImageDecoderServer::Greet&) | OwnPtr<Messages::ImageDecoderServer::GreetResponse> ClientConnection::handle(const Messages::ImageDecoderServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::ImageDecoderServer::GreetResponse>(client_id()); |     return make<Messages::ImageDecoderServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::ImageDecoderServer::DecodeImageResponse> ClientConnection::handle(const Messages::ImageDecoderServer::DecodeImage& message) | OwnPtr<Messages::ImageDecoderServer::DecodeImageResponse> ClientConnection::handle(const Messages::ImageDecoderServer::DecodeImage& message) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| endpoint ImageDecoderServer = 7001 | endpoint ImageDecoderServer = 7001 | ||||||
| { | { | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     DecodeImage(Core::AnonymousBuffer data) => (bool is_animated, u32 loop_count, Vector<Gfx::ShareableBitmap> bitmaps, Vector<u32> durations) |     DecodeImage(Core::AnonymousBuffer data) => (bool is_animated, u32 loop_count, Vector<Gfx::ShareableBitmap> bitmaps, Vector<u32> durations) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -50,7 +50,7 @@ void ClientConnection::die() | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::LaunchServer::GreetResponse> ClientConnection::handle(const Messages::LaunchServer::Greet&) | OwnPtr<Messages::LaunchServer::GreetResponse> ClientConnection::handle(const Messages::LaunchServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::LaunchServer::GreetResponse>(client_id()); |     return make<Messages::LaunchServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::LaunchServer::OpenURLResponse> ClientConnection::handle(const Messages::LaunchServer::OpenURL& request) | OwnPtr<Messages::LaunchServer::OpenURLResponse> ClientConnection::handle(const Messages::LaunchServer::OpenURL& request) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| endpoint LaunchServer = 101 | endpoint LaunchServer = 101 | ||||||
| { | { | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
|     OpenURL(URL url, String handler_name) => (bool response) |     OpenURL(URL url, String handler_name) => (bool response) | ||||||
|     GetHandlersForURL(URL url) => (Vector<String> handlers) |     GetHandlersForURL(URL url) => (Vector<String> handlers) | ||||||
|     GetHandlersWithDetailsForURL(URL url) => (Vector<String> handlers_details) |     GetHandlersWithDetailsForURL(URL url) => (Vector<String> handlers_details) | ||||||
|  |  | ||||||
|  | @ -50,7 +50,7 @@ void ClientConnection::die() | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::NotificationServer::GreetResponse> ClientConnection::handle(const Messages::NotificationServer::Greet&) | OwnPtr<Messages::NotificationServer::GreetResponse> ClientConnection::handle(const Messages::NotificationServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::NotificationServer::GreetResponse>(client_id()); |     return make<Messages::NotificationServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::NotificationServer::ShowNotificationResponse> ClientConnection::handle(const Messages::NotificationServer::ShowNotification& message) | OwnPtr<Messages::NotificationServer::ShowNotificationResponse> ClientConnection::handle(const Messages::NotificationServer::ShowNotification& message) | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| endpoint NotificationServer = 95 | endpoint NotificationServer = 95 | ||||||
| { | { | ||||||
|     // Basic protocol |     // Basic protocol | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     ShowNotification([UTF8] String text, [UTF8] String title, Gfx::ShareableBitmap icon) => () |     ShowNotification([UTF8] String text, [UTF8] String title, Gfx::ShareableBitmap icon) => () | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -122,7 +122,7 @@ void ClientConnection::did_request_certificates(Badge<Download>, Download& downl | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::ProtocolServer::GreetResponse> ClientConnection::handle(const Messages::ProtocolServer::Greet&) | OwnPtr<Messages::ProtocolServer::GreetResponse> ClientConnection::handle(const Messages::ProtocolServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::ProtocolServer::GreetResponse>(client_id()); |     return make<Messages::ProtocolServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::ProtocolServer::SetCertificateResponse> ClientConnection::handle(const Messages::ProtocolServer::SetCertificate& message) | OwnPtr<Messages::ProtocolServer::SetCertificateResponse> ClientConnection::handle(const Messages::ProtocolServer::SetCertificate& message) | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| endpoint ProtocolServer = 9 | endpoint ProtocolServer = 9 | ||||||
| { | { | ||||||
|     // Basic protocol |     // Basic protocol | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     // Test if a specific protocol is supported, e.g "http" |     // Test if a specific protocol is supported, e.g "http" | ||||||
|     IsSupportedProtocol(String protocol) => (bool supported) |     IsSupportedProtocol(String protocol) => (bool supported) | ||||||
|  |  | ||||||
|  | @ -78,7 +78,7 @@ const Web::Page& ClientConnection::page() const | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::WebContentServer::GreetResponse> ClientConnection::handle(const Messages::WebContentServer::Greet&) | OwnPtr<Messages::WebContentServer::GreetResponse> ClientConnection::handle(const Messages::WebContentServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::WebContentServer::GreetResponse>(client_id()); |     return make<Messages::WebContentServer::GreetResponse>(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void ClientConnection::handle(const Messages::WebContentServer::UpdateSystemTheme& message) | void ClientConnection::handle(const Messages::WebContentServer::UpdateSystemTheme& message) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| endpoint WebContentServer = 89 | endpoint WebContentServer = 89 | ||||||
| { | { | ||||||
|     Greet() => (i32 client_id) |     Greet() => () | ||||||
| 
 | 
 | ||||||
|     UpdateSystemTheme(Core::AnonymousBuffer theme_buffer) =| |     UpdateSystemTheme(Core::AnonymousBuffer theme_buffer) =| | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -722,7 +722,7 @@ void ClientConnection::handle(const Messages::WindowServer::WM_SetWindowMinimize | ||||||
| 
 | 
 | ||||||
| OwnPtr<Messages::WindowServer::GreetResponse> ClientConnection::handle(const Messages::WindowServer::Greet&) | OwnPtr<Messages::WindowServer::GreetResponse> ClientConnection::handle(const Messages::WindowServer::Greet&) | ||||||
| { | { | ||||||
|     return make<Messages::WindowServer::GreetResponse>(client_id(), Screen::the().rect(), Gfx::current_system_theme_buffer()); |     return make<Messages::WindowServer::GreetResponse>(Screen::the().rect(), Gfx::current_system_theme_buffer()); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void ClientConnection::handle(const Messages::WindowServer::WM_SetWindowTaskbarRect& message) | void ClientConnection::handle(const Messages::WindowServer::WM_SetWindowTaskbarRect& message) | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| endpoint WindowServer = 2 | endpoint WindowServer = 2 | ||||||
| { | { | ||||||
|     Greet() => (i32 client_id, Gfx::IntRect screen_rect, Core::AnonymousBuffer theme_buffer) |     Greet() => (Gfx::IntRect screen_rect, Core::AnonymousBuffer theme_buffer) | ||||||
| 
 | 
 | ||||||
|     CreateMenubar() => (i32 menubar_id) |     CreateMenubar() => (i32 menubar_id) | ||||||
|     DestroyMenubar(i32 menubar_id) => () |     DestroyMenubar(i32 menubar_id) => () | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Andreas Kling
						Andreas Kling