mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-12 13:29:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Create socket in /var/run/user/${HOME}

Browse source 
Use the runtime dir from XDG Base Directory Specification for creating the
socket in a directory only the user can read and write.
This commit is contained in:
Kristian Høgsberg 2010-12-01 15:36:20 -05:00
parent 0611e3efc2
commit 2bb3ebe1e4
11 changed files with 99 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compositor/compositor.c
View file

@ -37,8 +37,7 @@
/* The plan here is to generate a random anonymous socket name and
* advertise that through a service on the session dbus.
*/
static const char *option_socket_name = "wayland";
static const char *option_socket_name = NULL;
static const char *option_background = "background.jpg";
static const char *option_geometry = "1024x640";
static int option_connector = 0;
@ -901,7 +900,7 @@ notify_key(struct wlsc_input_device *device,
switch (key | device->modifier_state) {
case KEY_BACKSPACE | MODIFIER_CTRL | MODIFIER_ALT:
kill(0, SIGTERM);
wl_display_terminate(device->ec->wl_display);
return;
}
@ -1396,7 +1395,6 @@ wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display)
return 0;
}
int main(int argc, char *argv[])
{
struct wl_display *display;
@ -1404,8 +1402,6 @@ int main(int argc, char *argv[])
GError *error = NULL;
GOptionContext *context;
int width, height;
char *socket_name;
int socket_name_size;
g_type_init(); /* GdkPixbuf needs this, it seems. */
@ -1435,16 +1431,14 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
socket_name_size =
asprintf(&socket_name, "%c%s", '\0', option_socket_name) + 1;
if (wl_display_add_socket(display, socket_name, socket_name_size)) {
if (wl_display_add_socket(display, option_socket_name)) {
fprintf(stderr, "failed to add socket: %m\n");
exit(EXIT_FAILURE);
}
free(socket_name);
wl_display_run(display);
wl_display_destroy(display);
return 0;
}