From 700c2b37277867982bd7e308a23121918c4219fc Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Sat, 27 Jul 2024 19:41:40 -0600
Subject: [PATCH 1/7] Add zap animation

---
 metadata/animate.xml        |  8 +++-
 plugins/animate/animate.cpp |  9 +++++
 plugins/animate/zap.hpp     | 79 +++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 plugins/animate/zap.hpp

diff --git a/metadata/animate.xml b/metadata/animate.xml
index 385de9276..ee360b9fb 100644
--- a/metadata/animate.xml
+++ b/metadata/animate.xml
@@ -25,6 +25,10 @@
 				<value>fire</value>
 				<_name>Fire</_name>
 			</desc>
+			<desc>
+				<value>zap</value>
+				<_name>Zap</_name>
+			</desc>
 		</option>
 		<option name="close_animation" type="string">
 			<_short>Close animation</_short>
@@ -43,8 +47,8 @@
 				<_name>Zoom</_name>
 			</desc>
 			<desc>
-				<value>fire</value>
-				<_name>Fire</_name>
+				<value>zap</value>
+				<_name>Zap</_name>
 			</desc>
 		</option>
 		<option name="minimize_animation" type="string">
diff --git a/plugins/animate/animate.cpp b/plugins/animate/animate.cpp
index a7a6bd285..f8de8d287 100644
--- a/plugins/animate/animate.cpp
+++ b/plugins/animate/animate.cpp
@@ -9,6 +9,7 @@
 #include "system_fade.hpp"
 #include "basic_animations.hpp"
 #include "squeezimize.hpp"
+#include "zap.hpp"
 #include "fire/fire.hpp"
 #include "unmapped-view-node.hpp"
 #include "wayfire/plugin.hpp"
@@ -418,6 +419,10 @@ class wayfire_animation : public wf::plugin_interface_t, private wf::per_output_
         {
             set_animation<FireAnimation>(ev->view, ANIMATION_TYPE_MAP,
                 animation.duration, animation.animation_name);
+        } else if (animation.animation_name == "zap")
+        {
+            set_animation<wf::zap::zap_animation>(ev->view, ANIMATION_TYPE_MAP,
+                animation.duration, animation.animation_name);
         }
     };
 
@@ -438,6 +443,10 @@ class wayfire_animation : public wf::plugin_interface_t, private wf::per_output_
         {
             set_animation<FireAnimation>(ev->view, ANIMATION_TYPE_UNMAP,
                 animation.duration, animation.animation_name);
+        } else if (animation.animation_name == "zap")
+        {
+            set_animation<wf::zap::zap_animation>(ev->view, ANIMATION_TYPE_UNMAP,
+                animation.duration, animation.animation_name);
         }
     };
 
