mirror of
https://github.com/swaywm/sway.git
synced 2026-02-23 01:40:27 -05:00
Merge branch 'master' into tray-dbus-menu
This commit is contained in:
commit
a262ad1fb6
19 changed files with 143 additions and 156 deletions
|
|
@ -43,7 +43,7 @@ struct sway_session_lock {
|
|||
struct sway_server {
|
||||
struct wl_display *wl_display;
|
||||
struct wl_event_loop *wl_event_loop;
|
||||
const char *socket;
|
||||
char *socket;
|
||||
|
||||
struct wlr_backend *backend;
|
||||
struct wlr_session *session;
|
||||
|
|
@ -133,7 +133,7 @@ struct sway_server {
|
|||
struct wl_listener xdg_activation_v1_new_token;
|
||||
|
||||
struct wl_listener request_set_cursor_shape;
|
||||
|
||||
|
||||
struct wlr_tearing_control_manager_v1 *tearing_control_v1;
|
||||
struct wl_listener tearing_control_new_object;
|
||||
struct wl_list tearing_controllers; // sway_tearing_controller::link
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue