mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-19 06:46:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into session-lock-input-fix

Browse source
This commit is contained in:
Erik Reider 2026-03-30 00:20:29 +02:00 • committed by GitHub
commit 43b00127dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 367 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/sway/layers.h
View file

@ -33,6 +33,7 @@ struct sway_layer_popup {
struct wl_listener destroy;
struct wl_listener new_popup;
struct wl_listener commit;
struct wl_listener reposition;
};
struct sway_output;

1
include/sway/output.h
View file

@ -63,6 +63,7 @@ struct sway_output {
struct wl_listener request_state;
struct wlr_color_transform *color_transform;
struct wlr_ext_workspace_group_handle_v1 *ext_workspace_group;
struct timespec last_presentation;
uint32_t refresh_nsec;

3
include/sway/server.h
View file

@ -127,6 +127,9 @@ struct sway_server {
struct wl_listener tearing_control_new_object;
struct wl_list tearing_controllers; // sway_tearing_controller::link
struct wlr_ext_workspace_manager_v1 *workspace_manager_v1;
struct wl_listener workspace_manager_v1_commit;
struct wl_list pending_launcher_ctxs; // launcher_ctx::link
// The timeout for transactions, after which a transaction is applied

3
include/sway/tree/container.h
View file

@ -93,8 +93,7 @@ struct sway_container {
struct wlr_scene_tree *content_tree;
struct wlr_scene_buffer *output_handler;
struct wl_listener output_enter;
struct wl_listener output_leave;
struct wl_listener outputs_update;
struct wl_listener output_handler_destroy;
struct sway_container_state current;

9
include/sway/tree/workspace.h
View file

@ -3,6 +3,7 @@
#include <stdbool.h>
#include <wlr/types/wlr_scene.h>
#include <wlr/types/wlr_ext_workspace_v1.h>
#include "sway/config.h"
#include "sway/tree/container.h"
#include "sway/tree/node.h"
@ -51,6 +52,7 @@ struct sway_workspace {
bool urgent;
struct sway_workspace_state current;
struct wlr_ext_workspace_handle_v1 *ext_workspace; // Always set.
};
struct workspace_config *workspace_find_config(const char *ws_name);
@ -157,4 +159,11 @@ size_t workspace_num_sticky_containers(struct sway_workspace *ws);
*/
void workspace_squash(struct sway_workspace *workspace);
void workspace_move_to_output(struct sway_workspace *workspace,
struct sway_output *output);
void sway_ext_workspace_init(void);
void sway_ext_workspace_output_enable(struct sway_output *output);
void sway_ext_workspace_output_disable(struct sway_output *output);
#endif