aboutsummaryrefslogtreecommitdiff
path: root/sway/tree/view.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree/view.c')
-rw-r--r--sway/tree/view.c113
1 files changed, 31 insertions, 82 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7d921e0e..424c1084 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -3,7 +3,6 @@
#include <wayland-server.h>
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_output_layout.h>
-#include "list.h"
#include "log.h"
#include "sway/criteria.h"
#include "sway/commands.h"
@@ -20,7 +19,6 @@ void view_init(struct sway_view *view, enum sway_view_type type,
const struct sway_view_impl *impl) {
view->type = type;
view->impl = impl;
- view->executed_criteria = create_list();
wl_signal_init(&view->events.unmap);
}
@@ -33,8 +31,6 @@ void view_destroy(struct sway_view *view) {
view_unmap(view);
}
- list_free(view->executed_criteria);
-
container_destroy(view->swayc);
if (view->impl->destroy) {
@@ -45,47 +41,33 @@ void view_destroy(struct sway_view *view) {
}
const char *view_get_title(struct sway_view *view) {
- if (view->impl->get_string_prop) {
- return view->impl->get_string_prop(view, VIEW_PROP_TITLE);
+ if (view->impl->get_prop) {
+ return view->impl->get_prop(view, VIEW_PROP_TITLE);
}
return NULL;
}
const char *view_get_app_id(struct sway_view *view) {
- if (view->impl->get_string_prop) {
- return view->impl->get_string_prop(view, VIEW_PROP_APP_ID);
+ if (view->impl->get_prop) {
+ return view->impl->get_prop(view, VIEW_PROP_APP_ID);
}
return NULL;
}
const char *view_get_class(struct sway_view *view) {
- if (view->impl->get_string_prop) {
- return view->impl->get_string_prop(view, VIEW_PROP_CLASS);
+ if (view->impl->get_prop) {
+ return view->impl->get_prop(view, VIEW_PROP_CLASS);
}
return NULL;
}
const char *view_get_instance(struct sway_view *view) {
- if (view->impl->get_string_prop) {
- return view->impl->get_string_prop(view, VIEW_PROP_INSTANCE);
+ if (view->impl->get_prop) {
+ return view->impl->get_prop(view, VIEW_PROP_INSTANCE);
}
return NULL;
}
-uint32_t view_get_x11_window_id(struct sway_view *view) {
- if (view->impl->get_int_prop) {
- return view->impl->get_int_prop(view, VIEW_PROP_X11_WINDOW_ID);
- }
- return 0;
-}
-
-uint32_t view_get_window_type(struct sway_view *view) {
- if (view->impl->get_int_prop) {
- return view->impl->get_int_prop(view, VIEW_PROP_WINDOW_TYPE);
- }
- return 0;
-}
-
const char *view_get_type(struct sway_view *view) {
switch(view->type) {
case SWAY_VIEW_WL_SHELL:
@@ -181,13 +163,15 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
struct sway_container *focus, *focus_ws;
wl_list_for_each(seat, &input_manager->seats, link) {
focus = seat_get_focus(seat);
- focus_ws = focus;
- if (focus_ws->type != C_WORKSPACE) {
- focus_ws = container_parent(focus_ws, C_WORKSPACE);
- }
- seat_set_focus(seat, view->swayc);
- if (focus_ws != workspace) {
- seat_set_focus(seat, focus);
+ if (focus) {
+ focus_ws = focus;
+ if (focus && focus_ws->type != C_WORKSPACE) {
+ focus_ws = container_parent(focus_ws, C_WORKSPACE);
+ }
+ seat_set_focus(seat, view->swayc);
+ if (focus_ws != workspace) {
+ seat_set_focus(seat, focus);
+ }
}
}
} else {
@@ -300,36 +284,19 @@ static void view_handle_container_reparent(struct wl_listener *listener,
}
}
-static bool view_has_executed_criteria(struct sway_view *view,
- struct criteria *criteria) {
- for (int i = 0; i < view->executed_criteria->length; ++i) {
- struct criteria *item = view->executed_criteria->items[i];
- if (item == criteria) {
- return true;
- }
- }
- return false;
-}
-
-void view_execute_criteria(struct sway_view *view) {
- if (!view->swayc) {
+static void view_execute_criteria(struct sway_view *view) {
+ if (!sway_assert(view->swayc, "cannot run criteria for unmapped view")) {
return;
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *prior_workspace =
container_parent(view->swayc, C_WORKSPACE);
- list_t *criterias = criteria_for_view(view, CT_COMMAND);
- for (int i = 0; i < criterias->length; i++) {
- struct criteria *criteria = criterias->items[i];
- wlr_log(L_DEBUG, "Checking criteria %s", criteria->raw);
- if (view_has_executed_criteria(view, criteria)) {
- wlr_log(L_DEBUG, "Criteria already executed");
- continue;
- }
- wlr_log(L_DEBUG, "for_window '%s' matches view %p, cmd: '%s'",
- criteria->raw, view, criteria->cmdlist);
- list_add(view->executed_criteria, criteria);
- struct cmd_results *res = execute_command(criteria->cmdlist, NULL);
+ list_t *criteria = criteria_for(view->swayc);
+ for (int i = 0; i < criteria->length; i++) {
+ struct criteria *crit = criteria->items[i];
+ wlr_log(L_DEBUG, "for_window '%s' matches new view %p, cmd: '%s'",
+ crit->crit_raw, view, crit->cmdlist);
+ struct cmd_results *res = execute_command(crit->cmdlist, NULL);
if (res->status != CMD_SUCCESS) {
wlr_log(L_ERROR, "Command '%s' failed: %s", res->input, res->error);
}
@@ -338,7 +305,7 @@ void view_execute_criteria(struct sway_view *view) {
// so always refocus in-between command lists
seat_set_focus(seat, view->swayc);
}
- list_free(criterias);
+ list_free(criteria);
seat_set_focus(seat, seat_get_focus_inactive(seat, prior_workspace));
}
@@ -348,26 +315,9 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = seat_get_focus(seat);
- struct sway_container *cont = NULL;
-
- // Check if there's any `assign` criteria for the view
- list_t *criterias = criteria_for_view(view,
- CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT);
- if (criterias->length) {
- struct criteria *criteria = criterias->items[0];
- if (criteria->type == CT_ASSIGN_WORKSPACE) {
- struct sway_container *workspace = workspace_by_name(criteria->target);
- if (!workspace) {
- workspace = workspace_create(NULL, criteria->target);
- }
- focus = seat_get_focus_inactive(seat, workspace);
- } else {
- // TODO: CT_ASSIGN_OUTPUT
- }
- }
- free(criterias);
- cont = container_view_create(focus, view);
+ struct sway_container *focus = seat_get_focus_inactive(seat,
+ &root_container);
+ struct sway_container *cont = container_view_create(focus, view);
view->surface = wlr_surface;
view->swayc = cont;
@@ -385,11 +335,10 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
arrange_children_of(cont->parent);
input_manager_set_focus(input_manager, cont);
- view_update_title(view, false);
- view_execute_criteria(view);
-
container_damage_whole(cont);
view_handle_container_reparent(&view->container_reparent, NULL);
+
+ view_execute_criteria(view);
}
void view_unmap(struct sway_view *view) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 14:40:12 +0000