Skip to content

Commit

Permalink
swaybar: add overlay mode (fix #1620)
Browse files Browse the repository at this point in the history
Overlay mode puts the bar above normal windows and passes through/ignores any
touch/mouse/keyboard events that would be sent to it.
  • Loading branch information
milkey-mouse authored and RedSoxFan committed Feb 25, 2019
1 parent 2510e3d commit 2f7247e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
1 change: 1 addition & 0 deletions include/swaybar/bar.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions sway/commands/bar/mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode
bar->mode = strdup("hide");
} else if (strcasecmp("invisible", mode) == 0) {
bar->mode = strdup("invisible");
} else if (strcasecmp("overlay", mode) == 0) {
bar->mode = strdup("overlay");
} else {
return cmd_results_new(CMD_INVALID, "Invalid value %s", mode);
}
Expand Down
6 changes: 4 additions & 2 deletions sway/sway-bar.5.scd
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,13 @@ Sway allows configuring swaybar in the sway configuration file.
debug-events`. To disable the default behavior for a button, use the
command _nop_.

*mode* dock|hide|invisible
*mode* dock|hide|invisible|overlay
Specifies the visibility of the bar. In _dock_ mode, it is permanently
visible at one edge of the screen. In _hide_ mode, it is hidden unless the
modifier key is pressed, though this behaviour depends on the hidden state.
In _invisible_ mode, it is permanently hidden. Default is _dock_.
In _invisible_ mode, it is permanently hidden. In _overlay_ mode, it is
permanently visible on top of other windows. (In _overlay_ mode the bar is
transparent to input events.) Default is _dock_.

*hidden_state* hide|show
Specifies the behaviour of the bar when it is in _hide_ mode. When the
Expand Down
16 changes: 14 additions & 2 deletions swaybar/bar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
zxdg_output_v1_destroy(output->xdg_output);
wl_output_destroy(output->output);
destroy_buffer(&output->buffers[0]);
Expand Down Expand Up @@ -100,16 +103,25 @@ static void add_layer_surface(struct swaybar_output *output) {

struct swaybar_config *config = bar->config;
bool hidden = strcmp(config->mode, "hide") == 0;
bool overlay = !hidden && strcmp(config->mode, "overlay") == 0;
output->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
bar->layer_shell, output->surface, output->output,
hidden ? ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY :
hidden || overlay ? ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY :
ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel");
assert(output->layer_surface);
zwlr_layer_surface_v1_add_listener(output->layer_surface,
&layer_surface_listener, output);

if (overlay) {
// Empty input 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);
if (hidden) {
if (hidden || overlay) {
zwlr_layer_surface_v1_set_exclusive_zone(output->layer_surface, -1);
}
}
Expand Down

0 comments on commit 2f7247e

Please sign in to comment.