feat: fade in and fade out animations

README.md

@@ -25,6 +25,14 @@ Sway is an incredible window manager, and certainly one of the most well establi
 
 ## New Configuration Options
 
++ Fade in / out animations: `animation_duration <val>`: specifies the length of the animation in seconds
++ Corner radius: `corner_radius <val>`
++ Smart corner radius: `smart_corner_radius enable|disable`
++ Window shadows:
+ - `shadows enable|disable`
+ - `shadows_on_csd enable|disable` (**Note**: The shadow might not fit some windows)
+ - `shadow_blur_radius <integer value 0 - 100>`
+ - `shadow_color <hex color with alpha> ex, #0000007F`
 + Window blur:
  - `blur enable|disable`
  - `blur_xray enable|disable`: this will set floating windows to blur based on the background, not the windows below. You probably want to set this to `disable` :)
@@ -64,7 +72,6 @@ Sway is an incredible window manager, and certainly one of the most well establi
 
 ## Roadmap
 
-+ fade in / out animations
 + window movement animations
 
 ## Compiling From Source
@@ -137,4 +144,3 @@ We would also like to thank the talented artists in our community for contibutin
 + spooky_skeleton for the swayfx logo, and [Basil](https://basil.cafe) for making some fine adjustments to it
 
 Lastly, we would like to thank you, the community, for enjoying and using window manager that we have spent so much time maintaining.
-

include/sway/commands.h

@@ -109,6 +109,7 @@ bool cmd_corner_radius_parse_value(char *arg, int* result);
 sway_cmd cmd_exec_validate;
 sway_cmd cmd_exec_process;
 
+sway_cmd cmd_animation_duration;
 sway_cmd cmd_assign;
 sway_cmd cmd_bar;
 sway_cmd cmd_bindcode;

include/sway/config.h

@@ -478,6 +478,8 @@ enum xwayland_mode {
  * The configuration struct. The result of loading a config file.
  */
 struct sway_config {
+ float animation_duration;
+
  int corner_radius;
  bool smart_corner_radius;
 

include/sway/output.h

@@ -77,6 +77,7 @@ struct sway_output {
 
  struct timespec last_presentation;
  uint32_t refresh_nsec;
+ float refresh_sec;
  int max_render_time; // In milliseconds
  struct wl_event_source *repaint_timer;
  bool gamma_lut_changed;

include/sway/server.h

@@ -143,6 +143,9 @@ struct sway_server {
  // Stores the nodes that have been marked as "dirty" and will be put into
  // the pending transaction.
  list_t *dirty_nodes;
+
+ list_t *animated_containers;
+ struct wl_event_source *animation_tick;
 };
 
 extern struct sway_server server;

include/sway/tree/container.h

@@ -124,10 +124,13 @@ struct sway_container {
  // Unused for non-scratchpad windows.
  struct wlr_box transform;
 
+ // TODO: move alpha to state?
  float alpha;
+ float target_alpha;
+ float max_alpha;
 
  int corner_radius;
- 
+
  float dim;
 
  struct wlr_texture *title_focused;

include/sway/tree/view.h

@@ -320,6 +320,8 @@ void view_for_each_popup_surface(struct sway_view *view,
 void view_init(struct sway_view *view, enum sway_view_type type,
  const struct sway_view_impl *impl);
 
+void view_remove_container(struct sway_container *container);
+
 void view_destroy(struct sway_view *view);
 
 void view_begin_destroy(struct sway_view *view);

sway/commands.c

@@ -43,6 +43,7 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type
 
 /* Keep alphabetized */
 static const struct cmd_handler handlers[] = {
+ { "animation_duration", cmd_animation_duration },
  { "assign", cmd_assign },
  { "bar", cmd_bar },
  { "bindcode", cmd_bindcode },

sway/commands/animation_duration.c

@@ -0,0 +1,21 @@
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "log.h"
+
+struct cmd_results *cmd_animation_duration(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "animation_duration", EXPECTED_EQUAL_TO, 1))) {
+ return error;
+ }
+
+ char *err;
+ float value = strtof(argv[0], &err);
+ if (*err || value < 0.0f || value > 1.0f) {
+ return cmd_results_new(CMD_FAILURE, "animation_duration value invalid");
+ }
+
+ config->animation_duration = value;
+
+ return cmd_results_new(CMD_SUCCESS, NULL);
+}

sway/commands/opacity.c

@@ -24,9 +24,9 @@ struct cmd_results *cmd_opacity(int argc, char **argv) {
  }
 
  if (!strcasecmp(argv[0], "plus")) {
- val = con->alpha + val;
+ val = con->max_alpha + val;
  } else if (!strcasecmp(argv[0], "minus")) {
- val = con->alpha - val;
+ val = con->max_alpha - val;
  } else if (argc > 1 && strcasecmp(argv[0], "set")) {
  return cmd_results_new(CMD_INVALID,
  "Expected: set|plus|minus <0..1>: %s", argv[0]);
@@ -36,7 +36,8 @@ struct cmd_results *cmd_opacity(int argc, char **argv) {
  return cmd_results_new(CMD_FAILURE, "opacity value out of bounds");
  }
 
- con->alpha = val;
+ con->max_alpha = val;
+ con->target_alpha = val;
  container_damage_whole(con);
  return cmd_results_new(CMD_SUCCESS, NULL);
 }

sway/config.c

@@ -342,6 +342,8 @@ static void config_defaults(struct sway_config *config) {
  color_to_rgba(config->border_colors.background, 0xFFFFFFFF);
 
  // SwayFX defaults
+ config->animation_duration = 0;
+
  config->corner_radius = 0;
  config->smart_corner_radius = true;
 

sway/desktop/output.c

@@ -660,6 +660,7 @@ static int output_repaint_timer_handler(void *data) {
 
  pixman_region32_t damage;
  pixman_region32_init(&damage);
+
  wlr_damage_ring_get_buffer_damage(&output->damage_ring, buffer_age, &damage);
 
  if (debug.damage == DAMAGE_RERENDER) {
@@ -729,7 +730,7 @@ static void handle_frame(struct wl_listener *listener, void *user_data) {
  const long NSEC_IN_SECONDS = 1000000000;
  struct timespec predicted_refresh = output->last_presentation;
  predicted_refresh.tv_nsec += output->refresh_nsec % NSEC_IN_SECONDS;
- predicted_refresh.tv_sec += output->refresh_nsec / NSEC_IN_SECONDS;
+ predicted_refresh.tv_sec += output->refresh_sec;
  if (predicted_refresh.tv_nsec >= NSEC_IN_SECONDS) {
  predicted_refresh.tv_sec += 1;
  predicted_refresh.tv_nsec -= NSEC_IN_SECONDS;
@@ -1030,6 +1031,9 @@ static void handle_present(struct wl_listener *listener, void *data) {
 
  output->last_presentation = *output_event->when;
  output->refresh_nsec = output_event->refresh;
+
+ const long NSEC_IN_SECONDS = 1000000000;
+ output->refresh_sec = (float)output_event->refresh / NSEC_IN_SECONDS;
 }
 
 static void handle_request_state(struct wl_listener *listener, void *data) {

sway/desktop/render.c

@@ -92,6 +92,14 @@ struct decoration_data get_undecorated_decoration_data() {
  };
 }
 
+// TODO: don't need pointer
+float get_animation_completion_percentage(struct sway_container *con) {
+ if (con->alpha == 1.0f) {
+ return 1.0f;
+ }
+ return con->alpha < con->target_alpha ? con->alpha / con->target_alpha : con->alpha / con->max_alpha;
+}
+
 /**
  * Apply scale to a width or height.
  *
@@ -375,10 +383,11 @@ static void render_surface_iterator(struct sway_output *output,
 
  if (has_alpha) {
  bool should_optimize_blur = view ?
- !container_is_floating_or_child(view->container) || config->blur_xray
- : false;
+ !container_is_floating_or_child(view->container) || config->blur_xray : false;
+ struct decoration_data blur_deco_data = deco_data;
+ blur_deco_data.alpha = view ? get_animation_completion_percentage(view->container) : 1.0f;
  render_blur(data->ctx, texture, &src_box, &clip_box,
- should_optimize_blur, &opaque_region, deco_data);
+ should_optimize_blur, &opaque_region, blur_deco_data);
  }
 
  pixman_region32_fini(&opaque_region);
@@ -677,9 +686,11 @@ static void render_saved_view(struct fx_render_context *ctx, struct sway_view *v
  pixman_region32_union_rect(&opaque_region, &opaque_region, 0, 0, 0, 0);
 
  bool should_optimize_blur = !container_is_floating_or_child(view->container) || config->blur_xray;
- render_blur(ctx, saved_buf->buffer->texture,
- &saved_buf->source_box, &clip_box, should_optimize_blur,
- &opaque_region, deco_data);
+ struct decoration_data blur_deco_data = deco_data;
+ blur_deco_data.alpha = get_animation_completion_percentage(view->container);
+
+ render_blur(ctx, saved_buf->buffer->texture, &saved_buf->source_box, &clip_box,
+ should_optimize_blur, &opaque_region, blur_deco_data);
 
  pixman_region32_fini(&opaque_region);
  }
@@ -729,6 +740,7 @@ static void render_view(struct fx_render_context *ctx, struct sway_container *co
  int shadow_corner_radius = corner_radius == 0 ? 0 : corner_radius + state->border_thickness;
  float* shadow_color = view_is_urgent(view) || state->focused ?
  config->shadow_color : config->shadow_inactive_color;
+ shadow_color[3] *= get_animation_completion_percentage(con);
 
  render_box_shadow(ctx, &box, shadow_color, config->shadow_blur_sigma * output_scale,
  shadow_corner_radius * output_scale, config->shadow_offset_x * output_scale,

sway/desktop/transaction.c

@@ -256,7 +256,7 @@ static void apply_container_state(struct sway_container *container,
 
  memcpy(&container->current, state, sizeof(struct sway_container_state));
 
- if (view && !wl_list_empty(&view->saved_buffers)) {
+ if (view && !wl_list_empty(&view->saved_buffers) && view->surface) {
  if (!container->node.destroying || container->node.ntxnrefs == 1) {
  view_remove_saved_buffer(view);
  }
@@ -365,6 +365,9 @@ static bool should_configure(struct sway_node *node,
  if (!node_is_view(node)) {
  return false;
  }
+ if (!node->sway_container->view->surface) {
+ return false;
+ }
  if (node->destroying) {
  return false;
  }

sway/desktop/xdg_shell.c

@@ -525,6 +525,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
+ /*
  struct sway_xdg_shell_view *xdg_shell_view =
  wl_container_of(listener, xdg_shell_view, destroy);
  struct sway_view *view = &xdg_shell_view->view;
@@ -539,6 +540,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
  view->xdg_decoration->view = NULL;
  }
  view_begin_destroy(view);
+*/
 }
 
 struct sway_view *view_from_wlr_xdg_surface(

sway/input/seat.c

@@ -269,7 +269,7 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
  while (next_focus == NULL && parent != NULL) {
  struct sway_container *con =
  seat_get_focus_inactive_view(seat, parent);
- next_focus = con ? &con->node : NULL;
+ next_focus = (con && !con->node.destroying) ? &con->node : NULL;
 
  if (next_focus == NULL && parent->type == N_WORKSPACE) {
  next_focus = parent;
@@ -1092,6 +1092,9 @@ void seat_configure_xcursor(struct sway_seat *seat) {
 
 bool seat_is_input_allowed(struct sway_seat *seat,
  struct wlr_surface *surface) {
+ if (surface == NULL) {
+ return false;
+ }
  if (server.session_lock.locked) {
  if (server.session_lock.lock == NULL) {
  return false;
@@ -1109,7 +1112,7 @@ bool seat_is_input_allowed(struct sway_seat *seat,
 }
 
 static void send_unfocus(struct sway_container *con, void *data) {
- if (con->view) {
+ if (con->view && con->view->surface) {
  view_set_activated(con->view, false);
  }
 }
@@ -1257,7 +1260,7 @@ static void seat_set_workspace_focus(struct sway_seat *seat, struct sway_node *n
  }
 
  // Close any popups on the old focus
- if (last_focus && node_is_view(last_focus)) {
+ if (last_focus && node_is_view(last_focus) && last_focus->sway_container->view->surface) {
  view_close_popups(last_focus->sway_container->view);
  }
 

sway/input/seatop_default.c

@@ -583,7 +583,7 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
 
  // This is where we handle the common case. We don't want to focus inactive
  // tabs, hence the view_is_visible check.
- if (node_is_view(hovered_node) &&
+ if (node_is_view(hovered_node) && hovered_node->sway_container->view->surface &&
  view_is_visible(hovered_node->sway_container->view)) {
  // e->previous_node is the node which the cursor was over previously.
  // If focus_follows_mouse is yes and the cursor got over the view due

sway/ipc-json.c

@@ -792,7 +792,8 @@ static void ipc_json_describe_container(struct sway_container *c, json_object *o
 
  json_object_object_add(object, "marks", marks);
 
- if (c->view) {
+ // check if view exists and if it has not been unmapped
+ if (c->view && c->view->surface) {
  ipc_json_describe_view(c, object);
  }
 }

sway/meson.build

@@ -43,6 +43,7 @@ sway_sources = files(
  'config/seat.c',
  'config/input.c',
 
+ 'commands/animation_duration.c',
  'commands/assign.c',
  'commands/bar.c',
  'commands/bind.c',