Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

swaybar: prioritize workspace scroll over bindsyms #8299

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

swaybar: prioritize workspace scroll over bindsyms #8299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39dc37c
swaybar: refactor workspace button handling logic
joanbm Aug 15, 2024
9431d06
swaybar: prioritize workspace scroll over bindsyms
joanbm Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/swaybar/input.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ uint32_t event_to_x11_button(uint32_t event);

void free_hotspots(struct wl_list *list);

bool handle_workspace_button(struct swaybar_output *output,
uint32_t button, bool released, const char *ws);

void swaybar_seat_free(struct swaybar_seat *seat);

#endif
25 changes: 25 additions & 0 deletions swaybar/input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,30 @@ static void workspace_next(struct swaybar *bar, struct swaybar_output *output,
}
}

bool handle_workspace_button(struct swaybar_output *output,
uint32_t button, bool released, const char *ws) {
if (button == BTN_LEFT) {
if (released) {
// Since we handle the pressed event, also handle the released event
// to block it from falling through to a binding in the bar
return true;
}
ipc_send_workspace_command(output->bar, ws);
return true;
} else if (button == SWAY_SCROLL_UP || button == SWAY_SCROLL_DOWN ||
button == SWAY_SCROLL_LEFT || button == SWAY_SCROLL_RIGHT) {
if (released) {
return true;
}

workspace_next(output->bar, output,
button == SWAY_SCROLL_UP || button == SWAY_SCROLL_LEFT);
return true;
}

return false;
}

static void process_discrete_scroll(struct swaybar_seat *seat,
struct swaybar_output *output, struct swaybar_pointer *pointer,
uint32_t axis, wl_fixed_t value) {
Expand All @@ -251,6 +275,7 @@ static void process_discrete_scroll(struct swaybar_seat *seat,
return;
}

// If no hotspot nor binding handles the event, scroll through workspaces
struct swaybar_config *config = seat->bar->config;
double amt = wl_fixed_to_double(value);
if (amt == 0.0 || !config->workspace_buttons) {
Expand Down
12 changes: 2 additions & 10 deletions swaybar/render.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,16 +599,8 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx,
static enum hotspot_event_handling workspace_hotspot_callback(
struct swaybar_output *output, struct swaybar_hotspot *hotspot,
double x, double y, uint32_t button, bool released, void *data) {
if (button != BTN_LEFT) {
return HOTSPOT_PROCESS;
}
if (released) {
// Since we handle the pressed event, also handle the released event
// to block it from falling through to a binding in the bar
return HOTSPOT_IGNORE;
}
ipc_send_workspace_command(output->bar, (const char *)data);
return HOTSPOT_IGNORE;
return handle_workspace_button(output, button, released, (const char *)data)
? HOTSPOT_IGNORE : HOTSPOT_PROCESS;
}

static uint32_t render_workspace_button(struct render_context *ctx,
Expand Down