From 6766477234df4555253b4b67c4a7a67c75a37497 Mon Sep 17 00:00:00 2001 From: v0idpwn Date: Fri, 2 Oct 2020 09:20:48 -0300 Subject: [PATCH 1/2] throw error when starting on wayland --- i3lock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/i3lock.c b/i3lock.c index 0c3f5b65..884d7a90 100644 --- a/i3lock.c +++ b/i3lock.c @@ -1038,6 +1038,8 @@ int main(int argc, char *argv[]) { err(EXIT_FAILURE, "getpwuid() failed"); if ((username = pw->pw_name) == NULL) errx(EXIT_FAILURE, "pw->pw_name is NULL."); + if (getenv("WAYLAND_DISPLAY") != NULL) + errx(EXIT_FAILURE, "i3lock doesn't support wayland"); char *optstring = "hvnbdc:p:ui:teI:f"; while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) { From 0079f0665825b96c6964562556e0f497e5fcc108 Mon Sep 17 00:00:00 2001 From: v0idpwn Date: Fri, 2 Oct 2020 09:43:40 -0300 Subject: [PATCH 2/2] Change wayland error message --- i3lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i3lock.c b/i3lock.c index 884d7a90..e855a751 100644 --- a/i3lock.c +++ b/i3lock.c @@ -1039,7 +1039,7 @@ int main(int argc, char *argv[]) { if ((username = pw->pw_name) == NULL) errx(EXIT_FAILURE, "pw->pw_name is NULL."); if (getenv("WAYLAND_DISPLAY") != NULL) - errx(EXIT_FAILURE, "i3lock doesn't support wayland"); + errx(EXIT_FAILURE, "i3lock is a program for X11 and does not work on Wayland. Try https://github.com/swaywm/swaylock instead"); char *optstring = "hvnbdc:p:ui:teI:f"; while ((o = getopt_long(argc, argv, optstring, longopts, &longoptind)) != -1) {