Drop Xorg option -sharevts. It's no longer required for non-seat0 X servers since xorg-server release 1.16.

See http://cgit.freedesktop.org/xorg/xserver/commit/?id=46cf2

10 files changed, 7 insertions, 40 deletions

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index 74cf183e..b930ba32 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -198,8 +198,6 @@ create_x_server (Seat *seat)
         x_server_local_set_layout (x_server, layout);
 
     x_server_local_set_xdg_seat (x_server, seat_get_name (seat));
-    if (strcmp (seat_get_name (seat), "seat0") != 0)
-        x_server_local_set_sharevts (x_server, TRUE);
 
     config_file = seat_get_string_property (seat, "xserver-config");
     if (config_file)
diff --git a/src/x-server-local.c b/src/x-server-local.c
index b6a55aa9..caff9b46 100644
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -40,9 +40,6 @@ struct XServerLocalPrivate
     /* Value for -seat argument */
     gchar *xdg_seat;
 
-    /* TRUE if should share VT with other X server */
-    gboolean sharevts;
-
     /* TRUE if TCP/IP connections are allowed */
     gboolean allow_tcp;
 
@@ -219,13 +216,6 @@ x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat)
 }
 
 void
-x_server_local_set_sharevts (XServerLocal *server, gboolean sharevts)
-{
-    g_return_if_fail (server != NULL);
-    server->priv->sharevts = sharevts;
-}
-
-void
 x_server_local_set_allow_tcp (XServerLocal *server, gboolean allow_tcp)
 {
     g_return_if_fail (server != NULL);
@@ -473,9 +463,6 @@ x_server_local_start (DisplayServer *display_server)
     if (server->priv->xdg_seat)
         g_string_append_printf (command, " -seat %s", server->priv->xdg_seat);
 
-    if (server->priv->sharevts)
-        g_string_append (command, " -sharevts");
-
     write_authority_file (server);
     if (server->priv->authority_file)
         g_string_append_printf (command, " -auth %s", server->priv->authority_file);
diff --git a/src/x-server-local.h b/src/x-server-local.h
index 23c1d9a9..7ed5732c 100644
--- a/src/x-server-local.h
+++ b/src/x-server-local.h
@@ -51,8 +51,6 @@ void x_server_local_set_layout (XServerLocal *server, const gchar *layout);
 
 void x_server_local_set_xdg_seat (XServerLocal *server, const gchar *xdg_seat);
 
-void x_server_local_set_sharevts (XServerLocal *server, gboolean sharevts);
-
 void x_server_local_set_allow_tcp (XServerLocal *server, gboolean allow_tcp);
 
 void x_server_local_set_xdmcp_server (XServerLocal *server, const gchar *hostname);
diff --git a/tests/scripts/multi-seat-change-graphical-disabled.conf b/tests/scripts/multi-seat-change-graphical-disabled.conf
index 2fdd9fc5..3b3369fc 100644
--- a/tests/scripts/multi-seat-change-graphical-disabled.conf
+++ b/tests/scripts/multi-seat-change-graphical-disabled.conf
@@ -21,7 +21,7 @@
 #?*ADD-SEAT ID=seat1
 
 # seat1 starts
-#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?XSERVER-1 START SEAT=seat1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
diff --git a/tests/scripts/multi-seat-change-graphical.conf b/tests/scripts/multi-seat-change-graphical.conf
index b818d479..8c2bded7 100644
--- a/tests/scripts/multi-seat-change-graphical.conf
+++ b/tests/scripts/multi-seat-change-graphical.conf
@@ -24,7 +24,7 @@ logind-check-graphical=true
 #?*ADD-SEAT ID=seat1
 
 # seat1 starts
-#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?XSERVER-1 START SEAT=seat1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
@@ -46,7 +46,7 @@ logind-check-graphical=true
 #?*UPDATE-SEAT ID=seat1 CAN-GRAPHICAL=TRUE
 
 # seat1 starts
-#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?XSERVER-1 START SEAT=seat1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
diff --git a/tests/scripts/multi-seat-globbing-config-sections.conf b/tests/scripts/multi-seat-globbing-config-sections.conf
index 3109e649..044dd43c 100644
--- a/tests/scripts/multi-seat-globbing-config-sections.conf
+++ b/tests/scripts/multi-seat-globbing-config-sections.conf
@@ -34,7 +34,7 @@ autologin-user=have-password3
 #?*ADD-SEAT ID=seatAAAFoo
 
 # seatAAAFoo starts
-#?XSERVER-1 START SEAT=seatAAAFoo SHAREVTS=TRUE
+#?XSERVER-1 START SEAT=seatAAAFoo
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
@@ -66,7 +66,7 @@ autologin-user=have-password3
 #?*ADD-SEAT ID=seatBBBFoo
 
 # seatBBBFoo starts
-#?XSERVER-2 START SEAT=seatBBBFoo SHAREVTS=TRUE
+#?XSERVER-2 START SEAT=seatBBBFoo
 #?*XSERVER-2 INDICATE-READY
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
diff --git a/tests/scripts/multi-seat-non-graphical-disabled.conf b/tests/scripts/multi-seat-non-graphical-disabled.conf
index 2dea15f7..f8371c00 100644
--- a/tests/scripts/multi-seat-non-graphical-disabled.conf
+++ b/tests/scripts/multi-seat-non-graphical-disabled.conf
@@ -21,7 +21,7 @@
 #?*ADD-SEAT ID=seat1 CAN-GRAPHICAL=FALSE
 
 # seat1 starts
-#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?XSERVER-1 START SEAT=seat1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
diff --git a/tests/scripts/multi-seat.conf b/tests/scripts/multi-seat.conf
index 219393b5..1589d2b1 100644
--- a/tests/scripts/multi-seat.conf
+++ b/tests/scripts/multi-seat.conf
@@ -21,7 +21,7 @@
 #?*ADD-SEAT ID=seat1
 
 # seat1 starts
-#?XSERVER-1 START SEAT=seat1 SHAREVTS=TRUE
+#?XSERVER-1 START SEAT=seat1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
diff --git a/tests/src/X.c b/tests/src/X.c
index 2ad77b21..c8865af9 100644
--- a/tests/src/X.c
+++ b/tests/src/X.c
@@ -205,7 +205,6 @@ main (int argc, char **argv)
     gchar *seat = NULL;
     gchar *mir_id = NULL;
     gchar *lock_filename;
-    gboolean sharevts = FALSE;
     int lock_file;
     GString *status_text;
 
@@ -277,10 +276,6 @@ main (int argc, char **argv)
             seat = argv[i+1];
             i++;
         }