diff --git a/plugins/animate/zap.hpp b/plugins/animate/zap.hpp
new file mode 100644
index 000000000..8e7494b0a
--- /dev/null
+++ b/plugins/animate/zap.hpp
@@ -0,0 +1,79 @@
+#include "animate.hpp"
+#include "wayfire/toplevel-view.hpp"
+#include <memory>
+#include <wayfire/plugin.hpp>
+#include <wayfire/opengl.hpp>
+#include <wayfire/view-transform.hpp>
+#include <wayfire/output.hpp>
+
+static const std::string zap_transformer_name = "zap-transformer";
+namespace wf
+{
+namespace zap
+{
+using namespace wf::animation;
+class zap_animation_t : public duration_t
+{
+  public:
+    using duration_t::duration_t;
+    timed_transition_t zap{*this};
+};
+class zap_animation : public animation_base
+{
+    wayfire_view view;
+    wf_animation_type type;
+    wf::zap::zap_animation_t progression;
+
+  public:
+
+    void init(wayfire_view view, wf::animation_description_t dur, wf_animation_type type) override
+    {
+        this->view = view;
+        this->type = type;
+        this->progression =
+            wf::zap::zap_animation_t(wf::create_option<wf::animation_description_t>(dur));
+
+        if (type & HIDING_ANIMATION)
+        {
+            this->progression.reverse();
+        }
+
+        this->progression.start();
+
+        auto tr = std::make_shared<wf::scene::view_2d_transformer_t>(view);
+        view->get_transformed_node()->add_transformer(
+            tr, wf::TRANSFORMER_HIGHLEVEL, zap_transformer_name);
+    }
+
+    bool step() override
+    {
+        auto transform = view->get_transformed_node()
+            ->get_transformer<wf::scene::view_2d_transformer_t>(zap_transformer_name);
+        auto progress = this->progression.progress();
+        auto progress_pt_one   = std::clamp(progress, 0.0, 1.0 / 3.0) * 3.0;
+        auto progress_pt_two   = (std::clamp(progress, 1.0 / 3.0, (1.0 / 3.0) * 2.0) - 1.0 / 3.0) * 3.0;
+        auto progress_pt_three = (std::clamp(progress, (1.0 / 3.0) * 2.0, 1.0) - (1.0 / 3.0) * 2.0) * 3.0;
+        transform->alpha   = progress_pt_one;
+        transform->scale_x = 0.01 + progress_pt_three * 0.99;
+        transform->scale_y = 0.01 + progress_pt_two * 0.99;
+
+        return progression.running();
+    }
+
+    void reverse() override
+    {
+        this->progression.reverse();
+    }
+
+    int get_direction() override
+    {
+        return this->progression.get_direction();
+    }
+
+    ~zap_animation()
+    {
+        view->get_transformed_node()->rem_transformer(zap_transformer_name);
+    }
+};
+}
+}

From 4296d1b98cf9e1c7d53e2813ea5c38446aef5e1d Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Sat, 27 Jul 2024 19:50:52 -0600
Subject: [PATCH 2/7] Swap x and y progressions for better effect

This could also be made into an option.
---
 plugins/animate/zap.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/animate/zap.hpp b/plugins/animate/zap.hpp
index 8e7494b0a..877f03390 100644
--- a/plugins/animate/zap.hpp
+++ b/plugins/animate/zap.hpp
@@ -54,8 +54,8 @@ class zap_animation : public animation_base
         auto progress_pt_two   = (std::clamp(progress, 1.0 / 3.0, (1.0 / 3.0) * 2.0) - 1.0 / 3.0) * 3.0;
         auto progress_pt_three = (std::clamp(progress, (1.0 / 3.0) * 2.0, 1.0) - (1.0 / 3.0) * 2.0) * 3.0;
         transform->alpha   = progress_pt_one;
-        transform->scale_x = 0.01 + progress_pt_three * 0.99;
-        transform->scale_y = 0.01 + progress_pt_two * 0.99;
+        transform->scale_x = 0.01 + progress_pt_two * 0.99;
+        transform->scale_y = 0.01 + progress_pt_three * 0.99;
 
         return progression.running();
     }

From 2c52e6f360886e77bff142706bd06147c00a1f69 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Sat, 27 Jul 2024 19:56:01 -0600
Subject: [PATCH 3/7] Fix metadata

---
 metadata/animate.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/metadata/animate.xml b/metadata/animate.xml
index ee360b9fb..d85dc91f1 100644
--- a/metadata/animate.xml
+++ b/metadata/animate.xml
@@ -46,6 +46,10 @@
 				<value>zoom</value>
 				<_name>Zoom</_name>
 			</desc>
+			<desc>
+				<value>fire</value>
+				<_name>Fire</_name>
+			</desc>
 			<desc>
 				<value>zap</value>
 				<_name>Zap</_name>

From db8f175be1c82506d77c07d571dc13335a45e2da Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Sat, 27 Jul 2024 20:01:13 -0600
Subject: [PATCH 4/7] Remove unneeded line of code

---
 plugins/animate/zap.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/animate/zap.hpp b/plugins/animate/zap.hpp
