process.h \
seat.c \
seat.h \
- seat-surfaceflinger.c \
- seat-surfaceflinger.h \
seat-unity.c \
seat-unity.h \
seat-xdmcp-session.c \
session-config.h \
shared-data-manager.c \
shared-data-manager.h \
- surfaceflinger-server.c \
- surfaceflinger-server.h \
unity-system-compositor.c \
unity-system-compositor.h \
vnc-server.c \
#include "seat-xlocal.h"
#include "seat-xremote.h"
#include "seat-unity.h"
-#include "seat-surfaceflinger.h"
#include "plymouth.h"
enum {
seat_register_module ("xlocal", SEAT_XLOCAL_TYPE);
seat_register_module ("xremote", SEAT_XREMOTE_TYPE);
seat_register_module ("unity", SEAT_UNITY_TYPE);
- seat_register_module ("surfaceflinger", SEAT_SURFACEFLINGER_TYPE);
}
static void
+++ /dev/null
-/*
- * Copyright (C) 2013 Robert Ancell.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * 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 3 of the License, or (at your option) any later
- * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
- * license.
- */
-
-#include <string.h>
-
-#include "seat-surfaceflinger.h"
-#include "surfaceflinger-server.h"
-#include "vt.h"
-
-G_DEFINE_TYPE (SeatSurfaceflinger, seat_surfaceflinger, SEAT_TYPE);
-
-static void
-seat_surfaceflinger_setup (Seat *seat)
-{
- seat_set_supports_multi_session (seat, FALSE);
- SEAT_CLASS (seat_surfaceflinger_parent_class)->setup (seat);
-}
-
-static DisplayServer *
-seat_surfaceflinger_create_display_server (Seat *seat, Session *session)
-{
- const gchar *session_type;
-
- session_type = session_get_session_type (session);
-
- /* Allow mir types too, because Mir sessions usually support surfaceflinger
- as an alternate mode, since Mir is frequently used on phones. */
- if (strcmp (session_type, "surfaceflinger") == 0 || strcmp (session_type, "mir") == 0)
- return DISPLAY_SERVER (surfaceflinger_server_new ());
- else
- {
- l_warning (seat, "Can't create unsupported display server '%s'", session_type);
- return NULL;
- }
-}
-
-static Greeter *
-seat_surfaceflinger_create_greeter_session (Seat *seat)
-{
- Greeter *greeter_session;
-
- greeter_session = SEAT_CLASS (seat_surfaceflinger_parent_class)->create_greeter_session (seat);
- session_set_env (SESSION (greeter_session), "XDG_SEAT", seat_get_name (seat));
-
- /* Fake the VT */
- session_set_env (SESSION (greeter_session), "XDG_VTNR", vt_can_multi_seat () ? "1" : "0");
-
- return greeter_session;
-}
-
-static Session *
-seat_surfaceflinger_create_session (Seat *seat)
-{
- Session *session;
-
- session = SEAT_CLASS (seat_surfaceflinger_parent_class)->create_session (seat);
- session_set_env (session, "XDG_SEAT", seat_get_name (seat));
-
- /* Fake the VT */
- session_set_env (session, "XDG_VTNR", vt_can_multi_seat () ? "1" : "0");
-
- return session;
-}
-
-static void
-seat_surfaceflinger_init (SeatSurfaceflinger *seat)
-{
-}
-
-static void
-seat_surfaceflinger_class_init (SeatSurfaceflingerClass *klass)
-{
- SeatClass *seat_class = SEAT_CLASS (klass);
-
- seat_class->setup = seat_surfaceflinger_setup;
- seat_class->create_display_server = seat_surfaceflinger_create_display_server;
- seat_class->create_greeter_session = seat_surfaceflinger_create_greeter_session;
- seat_class->create_session = seat_surfaceflinger_create_session;
-}
+++ /dev/null
-/*
- * Copyright (C) 2013 Robert Ancell.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * 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 3 of the License, or (at your option) any later
- * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
- * license.
- */
-
-#ifndef _SEAT_SURFACEFLINGER_H_
-#define _SEAT_SURFACEFLINGER_H_
-
-#include <glib-object.h>
-#include "seat.h"
-
-G_BEGIN_DECLS
-
-#define SEAT_SURFACEFLINGER_TYPE (seat_surfaceflinger_get_type())
-#define SEAT_SURFACEFLINGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAT_SURFACEFLINGER_TYPE, SeatSurfaceflinger))
-
-typedef struct SeatSurfaceflingerPrivate SeatSurfaceflingerPrivate;
-
-typedef struct
-{
- Seat parent_instance;
- SeatSurfaceflingerPrivate *priv;
-} SeatSurfaceflinger;
-
-typedef struct
-{
- SeatClass parent_class;
-} SeatSurfaceflingerClass;
-
-GType seat_surfaceflinger_get_type (void);
-
-G_END_DECLS
-
-#endif /* _SEAT_SURFACEFLINGER_H_ */
+++ /dev/null
-/*
- * Copyright (C) 2013 Robert Ancell.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * 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 3 of the License, or (at your option) any later
- * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
- * license.
- */
-
-#include <string.h>
-
-#include "surfaceflinger-server.h"
-
-G_DEFINE_TYPE (SurfaceflingerServer, surfaceflinger_server, DISPLAY_SERVER_TYPE);
-
-SurfaceflingerServer *surfaceflinger_server_new (void)
-{
- return g_object_new (SURFACEFLINGER_SERVER_TYPE, NULL);
-}
-
-static const gchar *
-surfaceflinger_server_get_session_type (DisplayServer *server)
-{
- return "surfaceflinger";
-}
-
-static void
-surfaceflinger_server_init (SurfaceflingerServer *server)
-{
- display_server_set_name (DISPLAY_SERVER (server), "sf");
-}
-
-static void
-surfaceflinger_server_class_init (SurfaceflingerServerClass *klass)
-{
- DisplayServerClass *display_server_class = DISPLAY_SERVER_CLASS (klass);
-
- display_server_class->get_session_type = surfaceflinger_server_get_session_type;
-}
+++ /dev/null
-/*
- * Copyright (C) 2013 Robert Ancell.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * 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 3 of the License, or (at your option) any later
- * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
- * license.
- */
-
-#ifndef SURFACEFLINGER_SERVER_H_
-#define SURFACEFLINGER_SERVER_H_
-
-#include <glib-object.h>
-#include "display-server.h"
-
-G_BEGIN_DECLS
-
-#define SURFACEFLINGER_SERVER_TYPE (surfaceflinger_server_get_type())
-#define SURFACEFLINGER_SERVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SURFACEFLINGER_SERVER_TYPE, SurfaceflingerServer))
-#define SURFACEFLINGER_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SURFACEFLINGER_SERVER_TYPE, SurfaceflingerServerClass))
-#define SURFACEFLINGER_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SURFACEFLINGER_SERVER_TYPE, SurfaceflingerServerClass))
-#define IS_SURFACEFLINGER_SERVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SURFACEFLINGER_SERVER_TYPE))
-
-typedef struct SurfaceflingerServerPrivate SurfaceflingerServerPrivate;
-
-typedef struct
-{
- DisplayServer parent_instance;
- SurfaceflingerServerPrivate *priv;
-} SurfaceflingerServer;
-
-typedef struct
-{
- DisplayServerClass parent_class;
-} SurfaceflingerServerClass;
-
-GType surfaceflinger_server_get_type (void);
-
-SurfaceflingerServer *surfaceflinger_server_new (void);
-
-const gchar *surfaceflinger_server_get_id (SurfaceflingerServer *server);
-
-G_END_DECLS
-
-#endif /* SURFACEFLINGER_SERVER_H_ */
test-unity-mir-session-x-greeter \
test-unity-mir-switch \
test-unity-mir-switch-to-user-resettable \
- test-unity-xdg-seat \
- test-surfaceflinger-autologin
+ test-unity-xdg-seat
# test-session-exit-error
# test-greeter-no-exit
data/sessions/mir.desktop \
data/sessions/mir-container.desktop \
data/sessions/named.desktop \
- data/sessions/surfaceflinger.desktop \
scripts/0-additional.conf \
scripts/1-additional.conf \
scripts/additional-config.conf \
scripts/session-stderr.conf \
scripts/session-stderr-multi-write.conf \
scripts/session-stderr-backup.conf \
- scripts/surfaceflinger-autologin.conf \
scripts/switch-to-greeter.conf \
scripts/switch-to-greeter-disabled.conf \
scripts/switch-to-greeter-new-session.conf \
+++ /dev/null
-[Desktop Entry]
-Name=Test Session
-Comment=LightDM test Surfaceflinger session
-Exec=test-session
-X-LightDM-Session-Type=surfaceflinger
+++ /dev/null
-#
-# Check can automatically log into a Surfaceflinger session
-#
-
-[SeatDefaults]
-type=surfaceflinger
-autologin-user=have-password1
-user-session=surfaceflinger
-
-#?*START-DAEMON
-#?RUNNER DAEMON-START
-
-# Session starts (test session doesn't know it's in surfaceflinger)
-#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_DESKTOP=surfaceflinger USER=have-password1
-#?LOGIN1 ACTIVATE-SESSION SESSION=c0
-
-# Cleanup
-#?*STOP-DAEMON
-#?SESSION-UNKNOWN TERMINATE SIGNAL=15
-#?RUNNER DAEMON-EXIT STATUS=0
+++ /dev/null
-#!/bin/sh
-./src/dbus-env ./src/test-runner surfaceflinger-autologin test-gobject-greeter
projects / sojka / lightdm.git / commitdiff