1 files changed, 82 insertions, 104 deletions

diff --git a/sway/main.c b/sway/main.c
index 0611e80b..1c4939aa 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <getopt.h>
 #include <pango/pangocairo.h>
 #include <signal.h>
@@ -6,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -27,6 +27,7 @@
 
 static bool terminate_request = false;
 static int exit_value = 0;
+static struct rlimit original_nofile_rlimit = {0};
 struct sway_server server = {0};
 struct sway_debug debug = {0};
 
@@ -47,44 +48,6 @@ void sig_handler(int signal) {
         sway_terminate(EXIT_SUCCESS);
 }
 
-void detect_proprietary(int allow_unsupported_gpu) {
-        FILE *f = fopen("/proc/modules", "r");
-        if (!f) {
-                return;
-        }
-        char *line = NULL;
-        size_t line_size = 0;
-        while (getline(&line, &line_size, f) != -1) {
-                if (strncmp(line, "nvidia ", 7) == 0) {
-                        if (allow_unsupported_gpu) {
-                                sway_log(SWAY_ERROR,
-                                                "!!! Proprietary Nvidia drivers are in use !!!");
-                        } else {
-                                sway_log(SWAY_ERROR,
-                                        "Proprietary Nvidia drivers are NOT supported. "
-                                        "Use Nouveau. To launch sway anyway, launch with "
-                                        "--my-next-gpu-wont-be-nvidia and DO NOT report issues.");
-                                exit(EXIT_FAILURE);
-                        }
-                        break;
-                }
-                if (strstr(line, "fglrx")) {
-                        if (allow_unsupported_gpu) {
-                                sway_log(SWAY_ERROR,
-                                                "!!! Proprietary AMD drivers are in use !!!");
-                        } else {
-                                sway_log(SWAY_ERROR, "Proprietary AMD drivers do NOT support "
-                                        "Wayland. Use radeon. To try anyway, launch sway with "
-                                        "--unsupported-gpu and DO NOT report issues.");
-                                exit(EXIT_FAILURE);
-                        }
-                        break;
-                }
-        }
-        free(line);
-        fclose(f);
-}
-
 void run_as_ipc_client(char *command, char *socket_path) {
         int socketfd = ipc_open_socket(socket_path);
         uint32_t len = strlen(command);
@@ -148,33 +111,49 @@ static void log_kernel(void) {
         pclose(f);
 }
 
-
-static bool drop_permissions(void) {
-        if (getuid() != geteuid() || getgid() != getegid()) {
-                // Set the gid and uid in the correct order.
-                if (setgid(getgid()) != 0) {
-                        sway_log(SWAY_ERROR, "Unable to drop root group, refusing to start");
-                        return false;
-                }
-                if (setuid(getuid()) != 0) {
-                        sway_log(SWAY_ERROR, "Unable to drop root user, refusing to start");
-                        return false;
-                }
+static bool detect_suid(void) {
+        if (geteuid() != 0 && getegid() != 0) {
+                return false;
         }
-        if (setgid(0) != -1 || setuid(0) != -1) {
-                sway_log(SWAY_ERROR, "Unable to drop root (we shouldn't be able to "
-                        "restore it after setuid), refusing to start");
+
+        if (getuid() == geteuid() && getgid() == getegid()) {
                 return false;
         }
+
+        sway_log(SWAY_ERROR, "SUID operation is no longer supported, refusing to start. "
+                        "This check will be removed in a future release.");
         return true;
 }
 
+static void increase_nofile_limit(void) {
+        if (getrlimit(RLIMIT_NOFILE, &original_nofile_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to bump max open files limit: "
+                        "getrlimit(NOFILE) failed");
+                return;
+        }
+
+        struct rlimit new_rlimit = original_nofile_rlimit;
+        new_rlimit.rlim_cur = new_rlimit.rlim_max;
+        if (setrlimit(RLIMIT_NOFILE, &new_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to bump max open files limit: "
+                        "setrlimit(NOFILE) failed");
+                sway_log(SWAY_INFO, "Running with %d max open files",
+                        (int)original_nofile_rlimit.rlim_cur);
+        }
+}
+
+void restore_nofile_limit(void) {
+        if (original_nofile_rlimit.rlim_cur == 0) {
+                return;
+        }
+        if (setrlimit(RLIMIT_NOFILE, &original_nofile_rlimit) != 0) {
+                sway_log_errno(SWAY_ERROR, "Failed to restore max open files limit: "
+                        "setrlimit(NOFILE) failed");
+        }
+}
+
 void enable_debug_flag(const char *flag) {
-        if (strcmp(flag, "damage=highlight") == 0) {
-                debug.damage = DAMAGE_HIGHLIGHT;
-        } else if (strcmp(flag, "damage=rerender") == 0) {
-                debug.damage = DAMAGE_RERENDER;
-        } else if (strcmp(flag, "noatomic") == 0) {
+        if (strcmp(flag, "noatomic") == 0) {
                 debug.noatomic = true;
         } else if (strcmp(flag, "txn-wait") == 0) {
                 debug.txn_wait = true;
@@ -182,6 +161,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, "legacy-wl-drm") == 0) {
+                debug.legacy_wl_drm = true;
         } else {
                 sway_log(SWAY_ERROR, "Unknown debug flag: %s", flag);
         }
@@ -206,36 +187,35 @@ static void handle_wlr_log(enum wlr_log_importance importance,
         _sway_vlog(convert_wlr_log_importance(importance), sway_fmt, args);
 }
 
+static const struct option long_options[] = {
+        {"help", no_argument, NULL, 'h'},
+        {"config", required_argument, NULL, 'c'},
+        {"validate", no_argument, NULL, 'C'},
+        {"debug", no_argument, NULL, 'd'},
+        {"version", no_argument, NULL, 'v'},
+        {"verbose", no_argument, NULL, 'V'},
+        {"get-socketpath", no_argument, NULL, 'p'},
+        {"unsupported-gpu", no_argument, NULL, 'u'},
+        {0, 0, 0, 0}
+};
+
+static const char usage[] =
+        "Usage: sway [options] [command]\n"
+        "\n"
+        "  -h, --help             Show help message and quit.\n"
+        "  -c, --config <config>  Specify a config file.\n"
+        "  -C, --validate         Check the validity of the config file, then exit.\n"
+        "  -d, --debug            Enables full logging, including debug information.\n"
+        "  -v, --version          Show the version number and quit.\n"
+        "  -V, --verbose          Enables more verbose logging.\n"
+        "      --get-socketpath   Gets the IPC socket path and prints it, then exits.\n"
+        "\n";
+
 int main(int argc, char **argv) {
-        static int verbose = 0, debug = 0, validate = 0, allow_unsupported_gpu = 0;
-
-        static const struct option long_options[] = {
-                {"help", no_argument, NULL, 'h'},
-                {"config", required_argument, NULL, 'c'},
-                {"validate", no_argument, NULL, 'C'},
-                {"debug", no_argument, NULL, 'd'},
-                {"version", no_argument, NULL, 'v'},
-                {"verbose", no_argument, NULL, 'V'},
-                {"get-socketpath", no_argument, NULL, 'p'},
-                {"unsupported-gpu", no_argument, NULL, 'u'},
-                {"my-next-gpu-wont-be-nvidia", no_argument, NULL, 'u'},
-                {0, 0, 0, 0}
-        };
+        static bool verbose = false, debug = false, validate = false;
 
         char *config_path = NULL;
 
-        const char* usage =
-                "Usage: sway [options] [command]\n"
-                "\n"
-                "  -h, --help             Show help message and quit.\n"
-                "  -c, --config <config>  Specify a config file.\n"
-                "  -C, --validate         Check the validity of the config file, then exit.\n"
-                "  -d, --debug            Enables full logging, including debug information.\n"
-                "  -v, --version          Show the version number and quit.\n"
-                "  -V, --verbose          Enables more verbose logging.\n"
-                "      --get-socketpath   Gets the IPC socket path and prints it, then exits.\n"
-                "\n";
-
         int c;
         while (1) {
                 int option_index = 0;
@@ -253,25 +233,25 @@ int main(int argc, char **argv) {
                         config_path = strdup(optarg);
                         break;
                 case 'C': // validate
-                        validate = 1;
+                        validate = true;
                         break;
                 case 'd': // debug
-                        debug = 1;
+                        debug = true;
                         break;
                 case 'D': // extended debug options
                         enable_debug_flag(optarg);
                         break;
                 case 'u':
-                        allow_unsupported_gpu = 1;
+                        allow_unsupported_gpu = true;
                         break;
                 case 'v': // version
                         printf("sway version " SWAY_VERSION "\n");
                         exit(EXIT_SUCCESS);
                         break;
                 case 'V': // verbose
-                        verbose = 1;
+                        verbose = true;
                         break;
-                case 'p': ; // --get-socketpath
+                case 'p': // --get-socketpath
                         if (getenv("SWAYSOCK")) {
                                 printf("%s\n", getenv("SWAYSOCK"));
                                 exit(EXIT_SUCCESS);
@@ -286,6 +266,11 @@ int main(int argc, char **argv) {
                 }
         }
 
+        // SUID operation is deprecated, so block it for now.
+        if (detect_suid()) {
+                exit(EXIT_FAILURE);
+        }
+
         // Since wayland requires XDG_RUNTIME_DIR to be set, abort with just the
         // clear error message (when not running as an IPC client).
         if (!getenv("XDG_RUNTIME_DIR") && optind == argc) {
@@ -312,7 +297,6 @@ int main(int argc, char **argv) {
         log_kernel();
         log_distro();
         log_env();
-        detect_proprietary(allow_unsupported_gpu);
 
         if (optind < argc) { // Behave as IPC client
                 if (optind != 1) {
@@ -325,9 +309,6 @@ int main(int argc, char **argv) {
                                         "`sway -d 2>sway.log`.");
                         exit(EXIT_FAILURE);
                 }
-                if (!drop_permissions()) {
-                        exit(EXIT_FAILURE);
-                }
                 char *socket_path = getenv("SWAYSOCK");
                 if (!socket_path) {
                         sway_log(SWAY_ERROR, "Unable to retrieve socket path");
@@ -339,14 +320,7 @@ int main(int argc, char **argv) {
                 return 0;
         }
 
-        if (!server_privileged_prepare(&server)) {
-                return 1;
-        }
-
-        if (!drop_permissions()) {
-                server_fini(&server);
-                exit(EXIT_FAILURE);
-        }
+        increase_nofile_limit();
 
         // handle SIGTERM signals
         signal(SIGTERM, sig_handler);
@@ -357,12 +331,14 @@ int main(int argc, char **argv) {
 
         sway_log(SWAY_INFO, "Starting sway version " SWAY_VERSION);
 
-        root = root_create();
-
         if (!server_init(&server)) {
                 return 1;
         }
 
+        if (server.linux_dmabuf_v1) {
+                wlr_scene_set_linux_dmabuf_v1(root->root_scene, server.linux_dmabuf_v1);
+        }
+
         if (validate) {
                 bool valid = load_main_config(config_path, false, true);
                 free(config_path);
@@ -377,6 +353,8 @@ int main(int argc, char **argv) {
                 goto shutdown;
         }
 
+        set_rr_scheduling();
+
         if (!server_start(&server)) {
                 sway_terminate(EXIT_FAILURE);
                 goto shutdown;