index 877f03390..2e592863a 100644
--- a/plugins/animate/zap.hpp
+++ b/plugins/animate/zap.hpp
@@ -16,7 +16,6 @@ class zap_animation_t : public duration_t
 {
   public:
     using duration_t::duration_t;
-    timed_transition_t zap{*this};
 };
 class zap_animation : public animation_base
 {

From f2e91156e55575ec4f6d5a8c1ea96345c1c8f040 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Fri, 2 Aug 2024 02:59:10 -0600
Subject: [PATCH 5/7] zap: Add copyright header

---
 plugins/animate/zap.hpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/plugins/animate/zap.hpp b/plugins/animate/zap.hpp
index 2e592863a..3f5c79a95 100644
--- a/plugins/animate/zap.hpp
+++ b/plugins/animate/zap.hpp
@@ -1,3 +1,27 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2024 Scott Moreau <oreaus@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #include "animate.hpp"
 #include "wayfire/toplevel-view.hpp"
 #include <memory>

From d8d02cc5497cb059e800c6414d012000ce7b0670 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Tue, 27 Aug 2024 09:44:07 -0600
Subject: [PATCH 6/7] zap: Add dedicated duration option

---
 metadata/animate.xml    | 5 +++++
 plugins/animate/zap.hpp | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/metadata/animate.xml b/metadata/animate.xml
index d85dc91f1..707e8e90b 100644
--- a/metadata/animate.xml
+++ b/metadata/animate.xml
@@ -146,5 +146,10 @@
 			<_long>Sets the duration of the squeezimize animation in milliseconds.</_long>
 			<default>150ms linear</default>
 		</option>
+		<option name="zap_duration" type="animation">
+			<_short>Zap duration</_short>
+			<_long>Sets the duration for the zap animation in milliseconds.</_long>
+			<default>250ms linear</default>
+		</option>
 	</plugin>
 </wayfire>
diff --git a/plugins/animate/zap.hpp b/plugins/animate/zap.hpp
index 3f5c79a95..cbbc3d132 100644
--- a/plugins/animate/zap.hpp
+++ b/plugins/animate/zap.hpp
@@ -31,6 +31,9 @@
 #include <wayfire/output.hpp>
 
 static const std::string zap_transformer_name = "zap-transformer";
+
+wf::option_wrapper_t<wf::animation_description_t> zap_duration{"animate/zap_duration"};
+
 namespace wf
 {
 namespace zap
@@ -54,7 +57,7 @@ class zap_animation : public animation_base
         this->view = view;
         this->type = type;
         this->progression =
-            wf::zap::zap_animation_t(wf::create_option<wf::animation_description_t>(dur));
+            wf::zap::zap_animation_t(wf::create_option<wf::animation_description_t>(zap_duration));
 
         if (type & HIDING_ANIMATION)
         {

From 1f341b5ba91716b2b8916bb97467de838d9eb856 Mon Sep 17 00:00:00 2001
From: Scott Moreau <oreaus@gmail.com>
Date: Tue, 27 Aug 2024 09:46:32 -0600
Subject: [PATCH 7/7] zap: Move transformer name variable within plugin
 namespace

---
 plugins/animate/zap.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/animate/zap.hpp b/plugins/animate/zap.hpp
index cbbc3d132..e5b5f2211 100644
--- a/plugins/animate/zap.hpp
+++ b/plugins/animate/zap.hpp
@@ -30,7 +30,6 @@
 #include <wayfire/view-transform.hpp>
 #include <wayfire/output.hpp>
 
-static const std::string zap_transformer_name = "zap-transformer";
 
 wf::option_wrapper_t<wf::animation_description_t> zap_duration{"animate/zap_duration"};
 
@@ -38,6 +37,7 @@ namespace wf
 {
 namespace zap
 {
+static const std::string zap_transformer_name = "zap-transformer";
 using namespace wf::animation;
 class zap_animation_t : public duration_t
 {