simplier .clang-format and fix swap focus
This commit is contained in:
+87
-106
@@ -7,149 +7,130 @@
|
||||
#include "output.h"
|
||||
#include "toplevel.h"
|
||||
|
||||
void
|
||||
toplevel_map(struct wl_listener *listener, void *data)
|
||||
void toplevel_map(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, map);
|
||||
absn_server *server = toplevel->server;
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, map);
|
||||
absn_server *server = toplevel->server;
|
||||
|
||||
toplevel->scene_tree = wlr_scene_tree_create(
|
||||
server->layers[LAYER_TILE]);
|
||||
toplevel->scene_tree->node.data = toplevel;
|
||||
wlr_scene_node_set_enabled(&toplevel->scene_tree->node,
|
||||
toplevel_is_unmanaged(toplevel));
|
||||
toplevel->scene_tree = wlr_scene_tree_create(server->layers[LAYER_TILE]);
|
||||
toplevel->scene_tree->node.data = toplevel;
|
||||
wlr_scene_node_set_enabled(&toplevel->scene_tree->node, toplevel_is_unmanaged(toplevel));
|
||||
|
||||
if (toplevel->type != TOPLEVEL_X11 &&
|
||||
wl_resource_get_version(toplevel->xdg->resource) >=
|
||||
XDG_TOPLEVEL_STATE_TILED_RIGHT_SINCE_VERSION) {
|
||||
wlr_xdg_toplevel_set_tiled(toplevel->xdg,
|
||||
WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
WLR_EDGE_RIGHT);
|
||||
} else {
|
||||
wlr_xdg_toplevel_set_maximized(toplevel->xdg, true);
|
||||
}
|
||||
if (toplevel->type != TOPLEVEL_X11 &&
|
||||
wl_resource_get_version(toplevel->xdg->resource) >= XDG_TOPLEVEL_STATE_TILED_RIGHT_SINCE_VERSION) {
|
||||
wlr_xdg_toplevel_set_tiled(toplevel->xdg, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
|
||||
} else {
|
||||
wlr_xdg_toplevel_set_maximized(toplevel->xdg, true);
|
||||
}
|
||||
|
||||
toplevel->bw = toplevel_is_unmanaged(toplevel) ? 0 : TOPLEVEL_BW;
|
||||
toplevel->bw = toplevel_is_unmanaged(toplevel) ? 0 : TOPLEVEL_BW;
|
||||
|
||||
#ifdef XWAYLAND
|
||||
if (toplevel->type == TOPLEVEL_X11) {
|
||||
toplevel->scene_surface = wlr_scene_subsurface_tree_create(
|
||||
toplevel->scene_tree, toplevel->xw->surface);
|
||||
} else
|
||||
if (toplevel->type == TOPLEVEL_X11) {
|
||||
toplevel->scene_surface = wlr_scene_subsurface_tree_create(toplevel->scene_tree, toplevel->xw->surface);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
toplevel->scene_surface = wlr_scene_xdg_surface_create(
|
||||
toplevel->scene_tree, toplevel->xdg->base);
|
||||
}
|
||||
toplevel->scene_surface->node.data = toplevel;
|
||||
{
|
||||
toplevel->scene_surface = wlr_scene_xdg_surface_create(toplevel->scene_tree, toplevel->xdg->base);
|
||||
}
|
||||
toplevel->scene_surface->node.data = toplevel;
|
||||
|
||||
toplevel_get_geom(toplevel);
|
||||
toplevel->bw = toplevel_is_unmanaged(toplevel) ? 0 : TOPLEVEL_BW;
|
||||
toplevel_get_geom(toplevel);
|
||||
toplevel->bw = toplevel_is_unmanaged(toplevel) ? 0 : TOPLEVEL_BW;
|
||||
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
toplevel->border[i] = wlr_scene_rect_create(
|
||||
toplevel->scene_tree, 0, 0, unfocused_bc);
|
||||
toplevel->border[i]->node.data = toplevel;
|
||||
}
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
toplevel->border[i] = wlr_scene_rect_create(toplevel->scene_tree, 0, 0, unfocused_bc);
|
||||
toplevel->border[i]->node.data = toplevel;
|
||||
}
|
||||
|
||||
update_focused_output(toplevel->server);
|
||||
toplevel->output = toplevel->server->focused_output;
|
||||
toplevel->workspace = toplevel->output->workspace;
|
||||
toplevel->fullscreen = false;
|
||||
update_focused_output(toplevel->server);
|
||||
toplevel->output = toplevel->server->focused_output;
|
||||
toplevel->workspace = toplevel->output->workspace;
|
||||
toplevel->fullscreen = false;
|
||||
|
||||
wl_list_insert(&toplevel->server->toplevels, &toplevel->link);
|
||||
wl_list_insert(&toplevel->server->focus_stack, &toplevel->flink);
|
||||
wl_list_insert(&toplevel->server->toplevels, &toplevel->link);
|
||||
wl_list_insert(&toplevel->server->focus_stack, &toplevel->flink);
|
||||
|
||||
layout_arrange(toplevel->output);
|
||||
focus_toplevel(focus_get_topmost(toplevel->server));
|
||||
layout_arrange(toplevel->output);
|
||||
focus_toplevel(focus_get_topmost(toplevel->server));
|
||||
}
|
||||
|
||||
void
|
||||
toplevel_unmap(struct wl_listener *listener, void *data)
|
||||
void toplevel_unmap(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, unmap);
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, unmap);
|
||||
|
||||
if (toplevel == toplevel->server->focused_toplevel) {
|
||||
toplevel->server->focused_toplevel = NULL;
|
||||
toplevel->server->seat->keyboard_state.focused_surface = NULL;
|
||||
}
|
||||
if (toplevel == toplevel->server->focused_toplevel) {
|
||||
toplevel->server->focused_toplevel = NULL;
|
||||
toplevel->server->seat->keyboard_state.focused_surface = NULL;
|
||||
}
|
||||
|
||||
wl_list_remove(&toplevel->link);
|
||||
wl_list_remove(&toplevel->flink);
|
||||
wl_list_remove(&toplevel->link);
|
||||
wl_list_remove(&toplevel->flink);
|
||||
|
||||
layout_arrange(toplevel->output);
|
||||
focus_toplevel(focus_get_topmost(toplevel->server));
|
||||
layout_arrange(toplevel->output);
|
||||
focus_toplevel(focus_get_topmost(toplevel->server));
|
||||
|
||||
wlr_scene_node_destroy(&toplevel->scene_tree->node);
|
||||
wlr_scene_node_destroy(&toplevel->scene_tree->node);
|
||||
}
|
||||
|
||||
void
|
||||
toplevel_destroy(struct wl_listener *listener, void *data)
|
||||
void toplevel_destroy(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, destroy);
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, destroy);
|
||||
|
||||
#ifdef XWAYLAND
|
||||
if (toplevel->type == TOPLEVEL_X11) {
|
||||
wl_list_remove(&toplevel->xw_activate.link);
|
||||
wl_list_remove(&toplevel->xw_associate.link);
|
||||
wl_list_remove(&toplevel->xw_dissociate.link);
|
||||
wl_list_remove(&toplevel->xw_configure.link);
|
||||
wl_list_remove(&toplevel->xw_set_hints.link);
|
||||
} else
|
||||
if (toplevel->type == TOPLEVEL_X11) {
|
||||
wl_list_remove(&toplevel->xw_activate.link);
|
||||
wl_list_remove(&toplevel->xw_associate.link);
|
||||
wl_list_remove(&toplevel->xw_dissociate.link);
|
||||
wl_list_remove(&toplevel->xw_configure.link);
|
||||
wl_list_remove(&toplevel->xw_set_hints.link);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
wl_list_remove(&toplevel->map.link);
|
||||
wl_list_remove(&toplevel->unmap.link);
|
||||
wl_list_remove(&toplevel->commit.link);
|
||||
wl_list_remove(&toplevel->request_move.link);
|
||||
wl_list_remove(&toplevel->request_resize.link);
|
||||
}
|
||||
{
|
||||
wl_list_remove(&toplevel->map.link);
|
||||
wl_list_remove(&toplevel->unmap.link);
|
||||
wl_list_remove(&toplevel->commit.link);
|
||||
wl_list_remove(&toplevel->request_move.link);
|
||||
wl_list_remove(&toplevel->request_resize.link);
|
||||
}
|
||||
|
||||
wl_list_remove(&toplevel->destroy.link);
|
||||
wl_list_remove(&toplevel->request_maximize.link);
|
||||
wl_list_remove(&toplevel->request_fullscreen.link);
|
||||
wl_list_remove(&toplevel->destroy.link);
|
||||
wl_list_remove(&toplevel->request_maximize.link);
|
||||
wl_list_remove(&toplevel->request_fullscreen.link);
|
||||
|
||||
free(toplevel);
|
||||
free(toplevel);
|
||||
}
|
||||
|
||||
void
|
||||
toplevel_request_move(struct wl_listener *listener, void *data)
|
||||
void toplevel_request_move(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel,
|
||||
request_move);
|
||||
if (toplevel->xdg->base->initialized)
|
||||
wlr_xdg_surface_schedule_configure(toplevel->xdg->base);
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, request_move);
|
||||
if (toplevel->xdg->base->initialized)
|
||||
wlr_xdg_surface_schedule_configure(toplevel->xdg->base);
|
||||
}
|
||||
|
||||
void
|
||||
toplevel_request_resize(struct wl_listener *listener, void *data)
|
||||
void toplevel_request_resize(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel,
|
||||
request_resize);
|
||||
if (toplevel->xdg->base->initialized)
|
||||
wlr_xdg_surface_schedule_configure(toplevel->xdg->base);
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, request_resize);
|
||||
if (toplevel->xdg->base->initialized)
|
||||
wlr_xdg_surface_schedule_configure(toplevel->xdg->base);
|
||||
}
|
||||
|
||||
void
|
||||
toplevel_request_maximize(struct wl_listener *listener, void *data)
|
||||
void toplevel_request_maximize(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel,
|
||||
request_maximize);
|
||||
if (toplevel->xdg->base->initialized)
|
||||
wlr_xdg_surface_schedule_configure(toplevel->xdg->base);
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, request_maximize);
|
||||
if (toplevel->xdg->base->initialized)
|
||||
wlr_xdg_surface_schedule_configure(toplevel->xdg->base);
|
||||
}
|
||||
|
||||
void
|
||||
toplevel_request_fullscreen(struct wl_listener *listener, void *data)
|
||||
void toplevel_request_fullscreen(struct wl_listener *listener, void *data)
|
||||
{
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel,
|
||||
request_fullscreen);
|
||||
toplevel_set_fullscreen(toplevel, toplevel->xdg->requested.fullscreen);
|
||||
UNUSED(data);
|
||||
absn_toplevel *toplevel = wl_container_of(listener, toplevel, request_fullscreen);
|
||||
toplevel_set_fullscreen(toplevel, toplevel->xdg->requested.fullscreen);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user