1 files changed, 5 insertions, 39 deletions

diff --git a/sway/main.c b/sway/main.c
index 0c219fb3..e960c4e2 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -12,6 +12,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <wlr/util/log.h>
+#include <wlr/version.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/server.h"
@@ -46,43 +47,6 @@ void sig_handler(int signal) {
         sway_terminate(EXIT_SUCCESS);
 }
 
-void detect_raspi(void) {
-        bool raspi = false;
-        FILE *f = fopen("/sys/firmware/devicetree/base/model", "r");
-        if (!f) {
-                return;
-        }
-        char *line = NULL;
-        size_t line_size = 0;
-        while (getline(&line, &line_size, f) != -1) {
-                if (strstr(line, "Raspberry Pi")) {
-                        raspi = true;
-                        break;
-                }
-        }
-        fclose(f);
-        FILE *g = fopen("/proc/modules", "r");
-        if (!g) {
-                free(line);
-                return;
-        }
-        bool vc4 = false;
-        while (getline(&line, &line_size, g) != -1) {
-                if (strstr(line, "vc4")) {
-                        vc4 = true;
-                        break;
-                }
-        }
-        free(line);
-        fclose(g);
-        if (!vc4 && raspi) {
-                fprintf(stderr, "\x1B[1;31mWarning: You have a "
-                                "Raspberry Pi, but the vc4 Module is "
-                                "not loaded! Set 'dtoverlay=vc4-kms-v3d'"
-                                "in /boot/config.txt and reboot.\x1B[0m\n");
-        }
-}
-
 void detect_proprietary(int allow_unsupported_gpu) {
         FILE *f = fopen("/proc/modules", "r");
         if (!f) {
@@ -218,6 +182,8 @@ void enable_debug_flag(const char *flag) {
                 debug.txn_timings = true;
         } else if (strncmp(flag, "txn-timeout=", 12) == 0) {
                 server.txn_timeout_ms = atoi(&flag[12]);
+        } else if (strcmp(flag, "noscanout") == 0) {
+                debug.noscanout = true;
         } else {
                 sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
         }
@@ -245,7 +211,7 @@ static void handle_wlr_log(enum wlr_log_importance importance,
 int main(int argc, char **argv) {
         static int verbose = 0, debug = 0, validate = 0, allow_unsupported_gpu = 0;
 
-        static struct option long_options[] = {
+        static const struct option long_options[] = {
                 {"help", no_argument, NULL, 'h'},
                 {"config", required_argument, NULL, 'c'},
                 {"validate", no_argument, NULL, 'C'},
@@ -344,11 +310,11 @@ int main(int argc, char **argv) {
         }
 
         sway_log(SWAY_INFO, "Sway version " SWAY_VERSION);
+        sway_log(SWAY_INFO, "wlroots version " WLR_VERSION_STR);
         log_kernel();
         log_distro();
         log_env();
         detect_proprietary(allow_unsupported_gpu);
-        detect_raspi();
 
         if (optind < argc) { // Behave as IPC client
                 if (optind != 1) {