mirror of
https://github.com/brl/mutter.git
synced 2025-02-17 05:44:08 +00:00
a8984a81c2
Before this commit, sudo x11-app, e.g. sudo gvim /etc/some-file, fails when running a Wayland session. Where as doing this under a "GNOME on Xorg" session works fine. For a user switching from the Xorg session to the Wayland session, this is regression, which we want to avoid. This commit fixes this by creating and passing an xauth file to Xwayland when mutter starts it. Just like gdm or startx pass a xauth file to Xorg when they start Xorg. Fixes #643 https://gitlab.gnome.org/GNOME/mutter/issues/643
86 lines
2.3 KiB
C
86 lines
2.3 KiB
C
/*
|
|
* Copyright (C) 2012 Intel Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef META_WAYLAND_PRIVATE_H
|
|
#define META_WAYLAND_PRIVATE_H
|
|
|
|
#include <glib.h>
|
|
#include <wayland-server.h>
|
|
|
|
#include "clutter/clutter.h"
|
|
#include "core/window-private.h"
|
|
#include "meta/meta-cursor-tracker.h"
|
|
#include "wayland/meta-wayland-pointer-gestures.h"
|
|
#include "wayland/meta-wayland-seat.h"
|
|
#include "wayland/meta-wayland-surface.h"
|
|
#include "wayland/meta-wayland-tablet-manager.h"
|
|
#include "wayland/meta-wayland-versions.h"
|
|
#include "wayland/meta-wayland.h"
|
|
|
|
typedef struct _MetaXWaylandDnd MetaXWaylandDnd;
|
|
|
|
typedef struct
|
|
{
|
|
struct wl_list link;
|
|
struct wl_resource *resource;
|
|
MetaWaylandSurface *surface;
|
|
} MetaWaylandFrameCallback;
|
|
|
|
typedef struct
|
|
{
|
|
int display_index;
|
|
char *lock_file;
|
|
int abstract_fd;
|
|
int unix_fd;
|
|
struct wl_display *wayland_display;
|
|
struct wl_client *client;
|
|
struct wl_resource *xserver_resource;
|
|
char *display_name;
|
|
char *auth_file;
|
|
|
|
GCancellable *xserver_died_cancellable;
|
|
GSubprocess *proc;
|
|
GMainLoop *init_loop;
|
|
|
|
MetaXWaylandDnd *dnd;
|
|
} MetaXWaylandManager;
|
|
|
|
struct _MetaWaylandCompositor
|
|
{
|
|
GObject parent;
|
|
|
|
struct wl_display *wayland_display;
|
|
char *display_name;
|
|
GHashTable *outputs;
|
|
struct wl_list frame_callbacks;
|
|
|
|
MetaXWaylandManager xwayland_manager;
|
|
|
|
MetaWaylandSeat *seat;
|
|
MetaWaylandTabletManager *tablet_manager;
|
|
|
|
GHashTable *scheduled_surface_associations;
|
|
};
|
|
|
|
#define META_TYPE_WAYLAND_COMPOSITOR (meta_wayland_compositor_get_type ())
|
|
G_DECLARE_FINAL_TYPE (MetaWaylandCompositor, meta_wayland_compositor,
|
|
META, WAYLAND_COMPOSITOR, GObject)
|
|
|
|
#endif /* META_WAYLAND_PRIVATE_H */
|