isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

eis: Don't expose global socket

Browse Source 
How EIS will be used depends on its context, meaning we'll have multiple
EIS contexts that expose different things. To prepare for this remove
the global socket since that won't work with multiple contexts.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3228>
This commit is contained in:
Jonas Ådahl 2023-08-28 16:49:48 +02:00 committed by Marge Bot
parent 7e8bc5850e
commit ce61c8dc61
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backends/meta-eis.c
View File

@ -243,48 +243,19 @@ meta_eis_add_client_get_fd (MetaEis *eis)
return eis_backend_fd_add_client (eis->eis); return eis_backend_fd_add_client (eis->eis);
} }
static int
try_and_find_free_eis_socket (MetaEis *eis)
{
int rc;
int n;
char socketname[16];
for (n = 0; n < 100; n++)
{
g_snprintf (socketname, sizeof (socketname), "eis-%d", n);
rc = eis_setup_backend_socket (eis->eis, socketname);
if (rc == 0)
{
g_info ("Using EIS socket: %s", socketname);
return 0;
}
}
return rc;
}
MetaEis * MetaEis *
meta_eis_new (MetaBackend *backend) meta_eis_new (MetaBackend *backend)
{ {
MetaEis *eis; MetaEis *eis;
int fd; int fd;
int rc;
eis = g_object_new (META_TYPE_EIS, NULL); eis = g_object_new (META_TYPE_EIS, NULL);
eis->backend = backend; eis->backend = backend;
eis->eis = eis_new (eis); eis->eis = eis_new (eis);
rc = try_and_find_free_eis_socket (eis);
if (rc != 0)
{
g_warning ("Failed to initialize the EIS socket: %s", g_strerror (-rc));
g_clear_pointer (&eis->eis, eis_unref);
return NULL;
}
eis_log_set_handler (eis->eis, eis_logger); eis_log_set_handler (eis->eis, eis_logger);
eis_log_set_priority (eis->eis, EIS_LOG_PRIORITY_DEBUG); eis_log_set_priority (eis->eis, EIS_LOG_PRIORITY_DEBUG);
eis_setup_backend_fd (eis->eis);
fd = eis_get_fd (eis->eis); fd = eis_get_fd (eis->eis);
eis->event_source = meta_event_source_new (eis, fd, &eis_event_funcs); eis->event_source = meta_event_source_new (eis, fd, &eis_event_funcs);