From 7b530bf4487f36273938ffd7236dad8a7629790a Mon Sep 17 00:00:00 2001 From: Will McKinnon Date: Mon, 15 Aug 2022 00:54:07 -0400 Subject: [PATCH] Revert "merge sway master" This reverts commit 7460d9f565092836f81b917a040caff57142d91a. --- .builds/alpine.yml | 1 - .builds/archlinux.yml | 1 - .builds/freebsd.yml | 1 - completions/bash/sway | 2 +- completions/bash/swaybar | 2 +- completions/bash/swaymsg | 2 +- contrib/grimshot | 46 +++----- contrib/grimshot.1 | 13 +-- contrib/grimshot.1.scd | 7 +- 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 +- meson.build | 29 ++--- sway/commands/bind.c | 8 +- sway/commands/focus.c | 18 ++- sway/commands/input/xkb_switch_layout.c | 1 - sway/commands/move.c | 16 +-- sway/commands/output/background.c | 12 +- sway/commands/seat/cursor.c | 4 +- sway/config/output.c | 12 +- sway/criteria.c | 60 +++++----- sway/desktop/desktop.c | 9 +- sway/desktop/layer_shell.c | 54 +++++---- sway/desktop/output.c | 13 +-- sway/desktop/render.c | 2 +- sway/desktop/surface.c | 2 +- sway/desktop/xdg_shell.c | 120 ++++++++++--------- sway/desktop/xwayland.c | 30 +---- sway/input/cursor.c | 149 ++++++++++-------------- sway/input/input-manager.c | 4 +- sway/input/keyboard.c | 12 +- sway/input/seat.c | 33 ++---- sway/input/seatop_default.c | 8 +- sway/input/seatop_down.c | 4 +- sway/input/switch.c | 20 +--- sway/input/tablet.c | 6 +- sway/input/text_input.c | 2 + sway/ipc-json.c | 5 - sway/main.c | 58 ++++----- sway/meson.build | 3 +- sway/server.c | 7 +- sway/sway.5.scd | 10 +- sway/tree/arrange.c | 25 ++-- sway/tree/container.c | 26 ++--- sway/tree/output.c | 8 +- sway/tree/root.c | 2 +- sway/tree/view.c | 1 - swaybar/bar.c | 10 +- swaybar/render.c | 9 -- swaybar/tray/item.c | 5 - swaymsg/main.c | 82 +++---------- swaynag/config.c | 27 +---- swaynag/main.c | 52 +++++---- swaynag/swaynag.c | 27 ++--- 63 files changed, 463 insertions(+), 644 deletions(-) diff --git a/.builds/alpine.yml b/.builds/alpine.yml index df08a80f..456837df 100644 --- a/.builds/alpine.yml +++ b/.builds/alpine.yml @@ -12,7 +12,6 @@ packages: - mesa-dev - meson - pango-dev - - pcre2-dev - pixman-dev - scdoc - wayland-dev diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml index 594b4e0a..c79e3fe2 100644 --- a/.builds/archlinux.yml +++ b/.builds/archlinux.yml @@ -9,7 +9,6 @@ packages: - libxkbcommon - meson - pango - - pcre2 - scdoc - wayland - wayland-protocols diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 6ba95da9..5aa0e3dd 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -4,7 +4,6 @@ packages: - devel/json-c - devel/libevdev - devel/meson -- devel/pcre2 - devel/pkgconf - graphics/cairo - graphics/gdk-pixbuf2 diff --git a/completions/bash/sway b/completions/bash/sway index 01b20073..edd752cd 100644 --- a/completions/bash/sway +++ b/completions/bash/sway @@ -2,7 +2,7 @@ _sway() { - local cur prev short long + local cur prev _get_comp_words_by_ref cur prev short=( diff --git a/completions/bash/swaybar b/completions/bash/swaybar index 3709d4f9..1e085c65 100644 --- a/completions/bash/swaybar +++ b/completions/bash/swaybar @@ -2,7 +2,7 @@ _swaybar() { - local cur prev short long + local cur prev _get_comp_words_by_ref cur prev short=( diff --git a/completions/bash/swaymsg b/completions/bash/swaymsg index 30457751..f865e4e1 100644 --- a/completions/bash/swaymsg +++ b/completions/bash/swaymsg @@ -2,7 +2,7 @@ _swaymsg() { - local cur prev types short long + local cur prev _get_comp_words_by_ref cur prev types=( diff --git a/contrib/grimshot b/contrib/grimshot index d42fe9d8..4ce31f29 100755 --- a/contrib/grimshot +++ b/contrib/grimshot @@ -13,32 +13,18 @@ ## See `man 1 grimshot` or `grimshot usage` for further details. getTargetDirectory() { - test -f "${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs" && \ - . "${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs" + test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && \ + . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs - echo "${XDG_SCREENSHOTS_DIR:-${XDG_PICTURES_DIR:-$HOME}}" + echo ${XDG_SCREENSHOTS_DIR:-${XDG_PICTURES_DIR:-$HOME}} } -NOTIFY=no -CURSOR= - -while [ $# -gt 0 ]; do - key="$1" - - case $key in - -n|--notify) - NOTIFY=yes - shift # past argument - ;; - -c|--cursor) - CURSOR=yes - shift # past argument - ;; - *) # unknown option - break # done with parsing --flags - ;; - esac -done +if [ "$1" = "--notify" ]; then + NOTIFY=yes + shift 1 +else + NOTIFY=no +fi ACTION=${1:-usage} SUBJECT=${2:-screen} @@ -46,7 +32,7 @@ FILE=${3:-$(getTargetDirectory)/$(date -Ins).png} if [ "$ACTION" != "save" ] && [ "$ACTION" != "copy" ] && [ "$ACTION" != "check" ]; then echo "Usage:" - echo " grimshot [--notify] [--cursor] (copy|save) [active|screen|output|area|window] [FILE|-]" + echo " grimshot [--notify] (copy|save) [active|screen|output|area|window] [FILE|-]" echo " grimshot check" echo " grimshot usage" echo "" @@ -81,7 +67,7 @@ notifyError() { MESSAGE=${1:-"Error taking screenshot with grim"} notify -u critical "$TITLE" "$MESSAGE" else - echo "$1" + echo $1 fi } @@ -105,12 +91,12 @@ takeScreenshot() { FILE=$1 GEOM=$2 OUTPUT=$3 - if [ -n "$OUTPUT" ]; then - grim ${CURSOR:+-c} -o "$OUTPUT" "$FILE" || die "Unable to invoke grim" + if [ ! -z "$OUTPUT" ]; then + grim -o "$OUTPUT" "$FILE" || die "Unable to invoke grim" elif [ -z "$GEOM" ]; then - grim ${CURSOR:+-c} "$FILE" || die "Unable to invoke grim" + grim "$FILE" || die "Unable to invoke grim" else - grim ${CURSOR:+-c} -g "$GEOM" "$FILE" || die "Unable to invoke grim" + grim -g "$GEOM" "$FILE" || die "Unable to invoke grim" fi } @@ -161,7 +147,7 @@ else TITLE="Screenshot of $SUBJECT" MESSAGE=$(basename "$FILE") notifyOk "$MESSAGE" "$TITLE" - echo "$FILE" + echo $FILE else notifyError "Error taking screenshot with grim" fi diff --git a/contrib/grimshot.1 b/contrib/grimshot.1 index 2c4c6a95..e4baccfd 100644 --- a/contrib/grimshot.1 +++ b/contrib/grimshot.1 @@ -1,11 +1,11 @@ -.\" Generated by scdoc 1.11.2 +.\" Generated by scdoc 1.11.1 .\" Complete documentation for this program is not available as a GNU info page .ie \n(.g .ds Aq \(aq .el .ds Aq ' .nh .ad l .\" Begin generated content: -.TH "grimshot" "1" "2022-03-31" +.TH "grimshot" "1" "2021-02-23" .P .SH NAME .P @@ -13,7 +13,7 @@ grimshot - a helper for screenshots within sway .P .SH SYNOPSIS .P -\fBgrimshot\fR [--notify] [--cursor] (copy|save) [TARGET] [FILE] +\fBgrimshot\fR [--notify] (copy|save) [TARGET] [FILE] .br \fBgrimshot\fR check .br @@ -26,17 +26,12 @@ grimshot - a helper for screenshots within sway Show notifications to the user that a screenshot has been taken.\& .P .RE -\fB--cursor\fR -.RS 4 -Include cursors in the screenshot.\& -.P -.RE \fBsave\fR .RS 4 Save the screenshot into a regular file.\& Grimshot will write images files to \fBXDG_SCREENSHOTS_DIR\fR if this is set (or defined in \fBuser-dirs.\&dir\fR), or otherwise fall back to \fBXDG_PICTURES_DIR\fR.\& -Set FILE to '\&-'\& to pipe the output to STDOUT.\& +Set FILE to '-' to pipe the output to STDOUT.\& .P .RE \fBcopy\fR diff --git a/contrib/grimshot.1.scd b/contrib/grimshot.1.scd index e356f99d..d2a57759 100644 --- a/contrib/grimshot.1.scd +++ b/contrib/grimshot.1.scd @@ -6,7 +6,7 @@ grimshot - a helper for screenshots within sway # SYNOPSIS -*grimshot* [--notify] [--cursor] (copy|save) [TARGET] [FILE]++ +*grimshot* [--notify] (copy|save) [TARGET] [FILE]++ *grimshot* check++ *grimshot* usage @@ -15,11 +15,8 @@ grimshot - a helper for screenshots within sway *--notify* Show notifications to the user that a screenshot has been taken. -*--cursor* - Include cursors in the screenshot. - *save* - Save the screenshot into a regular file. Grimshot will write image + Save the screenshot into a regular file. Grimshot will write images files to *XDG_SCREENSHOTS_DIR* if this is set (or defined in *user-dirs.dir*), or otherwise fall back to *XDG_PICTURES_DIR*. Set FILE to '-' to pipe the output to STDOUT. 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; }; diff --git a/meson.build b/meson.build index 46352da5..5e4de87f 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'sway', 'c', - version: '1.8-dev', + version: '1.7', license: 'MIT', meson_version: '>=0.60.0', default_options: [ @@ -35,23 +35,13 @@ if is_freebsd add_project_arguments('-D_C11_SOURCE', language: 'c') endif -# Execute the wlroots subproject, if any -wlroots_version = ['>=0.16.0', '<0.17.0'] -subproject( - 'wlroots', - default_options: ['examples=false'], - required: false, - version: wlroots_version, -) - jsonc = dependency('json-c', version: '>=0.13') -pcre2 = dependency('libpcre2-8') +pcre = dependency('libpcre') wayland_server = dependency('wayland-server', version: '>=1.20.0') wayland_client = dependency('wayland-client') wayland_cursor = dependency('wayland-cursor') wayland_egl = dependency('wayland-egl') wayland_protos = dependency('wayland-protocols', version: '>=1.24') -wlroots = dependency('wlroots', version: wlroots_version) xkbcommon = dependency('xkbcommon') cairo = dependency('cairo') pango = dependency('pango') @@ -69,7 +59,20 @@ bash_comp = dependency('bash-completion', required: false) fish_comp = dependency('fish', required: false) math = cc.find_library('m') rt = cc.find_library('rt') -xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland')) + +# Try first to find wlroots as a subproject, then as a system dependency +wlroots_version = ['>=0.15.0', '<0.16.0'] +wlroots_proj = subproject( + 'wlroots', + default_options: ['examples=false'], + required: false, + version: wlroots_version, +) +if wlroots_proj.found() + wlroots = wlroots_proj.get_variable('wlroots') +else + wlroots = dependency('wlroots', version: wlroots_version) +endif wlroots_features = { 'xwayland': false, diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 26c99e63..25be415e 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -47,7 +47,7 @@ static bool binding_switch_compare(struct sway_switch_binding *binding_a, if (binding_a->type != binding_b->type) { return false; } - if (binding_a->trigger != binding_b->trigger) { + if (binding_a->state != binding_b->state) { return false; } if ((binding_a->flags & BINDING_LOCKED) != @@ -551,11 +551,11 @@ struct cmd_results *cmd_bind_or_unbind_switch(int argc, char **argv, "unknown switch %s)", bindtype, split->items[0]); } if (strcmp(split->items[1], "on") == 0) { - binding->trigger = SWAY_SWITCH_TRIGGER_ON; + binding->state = WLR_SWITCH_STATE_ON; } else if (strcmp(split->items[1], "off") == 0) { - binding->trigger = SWAY_SWITCH_TRIGGER_OFF; + binding->state = WLR_SWITCH_STATE_OFF; } else if (strcmp(split->items[1], "toggle") == 0) { - binding->trigger = SWAY_SWITCH_TRIGGER_TOGGLE; + binding->state = WLR_SWITCH_STATE_TOGGLE; } else { free_switch_binding(binding); return cmd_results_new(CMD_FAILURE, diff --git a/sway/commands/focus.c b/sway/commands/focus.c index facd82de..b8d28480 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -54,7 +54,7 @@ static bool get_direction_from_next_prev(struct sway_container *container, } else { return false; } - + return true; } @@ -285,7 +285,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws, } } else { return cmd_results_new(CMD_FAILURE, - "Failed to find a %s container in workspace.", + "Failed to find a %s container in workspace", floating ? "floating" : "tiling"); } return cmd_results_new(CMD_SUCCESS, NULL); @@ -295,7 +295,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat, int argc, char **argv) { if (!argc) { return cmd_results_new(CMD_INVALID, - "Expected 'focus output '."); + "Expected 'focus output '"); } char *identifier = join_args(argv, argc); struct sway_output *output = output_by_name_or_id(identifier); @@ -305,13 +305,13 @@ static struct cmd_results *focus_output(struct sway_seat *seat, if (!parse_direction(identifier, &direction)) { free(identifier); return cmd_results_new(CMD_INVALID, - "There is no output with that name."); + "There is no output with that name"); } struct sway_workspace *ws = seat_get_focused_workspace(seat); if (!ws) { free(identifier); return cmd_results_new(CMD_FAILURE, - "No focused workspace to base directions off of."); + "No focused workspace to base directions off of"); } output = output_get_in_direction(ws->output, direction); @@ -375,14 +375,10 @@ struct cmd_results *cmd_focus(int argc, char **argv) { struct sway_seat *seat = config->handler_context.seat; if (node->type < N_WORKSPACE) { return cmd_results_new(CMD_FAILURE, - "Command 'focus' cannot be used above the workspace level."); + "Command 'focus' cannot be used above the workspace level"); } - if (argc == 0) { - if (!container) { - return cmd_results_new(CMD_FAILURE, "No container to focus was specified."); - } - + if (argc == 0 && container) { if (container_is_scratchpad_hidden_or_child(container)) { root_scratchpad_show(container); } diff --git a/sway/commands/input/xkb_switch_layout.c b/sway/commands/input/xkb_switch_layout.c index 3be37daf..d6548a68 100644 --- a/sway/commands/input/xkb_switch_layout.c +++ b/sway/commands/input/xkb_switch_layout.c @@ -1,6 +1,5 @@ #define _POSIX_C_SOURCE 200809L #include -#include #include "sway/config.h" #include "sway/commands.h" #include "sway/input/input-manager.h" diff --git a/sway/commands/move.c b/sway/commands/move.c index 0d0d9727..1a05a7a6 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -788,15 +788,15 @@ static struct cmd_results *cmd_move_to_position_pointer( struct wlr_output *output = wlr_output_layout_output_at( root->output_layout, cursor->x, cursor->y); if (output) { - struct wlr_box box; - wlr_output_layout_get_box(root->output_layout, output, &box); - lx = fmax(lx, box.x); - ly = fmax(ly, box.y); - if (lx + container->pending.width > box.x + box.width) { - lx = box.x + box.width - container->pending.width; + struct wlr_box *box = + wlr_output_layout_get_box(root->output_layout, output); + lx = fmax(lx, box->x); + ly = fmax(ly, box->y); + if (lx + container->pending.width > box->x + box->width) { + lx = box->x + box->width - container->pending.width; } - if (ly + container->pending.height > box.y + box.height) { - ly = box.y + box.height - container->pending.height; + if (ly + container->pending.height > box->y + box->height) { + ly = box->y + box->height - container->pending.height; } } diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 67f212ff..68ee9fe1 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -102,19 +102,19 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { } char *conf_path = dirname(conf); - char *real_src = malloc(strlen(conf_path) + strlen(src) + 2); - if (!real_src) { - free(src); + char *rel_path = src; + src = malloc(strlen(conf_path) + strlen(src) + 2); + if (!src) { + free(rel_path); free(conf); sway_log(SWAY_ERROR, "Unable to allocate memory"); return cmd_results_new(CMD_FAILURE, "Unable to allocate resources"); } - snprintf(real_src, strlen(conf_path) + strlen(src) + 2, "%s/%s", conf_path, src); - free(src); + sprintf(src, "%s/%s", conf_path, rel_path); + free(rel_path); free(conf); - src = real_src; } bool can_access = access(src, F_OK) != -1; diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c index 504a9f5e..749235eb 100644 --- a/sway/commands/seat/cursor.c +++ b/sway/commands/seat/cursor.c @@ -111,8 +111,8 @@ static struct cmd_results *press_or_release(struct sway_cursor *cursor, : WLR_AXIS_ORIENTATION_HORIZONTAL; double delta = (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT) ? -1 : 1; - struct wlr_pointer_axis_event event = { - .pointer = NULL, + struct wlr_event_pointer_axis event = { + .device = NULL, .time_msec = 0, .source = WLR_AXIS_SOURCE_WHEEL, .orientation = orientation, diff --git a/sway/config/output.c b/sway/config/output.c index 88514ac0..fa509252 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -546,12 +546,12 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) { } // Update output->{lx, ly, width, height} - struct wlr_box output_box; - wlr_output_layout_get_box(root->output_layout, wlr_output, &output_box); - output->lx = output_box.x; - output->ly = output_box.y; - output->width = output_box.width; - output->height = output_box.height; + struct wlr_box *output_box = + wlr_output_layout_get_box(root->output_layout, wlr_output); + output->lx = output_box->x; + output->ly = output_box->y; + output->width = output_box->width; + output->height = output_box->height; if (!output->enabled) { output_enable(output); diff --git a/sway/criteria.c b/sway/criteria.c index 94751c5f..d2a5566f 100644 --- a/sway/criteria.c +++ b/sway/criteria.c @@ -3,8 +3,7 @@ #include #include #include -#define PCRE2_CODE_UNIT_WIDTH 8 -#include +#include #include "sway/criteria.h" #include "sway/tree/container.h" #include "sway/config.h" @@ -41,19 +40,17 @@ bool criteria_is_empty(struct criteria *criteria) { char *error = NULL; // Returns error string on failure or NULL otherwise. -static bool generate_regex(pcre2_code **regex, char *value) { - int errorcode; - PCRE2_SIZE offset; +static bool generate_regex(pcre **regex, char *value) { + const char *reg_err; + int offset; + + *regex = pcre_compile(value, PCRE_UTF8 | PCRE_UCP, ®_err, &offset, NULL); - *regex = pcre2_compile((PCRE2_SPTR)value, PCRE2_ZERO_TERMINATED, PCRE2_UTF | PCRE2_UCP, &errorcode, &offset, NULL); if (!*regex) { - PCRE2_UCHAR buffer[256]; - pcre2_get_error_message(errorcode, buffer, sizeof(buffer)); - const char *fmt = "Regex compilation for '%s' failed: %s"; - int len = strlen(fmt) + strlen(value) + strlen((char*) buffer) - 3; + int len = strlen(fmt) + strlen(value) + strlen(reg_err) - 3; error = malloc(len); - snprintf(error, len, fmt, value, buffer); + snprintf(error, len, fmt, value, reg_err); return false; } @@ -69,7 +66,7 @@ static bool pattern_create(struct pattern **pattern, char *value) { if (strcmp(value, "__focused__") == 0) { (*pattern)->match_type = PATTERN_FOCUSED; } else { - (*pattern)->match_type = PATTERN_PCRE2; + (*pattern)->match_type = PATTERN_PCRE; if (!generate_regex(&(*pattern)->regex, value)) { return false; }; @@ -80,7 +77,7 @@ static bool pattern_create(struct pattern **pattern, char *value) { static void pattern_destroy(struct pattern *pattern) { if (pattern) { if (pattern->regex) { - pcre2_code_free(pattern->regex); + pcre_free(pattern->regex); } free(pattern); } @@ -102,11 +99,8 @@ void criteria_destroy(struct criteria *criteria) { free(criteria); } -static int regex_cmp(const char *item, const pcre2_code *regex) { - pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(regex, NULL); - int result = pcre2_match(regex, (PCRE2_SPTR)item, strlen(item), 0, 0, match_data, NULL); - pcre2_match_data_free(match_data); - return result; +static int regex_cmp(const char *item, const pcre *regex) { + return pcre_exec(regex, NULL, item, strlen(item), 0, 0, NULL, 0); } #if HAVE_XWAYLAND @@ -161,7 +155,7 @@ static bool criteria_matches_container(struct criteria *criteria, bool exists = false; struct sway_container *con = container; for (int i = 0; i < con->marks->length; ++i) { - if (regex_cmp(con->marks->items[i], criteria->con_mark->regex) >= 0) { + if (regex_cmp(con->marks->items[i], criteria->con_mark->regex) == 0) { exists = true; break; } @@ -198,8 +192,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(title, criteria->title->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(title, criteria->title->regex) != 0) { return false; } break; @@ -218,8 +212,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(shell, criteria->shell->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(shell, criteria->shell->regex) != 0) { return false; } break; @@ -238,8 +232,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(app_id, criteria->app_id->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(app_id, criteria->app_id->regex) != 0) { return false; } break; @@ -270,8 +264,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(class, criteria->class->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(class, criteria->class->regex) != 0) { return false; } break; @@ -290,8 +284,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(instance, criteria->instance->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(instance, criteria->instance->regex) != 0) { return false; } break; @@ -310,8 +304,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(window_role, criteria->window_role->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(window_role, criteria->window_role->regex) != 0) { return false; } break; @@ -369,8 +363,8 @@ static bool criteria_matches_view(struct criteria *criteria, return false; } break; - case PATTERN_PCRE2: - if (regex_cmp(ws->name, criteria->workspace->regex) < 0) { + case PATTERN_PCRE: + if (regex_cmp(ws->name, criteria->workspace->regex) != 0) { return false; } break; diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c index c8d4502c..ec45d80a 100644 --- a/sway/desktop/desktop.c +++ b/sway/desktop/desktop.c @@ -6,11 +6,10 @@ void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly, bool whole) { for (int i = 0; i < root->outputs->length; ++i) { struct sway_output *output = root->outputs->items[i]; - struct wlr_box output_box; - wlr_output_layout_get_box(root->output_layout, - output->wlr_output, &output_box); - output_damage_surface(output, lx - output_box.x, - ly - output_box.y, surface, whole); + struct wlr_box *output_box = wlr_output_layout_get_box( + root->output_layout, output->wlr_output); + output_damage_surface(output, lx - output_box->x, + ly - output_box->y, surface, whole); } } diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 159f3336..27e457f1 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -5,7 +5,6 @@ #include #include #include -#include #include "log.h" #include "sway/desktop/transaction.h" #include "sway/input/cursor.h" @@ -271,6 +270,10 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) { wl_resource_get_client(sway_layer->layer_surface->resource); bool set_focus = seat->exclusive_client == client; + wl_list_remove(&sway_layer->output_destroy.link); + wl_list_remove(&sway_layer->link); + wl_list_init(&sway_layer->link); + if (set_focus) { struct sway_layer_surface *layer = find_mapped_layer_by_client(client, sway_layer->layer_surface->output); @@ -279,6 +282,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) { } } + sway_layer->layer_surface->output = NULL; wlr_layer_surface_v1_destroy(sway_layer->layer_surface); } @@ -287,7 +291,10 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) { wl_container_of(listener, layer, surface_commit); struct wlr_layer_surface_v1 *layer_surface = layer->layer_surface; struct wlr_output *wlr_output = layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); + if (wlr_output == NULL) { + return; + } + struct sway_output *output = wlr_output->data; struct wlr_box old_extent = layer->extent; @@ -334,8 +341,13 @@ static void unmap(struct sway_layer_surface *sway_layer) { cursor_rebase_all(); struct wlr_output *wlr_output = sway_layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); + if (wlr_output == NULL) { + return; + } struct sway_output *output = wlr_output->data; + if (output == NULL) { + return; + } output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, sway_layer->layer_surface->surface, true); } @@ -363,24 +375,22 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&sway_layer->surface_commit.link); wl_list_remove(&sway_layer->new_popup.link); wl_list_remove(&sway_layer->new_subsurface.link); - - struct wlr_output *wlr_output = sway_layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); - struct sway_output *output = wlr_output->data; - arrange_layers(output); - transaction_commit_dirty(); - wl_list_remove(&sway_layer->output_destroy.link); - sway_layer->layer_surface->output = NULL; - + if (sway_layer->layer_surface->output != NULL) { + struct sway_output *output = sway_layer->layer_surface->output->data; + if (output != NULL) { + arrange_layers(output); + transaction_commit_dirty(); + } + wl_list_remove(&sway_layer->output_destroy.link); + sway_layer->layer_surface->output = NULL; + } free(sway_layer); } static void handle_map(struct wl_listener *listener, void *data) { struct sway_layer_surface *sway_layer = wl_container_of(listener, sway_layer, map); - struct wlr_output *wlr_output = sway_layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); - struct sway_output *output = wlr_output->data; + struct sway_output *output = sway_layer->layer_surface->output->data; output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y, sway_layer->layer_surface->surface, true); wlr_surface_send_enter(sway_layer->layer_surface->surface, @@ -398,7 +408,9 @@ static void subsurface_damage(struct sway_layer_subsurface *subsurface, bool whole) { struct sway_layer_surface *layer = subsurface->layer_surface; struct wlr_output *wlr_output = layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); + if (!wlr_output) { + return; + } struct sway_output *output = wlr_output->data; int ox = subsurface->wlr_subsurface->current.x + layer->geo.x; int oy = subsurface->wlr_subsurface->current.y + layer->geo.y; @@ -501,7 +513,6 @@ static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) { } } struct wlr_output *wlr_output = layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); struct sway_output *output = wlr_output->data; output_damage_surface(output, ox, oy, surface, whole); } @@ -510,7 +521,6 @@ static void popup_handle_map(struct wl_listener *listener, void *data) { struct sway_layer_popup *popup = wl_container_of(listener, popup, map); struct sway_layer_surface *layer = popup_get_layer(popup); struct wlr_output *wlr_output = layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); wlr_surface_send_enter(popup->wlr_popup->base->surface, wlr_output); popup_damage(popup, true); } @@ -540,9 +550,7 @@ static void popup_unconstrain(struct sway_layer_popup *popup) { struct sway_layer_surface *layer = popup_get_layer(popup); struct wlr_xdg_popup *wlr_popup = popup->wlr_popup; - struct wlr_output *wlr_output = layer->layer_surface->output; - sway_assert(wlr_output, "wlr_layer_surface_v1 has null output"); - struct sway_output *output = wlr_output->data; + struct sway_output *output = layer->layer_surface->output->data; // the output box expressed in the coordinate system of the toplevel parent // of the popup @@ -634,10 +642,6 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) { sway_log(SWAY_ERROR, "no output to auto-assign layer surface '%s' to", layer_surface->namespace); - // Note that layer_surface->output can be NULL - // here, but none of our destroy callbacks are - // registered yet so we don't have to make them - // handle that case. wlr_layer_surface_v1_destroy(layer_surface); return; } diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ab60bd71..107e5080 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include "config.h" #include "log.h" @@ -738,15 +738,14 @@ static void update_output_manager_config(struct sway_server *server) { } struct wlr_output_configuration_head_v1 *config_head = wlr_output_configuration_head_v1_create(config, output->wlr_output); - struct wlr_box output_box; - wlr_output_layout_get_box(root->output_layout, - output->wlr_output, &output_box); + struct wlr_box *output_box = wlr_output_layout_get_box( + root->output_layout, output->wlr_output); // We mark the output enabled even if it is switched off by DPMS config_head->state.enabled = output->current_mode != NULL && output->enabled; config_head->state.mode = output->current_mode; - if (!wlr_box_empty(&output_box)) { - config_head->state.x = output_box.x; - config_head->state.y = output_box.y; + if (output_box) { + config_head->state.x = output_box->x; + config_head->state.y = output_box->y; } } diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 5559b0d8..94ccff42 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include "log.h" #include "config.h" diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c index 1d7b536d..767b2045 100644 --- a/sway/desktop/surface.c +++ b/sway/desktop/surface.c @@ -1,7 +1,7 @@ #define _POSIX_C_SOURCE 200112L #include #include -#include +#include #include "sway/server.h" #include "sway/surface.h" diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index 51168f4c..5fae8296 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -24,11 +24,11 @@ static const struct sway_view_child_impl popup_impl; static void popup_get_view_coords(struct sway_view_child *child, int *sx, int *sy) { struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child; - struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup; + struct wlr_xdg_surface *surface = popup->wlr_xdg_surface; - wlr_xdg_popup_get_toplevel_coords(wlr_popup, - wlr_popup->geometry.x - wlr_popup->base->current.geometry.x, - wlr_popup->geometry.y - wlr_popup->base->current.geometry.y, + wlr_xdg_popup_get_toplevel_coords(surface->popup, + surface->popup->geometry.x - surface->current.geometry.x, + surface->popup->geometry.y - surface->current.geometry.y, sx, sy); } @@ -65,7 +65,7 @@ static void popup_handle_destroy(struct wl_listener *listener, void *data) { static void popup_unconstrain(struct sway_xdg_popup *popup) { struct sway_view *view = popup->child.view; - struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup; + struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_surface->popup; struct sway_output *output = view->container->pending.workspace->output; @@ -91,7 +91,7 @@ static struct sway_xdg_popup *popup_create( return NULL; } view_child_init(&popup->child, &popup_impl, view, xdg_surface->surface); - popup->wlr_xdg_popup = xdg_surface->popup; + popup->wlr_xdg_surface = xdg_surface; wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup); popup->new_popup.notify = popup_handle_new_popup; @@ -119,7 +119,7 @@ static struct sway_xdg_shell_view *xdg_shell_view_from_view( static void get_constraints(struct sway_view *view, double *min_width, double *max_width, double *min_height, double *max_height) { struct wlr_xdg_toplevel_state *state = - &view->wlr_xdg_toplevel->current; + &view->wlr_xdg_surface->toplevel->current; *min_width = state->min_width > 0 ? state->min_width : DBL_MIN; *max_width = state->max_width > 0 ? state->max_width : DBL_MAX; *min_height = state->min_height > 0 ? state->min_height : DBL_MIN; @@ -133,9 +133,9 @@ static const char *get_string_prop(struct sway_view *view, } switch (prop) { case VIEW_PROP_TITLE: - return view->wlr_xdg_toplevel->title; + return view->wlr_xdg_surface->toplevel->title; case VIEW_PROP_APP_ID: - return view->wlr_xdg_toplevel->app_id; + return view->wlr_xdg_surface->toplevel->app_id; default: return NULL; } @@ -148,45 +148,50 @@ static uint32_t configure(struct sway_view *view, double lx, double ly, if (xdg_shell_view == NULL) { return 0; } - return wlr_xdg_toplevel_set_size(view->wlr_xdg_toplevel, - width, height); + return wlr_xdg_toplevel_set_size(view->wlr_xdg_surface, width, height); } static void set_activated(struct sway_view *view, bool activated) { if (xdg_shell_view_from_view(view) == NULL) { return; } - wlr_xdg_toplevel_set_activated(view->wlr_xdg_toplevel, activated); + struct wlr_xdg_surface *surface = view->wlr_xdg_surface; + if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) { + wlr_xdg_toplevel_set_activated(surface, activated); + } } static void set_tiled(struct sway_view *view, bool tiled) { if (xdg_shell_view_from_view(view) == NULL) { return; } + struct wlr_xdg_surface *surface = view->wlr_xdg_surface; enum wlr_edges edges = WLR_EDGE_NONE; if (tiled) { edges = WLR_EDGE_LEFT | WLR_EDGE_RIGHT | WLR_EDGE_TOP | WLR_EDGE_BOTTOM; } - wlr_xdg_toplevel_set_tiled(view->wlr_xdg_toplevel, edges); + wlr_xdg_toplevel_set_tiled(surface, edges); } static void set_fullscreen(struct sway_view *view, bool fullscreen) { if (xdg_shell_view_from_view(view) == NULL) { return; } - wlr_xdg_toplevel_set_fullscreen(view->wlr_xdg_toplevel, fullscreen); + struct wlr_xdg_surface *surface = view->wlr_xdg_surface; + wlr_xdg_toplevel_set_fullscreen(surface, fullscreen); } static void set_resizing(struct sway_view *view, bool resizing) { if (xdg_shell_view_from_view(view) == NULL) { return; } - wlr_xdg_toplevel_set_resizing(view->wlr_xdg_toplevel, resizing); + struct wlr_xdg_surface *surface = view->wlr_xdg_surface; + wlr_xdg_toplevel_set_resizing(surface, resizing); } static bool wants_floating(struct sway_view *view) { - struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_toplevel; + struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_surface->toplevel; struct wlr_xdg_toplevel_state *state = &toplevel->current; return (state->min_width != 0 && state->min_height != 0 && (state->min_width == state->max_width @@ -199,7 +204,7 @@ static void for_each_surface(struct sway_view *view, if (xdg_shell_view_from_view(view) == NULL) { return; } - wlr_xdg_surface_for_each_surface(view->wlr_xdg_toplevel->base, iterator, + wlr_xdg_surface_for_each_surface(view->wlr_xdg_surface, iterator, user_data); } @@ -208,8 +213,8 @@ static void for_each_popup_surface(struct sway_view *view, if (xdg_shell_view_from_view(view) == NULL) { return; } - wlr_xdg_surface_for_each_popup_surface(view->wlr_xdg_toplevel->base, - iterator, user_data); + wlr_xdg_surface_for_each_popup_surface(view->wlr_xdg_surface, iterator, + user_data); } static bool is_transient_for(struct sway_view *child, @@ -217,12 +222,12 @@ static bool is_transient_for(struct sway_view *child, if (xdg_shell_view_from_view(child) == NULL) { return false; } - struct wlr_xdg_toplevel *toplevel = child->wlr_xdg_toplevel; - while (toplevel) { - if (toplevel->parent == ancestor->wlr_xdg_toplevel) { + struct wlr_xdg_surface *surface = child->wlr_xdg_surface; + while (surface && surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) { + if (surface->toplevel->parent == ancestor->wlr_xdg_surface) { return true; } - toplevel = toplevel->parent; + surface = surface->toplevel->parent; } return false; } @@ -231,13 +236,17 @@ static void _close(struct sway_view *view) { if (xdg_shell_view_from_view(view) == NULL) { return; } - wlr_xdg_toplevel_send_close(view->wlr_xdg_toplevel); + struct wlr_xdg_surface *surface = view->wlr_xdg_surface; + if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL + && surface->toplevel) { + wlr_xdg_toplevel_send_close(surface); + } } static void close_popups(struct sway_view *view) { struct wlr_xdg_popup *popup, *tmp; - wl_list_for_each_safe(popup, tmp, &view->wlr_xdg_toplevel->base->popups, link) { - wlr_xdg_popup_destroy(popup); + wl_list_for_each_safe(popup, tmp, &view->wlr_xdg_surface->popups, link) { + wlr_xdg_popup_destroy(popup->base); } } @@ -271,7 +280,7 @@ static void handle_commit(struct wl_listener *listener, void *data) { struct sway_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, commit); struct sway_view *view = &xdg_shell_view->view; - struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_toplevel->base; + struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface; struct wlr_box new_geo; wlr_xdg_surface_get_geometry(xdg_surface, &new_geo); @@ -328,17 +337,23 @@ static void handle_new_popup(struct wl_listener *listener, void *data) { static void handle_request_fullscreen(struct wl_listener *listener, void *data) { struct sway_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, request_fullscreen); - struct wlr_xdg_toplevel *toplevel = xdg_shell_view->view.wlr_xdg_toplevel; + struct wlr_xdg_toplevel_set_fullscreen_event *e = data; + struct wlr_xdg_surface *xdg_surface = + xdg_shell_view->view.wlr_xdg_surface; struct sway_view *view = &xdg_shell_view->view; - if (!toplevel->base->mapped) { + if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL, + "xdg_shell requested fullscreen of surface with role %i", + xdg_surface->role)) { + return; + } + if (!xdg_surface->mapped) { return; } struct sway_container *container = view->container; - struct wlr_xdg_toplevel_requested *req = &toplevel->requested; - if (req->fullscreen && req->fullscreen_output && req->fullscreen_output->data) { - struct sway_output *output = req->fullscreen_output->data; + if (e->fullscreen && e->output && e->output->data) { + struct sway_output *output = e->output->data; struct sway_workspace *ws = output_get_active_workspace(output); if (ws && !container_is_scratchpad_hidden(container) && container->pending.workspace != ws) { @@ -350,7 +365,7 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data) } } - container_set_fullscreen(container, req->fullscreen); + container_set_fullscreen(container, e->fullscreen); arrange_root(); transaction_commit_dirty(); @@ -360,8 +375,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) { struct sway_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, request_move); struct sway_view *view = &xdg_shell_view->view; - if (!container_is_floating(view->container) || - view->container->pending.fullscreen_mode) { + if (!container_is_floating(view->container)) { return; } struct wlr_xdg_toplevel_move_event *e = data; @@ -409,13 +423,13 @@ static void handle_map(struct wl_listener *listener, void *data) { struct sway_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, map); struct sway_view *view = &xdg_shell_view->view; - struct wlr_xdg_toplevel *toplevel = view->wlr_xdg_toplevel; + struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface; - view->natural_width = toplevel->base->current.geometry.width; - view->natural_height = toplevel->base->current.geometry.height; + view->natural_width = view->wlr_xdg_surface->current.geometry.width; + view->natural_height = view->wlr_xdg_surface->current.geometry.height; if (!view->natural_width && !view->natural_height) { - view->natural_width = toplevel->base->surface->current.width; - view->natural_height = toplevel->base->surface->current.height; + view->natural_width = view->wlr_xdg_surface->surface->current.width; + view->natural_height = view->wlr_xdg_surface->surface->current.height; } bool csd = false; @@ -426,44 +440,44 @@ static void handle_map(struct wl_listener *listener, void *data) { csd = mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE; } else { struct sway_server_decoration *deco = - decoration_from_surface(toplevel->base->surface); + decoration_from_surface(xdg_surface->surface); csd = !deco || deco->wlr_server_decoration->mode == WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; } - view_map(view, toplevel->base->surface, - toplevel->requested.fullscreen, - toplevel->requested.fullscreen_output, + view_map(view, view->wlr_xdg_surface->surface, + xdg_surface->toplevel->requested.fullscreen, + xdg_surface->toplevel->requested.fullscreen_output, csd); transaction_commit_dirty(); xdg_shell_view->commit.notify = handle_commit; - wl_signal_add(&toplevel->base->surface->events.commit, + wl_signal_add(&xdg_surface->surface->events.commit, &xdg_shell_view->commit); xdg_shell_view->new_popup.notify = handle_new_popup; - wl_signal_add(&toplevel->base->events.new_popup, + wl_signal_add(&xdg_surface->events.new_popup, &xdg_shell_view->new_popup); xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen; - wl_signal_add(&toplevel->events.request_fullscreen, + wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen, &xdg_shell_view->request_fullscreen); xdg_shell_view->request_move.notify = handle_request_move; - wl_signal_add(&toplevel->events.request_move, + wl_signal_add(&xdg_surface->toplevel->events.request_move, &xdg_shell_view->request_move); xdg_shell_view->request_resize.notify = handle_request_resize; - wl_signal_add(&toplevel->events.request_resize, + wl_signal_add(&xdg_surface->toplevel->events.request_resize, &xdg_shell_view->request_resize); xdg_shell_view->set_title.notify = handle_set_title; - wl_signal_add(&toplevel->events.set_title, + wl_signal_add(&xdg_surface->toplevel->events.set_title, &xdg_shell_view->set_title); xdg_shell_view->set_app_id.notify = handle_set_app_id; - wl_signal_add(&toplevel->events.set_app_id, + wl_signal_add(&xdg_surface->toplevel->events.set_app_id, &xdg_shell_view->set_app_id); } @@ -477,7 +491,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&xdg_shell_view->destroy.link); wl_list_remove(&xdg_shell_view->map.link); wl_list_remove(&xdg_shell_view->unmap.link); - view->wlr_xdg_toplevel = NULL; + view->wlr_xdg_surface = NULL; if (view->xdg_decoration) { view->xdg_decoration->view = NULL; } @@ -508,7 +522,7 @@ void handle_xdg_shell_surface(struct wl_listener *listener, void *data) { } view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl); - xdg_shell_view->view.wlr_xdg_toplevel = xdg_surface->toplevel; + xdg_shell_view->view.wlr_xdg_surface = xdg_surface; xdg_shell_view->map.notify = handle_map; wl_signal_add(&xdg_surface->events.map, &xdg_shell_view->map); diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 7c5dde53..40288f97 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "log.h" #include "sway/desktop.h" #include "sway/desktop/transaction.h" @@ -122,20 +121,6 @@ static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) { } } -static void unmanaged_handle_request_activate(struct wl_listener *listener, void *data) { - struct wlr_xwayland_surface *xsurface = data; - if (!xsurface->mapped) { - return; - } - struct sway_seat *seat = input_manager_current_seat(); - struct sway_container *focus = seat_get_focused_container(seat); - if (focus && focus->view && focus->view->pid != xsurface->pid) { - return; - } - - seat_set_focus_surface(seat, xsurface->surface, false); -} - static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { struct sway_xwayland_unmanaged *surface = wl_container_of(listener, surface, destroy); @@ -144,7 +129,6 @@ static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&surface->unmap.link); wl_list_remove(&surface->destroy.link); wl_list_remove(&surface->override_redirect.link); - wl_list_remove(&surface->request_activate.link); free(surface); } @@ -192,8 +176,6 @@ static struct sway_xwayland_unmanaged *create_unmanaged( surface->destroy.notify = unmanaged_handle_destroy; wl_signal_add(&xsurface->events.set_override_redirect, &surface->override_redirect); surface->override_redirect.notify = unmanaged_handle_override_redirect; - wl_signal_add(&xsurface->events.request_activate, &surface->request_activate); - surface->request_activate.notify = unmanaged_handle_request_activate; return surface; } @@ -312,7 +294,7 @@ static bool wants_floating(struct sway_view *view) { } } - xcb_size_hints_t *size_hints = surface->size_hints; + struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; if (size_hints != NULL && size_hints->min_width > 0 && size_hints->min_height > 0 && (size_hints->max_width == size_hints->min_width || @@ -366,7 +348,7 @@ static void destroy(struct sway_view *view) { static void get_constraints(struct sway_view *view, double *min_width, double *max_width, double *min_height, double *max_height) { struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface; - xcb_size_hints_t *size_hints = surface->size_hints; + struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints; if (size_hints == NULL) { *min_width = DBL_MIN; @@ -595,8 +577,7 @@ static void handle_request_move(struct wl_listener *listener, void *data) { if (!xsurface->mapped) { return; } - if (!container_is_floating(view->container) || - view->container->pending.fullscreen_mode) { + if (!container_is_floating(view->container)) { return; } struct sway_seat *seat = input_manager_current_seat(); @@ -685,15 +666,14 @@ static void handle_set_hints(struct wl_listener *listener, void *data) { if (!xsurface->mapped) { return; } - const bool hints_urgency = xcb_icccm_wm_hints_get_urgency(xsurface->hints); - if (!hints_urgency && view->urgent_timer) { + if (!xsurface->hints_urgency && view->urgent_timer) { // The view is in the timeout period. We'll ignore the request to // unset urgency so that the view remains urgent until the timer clears // it. return; } if (view->allow_request_urgent) { - view_set_urgent(view, hints_urgency); + view_set_urgent(view, (bool)xsurface->hints_urgency); } } diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 0b2f03a2..6fddee90 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -386,29 +386,28 @@ static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, static void handle_pointer_motion_relative( struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, motion); - struct wlr_pointer_motion_event *e = data; - cursor_handle_activity_from_device(cursor, &e->pointer->base); + struct wlr_event_pointer_motion *e = data; + cursor_handle_activity_from_device(cursor, e->device); - pointer_motion(cursor, e->time_msec, &e->pointer->base, e->delta_x, - e->delta_y, e->unaccel_dx, e->unaccel_dy); + pointer_motion(cursor, e->time_msec, e->device, e->delta_x, e->delta_y, + e->unaccel_dx, e->unaccel_dy); } static void handle_pointer_motion_absolute( struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, motion_absolute); - struct wlr_pointer_motion_absolute_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_motion_absolute *event = data; + cursor_handle_activity_from_device(cursor, event->device); double lx, ly; - wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->pointer->base, + wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, event->x, event->y, &lx, &ly); double dx = lx - cursor->cursor->x; double dy = ly - cursor->cursor->y; - pointer_motion(cursor, event->time_msec, &event->pointer->base, dx, dy, - dx, dy); + pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy); } void dispatch_cursor_button(struct sway_cursor *cursor, @@ -423,7 +422,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor, static void handle_pointer_button(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, button); - struct wlr_pointer_button_event *event = data; + struct wlr_event_pointer_button *event = data; if (event->state == WLR_BUTTON_PRESSED) { cursor->pressed_button_count++; @@ -435,20 +434,20 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) { } } - cursor_handle_activity_from_device(cursor, &event->pointer->base); - dispatch_cursor_button(cursor, &event->pointer->base, + cursor_handle_activity_from_device(cursor, event->device); + dispatch_cursor_button(cursor, event->device, event->time_msec, event->button, event->state); } void dispatch_cursor_axis(struct sway_cursor *cursor, - struct wlr_pointer_axis_event *event) { + struct wlr_event_pointer_axis *event) { seatop_pointer_axis(cursor->seat, event); } static void handle_pointer_axis(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, axis); - struct wlr_pointer_axis_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_axis *event = data; + cursor_handle_activity_from_device(cursor, event->device); dispatch_cursor_axis(cursor, event); } @@ -459,8 +458,8 @@ static void handle_pointer_frame(struct wl_listener *listener, void *data) { static void handle_touch_down(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down); - struct wlr_touch_down_event *event = data; - cursor_handle_activity_from_device(cursor, &event->touch->base); + struct wlr_event_touch_down *event = data; + cursor_handle_activity_from_device(cursor, event->device); cursor_hide(cursor); struct sway_seat *seat = cursor->seat; @@ -468,7 +467,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) { struct wlr_surface *surface = NULL; double lx, ly; - wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->touch->base, + wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, event->x, event->y, &lx, &ly); double sx, sy; struct sway_node *focused_node = node_at_coords(seat, lx, ly, &surface, &sx, &sy); @@ -496,25 +495,24 @@ static void handle_touch_down(struct wl_listener *listener, void *data) { double dx, dy; dx = lx - cursor->cursor->x; dy = ly - cursor->cursor->y; - pointer_motion(cursor, event->time_msec, &event->touch->base, dx, dy, - dx, dy); - dispatch_cursor_button(cursor, &event->touch->base, event->time_msec, + pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy); + dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED); } } static void handle_touch_up(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up); - struct wlr_touch_up_event *event = data; - cursor_handle_activity_from_device(cursor, &event->touch->base); + struct wlr_event_touch_up *event = data; + cursor_handle_activity_from_device(cursor, event->device); struct wlr_seat *wlr_seat = cursor->seat->wlr_seat; if (cursor->simulating_pointer_from_touch) { if (cursor->pointer_touch_id == cursor->seat->touch_id) { cursor->pointer_touch_up = true; - dispatch_cursor_button(cursor, &event->touch->base, - event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED); + dispatch_cursor_button(cursor, event->device, event->time_msec, + BTN_LEFT, WLR_BUTTON_RELEASED); } } else { wlr_seat_touch_notify_up(wlr_seat, event->time_msec, event->touch_id); @@ -524,15 +522,15 @@ static void handle_touch_up(struct wl_listener *listener, void *data) { static void handle_touch_motion(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_motion); - struct wlr_touch_motion_event *event = data; - cursor_handle_activity_from_device(cursor, &event->touch->base); + struct wlr_event_touch_motion *event = data; + cursor_handle_activity_from_device(cursor, event->device); struct sway_seat *seat = cursor->seat; struct wlr_seat *wlr_seat = seat->wlr_seat; struct wlr_surface *surface = NULL; double lx, ly; - wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->touch->base, + wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, event->x, event->y, &lx, &ly); double sx, sy; node_at_coords(cursor->seat, lx, ly, &surface, &sx, &sy); @@ -554,8 +552,7 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { double dx, dy; dx = lx - cursor->cursor->x; dy = ly - cursor->cursor->y; - pointer_motion(cursor, event->time_msec, &event->touch->base, - dx, dy, dx, dy); + pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy); } } else if (surface) { wlr_seat_touch_notify_motion(wlr_seat, event->time_msec, @@ -594,15 +591,14 @@ static void apply_mapping_from_region(struct wlr_input_device *device, double x1 = region->x1, x2 = region->x2; double y1 = region->y1, y2 = region->y2; - if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) { - struct wlr_tablet *tablet = device->tablet; - if (tablet->width_mm == 0 || tablet->height_mm == 0) { + if (region->mm) { + if (device->width_mm == 0 || device->height_mm == 0) { return; } - x1 /= tablet->width_mm; - x2 /= tablet->width_mm; - y1 /= tablet->height_mm; - y2 /= tablet->height_mm; + x1 /= device->width_mm; + x2 /= device->width_mm; + y1 /= device->height_mm; + y2 /= device->height_mm; } *x = apply_mapping_from_coord(x1, x2, *x); @@ -664,8 +660,8 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor, static void handle_tool_axis(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis); - struct wlr_tablet_tool_axis_event *event = data; - cursor_handle_activity_from_device(cursor, &event->tablet->base); + struct wlr_event_tablet_tool_axis *event = data; + cursor_handle_activity_from_device(cursor, event->device); struct sway_tablet_tool *sway_tool = event->tool->data; if (!sway_tool) { @@ -720,8 +716,8 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) { static void handle_tool_tip(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip); - struct wlr_tablet_tool_tip_event *event = data; - cursor_handle_activity_from_device(cursor, &event->tablet->base); + struct wlr_event_tablet_tool_tip *event = data; + cursor_handle_activity_from_device(cursor, event->device); struct sway_tablet_tool *sway_tool = event->tool->data; struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2; @@ -736,7 +732,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) { if (cursor->simulating_pointer_from_tool_tip && event->state == WLR_TABLET_TOOL_TIP_UP) { cursor->simulating_pointer_from_tool_tip = false; - dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec, + dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED); wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat); } else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) { @@ -748,8 +744,8 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) { WLR_TABLET_TOOL_TIP_UP); } else { cursor->simulating_pointer_from_tool_tip = true; - dispatch_cursor_button(cursor, &event->tablet->base, - event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED); + dispatch_cursor_button(cursor, event->device, event->time_msec, + BTN_LEFT, WLR_BUTTON_PRESSED); wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat); } } else { @@ -771,13 +767,12 @@ static struct sway_tablet *get_tablet_for_device(struct sway_cursor *cursor, static void handle_tool_proximity(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_proximity); - struct wlr_tablet_tool_proximity_event *event = data; - cursor_handle_activity_from_device(cursor, &event->tablet->base); + struct wlr_event_tablet_tool_proximity *event = data; + cursor_handle_activity_from_device(cursor, event->device); struct wlr_tablet_tool *tool = event->tool; if (!tool->data) { - struct sway_tablet *tablet = get_tablet_for_device(cursor, - &event->tablet->base); + struct sway_tablet *tablet = get_tablet_for_device(cursor, event->device); if (!tablet) { sway_log(SWAY_ERROR, "no tablet for tablet tool"); return; @@ -802,8 +797,8 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) { static void handle_tool_button(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button); - struct wlr_tablet_tool_button_event *event = data; - cursor_handle_activity_from_device(cursor, &event->tablet->base); + struct wlr_event_tablet_tool_button *event = data; + cursor_handle_activity_from_device(cursor, event->device); struct sway_tablet_tool *sway_tool = event->tool->data; if (!sway_tool) { @@ -824,14 +819,14 @@ static void handle_tool_button(struct wl_listener *listener, void *data) { switch (event->state) { case WLR_BUTTON_PRESSED: if (cursor->tool_buttons == 0) { - dispatch_cursor_button(cursor, &event->tablet->base, + dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_RIGHT, event->state); } cursor->tool_buttons++; break; case WLR_BUTTON_RELEASED: if (cursor->tool_buttons == 1) { - dispatch_cursor_button(cursor, &event->tablet->base, + dispatch_cursor_button(cursor, event->device, event->time_msec, BTN_RIGHT, event->state); } cursor->tool_buttons--; @@ -931,8 +926,8 @@ static void handle_request_pointer_set_cursor(struct wl_listener *listener, static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of( listener, cursor, pinch_begin); - struct wlr_pointer_pinch_begin_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_pinch_begin *event = data; + cursor_handle_activity_from_device(cursor, event->device); wlr_pointer_gestures_v1_send_pinch_begin( cursor->pointer_gestures, cursor->seat->wlr_seat, event->time_msec, event->fingers); @@ -941,8 +936,8 @@ static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data) static void handle_pointer_pinch_update(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of( listener, cursor, pinch_update); - struct wlr_pointer_pinch_update_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_pinch_update *event = data; + cursor_handle_activity_from_device(cursor, event->device); wlr_pointer_gestures_v1_send_pinch_update( cursor->pointer_gestures, cursor->seat->wlr_seat, event->time_msec, event->dx, event->dy, @@ -952,8 +947,8 @@ static void handle_pointer_pinch_update(struct wl_listener *listener, void *data static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of( listener, cursor, pinch_end); - struct wlr_pointer_pinch_end_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_pinch_end *event = data; + cursor_handle_activity_from_device(cursor, event->device); wlr_pointer_gestures_v1_send_pinch_end( cursor->pointer_gestures, cursor->seat->wlr_seat, event->time_msec, event->cancelled); @@ -962,8 +957,8 @@ static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) { static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of( listener, cursor, swipe_begin); - struct wlr_pointer_swipe_begin_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_swipe_begin *event = data; + cursor_handle_activity_from_device(cursor, event->device); wlr_pointer_gestures_v1_send_swipe_begin( cursor->pointer_gestures, cursor->seat->wlr_seat, event->time_msec, event->fingers); @@ -972,8 +967,8 @@ static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data) static void handle_pointer_swipe_update(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of( listener, cursor, swipe_update); - struct wlr_pointer_swipe_update_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_swipe_update *event = data; + cursor_handle_activity_from_device(cursor, event->device); wlr_pointer_gestures_v1_send_swipe_update( cursor->pointer_gestures, cursor->seat->wlr_seat, event->time_msec, event->dx, event->dy); @@ -982,33 +977,13 @@ static void handle_pointer_swipe_update(struct wl_listener *listener, void *data static void handle_pointer_swipe_end(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = wl_container_of( listener, cursor, swipe_end); - struct wlr_pointer_swipe_end_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); + struct wlr_event_pointer_swipe_end *event = data; + cursor_handle_activity_from_device(cursor, event->device); wlr_pointer_gestures_v1_send_swipe_end( cursor->pointer_gestures, cursor->seat->wlr_seat, event->time_msec, event->cancelled); } -static void handle_pointer_hold_begin(struct wl_listener *listener, void *data) { - struct sway_cursor *cursor = wl_container_of( - listener, cursor, hold_begin); - struct wlr_pointer_hold_begin_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); - wlr_pointer_gestures_v1_send_hold_begin( - cursor->pointer_gestures, cursor->seat->wlr_seat, - event->time_msec, event->fingers); -} - -static void handle_pointer_hold_end(struct wl_listener *listener, void *data) { - struct sway_cursor *cursor = wl_container_of( - listener, cursor, hold_end); - struct wlr_pointer_hold_end_event *event = data; - cursor_handle_activity_from_device(cursor, &event->pointer->base); - wlr_pointer_gestures_v1_send_hold_end( - cursor->pointer_gestures, cursor->seat->wlr_seat, - event->time_msec, event->cancelled); -} - static void handle_image_surface_destroy(struct wl_listener *listener, void *data) { struct sway_cursor *cursor = @@ -1086,8 +1061,6 @@ void sway_cursor_destroy(struct sway_cursor *cursor) { wl_list_remove(&cursor->swipe_begin.link); wl_list_remove(&cursor->swipe_update.link); wl_list_remove(&cursor->swipe_end.link); - wl_list_remove(&cursor->hold_begin.link); - wl_list_remove(&cursor->hold_end.link); wl_list_remove(&cursor->motion.link); wl_list_remove(&cursor->motion_absolute.link); wl_list_remove(&cursor->button.link); @@ -1144,10 +1117,6 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) { wl_signal_add(&wlr_cursor->events.swipe_update, &cursor->swipe_update); cursor->swipe_end.notify = handle_pointer_swipe_end; wl_signal_add(&wlr_cursor->events.swipe_end, &cursor->swipe_end); - cursor->hold_begin.notify = handle_pointer_hold_begin; - wl_signal_add(&wlr_cursor->events.hold_begin, &cursor->hold_begin); - cursor->hold_end.notify = handle_pointer_hold_end; - wl_signal_add(&wlr_cursor->events.hold_end, &cursor->hold_end); // input events wl_signal_add(&wlr_cursor->events.motion, &cursor->motion); diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index 8538d97c..f04a8ce0 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c @@ -377,7 +377,7 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) { struct sway_input_manager *input_manager = wl_container_of(listener, input_manager, virtual_keyboard_new); struct wlr_virtual_keyboard_v1 *keyboard = data; - struct wlr_input_device *device = &keyboard->keyboard.base; + struct wlr_input_device *device = &keyboard->input_device; // TODO: Amend protocol to allow NULL seat struct sway_seat *seat = keyboard->seat ? @@ -410,7 +410,7 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) { wl_container_of(listener, input_manager, virtual_pointer_new); struct wlr_virtual_pointer_v1_new_pointer_event *event = data; struct wlr_virtual_pointer_v1 *pointer = event->new_pointer; - struct wlr_input_device *device = &pointer->pointer.base; + struct wlr_input_device *device = &pointer->input_device; struct sway_seat *seat = event->suggested_seat ? input_manager_sway_seat_from_wlr_seat(event->suggested_seat) : diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index 1aa30655..f258ac7d 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -401,7 +401,7 @@ static struct wlr_input_method_keyboard_grab_v2 *keyboard_get_im_grab( } static void handle_key_event(struct sway_keyboard *keyboard, - struct wlr_keyboard_key_event *event) { + struct wlr_event_keyboard_key *event) { struct sway_seat *seat = keyboard->seat_device->sway_seat; struct wlr_seat *wlr_seat = seat->wlr_seat; struct wlr_input_device *wlr_device = @@ -517,7 +517,7 @@ static void handle_key_event(struct sway_keyboard *keyboard, &keyboard->state_pressed_sent, event->keycode, event->state, keyinfo.keycode, 0); if (pressed_sent) { - wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard); + wlr_seat_set_keyboard(wlr_seat, wlr_device); wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec, event->keycode, event->state); handled = true; @@ -542,7 +542,7 @@ static void handle_key_event(struct sway_keyboard *keyboard, update_shortcut_state( &keyboard->state_pressed_sent, event->keycode, event->state, keyinfo.keycode, 0); - wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard); + wlr_seat_set_keyboard(wlr_seat, wlr_device); wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec, event->keycode, event->state); } @@ -670,7 +670,7 @@ static void handle_modifier_event(struct sway_keyboard *keyboard) { &wlr_device->keyboard->modifiers); } else { struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat; - wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard); + wlr_seat_set_keyboard(wlr_seat, wlr_device); wlr_seat_keyboard_notify_modifiers(wlr_seat, &wlr_device->keyboard->modifiers); } @@ -950,7 +950,7 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) { goto cleanup; } sway_group->seat_device->input_device->wlr_device = - &sway_group->wlr_group->keyboard.base; + sway_group->wlr_group->input_device; if (!sway_keyboard_create(seat, sway_group->seat_device)) { sway_log(SWAY_ERROR, "Failed to allocate sway_keyboard for group"); @@ -1086,7 +1086,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) { } struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat; - wlr_seat_set_keyboard(seat, wlr_device->keyboard); + wlr_seat_set_keyboard(seat, wlr_device); wl_list_remove(&keyboard->keyboard_key.link); wl_signal_add(&wlr_device->keyboard->events.key, &keyboard->keyboard_key); diff --git a/sway/input/seat.c b/sway/input/seat.c index 85179dc7..ce933b66 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include "config.h" #include "list.h" @@ -43,7 +42,6 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) { sway_keyboard_destroy(seat_device->keyboard); sway_tablet_destroy(seat_device->tablet); sway_tablet_pad_destroy(seat_device->tablet_pad); - sway_switch_destroy(seat_device->switch_device); wlr_cursor_detach_input_device(seat_device->sway_seat->cursor->cursor, seat_device->input_device->wlr_device); wl_list_remove(&seat_device->link); @@ -247,7 +245,7 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) { seat_node_destroy(seat_node); // If an unmanaged or layer surface is focused when an output gets // disabled and an empty workspace on the output was focused by the - // seat, the seat needs to refocus its focus inactive to update the + // seat, the seat needs to refocus it's focus inactive to update the // value of seat->workspace. if (seat->workspace == node->sway_workspace) { struct sway_node *node = seat_get_focus_inactive(seat, &root->node); @@ -380,8 +378,8 @@ void drag_icon_update_position(struct sway_drag_icon *icon) { case WLR_DRAG_GRAB_KEYBOARD: return; case WLR_DRAG_GRAB_KEYBOARD_POINTER: - icon->x = cursor->x + wlr_icon->surface->sx; - icon->y = cursor->y + wlr_icon->surface->sy; + icon->x = cursor->x; + icon->y = cursor->y; break; case WLR_DRAG_GRAB_KEYBOARD_TOUCH:; struct wlr_touch_point *point = @@ -389,8 +387,8 @@ void drag_icon_update_position(struct sway_drag_icon *icon) { if (point == NULL) { return; } - icon->x = seat->touch_x + wlr_icon->surface->sx; - icon->y = seat->touch_y + wlr_icon->surface->sy; + icon->x = seat->touch_x; + icon->y = seat->touch_y; } drag_icon_damage_whole(icon); @@ -726,25 +724,14 @@ static void seat_apply_input_config(struct sway_seat *seat, ic == NULL ? MAPPED_TO_DEFAULT : ic->mapped_to; switch (mapped_to) { - case MAPPED_TO_DEFAULT:; + case MAPPED_TO_DEFAULT: /* * If the wlroots backend provides an output name, use that. * - * Otherwise, try to map built-in touch and pointer devices to the + * Otherwise, try to map built-in touch and tablet tool devices to the * built-in output. */ - struct wlr_input_device *dev = sway_device->input_device->wlr_device; - switch (dev->type) { - case WLR_INPUT_DEVICE_POINTER: - mapped_to_output = dev->pointer->output_name; - break; - case WLR_INPUT_DEVICE_TOUCH: - mapped_to_output = dev->touch->output_name; - break; - default: - mapped_to_output = NULL; - break; - } + mapped_to_output = sway_device->input_device->wlr_device->output_name; if (mapped_to_output == NULL && is_touch_or_tablet_tool(sway_device) && sway_libinput_device_is_builtin(sway_device->input_device)) { mapped_to_output = get_builtin_output_name(); @@ -813,7 +800,7 @@ static void seat_configure_keyboard(struct sway_seat *seat, } sway_keyboard_configure(seat_device->keyboard); wlr_seat_set_keyboard(seat->wlr_seat, - seat_device->input_device->wlr_device->keyboard); + seat_device->input_device->wlr_device); struct sway_node *focus = seat_get_focus(seat); if (focus && node_is_view(focus)) { // force notify reenter to pick up the new configuration @@ -1574,7 +1561,7 @@ 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) { if (seat->seatop_impl->pointer_axis) { seat->seatop_impl->pointer_axis(seat, event); } diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c index 15d1ca8b..4320a3b4 100644 --- a/sway/input/seatop_default.c +++ b/sway/input/seatop_default.c @@ -474,7 +474,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec, seat_set_focus(seat, node); } - // If moving a container by its title bar, use a threshold for the drag + // If moving a container by it's title bar, use a threshold for the drag if (!mod_pressed && config->tiling_drag_threshold > 0) { seatop_begin_move_tiling_threshold(seat, cont); } else { @@ -645,7 +645,7 @@ static void handle_tablet_tool_motion(struct sway_seat *seat, * Functions used by handle_pointer_axis / *--------------------------------------*/ -static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) { +static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) { switch (event->orientation) { case WLR_AXIS_ORIENTATION_VERTICAL: return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN; @@ -658,9 +658,9 @@ static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) { } static void handle_pointer_axis(struct sway_seat *seat, - struct wlr_pointer_axis_event *event) { + struct wlr_event_pointer_axis *event) { struct sway_input_device *input_device = - event->pointer ? event->pointer->base.data : NULL; + event->device ? event->device->data : NULL; struct input_config *ic = input_device ? input_device_get_config(input_device) : NULL; struct sway_cursor *cursor = seat->cursor; diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c index b40773d0..ecc34fea 100644 --- a/sway/input/seatop_down.c +++ b/sway/input/seatop_down.c @@ -18,9 +18,9 @@ struct seatop_down_event { }; static void handle_pointer_axis(struct sway_seat *seat, - struct wlr_pointer_axis_event *event) { + struct wlr_event_pointer_axis *event) { struct sway_input_device *input_device = - event->pointer ? event->pointer->base.data : NULL; + event->device ? event->device->data : NULL; struct input_config *ic = input_device ? input_device_get_config(input_device) : NULL; float scroll_factor = diff --git a/sway/input/switch.c b/sway/input/switch.c index af5a2385..9ea87a1a 100644 --- a/sway/input/switch.c +++ b/sway/input/switch.c @@ -19,19 +19,6 @@ struct sway_switch *sway_switch_create(struct sway_seat *seat, return switch_device; } -static bool sway_switch_trigger_test(enum sway_switch_trigger trigger, - enum wlr_switch_state state) { - switch (trigger) { - case SWAY_SWITCH_TRIGGER_ON: - return state == WLR_SWITCH_STATE_ON; - case SWAY_SWITCH_TRIGGER_OFF: - return state == WLR_SWITCH_STATE_OFF; - case SWAY_SWITCH_TRIGGER_TOGGLE: - return true; - } - abort(); // unreachable -} - static void execute_binding(struct sway_switch *sway_switch) { struct sway_seat* seat = sway_switch->seat_device->sway_seat; bool input_inhibited = seat->exclusive_client != NULL; @@ -43,10 +30,11 @@ static void execute_binding(struct sway_switch *sway_switch) { if (binding->type != sway_switch->type) { continue; } - if (!sway_switch_trigger_test(binding->trigger, sway_switch->state)) { + if (binding->state != WLR_SWITCH_STATE_TOGGLE && + binding->state != sway_switch->state) { continue; } - if (config->reloading && (binding->trigger == SWAY_SWITCH_TRIGGER_TOGGLE + if (config->reloading && (binding->state == WLR_SWITCH_STATE_TOGGLE || (binding->flags & BINDING_RELOAD) == 0)) { continue; } @@ -77,7 +65,7 @@ static void execute_binding(struct sway_switch *sway_switch) { static void handle_switch_toggle(struct wl_listener *listener, void *data) { struct sway_switch *sway_switch = wl_container_of(listener, sway_switch, switch_toggle); - struct wlr_switch_toggle_event *event = data; + struct wlr_event_switch_toggle *event = data; struct sway_seat *seat = sway_switch->seat_device->sway_seat; seat_idle_notify_activity(seat, IDLE_SOURCE_SWITCH); diff --git a/sway/input/tablet.c b/sway/input/tablet.c index db2f93ec..26e86e36 100644 --- a/sway/input/tablet.c +++ b/sway/input/tablet.c @@ -196,7 +196,7 @@ static void handle_tablet_pad_attach(struct wl_listener *listener, static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) { struct sway_tablet_pad *pad = wl_container_of(listener, pad, ring); - struct wlr_tablet_pad_ring_event *event = data; + struct wlr_event_tablet_pad_ring *event = data; if (!pad->current_surface) { return; @@ -210,7 +210,7 @@ static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) { static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) { struct sway_tablet_pad *pad = wl_container_of(listener, pad, strip); - struct wlr_tablet_pad_strip_event *event = data; + struct wlr_event_tablet_pad_strip *event = data; if (!pad->current_surface) { return; @@ -224,7 +224,7 @@ static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) { static void handle_tablet_pad_button(struct wl_listener *listener, void *data) { struct sway_tablet_pad *pad = wl_container_of(listener, pad, button); - struct wlr_tablet_pad_button_event *event = data; + struct wlr_event_tablet_pad_button *event = data; if (!pad->current_surface) { return; diff --git a/sway/input/text_input.c b/sway/input/text_input.c index 58911c2d..b8c19c17 100644 --- a/sway/input/text_input.c +++ b/sway/input/text_input.c @@ -77,6 +77,8 @@ static void handle_im_grab_keyboard(struct wl_listener *listener, void *data) { struct wlr_keyboard *active_keyboard = wlr_seat_get_keyboard(relay->seat->wlr_seat); wlr_input_method_keyboard_grab_v2_set_keyboard(keyboard_grab, active_keyboard); + wlr_input_method_keyboard_grab_v2_send_modifiers(keyboard_grab, + &active_keyboard->modifiers); wl_signal_add(&keyboard_grab->events.destroy, &relay->input_method_keyboard_grab_destroy); diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 8357ae04..1b64f86e 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -980,11 +980,6 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) { struct wlr_keyboard *keyboard = device->wlr_device->keyboard; struct xkb_keymap *keymap = keyboard->keymap; struct xkb_state *state = keyboard->xkb_state; - - json_object_object_add(object, "repeat_delay", - json_object_new_int(keyboard->repeat_info.delay)); - json_object_object_add(object, "repeat_rate", - json_object_new_int(keyboard->repeat_info.rate)); json_object *layouts_arr = json_object_new_array(); json_object_object_add(object, "xkb_layout_names", layouts_arr); diff --git a/sway/main.c b/sway/main.c index 78974e22..b6f8a8bf 100644 --- a/sway/main.c +++ b/sway/main.c @@ -240,35 +240,35 @@ static void handle_wlr_log(enum wlr_log_importance importance, _sway_vlog(convert_wlr_log_importance(importance), sway_fmt, args); } -static const struct option long_options[] = { - {"help", no_argument, NULL, 'h'}, - {"config", required_argument, NULL, 'c'}, - {"validate", no_argument, NULL, 'C'}, - {"debug", no_argument, NULL, 'd'}, - {"version", no_argument, NULL, 'v'}, - {"verbose", no_argument, NULL, 'V'}, - {"get-socketpath", no_argument, NULL, 'p'}, - {"unsupported-gpu", no_argument, NULL, 'u'}, - {0, 0, 0, 0} -}; - -static const char usage[] = - "Usage: sway [options] [command]\n" - "\n" - " -h, --help Show help message and quit.\n" - " -c, --config Specify a config file.\n" - " -C, --validate Check the validity of the config file, then exit.\n" - " -d, --debug Enables full logging, including debug information.\n" - " -v, --version Show the version number and quit.\n" - " -V, --verbose Enables more verbose logging.\n" - " --get-socketpath Gets the IPC socket path and prints it, then exits.\n" - "\n"; - int main(int argc, char **argv) { - static bool verbose = false, debug = false, validate = false, allow_unsupported_gpu = false; + static int verbose = 0, debug = 0, validate = 0, allow_unsupported_gpu = 0; + + static const struct option long_options[] = { + {"help", no_argument, NULL, 'h'}, + {"config", required_argument, NULL, 'c'}, + {"validate", no_argument, NULL, 'C'}, + {"debug", no_argument, NULL, 'd'}, + {"version", no_argument, NULL, 'v'}, + {"verbose", no_argument, NULL, 'V'}, + {"get-socketpath", no_argument, NULL, 'p'}, + {"unsupported-gpu", no_argument, NULL, 'u'}, + {0, 0, 0, 0} + }; char *config_path = NULL; + const char* usage = + "Usage: sway [options] [command]\n" + "\n" + " -h, --help Show help message and quit.\n" + " -c, --config Specify a config file.\n" + " -C, --validate Check the validity of the config file, then exit.\n" + " -d, --debug Enables full logging, including debug information.\n" + " -v, --version Show the version number and quit.\n" + " -V, --verbose Enables more verbose logging.\n" + " --get-socketpath Gets the IPC socket path and prints it, then exits.\n" + "\n"; + int c; while (1) { int option_index = 0; @@ -286,23 +286,23 @@ int main(int argc, char **argv) { config_path = strdup(optarg); break; case 'C': // validate - validate = true; + validate = 1; break; case 'd': // debug - debug = true; + debug = 1; break; case 'D': // extended debug options enable_debug_flag(optarg); break; case 'u': - allow_unsupported_gpu = true; + allow_unsupported_gpu = 1; break; case 'v': // version printf("sway version " SWAY_VERSION "\n"); exit(EXIT_SUCCESS); break; case 'V': // verbose - verbose = true; + verbose = 1; break; case 'p': ; // --get-socketpath if (getenv("SWAYSOCK")) { diff --git a/sway/meson.build b/sway/meson.build index 99d729ff..68c0a14f 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -214,14 +214,13 @@ sway_deps = [ libudev, math, pango, - pcre2, + pcre, glesv2, pixman, server_protos, wayland_server, wlroots, xkbcommon, - xcb_icccm, ] if have_xwayland diff --git a/sway/server.c b/sway/server.c index d6a4d00a..3fab3431 100644 --- a/sway/server.c +++ b/sway/server.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -110,8 +109,6 @@ bool server_init(struct sway_server *server) { wl_signal_add(&server->compositor->events.new_surface, &server->compositor_new_surface); - wlr_subcompositor_create(server->wl_display); - server->data_device_manager = wlr_data_device_manager_create(server->wl_display); @@ -221,8 +218,8 @@ bool server_init(struct sway_server *server) { // Avoid using "wayland-0" as display socket char name_candidate[16]; - for (unsigned int i = 1; i <= 32; ++i) { - snprintf(name_candidate, sizeof(name_candidate), "wayland-%u", i); + for (int i = 1; i <= 32; ++i) { + sprintf(name_candidate, "wayland-%d", i); if (wl_display_add_socket(server->wl_display, name_candidate) >= 0) { server->socket = strdup(name_candidate); break; diff --git a/sway/sway.5.scd b/sway/sway.5.scd index 168761e1..641d0925 100644 --- a/sway/sway.5.scd +++ b/sway/sway.5.scd @@ -620,11 +620,11 @@ The default colors are: after switching between workspaces. *focus_on_window_activation* smart|urgent|focus|none - This option determines what to do when a client requests window activation. - If set to _urgent_, the urgent state will be set for that window. If set to - _focus_, the window will become focused. If set to _smart_, the window will - become focused only if it is already visible, otherwise the urgent state - will be set. Default is _urgent_. + This option determines what to do when an xwayland client requests + window activation. If set to _urgent_, the urgent state will be set + for that window. If set to _focus_, the window will become focused. + If set to _smart_, the window will become focused only if it is already + visible, otherwise the urgent state will be set. Default is _urgent_. *focus_wrapping* yes|no|force|workspace This option determines what to do when attempting to focus over the edge diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index 9c1a11e5..4aa82c35 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -311,13 +311,12 @@ void arrange_output(struct sway_output *output) { if (config->reloading) { return; } - struct wlr_box output_box; - wlr_output_layout_get_box(root->output_layout, - output->wlr_output, &output_box); - output->lx = output_box.x; - output->ly = output_box.y; - output->width = output_box.width; - output->height = output_box.height; + const struct wlr_box *output_box = wlr_output_layout_get_box( + root->output_layout, output->wlr_output); + output->lx = output_box->x; + output->ly = output_box->y; + output->width = output_box->width; + output->height = output_box->height; for (int i = 0; i < output->workspaces->length; ++i) { struct sway_workspace *workspace = output->workspaces->items[i]; @@ -329,12 +328,12 @@ void arrange_root(void) { if (config->reloading) { return; } - struct wlr_box layout_box; - wlr_output_layout_get_box(root->output_layout, NULL, &layout_box); - root->x = layout_box.x; - root->y = layout_box.y; - root->width = layout_box.width; - root->height = layout_box.height; + const struct wlr_box *layout_box = + wlr_output_layout_get_box(root->output_layout, NULL); + root->x = layout_box->x; + root->y = layout_box->y; + root->width = layout_box->width; + root->height = layout_box->height; if (root->fullscreen_global) { struct sway_container *fs = root->fullscreen_global; diff --git a/sway/tree/container.c b/sway/tree/container.c index 2b6aa2ec..17289dd3 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include "linux-dmabuf-unstable-v1-protocol.h" #include "cairo_util.h" @@ -195,7 +194,7 @@ static struct sway_container *surface_at_view(struct sway_container *con, double #endif case SWAY_VIEW_XDG_SHELL: _surface = wlr_xdg_surface_surface_at( - view->wlr_xdg_toplevel->base, + view->wlr_xdg_surface, view_sx, view_sy, &_sx, &_sy); break; } @@ -696,13 +695,12 @@ void floating_calculate_constraints(int *min_width, int *max_width, *min_height = config->floating_minimum_height; } - struct wlr_box box; - wlr_output_layout_get_box(root->output_layout, NULL, &box); + struct wlr_box *box = wlr_output_layout_get_box(root->output_layout, NULL); if (config->floating_maximum_width == -1) { // no maximum *max_width = INT_MAX; } else if (config->floating_maximum_width == 0) { // automatic - *max_width = box.width; + *max_width = box->width; } else { *max_width = config->floating_maximum_width; } @@ -710,7 +708,7 @@ void floating_calculate_constraints(int *min_width, int *max_width, if (config->floating_maximum_height == -1) { // no maximum *max_height = INT_MAX; } else if (config->floating_maximum_height == 0) { // automatic - *max_height = box.height; + *max_height = box->height; } else { *max_height = config->floating_maximum_height; } @@ -742,9 +740,9 @@ void container_floating_resize_and_center(struct sway_container *con) { return; } - struct wlr_box ob; - wlr_output_layout_get_box(root->output_layout, ws->output->wlr_output, &ob); - if (wlr_box_empty(&ob)) { + struct wlr_box *ob = wlr_output_layout_get_box(root->output_layout, + ws->output->wlr_output); + if (!ob) { // On NOOP output. Will be called again when moved to an output con->pending.x = 0; con->pending.y = 0; @@ -756,8 +754,8 @@ void container_floating_resize_and_center(struct sway_container *con) { floating_natural_resize(con); if (!con->view) { if (con->pending.width > ws->width || con->pending.height > ws->height) { - con->pending.x = ob.x + (ob.width - con->pending.width) / 2; - con->pending.y = ob.y + (ob.height - con->pending.height) / 2; + con->pending.x = ob->x + (ob->width - con->pending.width) / 2; + con->pending.y = ob->y + (ob->height - con->pending.height) / 2; } else { con->pending.x = ws->x + (ws->width - con->pending.width) / 2; con->pending.y = ws->y + (ws->height - con->pending.height) / 2; @@ -765,8 +763,8 @@ void container_floating_resize_and_center(struct sway_container *con) { } else { if (con->pending.content_width > ws->width || con->pending.content_height > ws->height) { - con->pending.content_x = ob.x + (ob.width - con->pending.content_width) / 2; - con->pending.content_y = ob.y + (ob.height - con->pending.content_height) / 2; + con->pending.content_x = ob->x + (ob->width - con->pending.content_width) / 2; + con->pending.content_y = ob->y + (ob->height - con->pending.content_height) / 2; } else { con->pending.content_x = ws->x + (ws->width - con->pending.content_width) / 2; con->pending.content_y = ws->y + (ws->height - con->pending.content_height) / 2; @@ -1707,7 +1705,7 @@ static void update_marks_texture(struct sway_container *con, for (int i = 0; i < con->marks->length; ++i) { char *mark = con->marks->items[i]; if (mark[0] != '_') { - snprintf(part, len + 1, "[%s]", mark); + sprintf(part, "[%s]", mark); strcat(buffer, part); } } diff --git a/sway/tree/output.c b/sway/tree/output.c index 52826c91..ad8d2482 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c @@ -301,10 +301,10 @@ struct sway_output *output_get_in_direction(struct sway_output *reference, if (!sway_assert(direction, "got invalid direction: %d", direction)) { return NULL; } - struct wlr_box output_box; - wlr_output_layout_get_box(root->output_layout, reference->wlr_output, &output_box); - int lx = output_box.x + output_box.width / 2; - int ly = output_box.y + output_box.height / 2; + struct wlr_box *output_box = + wlr_output_layout_get_box(root->output_layout, reference->wlr_output); + int lx = output_box->x + output_box->width / 2; + int ly = output_box->y + output_box->height / 2; struct wlr_output *wlr_adjacent = wlr_output_layout_adjacent_output( root->output_layout, direction, reference->wlr_output, lx, ly); if (!wlr_adjacent) { diff --git a/sway/tree/root.c b/sway/tree/root.c index 8508e9eb..73f3993c 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -209,7 +209,7 @@ static pid_t get_parent_pid(pid_t child) { FILE *stat = NULL; size_t buf_size = 0; - snprintf(file_name, sizeof(file_name), "/proc/%d/stat", child); + sprintf(file_name, "/proc/%d/stat", child); if ((stat = fopen(file_name, "r"))) { if (getline(&buffer, &buf_size, stat) != -1) { diff --git a/sway/tree/view.c b/sway/tree/view.c index 176be8af..8b7061ba 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include "config.h" #if HAVE_XWAYLAND diff --git a/swaybar/bar.c b/swaybar/bar.c index 5e4ebd97..6ffdc9b4 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -51,6 +51,9 @@ static void swaybar_output_free(struct swaybar_output *output) { if (output->surface != NULL) { wl_surface_destroy(output->surface); } + if (output->input_region != NULL) { + wl_region_destroy(output->input_region); + } wl_output_destroy(output->output); destroy_buffer(&output->buffers[0]); destroy_buffer(&output->buffers[1]); @@ -110,9 +113,10 @@ static void add_layer_surface(struct swaybar_output *output) { if (overlay) { // Empty input region - struct wl_region *region = wl_compositor_create_region(bar->compositor); - wl_surface_set_input_region(output->surface, region); - wl_region_destroy(region); + output->input_region = wl_compositor_create_region(bar->compositor); + assert(output->input_region); + + wl_surface_set_input_region(output->surface, output->input_region); } zwlr_layer_surface_v1_set_anchor(output->layer_surface, config->position); diff --git a/swaybar/render.c b/swaybar/render.c index 7e2f97b7..dcde6b9e 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -831,15 +831,6 @@ void render_frame(struct swaybar_output *output) { wl_surface_damage(output->surface, 0, 0, output->width, output->height); - uint32_t bg_alpha = ctx.background_color & 0xFF; - if (bg_alpha == 0xFF) { - struct wl_region *region = - wl_compositor_create_region(output->bar->compositor); - wl_region_add(region, 0, 0, INT32_MAX, INT32_MAX); - wl_surface_set_opaque_region(output->surface, region); - wl_region_destroy(region); - } - struct wl_callback *frame_callback = wl_surface_frame(output->surface); wl_callback_add_listener(frame_callback, &output_frame_listener, output); output->frame_scheduled = true; diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c index 0cb5ee9d..6d4b17bf 100644 --- a/swaybar/tray/item.c +++ b/swaybar/tray/item.c @@ -466,11 +466,6 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x, sni->target_size = target_size; } - // Passive - if (sni->status && sni->status[0] == 'P') { - return 0; - } - int icon_size; cairo_surface_t *icon; if (sni->icon) { diff --git a/swaymsg/main.c b/swaymsg/main.c index 02bb12c6..0d9dc5a0 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c @@ -288,76 +288,30 @@ static void pretty_print_config(json_object *c) { printf("%s\n", json_object_get_string(config)); } -static void pretty_print_tree(json_object *obj, int indent) { - for (int i = 0; i < indent; i++) { - printf(" "); - } - - int id = json_object_get_int(json_object_object_get(obj, "id")); - const char *name = json_object_get_string(json_object_object_get(obj, "name")); - const char *type = json_object_get_string(json_object_object_get(obj, "type")); - const char *shell = json_object_get_string(json_object_object_get(obj, "shell")); - - printf("#%d: %s \"%s\"", id, type, name); - - if (shell != NULL) { - int pid = json_object_get_int(json_object_object_get(obj, "pid")); - const char *app_id = json_object_get_string(json_object_object_get(obj, "app_id")); - json_object *window_props_obj = json_object_object_get(obj, "window_properties"); - const char *instance = json_object_get_string(json_object_object_get(window_props_obj, "instance")); - const char *class = json_object_get_string(json_object_object_get(window_props_obj, "class")); - int x11_id = json_object_get_int(json_object_object_get(obj, "window")); - - printf(" (%s, pid: %d", shell, pid); - if (app_id != NULL) { - printf(", app_id: \"%s\"", app_id); - } - if (instance != NULL) { - printf(", instance: \"%s\"", instance); - } - if (class != NULL) { - printf(", class: \"%s\"", class); - } - if (x11_id != 0) { - printf(", X11 window: 0x%X", x11_id); - } - printf(")"); - } - - printf("\n"); - - json_object *nodes_obj = json_object_object_get(obj, "nodes"); - size_t len = json_object_array_length(nodes_obj); - for (size_t i = 0; i < len; i++) { - pretty_print_tree(json_object_array_get_idx(nodes_obj, i), indent + 1); - } -} - static void pretty_print(int type, json_object *resp) { - switch (type) { - case IPC_SEND_TICK: - return; - case IPC_GET_VERSION: - pretty_print_version(resp); - return; - case IPC_GET_CONFIG: - pretty_print_config(resp); - return; - case IPC_GET_TREE: - pretty_print_tree(resp, 0); - return; - case IPC_COMMAND: - case IPC_GET_WORKSPACES: - case IPC_GET_INPUTS: - case IPC_GET_OUTPUTS: - case IPC_GET_SEATS: - break; - default: + if (type != IPC_COMMAND && type != IPC_GET_WORKSPACES && + type != IPC_GET_INPUTS && type != IPC_GET_OUTPUTS && + type != IPC_GET_VERSION && type != IPC_GET_SEATS && + type != IPC_GET_CONFIG && type != IPC_SEND_TICK) { printf("%s\n", json_object_to_json_string_ext(resp, JSON_C_TO_STRING_PRETTY | JSON_C_TO_STRING_SPACED)); return; } + if (type == IPC_SEND_TICK) { + return; + } + + if (type == IPC_GET_VERSION) { + pretty_print_version(resp); + return; + } + + if (type == IPC_GET_CONFIG) { + pretty_print_config(resp); + return; + } + json_object *obj; size_t len = json_object_array_length(resp); for (size_t i = 0; i < len; ++i) { diff --git a/swaynag/config.c b/swaynag/config.c index b212a0c3..6db7cce5 100644 --- a/swaynag/config.c +++ b/swaynag/config.c @@ -19,10 +19,6 @@ static char *read_from_stdin(void) { ssize_t nread; while ((nread = getline(&line, &line_size, stdin)) != -1) { buffer = realloc(buffer, buffer_len + nread + 1); - if (!buffer) { - perror("realloc"); - return NULL; - } snprintf(&buffer[buffer_len], nread + 1, "%s", line); buffer_len += nread; } @@ -156,10 +152,6 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, } struct swaynag_button *button; button = calloc(sizeof(struct swaynag_button), 1); - if (!button) { - perror("calloc"); - return EXIT_FAILURE; - } button->text = strdup(optarg); button->type = SWAYNAG_ACTION_COMMAND; button->action = strdup(argv[optind]); @@ -223,17 +215,14 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, if (swaynag) { free(swaynag->details.message); swaynag->details.message = read_from_stdin(); - if (!swaynag->details.message) { - return EXIT_FAILURE; - } swaynag->details.button_up.text = strdup("▲"); swaynag->details.button_down.text = strdup("▼"); } break; case 'L': // Detailed Button Text if (swaynag) { - free(swaynag->details.button_details.text); - swaynag->details.button_details.text = strdup(optarg); + free(swaynag->details.button_details->text); + swaynag->details.button_details->text = strdup(optarg); } break; case 'm': // Message @@ -417,10 +406,6 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) { break; } char *name = calloc(1, close - line); - if (!name) { - perror("calloc"); - return EXIT_FAILURE; - } strncat(name, line + 1, close - line - 1); type = swaynag_type_get(types, name); if (!type) { @@ -429,12 +414,8 @@ int swaynag_load_config(char *path, struct swaynag *swaynag, list_t *types) { } free(name); } else { - char *flag = malloc(nread + 3); - if (!flag) { - perror("calloc"); - return EXIT_FAILURE; - } - snprintf(flag, nread + 3, "--%s", line); + char *flag = malloc(sizeof(char) * (nread + 3)); + sprintf(flag, "--%s", line); char *argv[] = {"swaynag", flag}; result = swaynag_parse_options(2, argv, swaynag, types, type, NULL, NULL); diff --git a/swaynag/main.c b/swaynag/main.c index 56e4950b..88007818 100644 --- a/swaynag/main.c +++ b/swaynag/main.c @@ -20,20 +20,33 @@ void sway_terminate(int code) { } int main(int argc, char **argv) { - int status = EXIT_SUCCESS; + int exit_code = EXIT_SUCCESS; list_t *types = create_list(); swaynag_types_add_default(types); + memset(&swaynag, 0, sizeof(swaynag)); swaynag.buttons = create_list(); wl_list_init(&swaynag.outputs); wl_list_init(&swaynag.seats); + struct swaynag_button *button_close = + calloc(sizeof(struct swaynag_button), 1); + button_close->text = strdup("X"); + button_close->type = SWAYNAG_ACTION_DISMISS; + list_add(swaynag.buttons, button_close); + + swaynag.details.button_details = + calloc(sizeof(struct swaynag_button), 1); + swaynag.details.button_details->text = strdup("Toggle details"); + swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND; + char *config_path = NULL; bool debug = false; - status = swaynag_parse_options(argc, argv, NULL, NULL, NULL, + int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL, &config_path, &debug); - if (status != 0) { + if (launch_status != 0) { + exit_code = launch_status; goto cleanup; } sway_log_init(debug ? SWAY_DEBUG : SWAY_ERROR, NULL); @@ -43,29 +56,29 @@ int main(int argc, char **argv) { } if (config_path) { sway_log(SWAY_DEBUG, "Loading config file: %s", config_path); - status = swaynag_load_config(config_path, &swaynag, types); - if (status != 0) { + int config_status = swaynag_load_config(config_path, &swaynag, types); + free(config_path); + if (config_status != 0) { + exit_code = config_status; goto cleanup; } } - swaynag.details.button_details.text = strdup("Toggle details"); - swaynag.details.button_details.type = SWAYNAG_ACTION_EXPAND; - if (argc > 1) { struct swaynag_type *type_args = swaynag_type_new(""); list_add(types, type_args); - status = swaynag_parse_options(argc, argv, &swaynag, types, + int result = swaynag_parse_options(argc, argv, &swaynag, types, type_args, NULL, NULL); - if (status != 0) { + if (result != 0) { + exit_code = result; goto cleanup; } } if (!swaynag.message) { sway_log(SWAY_ERROR, "No message passed. Please provide --message/-m"); - status = EXIT_FAILURE; + exit_code = EXIT_FAILURE; goto cleanup; } @@ -85,13 +98,11 @@ int main(int argc, char **argv) { swaynag_types_free(types); - struct swaynag_button button_close = { 0 }; - button_close.text = strdup("X"); - button_close.type = SWAYNAG_ACTION_DISMISS; - list_add(swaynag.buttons, &button_close); - if (swaynag.details.message) { - list_add(swaynag.buttons, &swaynag.details.button_details); + list_add(swaynag.buttons, swaynag.details.button_details); + } else { + free(swaynag.details.button_details->text); + free(swaynag.details.button_details); } sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output); @@ -109,11 +120,12 @@ int main(int argc, char **argv) { swaynag_setup(&swaynag); swaynag_run(&swaynag); - return status; + return exit_code; cleanup: swaynag_types_free(types); - free(swaynag.details.button_details.text); + free(swaynag.details.button_details->text); + free(swaynag.details.button_details); swaynag_destroy(&swaynag); - return status; + return exit_code; } diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c index 5620155d..9b57d578 100644 --- a/swaynag/swaynag.c +++ b/swaynag/swaynag.c @@ -28,13 +28,8 @@ static bool terminal_execute(char *terminal, char *command) { fprintf(tmp, "#!/bin/sh\nrm %s\n%s", fname, command); fclose(tmp); chmod(fname, S_IRUSR | S_IWUSR | S_IXUSR); - size_t cmd_size = strlen(terminal) + strlen(" -e ") + strlen(fname) + 1; - char *cmd = malloc(cmd_size); - if (!cmd) { - perror("malloc"); - return false; - } - snprintf(cmd, cmd_size, "%s -e %s", terminal, fname); + char *cmd = malloc(sizeof(char) * (strlen(terminal) + strlen(" -e ") + strlen(fname) + 1)); + sprintf(cmd, "%s -e %s", terminal, fname); execlp("sh", "sh", "-c", cmd, NULL); sway_log_errno(SWAY_ERROR, "Failed to run command, execlp() returned."); free(cmd); @@ -63,7 +58,7 @@ static void swaynag_button_execute(struct swaynag *swaynag, } else if (pid == 0) { // Child of the child. Will be reparented to the init process char *terminal = getenv("TERMINAL"); - if (button->terminal && terminal && *terminal) { + if (button->terminal && terminal && strlen(terminal)) { sway_log(SWAY_DEBUG, "Found $TERMINAL: %s", terminal); if (!terminal_execute(terminal, button->action)) { swaynag_destroy(swaynag); @@ -143,7 +138,7 @@ static void update_cursor(struct swaynag_seat *seat) { const char *cursor_theme = getenv("XCURSOR_THEME"); unsigned cursor_size = 24; const char *env_cursor_size = getenv("XCURSOR_SIZE"); - if (env_cursor_size && *env_cursor_size) { + if (env_cursor_size && strlen(env_cursor_size) > 0) { errno = 0; char *end; unsigned size = strtoul(env_cursor_size, &end, 10); @@ -344,7 +339,6 @@ static void handle_global(void *data, struct wl_registry *registry, struct swaynag_seat *seat = calloc(1, sizeof(struct swaynag_seat)); if (!seat) { - perror("calloc"); return; } @@ -362,10 +356,6 @@ static void handle_global(void *data, struct wl_registry *registry, if (!swaynag->output) { struct swaynag_output *output = calloc(1, sizeof(struct swaynag_output)); - if (!output) { - perror("calloc"); - return; - } output->wl_output = wl_registry_bind(registry, name, &wl_output_interface, 4); output->wl_name = name; @@ -521,8 +511,13 @@ void swaynag_destroy(struct swaynag *swaynag) { swaynag_seat_destroy(seat); } - destroy_buffer(&swaynag->buffers[0]); - destroy_buffer(&swaynag->buffers[1]); + if (&swaynag->buffers[0]) { + destroy_buffer(&swaynag->buffers[0]); + } + + if (&swaynag->buffers[1]) { + destroy_buffer(&swaynag->buffers[1]); + } if (swaynag->outputs.prev || swaynag->outputs.next) { struct swaynag_output *output, *temp;