From 9feacd29f012a36fb6b3b0bbc80a639042009a75 Mon Sep 17 00:00:00 2001 From: speckitor Date: Fri, 22 May 2026 19:33:32 +0700 Subject: [PATCH] format --- .clang-format | 2 +- include/cursor.h | 7 +- include/types.h | 8 +-- src/absinthe.c | 67 ++++++++++++------ src/cursor.c | 13 ++-- src/focus.c | 7 +- src/keybinds.c | 16 +++-- src/keyboard.c | 15 ++-- src/layer-surface.c | 34 ++++++--- src/layers.c | 27 ++++--- src/layout.c | 47 +++++++++---- src/output.c | 51 +++++++++----- src/seat.c | 9 ++- src/server.c | 151 +++++++++++++++++++++++++++------------- src/toplevel-handlers.c | 31 ++++++--- src/toplevel.c | 50 ++++++++----- src/xdg-decoration.c | 6 +- src/xwayland.c | 20 ++++-- 18 files changed, 375 insertions(+), 186 deletions(-) diff --git a/.clang-format b/.clang-format index b4b9dac..f211551 100644 --- a/.clang-format +++ b/.clang-format @@ -2,7 +2,7 @@ BasedOnStyle: LLVM IndentWidth: 4 TabWidth: 4 UseTab: Never -ColumnLimit: 120 +ColumnLimit: 80 AllowShortFunctionsOnASingleLine: false SortIncludes: true BreakBeforeBraces: Custom diff --git a/include/cursor.h b/include/cursor.h index f60a2a1..9e5614a 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -1,7 +1,10 @@ #include "types.h" -void client_from_coords(absn_server *server, double x, double y, struct wlr_surface **rsurface, - absn_toplevel **rtoplevel, absn_layer_surface **rlayer_surface, double *rx, double *ry); +void client_from_coords(absn_server *server, double x, double y, + struct wlr_surface **rsurface, + absn_toplevel **rtoplevel, + absn_layer_surface **rlayer_surface, double *rx, + double *ry); void reset_cursor_mode(absn_server *server); void process_cursor_motion(absn_server *server, uint32_t time); diff --git a/include/types.h b/include/types.h index 59f6d74..ee63bf9 100644 --- a/include/types.h +++ b/include/types.h @@ -28,10 +28,10 @@ #define MAX(A, B) (A) > (B) ? (A) : (B) #define MIN(A, B) (A) < (B) ? (A) : (B) /* macro for adding listener for event */ -#define LISTEN(L, C, E) \ - do { \ - (L).notify = (C); \ - wl_signal_add(&(E), &(L)); \ +#define LISTEN(L, C, E) \ + do { \ + (L).notify = (C); \ + wl_signal_add(&(E), &(L)); \ } while (0); #define UNUSED(X) (void)(X) #define CLEANMASK(M) (M & ~WLR_MODIFIER_CAPS) diff --git a/src/absinthe.c b/src/absinthe.c index 769d10a..b75affa 100644 --- a/src/absinthe.c +++ b/src/absinthe.c @@ -33,7 +33,8 @@ static int setup(absn_server *server) return 1; } - server->backend = wlr_backend_autocreate(wl_display_get_event_loop(server->display), NULL); + server->backend = wlr_backend_autocreate( + wl_display_get_event_loop(server->display), NULL); if (!server->backend) { wlr_log(WLR_ERROR, "Failed to create wlr_backend"); return 1; @@ -48,21 +49,25 @@ static int setup(absn_server *server) wlr_renderer_init_wl_shm(server->renderer, server->display); server->scene = wlr_scene_create(); - if (wlr_renderer_get_texture_formats(server->renderer, WLR_BUFFER_CAP_DMABUF)) { + if (wlr_renderer_get_texture_formats(server->renderer, + WLR_BUFFER_CAP_DMABUF)) { wlr_drm_create(server->display, server->renderer); - wlr_scene_set_linux_dmabuf_v1(server->scene, - wlr_linux_dmabuf_v1_create_with_renderer(server->display, 5, server->renderer)); + wlr_scene_set_linux_dmabuf_v1( + server->scene, wlr_linux_dmabuf_v1_create_with_renderer( + server->display, 5, server->renderer)); } server->bg = wlr_scene_rect_create(&server->scene->tree, 0, 0, bgcolor); - server->allocator = wlr_allocator_autocreate(server->backend, server->renderer); + server->allocator = + wlr_allocator_autocreate(server->backend, server->renderer); if (!server->allocator) { wlr_log(WLR_ERROR, "Failed to create wlr_allocator"); return 1; } /* wlroots managers */ - server->compositor = wlr_compositor_create(server->display, 6, server->renderer); + server->compositor = + wlr_compositor_create(server->display, 6, server->renderer); wlr_subcompositor_create(server->display); wlr_data_device_manager_create(server->display); wlr_screencopy_manager_v1_create(server->display); @@ -75,10 +80,13 @@ static int setup(absn_server *server) wlr_export_dmabuf_manager_v1_create(server->display); wlr_ext_foreign_toplevel_list_v1_create(server->display, 1); - wlr_server_decoration_manager_set_default_mode(wlr_server_decoration_manager_create(server->display), - WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); - server->xdg_deco_mgr = wlr_xdg_decoration_manager_v1_create(server->display); - LISTEN(server->new_xdg_deco, new_xdg_decoration, server->xdg_deco_mgr->events.new_toplevel_decoration); + wlr_server_decoration_manager_set_default_mode( + wlr_server_decoration_manager_create(server->display), + WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); + server->xdg_deco_mgr = + wlr_xdg_decoration_manager_v1_create(server->display); + LISTEN(server->new_xdg_deco, new_xdg_decoration, + server->xdg_deco_mgr->events.new_toplevel_decoration); /* toplevels lists */ wl_list_init(&server->toplevels); @@ -89,18 +97,22 @@ static int setup(absn_server *server) LISTEN(server->new_output, new_output, server->backend->events.new_output); server->output_layout = wlr_output_layout_create(server->display); - LISTEN(server->layout_change, output_layout_change, server->output_layout->events.change); + LISTEN(server->layout_change, output_layout_change, + server->output_layout->events.change); server->output_mgr = wlr_output_manager_v1_create(server->display); wlr_xdg_output_manager_v1_create(server->display, server->output_layout); - server->scene_layout = wlr_scene_attach_output_layout(server->scene, server->output_layout); + server->scene_layout = + wlr_scene_attach_output_layout(server->scene, server->output_layout); /* xdg_shell */ server->xdg_shell = wlr_xdg_shell_create(server->display, 6); - LISTEN(server->new_xdg_toplevel, new_xdg_toplevel, server->xdg_shell->events.new_toplevel); - LISTEN(server->new_xdg_popup, new_xdg_popup, server->xdg_shell->events.new_popup); + LISTEN(server->new_xdg_toplevel, new_xdg_toplevel, + server->xdg_shell->events.new_toplevel); + LISTEN(server->new_xdg_popup, new_xdg_popup, + server->xdg_shell->events.new_popup); /* cursor */ server->cursor = wlr_cursor_create(); @@ -110,7 +122,8 @@ static int setup(absn_server *server) server->cursor_mode = CURSOR_PASSTHROUGH; LISTEN(server->cursor_motion, cursor_motion, server->cursor->events.motion); - LISTEN(server->cursor_motion_abs, cursor_motion_abs, server->cursor->events.motion_absolute); + LISTEN(server->cursor_motion_abs, cursor_motion_abs, + server->cursor->events.motion_absolute); LISTEN(server->cursor_button, cursor_button, server->cursor->events.button); LISTEN(server->cursor_axis, cursor_axis, server->cursor->events.axis); LISTEN(server->cursor_frame, cursor_frame, server->cursor->events.frame); @@ -119,16 +132,20 @@ static int setup(absn_server *server) wl_list_init(&server->keyboards); server->seat = wlr_seat_create(server->display, "seat0"); LISTEN(server->new_input, new_input, server->backend->events.new_input); - LISTEN(server->request_cursor, request_cursor, server->seat->events.request_set_cursor); - LISTEN(server->pointer_focus_change, pointer_focus_change, server->seat->pointer_state.events.focus_change); - LISTEN(server->request_set_selection, request_cursor, server->seat->events.request_set_selection); + LISTEN(server->request_cursor, request_cursor, + server->seat->events.request_set_cursor); + LISTEN(server->pointer_focus_change, pointer_focus_change, + server->seat->pointer_state.events.focus_change); + LISTEN(server->request_set_selection, request_cursor, + server->seat->events.request_set_selection); /* layer shell */ server->layer_shell = wlr_layer_shell_v1_create(server->display, 5); for (int i = 0; i < LAYERS_COUNT; ++i) { server->layers[i] = wlr_scene_tree_create(&server->scene->tree); } - LISTEN(server->new_layer_surface, new_layer_surface, server->layer_shell->events.new_surface); + LISTEN(server->new_layer_surface, new_layer_surface, + server->layer_shell->events.new_surface); /* workspaces */ int workspaces_count = sizeof(workspaces) / sizeof(workspaces[0]); @@ -144,12 +161,16 @@ static int setup(absn_server *server) unsetenv("DISPLAY"); #ifdef XWAYLAND - if ((server->xwayland = wlr_xwayland_create(server->display, server->compositor, 1))) { - LISTEN(server->xw_ready, xwayland_ready, server->xwayland->events.ready); - LISTEN(server->xw_new_surface, xwayland_new_surface, server->xwayland->events.new_surface); + if ((server->xwayland = + wlr_xwayland_create(server->display, server->compositor, 1))) { + LISTEN(server->xw_ready, xwayland_ready, + server->xwayland->events.ready); + LISTEN(server->xw_new_surface, xwayland_new_surface, + server->xwayland->events.new_surface); setenv("DISPLAY", server->xwayland->display_name, 1); - wlr_log(WLR_INFO, "Running XWayland, DISPLAY=%s", server->xwayland->display_name); + wlr_log(WLR_INFO, "Running XWayland, DISPLAY=%s", + server->xwayland->display_name); } else { wlr_log(WLR_ERROR, "Failed to setup XWayland, continuing without it"); } diff --git a/src/cursor.c b/src/cursor.c index 36042ce..2b0f8cf 100644 --- a/src/cursor.c +++ b/src/cursor.c @@ -9,8 +9,11 @@ * returns surface at given cursor coordinates * and coordinates inside of it to process input event */ -void client_from_coords(absn_server *server, double x, double y, struct wlr_surface **rsurface, - absn_toplevel **rtoplevel, absn_layer_surface **rlayer_surface, double *rx, double *ry) +void client_from_coords(absn_server *server, double x, double y, + struct wlr_surface **rsurface, + absn_toplevel **rtoplevel, + absn_layer_surface **rlayer_surface, double *rx, + double *ry) { struct wlr_scene_node *pnode = NULL, *node = NULL; struct wlr_scene_buffer *buffer = NULL; @@ -106,7 +109,8 @@ static void apply_resize(absn_toplevel *toplevel, struct wlr_box *new_geom) new_geom->x = toplevel->geom.x; } - if (!(new_geom->height >= min_height && new_geom->height <= max_height)) { + if (!(new_geom->height >= min_height && + new_geom->height <= max_height)) { new_geom->height = toplevel->geom.height; new_geom->y = toplevel->geom.y; } @@ -189,7 +193,8 @@ void process_cursor_motion(absn_server *server, uint32_t time) { double x, y; struct wlr_surface *surface = NULL; - client_from_coords(server, server->cursor->x, server->cursor->y, &surface, NULL, NULL, &x, &y); + client_from_coords(server, server->cursor->x, server->cursor->y, &surface, + NULL, NULL, &x, &y); struct wlr_seat *seat = server->seat; if (server->cursor_mode == CURSOR_MOVE) { diff --git a/src/focus.c b/src/focus.c index abe75f3..5dd8e77 100644 --- a/src/focus.c +++ b/src/focus.c @@ -55,7 +55,9 @@ void focus_toplevel(absn_toplevel *toplevel) toplevel_set_border_color(toplevel, focused_bc); if (keyboard) { - wlr_seat_keyboard_notify_enter(seat, surface, keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); + wlr_seat_keyboard_notify_enter(seat, surface, keyboard->keycodes, + keyboard->num_keycodes, + &keyboard->modifiers); } } @@ -68,7 +70,8 @@ absn_toplevel *focus_get_topmost(absn_server *server) absn_toplevel *toplevel; wl_list_for_each(toplevel, &server->focus_stack, flink) { - if (toplevel && toplevel->workspace == server->focused_output->workspace) { + if (toplevel && + toplevel->workspace == server->focused_output->workspace) { return toplevel; } } diff --git a/src/keybinds.c b/src/keybinds.c index c40a4a0..1712e8c 100644 --- a/src/keybinds.c +++ b/src/keybinds.c @@ -151,8 +151,11 @@ void toggle_floating(absn_server *server, const absn_arg *arg) toplevel_set_floating(focus, !focus->floating); if (focus->floating) { - int32_t new_x = focus->output->geom.x + (focus->output->geom.width / 2 - focus->geom.width / 2); - int32_t new_y = focus->output->geom.y + (focus->output->geom.height / 2 - focus->geom.height / 2); + int32_t new_x = focus->output->geom.x + + (focus->output->geom.width / 2 - focus->geom.width / 2); + int32_t new_y = + focus->output->geom.y + + (focus->output->geom.height / 2 - focus->geom.height / 2); toplevel_set_pos(focus, new_x, new_y); } } @@ -203,7 +206,8 @@ void switch_workspace(absn_server *server, const absn_arg *arg) } } - if (toplevels_count == 0 && server->focused_output == server->workspaces[i].output) { + if (toplevels_count == 0 && + server->focused_output == server->workspaces[i].output) { server->focused_output->workspace->output = NULL; } @@ -226,11 +230,13 @@ void switch_workspace(absn_server *server, const absn_arg *arg) absn_toplevel *focus = NULL; wl_list_for_each(toplevel, &server->toplevels, link) { - if (!focus && toplevel && toplevel->workspace == &server->workspaces[i]) { + if (!focus && toplevel && + toplevel->workspace == &server->workspaces[i]) { focus = toplevel; /* found it */ } - if (toplevel && toplevel->workspace == &server->workspaces[i] && toplevel->fullscreen) { + if (toplevel && toplevel->workspace == &server->workspaces[i] && + toplevel->fullscreen) { /* overwrite if there is a fullscreen window */ focus = toplevel; break; diff --git a/src/keyboard.c b/src/keyboard.c index 8d71d4c..b1dde12 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -14,15 +14,18 @@ void handle_modifiers(struct wl_listener *listener, void *data) absn_keyboard *keyboard = wl_container_of(listener, keyboard, modifiers); wlr_seat_set_keyboard(keyboard->server->seat, keyboard->wlr); - wlr_seat_keyboard_notify_modifiers(keyboard->server->seat, &keyboard->wlr->modifiers); + wlr_seat_keyboard_notify_modifiers(keyboard->server->seat, + &keyboard->wlr->modifiers); } -static bool handle_keybind(absn_server *server, uint32_t mods, xkb_keysym_t keysym) +static bool handle_keybind(absn_server *server, uint32_t mods, + xkb_keysym_t keysym) { int nkeyb = sizeof(keybinds) / sizeof(keybinds[0]); for (int i = 0; i < nkeyb; ++i) { if (CLEANMASK(keybinds[i].mods) == CLEANMASK(mods) && - xkb_keysym_to_lower(keybinds[i].keysym) == xkb_keysym_to_lower(keysym)) { + xkb_keysym_to_lower(keybinds[i].keysym) == + xkb_keysym_to_lower(keysym)) { keybinds[i].cb(server, &keybinds[i].arg); return true; } @@ -44,7 +47,8 @@ void handle_key(struct wl_listener *listener, void *data) bool handled = false; if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) { for (int i = 0; i < nsyms; ++i) { - handled = handle_keybind(keyboard->server, mods, syms[i]) || handled; + handled = + handle_keybind(keyboard->server, mods, syms[i]) || handled; } } @@ -53,7 +57,8 @@ void handle_key(struct wl_listener *listener, void *data) } wlr_seat_set_keyboard(keyboard->server->seat, keyboard->wlr); - wlr_seat_keyboard_notify_key(keyboard->server->seat, event->time_msec, event->keycode, event->state); + wlr_seat_keyboard_notify_key(keyboard->server->seat, event->time_msec, + event->keycode, event->state); } void handle_destroy(struct wl_listener *listener, void *data) diff --git a/src/layer-surface.c b/src/layer-surface.c index 12a1ac2..75da5fe 100644 --- a/src/layer-surface.c +++ b/src/layer-surface.c @@ -9,9 +9,11 @@ void layer_surface_unmap(struct wl_listener *listener, void *data) { UNUSED(data); - absn_layer_surface *layer_surface = wl_container_of(listener, layer_surface, unmap); + absn_layer_surface *layer_surface = + wl_container_of(listener, layer_surface, unmap); - if (layer_surface->wlr->surface == layer_surface->server->seat->keyboard_state.focused_surface) { + if (layer_surface->wlr->surface == + layer_surface->server->seat->keyboard_state.focused_surface) { focus_toplevel(focus_get_topmost(layer_surface->server)); } if (layer_surface == layer_surface->server->exclusive_focus) { @@ -24,9 +26,11 @@ void layer_surface_unmap(struct wl_listener *listener, void *data) void layer_surface_commit(struct wl_listener *listener, void *data) { UNUSED(data); - absn_layer_surface *layer_surface = wl_container_of(listener, layer_surface, commit); + absn_layer_surface *layer_surface = + wl_container_of(listener, layer_surface, commit); struct wlr_layer_surface_v1 *surface = layer_surface->wlr; - struct wlr_scene_tree *scene_layer = layer_surface->server->layers[layermap[surface->current.layer]]; + struct wlr_scene_tree *scene_layer = + layer_surface->server->layers[layermap[surface->current.layer]]; if (surface->initial_commit) { struct wlr_layer_surface_v1_state old_state = surface->current; @@ -36,7 +40,8 @@ void layer_surface_commit(struct wl_listener *listener, void *data) return; } - if (surface->current.committed == 0 || layer_surface->mapped == surface->surface->mapped) { + if (surface->current.committed == 0 || + layer_surface->mapped == surface->surface->mapped) { return; } layer_surface->mapped = surface->surface->mapped; @@ -44,10 +49,14 @@ void layer_surface_commit(struct wl_listener *listener, void *data) if (scene_layer != layer_surface->scene_tree->node.parent) { wlr_scene_node_reparent(&layer_surface->scene_tree->node, scene_layer); wl_list_remove(&layer_surface->link); - wl_list_insert(&layer_surface->output->layers[surface->current.layer], &layer_surface->link); - bool on_top_layer = surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP; + wl_list_insert(&layer_surface->output->layers[surface->current.layer], + &layer_surface->link); + bool on_top_layer = + surface->current.layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP; if (on_top_layer) { - wlr_scene_node_reparent(&layer_surface->popups->node, layer_surface->output->server->layers[LAYER_TOP]); + wlr_scene_node_reparent( + &layer_surface->popups->node, + layer_surface->output->server->layers[LAYER_TOP]); } else { wlr_scene_node_reparent(&layer_surface->popups->node, scene_layer); } @@ -60,7 +69,8 @@ void layer_surface_commit(struct wl_listener *listener, void *data) void layer_surface_new_popup(struct wl_listener *listener, void *data) { UNUSED(data); - absn_layer_surface *layer_surface = wl_container_of(listener, layer_surface, new_popup); + absn_layer_surface *layer_surface = + wl_container_of(listener, layer_surface, new_popup); struct wlr_xdg_popup *xdg_popup = data; wlr_scene_xdg_surface_create(layer_surface->popups, xdg_popup->base); @@ -70,13 +80,15 @@ void layer_surface_new_popup(struct wl_listener *listener, void *data) popup->parent_type = LAYER_SURFACE; popup->parent = layer_surface; - LISTEN(popup->commit, xdg_popup_commit, xdg_popup->base->surface->events.commit); + LISTEN(popup->commit, xdg_popup_commit, + xdg_popup->base->surface->events.commit); } void layer_surface_destroy(struct wl_listener *listener, void *data) { UNUSED(data); - absn_layer_surface *layer_surface = wl_container_of(listener, layer_surface, destroy); + absn_layer_surface *layer_surface = + wl_container_of(listener, layer_surface, destroy); wl_list_remove(&layer_surface->link); wl_list_remove(&layer_surface->unmap.link); diff --git a/src/layers.c b/src/layers.c index 2a26dea..d9ef349 100644 --- a/src/layers.c +++ b/src/layers.c @@ -7,7 +7,8 @@ /* arrange layers logic from dwl */ -static void layer_arrange(absn_output *output, struct wl_list *list, struct wlr_box *usable_area, int exclusive) +static void layer_arrange(absn_output *output, struct wl_list *list, + struct wlr_box *usable_area, int exclusive) { absn_layer_surface *layer_surface; wl_list_for_each(layer_surface, list, link) @@ -18,8 +19,10 @@ static void layer_arrange(absn_output *output, struct wl_list *list, struct wlr_ continue; } - wlr_scene_layer_surface_v1_configure(layer_surface->scene_layer, &output->geom, usable_area); - wlr_scene_node_set_position(&layer_surface->popups->node, layer_surface->scene_tree->node.x, + wlr_scene_layer_surface_v1_configure(layer_surface->scene_layer, + &output->geom, usable_area); + wlr_scene_node_set_position(&layer_surface->popups->node, + layer_surface->scene_tree->node.x, layer_surface->scene_tree->node.y); } } @@ -52,21 +55,27 @@ void layers_arrange(absn_output *output) ZWLR_LAYER_SHELL_V1_LAYER_TOP, }; - int layers_above_shell_count = sizeof(layers_above_shell) / sizeof(layers_above_shell[0]); + int layers_above_shell_count = + sizeof(layers_above_shell) / sizeof(layers_above_shell[0]); absn_layer_surface *layer_surface; for (int i = 0; i < layers_above_shell_count; ++i) { - wl_list_for_each_reverse(layer_surface, &output->layers[layers_above_shell[i]], link) + wl_list_for_each_reverse(layer_surface, + &output->layers[layers_above_shell[i]], link) { - if (!layer_surface->wlr->current.keyboard_interactive || !layer_surface->mapped) { + if (!layer_surface->wlr->current.keyboard_interactive || + !layer_surface->mapped) { continue; } unfocus_toplevel(output->server->focused_toplevel); output->server->exclusive_focus = layer_surface; - struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(output->server->seat); + struct wlr_keyboard *keyboard = + wlr_seat_get_keyboard(output->server->seat); if (keyboard) { - wlr_seat_keyboard_notify_enter(output->server->seat, layer_surface->wlr->surface, keyboard->keycodes, - keyboard->num_keycodes, &keyboard->modifiers); + wlr_seat_keyboard_notify_enter( + output->server->seat, layer_surface->wlr->surface, + keyboard->keycodes, keyboard->num_keycodes, + &keyboard->modifiers); } return; } diff --git a/src/layout.c b/src/layout.c index 4086b9a..de26cc4 100644 --- a/src/layout.c +++ b/src/layout.c @@ -17,7 +17,8 @@ static int prepare_output(struct absn_output *output) if (!toplevel->floating && !toplevel->fullscreen) { res++; } - } else if (toplevel->output == output && toplevel->workspace != output->workspace) { + } else if (toplevel->output == output && + toplevel->workspace != output->workspace) { wlr_scene_node_set_enabled(&toplevel->scene_tree->node, false); } } @@ -40,12 +41,15 @@ static void tile(struct absn_output *output) if (toplevels_count == 1) { wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace == output->workspace && !toplevel->floating && !toplevel->fullscreen) { + if (toplevel->workspace == output->workspace && + !toplevel->floating && !toplevel->fullscreen) { break; } } - new_geom.x = output->usable_area.x + og, new_geom.y = output->usable_area.y + og, - new_geom.width = output->usable_area.width - 2 * og, new_geom.height = output->usable_area.height - 2 * og, + new_geom.x = output->usable_area.x + og, + new_geom.y = output->usable_area.y + og, + new_geom.width = output->usable_area.width - 2 * og, + new_geom.height = output->usable_area.height - 2 * og, toplevel_set_geom(toplevel, &new_geom); return; @@ -58,7 +62,9 @@ static void tile(struct absn_output *output) float msize = output->workspace->size; int32_t main_stack_width = - (toplevels_count <= mcount) ? output->usable_area.width - 2 * og : msize * (output->usable_area.width - 2 * og); + (toplevels_count <= mcount) + ? output->usable_area.width - 2 * og + : msize * (output->usable_area.width - 2 * og); int32_t w = output->usable_area.width - main_stack_width - 2 * og - lg; int32_t pure_h; @@ -77,7 +83,8 @@ static void tile(struct absn_output *output) wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace != output->workspace || toplevel->floating || toplevel->fullscreen) { + if (toplevel->workspace != output->workspace || + toplevel->floating || toplevel->fullscreen) { continue; } @@ -99,7 +106,8 @@ static void tile(struct absn_output *output) wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace != output->workspace || toplevel->floating || toplevel->fullscreen) { + if (toplevel->workspace != output->workspace || toplevel->floating || + toplevel->fullscreen) { continue; } @@ -161,12 +169,15 @@ static void tile_left(struct absn_output *output) if (toplevels_count == 1) { wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace == output->workspace && !toplevel->floating && !toplevel->fullscreen) { + if (toplevel->workspace == output->workspace && + !toplevel->floating && !toplevel->fullscreen) { break; } } - new_geom.x = output->usable_area.x + og, new_geom.y = output->usable_area.y + og, - new_geom.width = output->usable_area.width - 2 * og, new_geom.height = output->usable_area.height - 2 * og, + new_geom.x = output->usable_area.x + og, + new_geom.y = output->usable_area.y + og, + new_geom.width = output->usable_area.width - 2 * og, + new_geom.height = output->usable_area.height - 2 * og, toplevel_set_geom(toplevel, &new_geom); return; @@ -179,7 +190,9 @@ static void tile_left(struct absn_output *output) float msize = output->workspace->size; int32_t main_stack_width = - (toplevels_count <= mcount) ? output->usable_area.width - 2 * og : msize * (output->usable_area.width - 2 * og); + (toplevels_count <= mcount) + ? output->usable_area.width - 2 * og + : msize * (output->usable_area.width - 2 * og); int32_t w = output->usable_area.width - main_stack_width - 2 * og - lg; int32_t pure_h; @@ -198,7 +211,8 @@ static void tile_left(struct absn_output *output) wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace != output->workspace || toplevel->floating || toplevel->fullscreen) { + if (toplevel->workspace != output->workspace || + toplevel->floating || toplevel->fullscreen) { continue; } @@ -220,7 +234,8 @@ static void tile_left(struct absn_output *output) wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace != output->workspace || toplevel->floating || toplevel->fullscreen) { + if (toplevel->workspace != output->workspace || toplevel->floating || + toplevel->fullscreen) { continue; } @@ -232,7 +247,8 @@ static void tile_left(struct absn_output *output) cur_h = h + (i < r ? 1 : 0); - new_geom.x = output->usable_area.x + output->usable_area.width - og - main_stack_width; + new_geom.x = output->usable_area.x + output->usable_area.width - + og - main_stack_width; new_geom.y = output->usable_area.y + dy; new_geom.width = main_stack_width; new_geom.height = cur_h; @@ -287,7 +303,8 @@ static void monocle(struct absn_output *output) absn_toplevel *toplevel; wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->workspace != output->workspace || toplevel->floating || toplevel->fullscreen) { + if (toplevel->workspace != output->workspace || toplevel->floating || + toplevel->fullscreen) { continue; } diff --git a/src/output.c b/src/output.c index 0f2e9ff..81f2191 100644 --- a/src/output.c +++ b/src/output.c @@ -13,11 +13,13 @@ void output_frame(struct wl_listener *listener, void *data) absn_output *output = wl_container_of(listener, output, frame); struct wlr_scene *scene = output->server->scene; - struct wlr_scene_output *scene_output = wlr_scene_get_scene_output(scene, output->wlr); + struct wlr_scene_output *scene_output = + wlr_scene_get_scene_output(scene, output->wlr); absn_toplevel *toplevel; wl_list_for_each(toplevel, &output->server->toplevels, link) { - if (toplevel->resizing && !toplevel->floating && toplevel->output == output) { + if (toplevel->resizing && !toplevel->floating && + toplevel->output == output) { goto skip; } } @@ -31,7 +33,8 @@ skip: void output_request_state(struct wl_listener *listener, void *data) { - struct absn_output *output = wl_container_of(listener, output, request_state); + struct absn_output *output = + wl_container_of(listener, output, request_state); const struct wlr_output_event_request_state *event = data; wlr_output_commit_state(output->wlr, event->state); } @@ -39,7 +42,8 @@ void output_request_state(struct wl_listener *listener, void *data) void output_destroy(struct wl_listener *listener, void *data) { UNUSED(data); - struct absn_output *output = wl_container_of(listener, output, request_state); + struct absn_output *output = + wl_container_of(listener, output, request_state); wl_list_remove(&output->frame.link); wl_list_remove(&output->request_state.link); @@ -52,7 +56,8 @@ void output_layout_change(struct wl_listener *listener, void *data) { UNUSED(data); absn_server *server = wl_container_of(listener, server, layout_change); - struct wlr_output_configuration_v1 *config = wlr_output_configuration_v1_create(); + struct wlr_output_configuration_v1 *config = + wlr_output_configuration_v1_create(); absn_toplevel *toplevel = NULL; absn_output *output; @@ -63,7 +68,8 @@ void output_layout_change(struct wl_listener *listener, void *data) if (output->wlr->enabled) { continue; } - config_head = wlr_output_configuration_head_v1_create(config, output->wlr); + config_head = + wlr_output_configuration_head_v1_create(config, output->wlr); config_head->state.enabled = 0; wlr_output_layout_remove(server->output_layout, output->wlr); @@ -73,15 +79,18 @@ void output_layout_change(struct wl_listener *listener, void *data) wl_list_for_each(output, &server->outputs, link) { - if (output->wlr->enabled && !wlr_output_layout_get(server->output_layout, output->wlr)) { - wlr_output_layout_add_auto(server->output_layout, toplevel->output->wlr); + if (output->wlr->enabled && + !wlr_output_layout_get(server->output_layout, output->wlr)) { + wlr_output_layout_add_auto(server->output_layout, + toplevel->output->wlr); } } struct wlr_box layout_geom; wlr_output_layout_get_box(server->output_layout, NULL, &layout_geom); - wlr_scene_node_set_position(&server->bg->node, layout_geom.x, layout_geom.y); + wlr_scene_node_set_position(&server->bg->node, layout_geom.x, + layout_geom.y); wlr_scene_rect_set_size(server->bg, layout_geom.width, layout_geom.height); wl_list_for_each(output, &server->outputs, link) @@ -89,13 +98,16 @@ void output_layout_change(struct wl_listener *listener, void *data) if (!output->wlr->enabled) { continue; } - config_head = wlr_output_configuration_head_v1_create(config, output->wlr); + config_head = + wlr_output_configuration_head_v1_create(config, output->wlr); - wlr_output_layout_get_box(server->output_layout, output->wlr, &output->geom); + wlr_output_layout_get_box(server->output_layout, output->wlr, + &output->geom); output->usable_area = output->geom; if ((toplevel = focus_get_topmost(server)) && toplevel->fullscreen) { - toplevel_set_size(toplevel, output->geom.width, output->geom.height); + toplevel_set_size(toplevel, output->geom.width, + output->geom.height); } config_head->state.x = output->geom.x; @@ -128,8 +140,12 @@ void update_focused_output(absn_server *server) int32_t cursor_y = server->cursor->y; wl_list_for_each(output, &server->outputs, link) { - bool cursor_in_output_x = cursor_x >= output->geom.x && cursor_x <= output->geom.x + output->geom.width; - bool cursor_in_output_y = cursor_y >= output->geom.y && cursor_y <= output->geom.y + output->geom.height; + bool cursor_in_output_x = + cursor_x >= output->geom.x && + cursor_x <= output->geom.x + output->geom.width; + bool cursor_in_output_y = + cursor_y >= output->geom.y && + cursor_y <= output->geom.y + output->geom.height; if (cursor_in_output_x && cursor_in_output_y) { server->focused_output = output; break; @@ -155,9 +171,12 @@ void output_arrange(absn_output *output) wl_list_for_each(toplevel, &server->toplevels, link) { - if (toplevel->output != output || toplevel->scene_tree->node.parent == server->layers[LAYER_FULLSCREEN]) { + if (toplevel->output != output || + toplevel->scene_tree->node.parent == + server->layers[LAYER_FULLSCREEN]) { continue; } - wlr_scene_node_reparent(&toplevel->scene_tree->node, toplevel->scene_tree->node.parent); + wlr_scene_node_reparent(&toplevel->scene_tree->node, + toplevel->scene_tree->node.parent); } } diff --git a/src/seat.c b/src/seat.c index 77c93e7..ce7116d 100644 --- a/src/seat.c +++ b/src/seat.c @@ -10,13 +10,15 @@ void request_cursor(struct wl_listener *listener, void *data) struct wlr_seat_client *client = server->seat->pointer_state.focused_client; if (client == event->seat_client) { - wlr_cursor_set_surface(server->cursor, event->surface, event->hotspot_x, event->hotspot_y); + wlr_cursor_set_surface(server->cursor, event->surface, event->hotspot_x, + event->hotspot_y); } } void pointer_focus_change(struct wl_listener *listener, void *data) { - absn_server *server = wl_container_of(listener, server, pointer_focus_change); + absn_server *server = + wl_container_of(listener, server, pointer_focus_change); struct wlr_seat_pointer_focus_change_event *event = data; if (!event->new_surface) { @@ -26,7 +28,8 @@ void pointer_focus_change(struct wl_listener *listener, void *data) void request_set_selection(struct wl_listener *listener, void *data) { - absn_server *server = wl_container_of(listener, server, request_set_selection); + absn_server *server = + wl_container_of(listener, server, request_set_selection); struct wlr_seat_request_set_selection_event *event = data; wlr_seat_set_selection(server->seat, event->source, event->serial); diff --git a/src/server.c b/src/server.c index 43ac9a5..57d5a7a 100644 --- a/src/server.c +++ b/src/server.c @@ -57,7 +57,8 @@ void new_output(struct wl_listener *listener, void *data) } LISTEN(output->frame, output_frame, wlr_output->events.frame); - LISTEN(output->request_state, output_request_state, wlr_output->events.request_state); + LISTEN(output->request_state, output_request_state, + wlr_output->events.request_state); LISTEN(output->destroy, output_destroy, wlr_output->events.destroy); wl_list_insert(&server->outputs, &output->link); @@ -66,10 +67,14 @@ void new_output(struct wl_listener *listener, void *data) wl_list_init(&output->layers[i]); } - struct wlr_output_layout_output *l_layout = wlr_output_layout_add_auto(server->output_layout, output->wlr); - struct wlr_scene_output *scene_output = wlr_scene_output_create(server->scene, wlr_output); - wlr_scene_output_layout_add_output(server->scene_layout, l_layout, scene_output); - wlr_output_layout_get_box(server->output_layout, output->wlr, &output->geom); + struct wlr_output_layout_output *l_layout = + wlr_output_layout_add_auto(server->output_layout, output->wlr); + struct wlr_scene_output *scene_output = + wlr_scene_output_create(server->scene, wlr_output); + wlr_scene_output_layout_add_output(server->scene_layout, l_layout, + scene_output); + wlr_output_layout_get_box(server->output_layout, output->wlr, + &output->geom); output->usable_area = output->geom; } @@ -87,14 +92,21 @@ void new_xdg_toplevel(struct wl_listener *listener, void *data) wlr_surface_set_preferred_buffer_scale(toplevel->xdg->base->surface, 1); - LISTEN(toplevel->commit, toplevel_commit, xdg_toplevel->base->surface->events.commit); - LISTEN(toplevel->map, toplevel_map, xdg_toplevel->base->surface->events.map); - LISTEN(toplevel->unmap, toplevel_unmap, xdg_toplevel->base->surface->events.unmap); + LISTEN(toplevel->commit, toplevel_commit, + xdg_toplevel->base->surface->events.commit); + LISTEN(toplevel->map, toplevel_map, + xdg_toplevel->base->surface->events.map); + LISTEN(toplevel->unmap, toplevel_unmap, + xdg_toplevel->base->surface->events.unmap); LISTEN(toplevel->destroy, toplevel_destroy, xdg_toplevel->events.destroy); - LISTEN(toplevel->request_move, toplevel_request_move, xdg_toplevel->events.request_move); - LISTEN(toplevel->request_resize, toplevel_request_resize, xdg_toplevel->events.request_resize); - LISTEN(toplevel->request_maximize, toplevel_request_maximize, xdg_toplevel->events.request_maximize); - LISTEN(toplevel->request_fullscreen, toplevel_request_fullscreen, xdg_toplevel->events.request_fullscreen); + LISTEN(toplevel->request_move, toplevel_request_move, + xdg_toplevel->events.request_move); + LISTEN(toplevel->request_resize, toplevel_request_resize, + xdg_toplevel->events.request_resize); + LISTEN(toplevel->request_maximize, toplevel_request_maximize, + xdg_toplevel->events.request_maximize); + LISTEN(toplevel->request_fullscreen, toplevel_request_fullscreen, + xdg_toplevel->events.request_fullscreen); } void new_xdg_popup(struct wl_listener *listener, void *data) @@ -102,7 +114,8 @@ void new_xdg_popup(struct wl_listener *listener, void *data) absn_server *server = wl_container_of(listener, server, new_xdg_popup); struct wlr_xdg_popup *xdg_popup = data; - struct wlr_xdg_surface *parent = wlr_xdg_surface_try_from_wlr_surface(xdg_popup->parent); + struct wlr_xdg_surface *parent = + wlr_xdg_surface_try_from_wlr_surface(xdg_popup->parent); if (!parent) { return; } @@ -115,7 +128,8 @@ void new_xdg_popup(struct wl_listener *listener, void *data) popup->parent_type = TOPLEVEL_XDG; popup->parent = toplevel; - LISTEN(popup->commit, xdg_popup_commit, xdg_popup->base->surface->events.commit); + LISTEN(popup->commit, xdg_popup_commit, + xdg_popup->base->surface->events.commit); } void new_xdg_decoration(struct wl_listener *listener, void *data) @@ -125,7 +139,8 @@ void new_xdg_decoration(struct wl_listener *listener, void *data) absn_toplevel *toplevel = deco->toplevel->base->data; toplevel->deco = deco; - LISTEN(toplevel->deco_request_mode, deco_request_mode, deco->events.request_mode); + LISTEN(toplevel->deco_request_mode, deco_request_mode, + deco->events.request_mode); LISTEN(toplevel->deco_destroy, deco_destroy, deco->events.destroy); /* Forse server side decoration mode */ @@ -148,18 +163,27 @@ void new_layer_surface(struct wl_listener *listener, void *data) layer_surface->wlr = surface; layer_surface->output = surface->output->data; - LISTEN(layer_surface->unmap, layer_surface_unmap, surface->surface->events.unmap); - LISTEN(layer_surface->commit, layer_surface_commit, surface->surface->events.commit); - LISTEN(layer_surface->new_popup, layer_surface_new_popup, surface->events.new_popup); - LISTEN(layer_surface->destroy, layer_surface_destroy, surface->events.destroy); + LISTEN(layer_surface->unmap, layer_surface_unmap, + surface->surface->events.unmap); + LISTEN(layer_surface->commit, layer_surface_commit, + surface->surface->events.commit); + LISTEN(layer_surface->new_popup, layer_surface_new_popup, + surface->events.new_popup); + LISTEN(layer_surface->destroy, layer_surface_destroy, + surface->events.destroy); - struct wlr_scene_tree *scene_layer = server->layers[layermap[surface->pending.layer]]; - layer_surface->scene_layer = wlr_scene_layer_surface_v1_create(scene_layer, surface); + struct wlr_scene_tree *scene_layer = + server->layers[layermap[surface->pending.layer]]; + layer_surface->scene_layer = + wlr_scene_layer_surface_v1_create(scene_layer, surface); layer_surface->scene_tree = layer_surface->scene_layer->tree; layer_surface->popups = wlr_scene_tree_create( - surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP ? server->layers[LAYER_TOP] : scene_layer); + surface->current.layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP + ? server->layers[LAYER_TOP] + : scene_layer); - wl_list_insert(&layer_surface->output->layers[surface->pending.layer], &layer_surface->link); + wl_list_insert(&layer_surface->output->layers[surface->pending.layer], + &layer_surface->link); wlr_surface_send_enter(surface->surface, surface->output); } @@ -172,9 +196,13 @@ void xwayland_ready(struct wl_listener *listener, void *data) wlr_xwayland_set_seat(server->xwayland, server->seat); struct wlr_xcursor *xcursor; - if ((xcursor = wlr_xcursor_manager_get_xcursor(server->cursor_mgr, "default", 1))) { - struct wlr_buffer *buffer = wlr_xcursor_image_get_buffer(xcursor->images[0]); - wlr_xwayland_set_cursor(server->xwayland, buffer, xcursor->images[0]->hotspot_x, xcursor->images[0]->hotspot_y); + if ((xcursor = wlr_xcursor_manager_get_xcursor(server->cursor_mgr, + "default", 1))) { + struct wlr_buffer *buffer = + wlr_xcursor_image_get_buffer(xcursor->images[0]); + wlr_xwayland_set_cursor(server->xwayland, buffer, + xcursor->images[0]->hotspot_x, + xcursor->images[0]->hotspot_y); } } @@ -191,14 +219,21 @@ void xwayland_new_surface(struct wl_listener *listener, void *data) surface->data = toplevel; LISTEN(toplevel->destroy, toplevel_destroy, surface->events.destroy); - LISTEN(toplevel->request_maximize, toplevel_request_maximize, surface->events.request_maximize); - LISTEN(toplevel->request_fullscreen, toplevel_request_fullscreen, surface->events.request_fullscreen); + LISTEN(toplevel->request_maximize, toplevel_request_maximize, + surface->events.request_maximize); + LISTEN(toplevel->request_fullscreen, toplevel_request_fullscreen, + surface->events.request_fullscreen); - LISTEN(toplevel->xw_activate, xwayland_activate, surface->events.request_activate); - LISTEN(toplevel->xw_associate, xwayland_associate, surface->events.associate); - LISTEN(toplevel->xw_dissociate, xwayland_dissociate, surface->events.dissociate); - LISTEN(toplevel->xw_configure, xwayland_configure, surface->events.request_configure); - LISTEN(toplevel->xw_set_hints, xwayland_set_hints, surface->events.set_hints); + LISTEN(toplevel->xw_activate, xwayland_activate, + surface->events.request_activate); + LISTEN(toplevel->xw_associate, xwayland_associate, + surface->events.associate); + LISTEN(toplevel->xw_dissociate, xwayland_dissociate, + surface->events.dissociate); + LISTEN(toplevel->xw_configure, xwayland_configure, + surface->events.request_configure); + LISTEN(toplevel->xw_set_hints, xwayland_set_hints, + surface->events.set_hints); } #endif @@ -207,7 +242,8 @@ void cursor_motion(struct wl_listener *listener, void *data) absn_server *server = wl_container_of(listener, server, cursor_motion); struct wlr_pointer_motion_event *event = data; update_focused_output(server); - wlr_cursor_move(server->cursor, &event->pointer->base, event->delta_x, event->delta_y); + wlr_cursor_move(server->cursor, &event->pointer->base, event->delta_x, + event->delta_y); process_cursor_motion(server, event->time_msec); } @@ -216,7 +252,8 @@ void cursor_motion_abs(struct wl_listener *listener, void *data) absn_server *server = wl_container_of(listener, server, cursor_motion_abs); struct wlr_pointer_motion_absolute_event *event = data; update_focused_output(server); - wlr_cursor_warp_absolute(server->cursor, &event->pointer->base, event->x, event->y); + wlr_cursor_warp_absolute(server->cursor, &event->pointer->base, event->x, + event->y); process_cursor_motion(server, event->time_msec); } @@ -233,7 +270,8 @@ void cursor_button(struct wl_listener *listener, void *data) struct wlr_surface *surface = NULL; absn_toplevel *toplevel; absn_layer_surface *layer_surface; - client_from_coords(server, server->cursor->x, server->cursor->y, &surface, &toplevel, &layer_surface, &x, &y); + client_from_coords(server, server->cursor->x, server->cursor->y, + &surface, &toplevel, &layer_surface, &x, &y); if (server->exclusive_focus) { goto handle; @@ -248,7 +286,8 @@ void cursor_button(struct wl_listener *listener, void *data) if (mods & CURSOR_MOD) { if (event->button == CURSOR_MOVE_BUTTON) { server->cursor_mode = CURSOR_MOVE; - wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, "all-scroll"); + wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, + "all-scroll"); handled = true; } else if (event->button == CURSOR_RESIZE_BUTTON) { server->cursor_mode = CURSOR_RESIZE; @@ -274,18 +313,25 @@ void cursor_button(struct wl_listener *listener, void *data) int32_t width = toplevel->xdg->base->geometry.width; int32_t height = toplevel->xdg->base->geometry.height; - if (server->grab_x > (tx + width / 2) && server->grab_y > (ty + height / 2)) { + if (server->grab_x > (tx + width / 2) && + server->grab_y > (ty + height / 2)) { server->resize_corner = BOTTOM_RIGHT; - wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, "se-resize"); - } else if (server->grab_x < (tx + width / 2) && server->grab_y > (ty + height / 2)) { + wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, + "se-resize"); + } else if (server->grab_x < (tx + width / 2) && + server->grab_y > (ty + height / 2)) { server->resize_corner = BOTTOM_LEFT; - wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, "sw-resize"); - } else if (server->grab_x > (tx + width / 2) && server->grab_y < (ty + height / 2)) { + wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, + "sw-resize"); + } else if (server->grab_x > (tx + width / 2) && + server->grab_y < (ty + height / 2)) { server->resize_corner = TOP_RIGHT; - wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, "ne-resize"); + wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, + "ne-resize"); } else { server->resize_corner = TOP_LEFT; - wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, "nw-resize"); + wlr_cursor_set_xcursor(server->cursor, server->cursor_mgr, + "nw-resize"); } wlr_xdg_toplevel_set_resizing(toplevel->xdg, true); @@ -293,7 +339,8 @@ void cursor_button(struct wl_listener *listener, void *data) handle: if (!handled) { - wlr_seat_pointer_notify_button(server->seat, event->time_msec, event->button, event->state); + wlr_seat_pointer_notify_button(server->seat, event->time_msec, + event->button, event->state); } } @@ -301,8 +348,9 @@ void cursor_axis(struct wl_listener *listener, void *data) { absn_server *server = wl_container_of(listener, server, cursor_axis); struct wlr_pointer_axis_event *event = data; - wlr_seat_pointer_notify_axis(server->seat, event->time_msec, event->orientation, event->delta, - event->delta_discrete, event->source, event->relative_direction); + wlr_seat_pointer_notify_axis( + server->seat, event->time_msec, event->orientation, event->delta, + event->delta_discrete, event->source, event->relative_direction); } void cursor_frame(struct wl_listener *listener, void *data) @@ -320,16 +368,19 @@ static void new_keyboard(absn_server *server, struct wlr_input_device *device) keyboard->wlr = wlr_keyboard; struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); - struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS); + struct xkb_keymap *keymap = + xkb_keymap_new_from_names(context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS); wlr_keyboard_set_keymap(wlr_keyboard, keymap); xkb_keymap_unref(keymap); xkb_context_unref(context); wlr_keyboard_set_repeat_info(wlr_keyboard, 25, 600); - LISTEN(keyboard->modifiers, handle_modifiers, wlr_keyboard->events.modifiers); + LISTEN(keyboard->modifiers, handle_modifiers, + wlr_keyboard->events.modifiers); LISTEN(keyboard->key, handle_key, wlr_keyboard->events.key); - LISTEN(keyboard->destroy, handle_destroy, wlr_keyboard->base.events.destroy); + LISTEN(keyboard->destroy, handle_destroy, + wlr_keyboard->base.events.destroy); wlr_seat_set_keyboard(server->seat, wlr_keyboard); diff --git a/src/toplevel-handlers.c b/src/toplevel-handlers.c index bc990a4..4c64c5e 100644 --- a/src/toplevel-handlers.c +++ b/src/toplevel-handlers.c @@ -15,7 +15,8 @@ void toplevel_map(struct wl_listener *listener, void *data) 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)); + wlr_scene_node_set_enabled(&toplevel->scene_tree->node, + toplevel_is_unmanaged(toplevel)); update_focused_output(toplevel->server); toplevel->output = toplevel->server->focused_output; @@ -29,17 +30,22 @@ void toplevel_map(struct wl_listener *listener, void *data) #endif 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); + 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); } #ifdef XWAYLAND if (toplevel->type == TOPLEVEL_X11) { - toplevel->scene_surface = wlr_scene_subsurface_tree_create(toplevel->scene_tree, toplevel->xw->surface); + 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 = wlr_scene_xdg_surface_create( + toplevel->scene_tree, toplevel->xdg->base); } toplevel->scene_surface->node.data = toplevel; @@ -48,7 +54,8 @@ void toplevel_map(struct wl_listener *listener, void *data) if (toplevel_is_unmanaged(toplevel)) { toplevel_set_floating(toplevel, true); - toplevel_set_size(toplevel, toplevel->geom.width, toplevel->geom.height); + toplevel_set_size(toplevel, toplevel->geom.width, + toplevel->geom.height); if (toplevel_wants_focus(toplevel)) { focus_toplevel(toplevel); server->exclusive_focus = toplevel; @@ -57,7 +64,8 @@ void toplevel_map(struct wl_listener *listener, void *data) } for (int i = 0; i < 4; ++i) { - toplevel->border[i] = wlr_scene_rect_create(toplevel->scene_tree, 0, 0, unfocused_bc); + toplevel->border[i] = + wlr_scene_rect_create(toplevel->scene_tree, 0, 0, unfocused_bc); toplevel->border[i]->node.data = toplevel; } @@ -150,7 +158,8 @@ void toplevel_request_move(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); + absn_toplevel *toplevel = + wl_container_of(listener, toplevel, request_resize); if (toplevel->xdg->base->initialized) { wlr_xdg_surface_schedule_configure(toplevel->xdg->base); } @@ -159,7 +168,8 @@ void toplevel_request_resize(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); + absn_toplevel *toplevel = + wl_container_of(listener, toplevel, request_maximize); if (toplevel->xdg->base->initialized) { wlr_xdg_surface_schedule_configure(toplevel->xdg->base); } @@ -168,6 +178,7 @@ void toplevel_request_maximize(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); + absn_toplevel *toplevel = + wl_container_of(listener, toplevel, request_fullscreen); toplevel_set_fullscreen(toplevel, toplevel->xdg->requested.fullscreen); } diff --git a/src/toplevel.c b/src/toplevel.c index d6c4e0f..1db0a9e 100644 --- a/src/toplevel.c +++ b/src/toplevel.c @@ -25,8 +25,10 @@ bool toplevel_is_unmanaged(absn_toplevel *toplevel) bool toplevel_wants_focus(absn_toplevel *toplevel) { #ifdef XWAYLAND - return toplevel_is_unmanaged(toplevel) && wlr_xwayland_surface_override_redirect_wants_focus(toplevel->xw) && - wlr_xwayland_surface_icccm_input_model(toplevel->xw) != WLR_ICCCM_INPUT_MODEL_NONE; + return toplevel_is_unmanaged(toplevel) && + wlr_xwayland_surface_override_redirect_wants_focus(toplevel->xw) && + wlr_xwayland_surface_icccm_input_model(toplevel->xw) != + WLR_ICCCM_INPUT_MODEL_NONE; #endif } @@ -50,22 +52,28 @@ static void toplevel_update_borders_geom(absn_toplevel *toplevel) { int32_t bw = toplevel->bw; - if (toplevel->geom.width - 2 * bw < 0 || toplevel->geom.height - 2 * bw < 0) { + if (toplevel->geom.width - 2 * bw < 0 || + toplevel->geom.height - 2 * bw < 0) { return; } - wlr_scene_node_set_position(&toplevel->scene_tree->node, toplevel->geom.x, toplevel->geom.y); + wlr_scene_node_set_position(&toplevel->scene_tree->node, toplevel->geom.x, + toplevel->geom.y); wlr_scene_node_set_position(&toplevel->scene_surface->node, bw, bw); - wlr_scene_rect_set_size(toplevel->border[0], toplevel->geom.width - 2 * bw, bw); - wlr_scene_rect_set_size(toplevel->border[1], toplevel->geom.width - 2 * bw, bw); + wlr_scene_rect_set_size(toplevel->border[0], toplevel->geom.width - 2 * bw, + bw); + wlr_scene_rect_set_size(toplevel->border[1], toplevel->geom.width - 2 * bw, + bw); wlr_scene_rect_set_size(toplevel->border[2], bw, toplevel->geom.height); wlr_scene_rect_set_size(toplevel->border[3], bw, toplevel->geom.height); wlr_scene_node_set_position(&toplevel->border[0]->node, bw, 0); - wlr_scene_node_set_position(&toplevel->border[1]->node, bw, toplevel->geom.height - bw); + wlr_scene_node_set_position(&toplevel->border[1]->node, bw, + toplevel->geom.height - bw); wlr_scene_node_set_position(&toplevel->border[2]->node, 0, 0); - wlr_scene_node_set_position(&toplevel->border[3]->node, toplevel->geom.width - bw, 0); + wlr_scene_node_set_position(&toplevel->border[3]->node, + toplevel->geom.width - bw, 0); } void toplevel_set_pos(absn_toplevel *toplevel, int32_t x, int32_t y) @@ -96,21 +104,24 @@ void toplevel_set_size(absn_toplevel *toplevel, int32_t width, int32_t height) }; if (toplevel->type == TOPLEVEL_XDG) { - if (wl_resource_get_version(toplevel->xdg->resource) >= XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION) { + if (wl_resource_get_version(toplevel->xdg->resource) >= + XDG_TOPLEVEL_CONFIGURE_BOUNDS_SINCE_VERSION) { wlr_xdg_toplevel_set_bounds(toplevel->xdg, width, height); } - toplevel->resizing = wlr_xdg_toplevel_set_size(toplevel->xdg, width - 2 * bw, height - 2 * bw); + toplevel->resizing = wlr_xdg_toplevel_set_size( + toplevel->xdg, width - 2 * bw, height - 2 * bw); } #ifdef XWAYLAND else if (toplevel->type == TOPLEVEL_X11) { - wlr_xwayland_surface_configure(toplevel->xw, toplevel->geom.x, toplevel->geom.y, width - 2 * bw, + wlr_xwayland_surface_configure(toplevel->xw, toplevel->geom.x, + toplevel->geom.y, width - 2 * bw, height - 2 * toplevel->bw); /* manually update position */ toplevel_set_pos(toplevel, toplevel->geom.x, toplevel->geom.y); } #endif - wlr_scene_subsurface_tree_set_clip(&toplevel->scene_surface->node, &clip); + wlr_scene_subsurface_tree_set_clip(&toplevel->scene_surface->node, &clip); } void toplevel_set_geom(absn_toplevel *toplevel, struct wlr_box *geom) @@ -132,9 +143,11 @@ void toplevel_set_floating(absn_toplevel *toplevel, bool floating) toplevel->floating = floating; if (floating) { - wlr_scene_node_reparent(&toplevel->scene_tree->node, toplevel->server->layers[LAYER_FLOAT]); + wlr_scene_node_reparent(&toplevel->scene_tree->node, + toplevel->server->layers[LAYER_FLOAT]); } else { - wlr_scene_node_reparent(&toplevel->scene_tree->node, toplevel->server->layers[LAYER_TILE]); + wlr_scene_node_reparent(&toplevel->scene_tree->node, + toplevel->server->layers[LAYER_TILE]); } layout_arrange(toplevel->output); @@ -157,14 +170,17 @@ void toplevel_set_fullscreen(absn_toplevel *toplevel, bool fullscreen) toplevel->bw = 0; toplevel_set_geom(toplevel, &output->geom); - wlr_scene_node_reparent(&toplevel->scene_tree->node, toplevel->server->layers[LAYER_FULLSCREEN]); + wlr_scene_node_reparent(&toplevel->scene_tree->node, + toplevel->server->layers[LAYER_FULLSCREEN]); } else { toplevel->bw = toplevel_is_unmanaged(toplevel) ? 0 : TOPLEVEL_BW; toplevel_set_geom(toplevel, &toplevel->prev_geom); if (toplevel->floating) { - wlr_scene_node_reparent(&toplevel->scene_tree->node, toplevel->server->layers[LAYER_FLOAT]); + wlr_scene_node_reparent(&toplevel->scene_tree->node, + toplevel->server->layers[LAYER_FLOAT]); } else { - wlr_scene_node_reparent(&toplevel->scene_tree->node, toplevel->server->layers[LAYER_TILE]); + wlr_scene_node_reparent(&toplevel->scene_tree->node, + toplevel->server->layers[LAYER_TILE]); } } diff --git a/src/xdg-decoration.c b/src/xdg-decoration.c index 729cfcc..023b42f 100644 --- a/src/xdg-decoration.c +++ b/src/xdg-decoration.c @@ -5,9 +5,11 @@ void deco_request_mode(struct wl_listener *listener, void *data) { UNUSED(data); - absn_toplevel *toplevel = wl_container_of(listener, toplevel, deco_request_mode); + absn_toplevel *toplevel = + wl_container_of(listener, toplevel, deco_request_mode); if (toplevel->xdg->base->initialized) { - wlr_xdg_toplevel_decoration_v1_set_mode(toplevel->deco, WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + wlr_xdg_toplevel_decoration_v1_set_mode( + toplevel->deco, WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); } } diff --git a/src/xwayland.c b/src/xwayland.c index 329c8cb..5e38907 100644 --- a/src/xwayland.c +++ b/src/xwayland.c @@ -1,7 +1,7 @@ #ifdef XWAYLAND -#include "config.h" #include "xwayland.h" +#include "config.h" #include "toplevel-handlers.h" #include "toplevel.h" #include "types.h" @@ -22,13 +22,15 @@ void xwayland_associate(struct wl_listener *listener, void *data) absn_toplevel *toplevel = wl_container_of(listener, toplevel, xw_associate); LISTEN(toplevel->map, toplevel_map, toplevel->xw->surface->events.map); - LISTEN(toplevel->unmap, toplevel_unmap, toplevel->xw->surface->events.unmap); + LISTEN(toplevel->unmap, toplevel_unmap, + toplevel->xw->surface->events.unmap); } void xwayland_dissociate(struct wl_listener *listener, void *data) { UNUSED(data); - absn_toplevel *toplevel = wl_container_of(listener, toplevel, xw_dissociate); + absn_toplevel *toplevel = + wl_container_of(listener, toplevel, xw_dissociate); wl_list_remove(&toplevel->map.link); wl_list_remove(&toplevel->unmap.link); @@ -41,13 +43,16 @@ void xwayland_configure(struct wl_listener *listener, void *data) struct wlr_xwayland_surface_configure_event *event = data; if (!toplevel->xw->surface || !toplevel->xw->surface->mapped) { - wlr_xwayland_surface_configure(toplevel->xw, event->x, event->y, event->width, event->height); + wlr_xwayland_surface_configure(toplevel->xw, event->x, event->y, + event->width, event->height); return; } if (toplevel_is_unmanaged(toplevel)) { - wlr_scene_node_set_position(&toplevel->scene_tree->node, event->x, event->y); - wlr_xwayland_surface_configure(toplevel->xw, event->x, event->y, event->width, event->height); + wlr_scene_node_set_position(&toplevel->scene_tree->node, event->x, + event->y); + wlr_xwayland_surface_configure(toplevel->xw, event->x, event->y, + event->width, event->height); return; } } @@ -56,7 +61,8 @@ void xwayland_set_hints(struct wl_listener *listener, void *data) { UNUSED(data); absn_toplevel *toplevel = wl_container_of(listener, toplevel, xw_set_hints); - if (toplevel == toplevel->server->focused_toplevel || !toplevel->xw->hints) { + if (toplevel == toplevel->server->focused_toplevel || + !toplevel->xw->hints) { return; }