launchers: Remove --tty option

This doesn't work with any of the launchers we've kept. Remove the option
and all the bits that handle it.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>

libweston/backend-drm/drm.c

@@ -3018,8 +3018,7 @@ drm_backend_create(struct weston_compositor *compositor,
 		goto err_compositor;
 
 	/* Check if we run drm-backend using a compatible launcher */
-	compositor->launcher = weston_launcher_connect(compositor, config->tty,
-						       seat_id, true);
+	compositor->launcher = weston_launcher_connect(compositor, seat_id, true);
 	if (compositor->launcher == NULL) {
 		weston_log("fatal: your system should either provide the "
 			   "logind D-Bus API, or use seatd.\n");

libweston/backend-fbdev/fbdev.c

@@ -924,7 +924,7 @@ fbdev_backend_create(struct weston_compositor *compositor,
 	wl_signal_add(&compositor->session_signal,
 		      &backend->session_listener);
 	compositor->launcher =
-		weston_launcher_connect(compositor, param->tty, seat_id, false);
+		weston_launcher_connect(compositor, seat_id, false);
 	if (!compositor->launcher) {
 		weston_log("fatal: your system should either provide the "
 			   "logind D-Bus API, or use seatd.\n");
@@ -968,7 +968,6 @@ out_compositor:
 static void
 config_init_to_defaults(struct weston_fbdev_backend_config *config)
 {
-	config->tty = 0; /* default to current tty */
 	config->device = NULL;
 	config->seat_id = NULL;
 }

libweston/launcher-impl.h

@@ -32,7 +32,7 @@ struct weston_launcher;
 struct launcher_interface {
 	char *name;
 	int (* connect) (struct weston_launcher **launcher_out, struct weston_compositor *compositor,
-			 int tty, const char *seat_id, bool sync_drm);
+			 const char *seat_id, bool sync_drm);
 	void (* destroy) (struct weston_launcher *launcher);
 	int (* open) (struct weston_launcher *launcher, const char *path, int flags);
 	void (* close) (struct weston_launcher *launcher, int fd);

libweston/launcher-libseat.c

@@ -181,7 +181,7 @@ libseat_event(int fd, uint32_t mask, void *data)
 
 static int
 seat_open(struct weston_launcher **out, struct weston_compositor *compositor,
-	  int tty, const char *seat_id, bool sync_drm)
+	  const char *seat_id, bool sync_drm)
 {
 	struct launcher_libseat *wl;
 	struct wl_event_loop *event_loop;

libweston/launcher-logind.c

@@ -736,7 +736,7 @@ launcher_logind_get_session(char **session)
 
 static int
 launcher_logind_connect(struct weston_launcher **out, struct weston_compositor *compositor,
-			int tty, const char *seat_id, bool sync_drm)
+			const char *seat_id, bool sync_drm)
 {
 	struct launcher_logind *wl;
 	struct wl_event_loop *loop;
@@ -784,11 +784,6 @@ launcher_logind_connect(struct weston_launcher **out, struct weston_compositor *
 		if (r < 0) {
 			weston_log("logind: session not running on a VT\n");
 			goto err_session;
-		} else if (tty > 0 && wl->vtnr != (unsigned int )tty) {
-			weston_log("logind: requested VT --tty=%d differs from real session VT %u\n",
-				   tty, wl->vtnr);
-			r = -EINVAL;
-			goto err_session;
 		}
 	} else if (r < 0) {
 		weston_log("logind: could not determine if seat %s has ttys or not", t);

libweston/launcher-util.c

@@ -47,7 +47,7 @@ static const struct launcher_interface *ifaces[] = {
 };
 
 WL_EXPORT struct weston_launcher *
-weston_launcher_connect(struct weston_compositor *compositor, int tty,
+weston_launcher_connect(struct weston_compositor *compositor,
 			const char *seat_id, bool sync_drm)
 {
 	const struct launcher_interface **it;
@@ -57,7 +57,7 @@ weston_launcher_connect(struct weston_compositor *compositor, int tty,
 		struct weston_launcher *launcher;
 
 		weston_log("Trying %s launcher...\n", iface->name);
-		if (iface->connect(&launcher, compositor, tty, seat_id, sync_drm) == 0)
+		if (iface->connect(&launcher, compositor, seat_id, sync_drm) == 0)
 			return launcher;
 	}
 

libweston/launcher-util.h

@@ -33,7 +33,7 @@
 struct weston_launcher;
 
 struct weston_launcher *
-weston_launcher_connect(struct weston_compositor *compositor, int tty,
+weston_launcher_connect(struct weston_compositor *compositor,
 			const char *seat_id, bool sync_drm);
 
 void