From 7b530bf4487f36273938ffd7236dad8a7629790a Mon Sep 17 00:00:00 2001 From: Will McKinnon Date: Mon, 15 Aug 2022 00:54:07 -0400 Subject: Revert "merge sway master" This reverts commit 7460d9f565092836f81b917a040caff57142d91a. --- include/sway/config.h | 8 +------- include/sway/criteria.h | 7 +++---- include/sway/desktop.h | 2 +- include/sway/input/cursor.h | 6 ++---- include/sway/input/seat.h | 4 ++-- include/sway/input/text_input.h | 2 +- include/sway/layers.h | 2 +- include/sway/surface.h | 2 +- include/sway/tree/container.h | 4 ++-- include/sway/tree/view.h | 7 +++---- include/swaybar/bar.h | 1 + include/swaynag/swaynag.h | 2 +- 12 files changed, 19 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/sway/config.h b/include/sway/config.h index 538930f2..fda0e83f 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -70,18 +70,12 @@ struct sway_mouse_binding { char *command; }; -enum sway_switch_trigger { - SWAY_SWITCH_TRIGGER_OFF, - SWAY_SWITCH_TRIGGER_ON, - SWAY_SWITCH_TRIGGER_TOGGLE, -}; - /** * A laptop switch binding and an associated command. */ struct sway_switch_binding { enum wlr_switch_type type; - enum sway_switch_trigger trigger; + enum wlr_switch_state state; uint32_t flags; char *command; }; diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 59f57f94..ad8610cd 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h @@ -1,8 +1,7 @@ #ifndef _SWAY_CRITERIA_H #define _SWAY_CRITERIA_H -#define PCRE2_CODE_UNIT_WIDTH 8 -#include +#include #include "config.h" #include "list.h" #include "tree/view.h" @@ -16,13 +15,13 @@ enum criteria_type { }; enum pattern_type { - PATTERN_PCRE2, + PATTERN_PCRE, PATTERN_FOCUSED, }; struct pattern { enum pattern_type match_type; - pcre2_code *regex; + pcre *regex; }; struct criteria { diff --git a/include/sway/desktop.h b/include/sway/desktop.h index 7f2f5b3e..c969a76b 100644 --- a/include/sway/desktop.h +++ b/include/sway/desktop.h @@ -1,4 +1,4 @@ -#include +#include struct sway_container; struct sway_view; diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 3a71a35f..7d66e699 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "sway/input/seat.h" #include "config.h" @@ -42,8 +42,6 @@ struct sway_cursor { struct wl_listener swipe_begin; struct wl_listener swipe_update; struct wl_listener swipe_end; - struct wl_listener hold_begin; - struct wl_listener hold_end; struct wl_listener motion; struct wl_listener motion_absolute; @@ -112,7 +110,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, enum wlr_button_state state); void dispatch_cursor_axis(struct sway_cursor *cursor, - struct wlr_pointer_axis_event *event); + struct wlr_event_pointer_axis *event); void cursor_set_image(struct sway_cursor *cursor, const char *image, struct wl_client *client); diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 50c4be9b..77c2278d 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h @@ -18,7 +18,7 @@ struct sway_seatop_impl { enum wlr_button_state state); void (*pointer_motion)(struct sway_seat *seat, uint32_t time_msec); void (*pointer_axis)(struct sway_seat *seat, - struct wlr_pointer_axis_event *event); + struct wlr_event_pointer_axis *event); void (*rebase)(struct sway_seat *seat, uint32_t time_msec); void (*tablet_tool_motion)(struct sway_seat *seat, struct sway_tablet_tool *tool, uint32_t time_msec); @@ -274,7 +274,7 @@ void seatop_button(struct sway_seat *seat, uint32_t time_msec, void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec); void seatop_pointer_axis(struct sway_seat *seat, - struct wlr_pointer_axis_event *event); + struct wlr_event_pointer_axis *event); void seatop_tablet_tool_tip(struct sway_seat *seat, struct sway_tablet_tool *tool, uint32_t time_msec, diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h index c70fd935..37744266 100644 --- a/include/sway/input/text_input.h +++ b/include/sway/input/text_input.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include "sway/input/seat.h" /** diff --git a/include/sway/layers.h b/include/sway/layers.h index f8508493..14816861 100644 --- a/include/sway/layers.h +++ b/include/sway/layers.h @@ -1,7 +1,7 @@ #ifndef _SWAY_LAYERS_H #define _SWAY_LAYERS_H #include -#include +#include #include enum layer_parent { diff --git a/include/sway/surface.h b/include/sway/surface.h index fb1cd775..4da96c02 100644 --- a/include/sway/surface.h +++ b/include/sway/surface.h @@ -1,6 +1,6 @@ #ifndef _SWAY_SURFACE_H #define _SWAY_SURFACE_H -#include +#include struct sway_surface { struct wlr_surface *wlr_surface; diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 751612e2..05761150 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -2,7 +2,7 @@ #define _SWAY_CONTAINER_H #include #include -#include +#include #include "list.h" #include "sway/tree/node.h" @@ -364,7 +364,7 @@ bool container_is_sticky_or_child(struct sway_container *con); * This will destroy pairs of redundant H/V splits * e.g. H[V[H[app app]] app] -> H[app app app] * The middle "V[H[" are eliminated by a call to container_squash - * on the V[ con. It's grandchildren are added to its parent. + * on the V[ con. It's grandchildren are added to it's parent. * * This function is roughly equivalent to i3's tree_flatten here: * https://github.com/i3/i3/blob/1f0c628cde40cf87371481041b7197344e0417c6/src/tree.c#L651 diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 1fb39ce7..ee34af48 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -1,7 +1,7 @@ #ifndef _SWAY_VIEW_H #define _SWAY_VIEW_H #include -#include +#include #include "config.h" #if HAVE_XWAYLAND #include @@ -109,7 +109,7 @@ struct sway_view { list_t *executed_criteria; // struct criteria * union { - struct wlr_xdg_toplevel *wlr_xdg_toplevel; + struct wlr_xdg_surface *wlr_xdg_surface; #if HAVE_XWAYLAND struct wlr_xwayland_surface *wlr_xwayland_surface; #endif @@ -170,7 +170,6 @@ struct sway_xwayland_unmanaged { int lx, ly; - struct wl_listener request_activate; struct wl_listener request_configure; struct wl_listener request_fullscreen; struct wl_listener commit; @@ -218,7 +217,7 @@ struct sway_subsurface { struct sway_xdg_popup { struct sway_view_child child; - struct wlr_xdg_popup *wlr_xdg_popup; + struct wlr_xdg_surface *wlr_xdg_surface; struct wl_listener new_popup; struct wl_listener destroy; diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h index 3ad0bdf3..545a66a8 100644 --- a/include/swaybar/bar.h +++ b/include/swaybar/bar.h @@ -58,6 +58,7 @@ struct swaybar_output { struct zxdg_output_v1 *xdg_output; struct wl_surface *surface; struct zwlr_layer_surface_v1 *layer_surface; + struct wl_region *input_region; uint32_t wl_name; struct wl_list workspaces; // swaybar_workspace::link diff --git a/include/swaynag/swaynag.h b/include/swaynag/swaynag.h index 2d68b6c9..baa6ee8b 100644 --- a/include/swaynag/swaynag.h +++ b/include/swaynag/swaynag.h @@ -67,7 +67,7 @@ struct swaynag_details { int offset; int visible_lines; int total_lines; - struct swaynag_button button_details; + struct swaynag_button *button_details; struct swaynag_button button_up; struct swaynag_button button_down; }; -- cgit v1.2.3