rebase: Sway 1.11 (#431)

Co-authored-by: Erik Reider <35975961+ErikReider@users.noreply.github.com>

Author: WillPower3309

.gitignore

@@ -7,8 +7,6 @@ test/
 build/
 build-*/
 .cache/
-!build-scripts
-!build-scripts/*
 .lvimrc
 config-debug
 wayland-*-protocol.*

README.md

@@ -2,7 +2,6 @@
     <img src="assets/swayfx_logo.svg" width="256" alt="swayfx logo">
 </p>
 
----
 
 Sway is an incredible window manager, and certainly one of the most well established wayland window managers. However, it is restricted to only include the functionality that existed in i3. This fork ditches the simple wlr_renderer, and replaces it with our fx_renderer, capable of rendering with fancy GLES2 effects. This, along with a couple of minor changes, expands sway's featureset to include the following:
 

common/stringop.c

@@ -360,3 +360,8 @@ char *format_str(const char *fmt, ...) {
 	va_end(args);
 	return str;
 }
+
+bool has_prefix(const char *str, const char *prefix) {
+	return strncmp(str, prefix, strlen(prefix)) == 0;
+}
+

config.in

@@ -46,14 +46,18 @@ output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # Example configuration:
 #
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#   input type:touchpad {
 #       dwt enabled
 #       tap enabled
 #       natural_scroll enabled
 #       middle_emulation enabled
 #   }
 #
-# You can get the names of your inputs by running: swaymsg -t get_inputs
+#   input type:keyboard {
+#       xkb_layout "eu"
+#   }
+#
+# You can also configure each device individually.
 # Read `man 5 sway-input` for more information about this section.
 
 ### Key bindings

flake.lock

@@ -25,10 +25,10 @@
               version = "0.4.0-git";
               src = pkgs.lib.cleanSource ./.;
               nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ];
-              # Add wlroots_0_18 here
+              # Add wlroots_0_19 here
               buildInputs = old.buildInputs ++ [
                 pkgs.scenefx
-                pkgs.wlroots_0_18 # <-- Added this line
+                pkgs.wlroots_0_19 # <-- Added this line
               ];
               providedSessions = [ pkgs.swayfx-unwrapped.meta.mainProgram ];
               patches = []; ## Consider if you need patches from the original derivation
@@ -77,13 +77,13 @@
           # Adding wlroots and scenefx explicitly here is fine, but they are also included via inputsFrom
           inputsFrom = [
             self.packages.${pkgs.system}.swayfx-unwrapped
-            # pkgs.wlroots_0_18 # Included via swayfx-unwrapped buildInputs now
+            # pkgs.wlroots_0_19 # Included via swayfx-unwrapped buildInputs now
             # pkgs.scenefx      # Included via swayfx-unwrapped buildInputs now
           ];
           # You still might want wlroots/scenefx here if you need tools/headers directly in the shell
           # outside of what swayfx uses.
           buildInputs = [
-            pkgs.wlroots_0_18
+            pkgs.wlroots_0_19
             pkgs.scenefx
           ];
           packages = with pkgs; [
@@ -96,7 +96,7 @@
               echo "Copying wlroots and scenefx sources to ./subprojects for dev environment..."
               mkdir -p "$PWD/subprojects" && cd "$PWD/subprojects"
               rm -rf wlroots scenefx # Clean previous copies if they exist
-              cp -R --no-preserve=mode,ownership ${pkgs.wlroots_0_18.src} wlroots
+              cp -R --no-preserve=mode,ownership ${pkgs.wlroots_0_19.src} wlroots
               cp -R --no-preserve=mode,ownership ${pkgs.scenefx.src} scenefx
               echo "Done copying sources."
               cd "$OLDPWD"

flake.nix

@@ -40,4 +40,6 @@ bool expand_path(char **path);
 char *vformat_str(const char *fmt, va_list args) _SWAY_ATTRIB_PRINTF(1, 0);
 char *format_str(const char *fmt, ...) _SWAY_ATTRIB_PRINTF(1, 2);
 
+bool has_prefix(const char *str, const char *prefix);
+
 #endif

include/stringop.h

@@ -1,7 +1,6 @@
 #ifndef _SWAY_CONFIG_H
 #define _SWAY_CONFIG_H
 #include <libinput.h>
-#include <scenefx/types/fx/blur_data.h>
 #include <stdint.h>
 #include <string.h>
 #include <time.h>

include/sway/config.h

@@ -53,6 +53,9 @@ struct criteria {
 	char urgent; // 'l' for latest or 'o' for oldest
 	struct pattern *workspace;
 	pid_t pid;
+	struct pattern *sandbox_engine;
+	struct pattern *sandbox_app_id;
+	struct pattern *sandbox_instance_id;
 };
 
 bool criteria_is_empty(struct criteria *criteria);

include/sway/criteria.h

@@ -13,6 +13,7 @@ enum sway_idle_inhibit_mode {
 struct sway_idle_inhibit_manager_v1 {
 	struct wlr_idle_inhibit_manager_v1 *wlr_manager;
 	struct wl_listener new_idle_inhibitor_v1;
+	struct wl_listener manager_destroy;
 	struct wl_list inhibitors;
 };