mirror of
https://github.com/swaywm/sway.git
synced 2026-04-23 06:46:27 -04:00
d4482400f1
After previous commits, swaybar bindsym statements would already accept
the new pseudo button names for swipe gestures. Also, sway itself would
not handle swipes when executed while the pointer was above a bar.
Add the necessary handling for three- and four-finger swipe pointer
gestures in swaybar. Cancel ongoing swipes when the pointer leaves the
bar as to not confuse successive swipes with focus changes inbetween
them. Add the pointer gestures protocol in client and server variants
to the meson build file to make the necessary definitions available.
Bind to the global interface on startup, instantiate a swipe gesture and
add a listener on seat setup as well as destroy it on seat shutdown.
Extend the sway-bar manual page as necessary.
Test-plan:
- add workspace switching to config like so:
bar bar-0 {
swaybar_command swaybar
bindsym release SWIPE_3_LEFT workspace prev_on_output
bindsym release SWIPE_4_RIGHT workspace next_on_output
bindsym --release SWIPE_3_LEFT exec yad --text foo
bindsym --release SWIPE_4_UP exec yad --text bar
}
- start sway and open two workspaces
- position pointer above a bar surface
- switch back and forth using horizontal three- and four-finger swipes,
observing that different finger counts are necessary per direction
- observe that the --release binding for left swipes is ignored because
there is an on-press binding already
- observe that the --release binding for upward swipes is honoured
because there is no on-press binding
- move pointer away from bar surface
- observe that switching by swipe no longer works
Signed-off-by: Michael Weiser <michael.weiser@gmx.de>
119 lines
3 KiB
C
119 lines
3 KiB
C
#ifndef _SWAYBAR_BAR_H
|
|
#define _SWAYBAR_BAR_H
|
|
#include <wayland-client.h>
|
|
#include "config.h"
|
|
#include "input.h"
|
|
#include "pool-buffer.h"
|
|
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
|
|
#include "xdg-output-unstable-v1-client-protocol.h"
|
|
#include "pointer-gestures-unstable-v1-client-protocol.h"
|
|
|
|
struct swaybar_config;
|
|
struct swaybar_output;
|
|
#if HAVE_TRAY
|
|
struct swaybar_tray;
|
|
#endif
|
|
struct swaybar_workspace;
|
|
struct loop;
|
|
|
|
struct swaybar {
|
|
char *id;
|
|
char *mode;
|
|
bool mode_pango_markup;
|
|
|
|
// only relevant when bar is in "hide" mode
|
|
bool visible_by_modifier;
|
|
bool visible_by_urgency;
|
|
bool visible_by_mode;
|
|
bool visible;
|
|
|
|
struct wl_display *display;
|
|
struct wl_compositor *compositor;
|
|
struct zwlr_layer_shell_v1 *layer_shell;
|
|
struct zxdg_output_manager_v1 *xdg_output_manager;
|
|
struct wl_shm *shm;
|
|
struct zwp_pointer_gestures_v1 *pointer_gestures;
|
|
|
|
struct swaybar_config *config;
|
|
struct status_line *status;
|
|
|
|
struct loop *eventloop;
|
|
|
|
int ipc_event_socketfd;
|
|
int ipc_socketfd;
|
|
|
|
struct wl_list outputs; // swaybar_output::link
|
|
struct wl_list unused_outputs; // swaybar_output::link
|
|
struct wl_list seats; // swaybar_seat::link
|
|
|
|
#if HAVE_TRAY
|
|
struct swaybar_tray *tray;
|
|
#endif
|
|
|
|
bool running;
|
|
};
|
|
|
|
struct swaybar_output {
|
|
struct wl_list link; // swaybar::outputs
|
|
struct swaybar *bar;
|
|
struct wl_output *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
|
|
struct wl_list hotspots; // swaybar_hotspot::link
|
|
|
|
char *name;
|
|
char *identifier;
|
|
bool focused;
|
|
|
|
uint32_t width, height;
|
|
int32_t scale;
|
|
enum wl_output_subpixel subpixel;
|
|
struct pool_buffer buffers[2];
|
|
struct pool_buffer *current_buffer;
|
|
bool dirty;
|
|
bool frame_scheduled;
|
|
|
|
uint32_t output_height, output_width, output_x, output_y;
|
|
};
|
|
|
|
struct swaybar_workspace {
|
|
struct wl_list link; // swaybar_output::workspaces
|
|
int num;
|
|
char *name;
|
|
char *label;
|
|
bool focused;
|
|
bool visible;
|
|
bool urgent;
|
|
};
|
|
|
|
bool bar_setup(struct swaybar *bar, const char *socket_path);
|
|
void bar_run(struct swaybar *bar);
|
|
void bar_teardown(struct swaybar *bar);
|
|
|
|
void set_bar_dirty(struct swaybar *bar);
|
|
|
|
/*
|
|
* Determines whether the bar should be visible and changes it to be so.
|
|
* If the current visibility of the bar is the different to what it should be,
|
|
* then it adds or destroys the layer surface as required,
|
|
* as well as sending the cont or stop signal to the status command.
|
|
* If the current visibility of the bar is already what it should be,
|
|
* then this function is a no-op, unless moving_layer is true, which occurs
|
|
* when the bar changes from "hide" to "dock" mode or vice versa, and the bar
|
|
* needs to be destroyed and re-added in order to change its layer.
|
|
*
|
|
* Returns true if the bar is now visible, otherwise false.
|
|
*/
|
|
bool determine_bar_visibility(struct swaybar *bar, bool moving_layer);
|
|
void free_workspaces(struct wl_list *list);
|
|
|
|
void status_in(int fd, short mask, void *data);
|
|
|
|
void destroy_layer_surface(struct swaybar_output *output);
|
|
|
|
#endif
|