-        else if (strcmp (arg, "-sharevts") == 0)
-        {
-            sharevts = TRUE;
-        }
         else if (strcmp (arg, "-mir") == 0)
         {
             mir_id = argv[i+1];
@@ -303,7 +298,6 @@ main (int argc, char **argv)
                         "-broadcast             Broadcast for XDMCP\n"
                         "-port port-num         UDP port number to send messages to\n"
                         "-seat string           seat to run on\n"
-                        "-sharevts              share VTs with another X server\n"
                         "-mir id                Mir ID to use\n"
                         "-mirSocket name        Mir socket to use\n"
                         "vtxx                   Use virtual terminal xx instead of the next available\n",
@@ -326,8 +320,6 @@ main (int argc, char **argv)
         g_string_append_printf (status_text, " VT=%d", vt_number);
     if (seat != NULL)
         g_string_append_printf (status_text, " SEAT=%s", seat);
-    if (sharevts)
-        g_string_append (status_text, " SHAREVTS=TRUE");
     if (mir_id != NULL)
         g_string_append_printf (status_text, " MIR-ID=%s", mir_id);
     status_notify ("%s", status_text->str);
diff --git a/tests/src/Xmir.c b/tests/src/Xmir.c
index 8220a51e..5baa4921 100644
--- a/tests/src/Xmir.c
+++ b/tests/src/Xmir.c
@@ -119,7 +119,6 @@ main (int argc, char **argv)
     gchar *seat = NULL;
     gchar *mir_id = NULL;
     gchar *lock_filename;
-    gboolean sharevts = FALSE;
     int lock_file;
     GString *status_text;
 
@@ -176,10 +175,6 @@ main (int argc, char **argv)
             seat = argv[i+1];
             i++;
         }
-        else if (strcmp (arg, "-sharevts") == 0)
-        {
-            sharevts = TRUE;
-        }
         else if (strcmp (arg, "-mir") == 0)
         {
             mir_id = argv[i+1];
@@ -199,7 +194,6 @@ main (int argc, char **argv)
                         "-background [none]     Create root window with no background\n"
                         "-nr                    (Ubuntu-specific) Synonym for -background none\n"
                         "-seat string           seat to run on\n"
-                        "-sharevts              share VTs with another X server\n"
                         "-mir id                Mir ID to use\n"
                         "-mirSocket name        Mir socket to use\n"
                         "vtxx                   Use virtual terminal xx instead of the next available\n",
@@ -222,8 +216,6 @@ main (int argc, char **argv)
         g_string_append_printf (status_text, " VT=%d", vt_number);
     if (seat != NULL)
         g_string_append_printf (status_text, " SEAT=%s", seat);
-    if (sharevts)
-        g_string_append (status_text, " SHAREVTS=TRUE");
     if (mir_id != NULL)
         g_string_append_printf (status_text, " MIR-ID=%s", mir_id);
     status_notify ("%s", status_text->str);