aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/swaybar/bar.h23
-rw-r--r--include/swaybar/ipc.h1
-rw-r--r--meson.build1
-rw-r--r--swaybar/bar.c167
-rw-r--r--swaybar/ipc.c8
-rw-r--r--swaybar/meson.build4
-rw-r--r--swaybar/render.c39
7 files changed, 226 insertions, 17 deletions
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 1bf2ea2d..74292519 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -2,20 +2,39 @@
#define _SWAYBAR_BAR_H
#include <wayland-client.h>
#include "pool-buffer.h"
-#include "list.h"
struct swaybar_config;
struct swaybar_output;
struct swaybar_workspace;
+struct swaybar_pointer {
+ struct wl_pointer *pointer;
+ struct wl_cursor_theme *cursor_theme;
+ struct wl_cursor_image *cursor_image;
+ struct wl_surface *cursor_surface;
+ struct swaybar_output *current;
+ int x, y;
+};
+
+struct swaybar_hotspot {
+ struct wl_list link;
+ int x, y, width, height;
+ void (*callback)(struct swaybar_output *output,
+ int x, int y, uint32_t button, void *data);
+ void (*destroy)(void *data);
+ void *data;
+};
+
struct swaybar {
struct wl_display *display;
struct wl_compositor *compositor;
struct zwlr_layer_shell_v1 *layer_shell;
struct wl_shm *shm;
+ struct wl_seat *seat;
struct swaybar_config *config;
struct swaybar_output *focused_output;
+ struct swaybar_pointer pointer;
struct status_line *status;
int ipc_event_socketfd;
@@ -32,6 +51,7 @@ struct swaybar_output {
struct zwlr_layer_surface_v1 *layer_surface;
struct wl_list workspaces;
+ struct wl_list hotspots;
char *name;
size_t index;
@@ -51,7 +71,6 @@ struct swaybar_workspace {
bool urgent;
};
-// TODO: Rename stuff to match wlroots conventions (init/create/etc)
void bar_setup(struct swaybar *bar,
const char *socket_path,
const char *bar_id);
diff --git a/include/swaybar/ipc.h b/include/swaybar/ipc.h
index 278baef0..6ea7c4d6 100644
--- a/include/swaybar/ipc.h
+++ b/include/swaybar/ipc.h
@@ -6,5 +6,6 @@
void ipc_initialize(struct swaybar *bar, const char *bar_id);
bool handle_ipc_event(struct swaybar *bar);
void ipc_get_workspaces(struct swaybar *bar);
+void ipc_send_workspace_command(struct swaybar *bar, const char *ws);
#endif
diff --git a/meson.build b/meson.build
index 49824b30..01788fd9 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,7 @@ pcre = dependency('libpcre')
wlroots = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
wayland_server = dependency('wayland-server')
wayland_client = dependency('wayland-client')
+wayland_cursor = dependency('wayland-cursor')
wayland_egl = dependency('wayland-egl')
wayland_protos = dependency('wayland-protocols')
xkbcommon = dependency('xkbcommon')
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 0fc41517..f743236c 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -9,7 +9,13 @@
#include <sys/wait.h>
#include <unistd.h>
#include <wayland-client.h>
+#include <wayland-cursor.h>
#include <wlr/util/log.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input-event-codes.h>
+#else
+#include <linux/input-event-codes.h>
+#endif
#include "swaybar/render.h"
#include "swaybar/config.h"
#include "swaybar/event_loop.h"
@@ -18,6 +24,7 @@
#include "swaybar/ipc.h"
#include "ipc-client.h"
#include "list.h"
+#include "log.h"
#include "pango.h"
#include "pool-buffer.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
@@ -27,12 +34,6 @@ static void bar_init(struct swaybar *bar) {
wl_list_init(&bar->outputs);
}
-struct swaybar_output *new_output(const char *name) {
- struct swaybar_output *output = malloc(sizeof(struct swaybar_output));
- output->name = strdup(name);
- return output;
-}
-
static void layer_surface_configure(void *data,
struct zwlr_layer_surface_v1 *surface,
uint32_t serial, uint32_t width, uint32_t height) {
@@ -56,12 +57,156 @@ struct zwlr_layer_surface_v1_listener layer_surface_listener = {
.closed = layer_surface_closed,
};
+static void wl_pointer_enter(void *data, struct wl_pointer *wl_pointer,
+ uint32_t serial, struct wl_surface *surface,
+ wl_fixed_t surface_x, wl_fixed_t surface_y) {
+ struct swaybar *bar = data;
+ struct swaybar_pointer *pointer = &bar->pointer;
+ struct swaybar_output *output;
+ wl_list_for_each(output, &bar->outputs, link) {
+ if (output->surface == surface) {
+ pointer->current = output;
+ break;
+ }
+ }
+ wl_surface_attach(pointer->cursor_surface,
+ wl_cursor_image_get_buffer(pointer->cursor_image), 0, 0);
+ wl_pointer_set_cursor(wl_pointer, serial, pointer->cursor_surface,
+ pointer->cursor_image->hotspot_x,
+ pointer->cursor_image->hotspot_y);
+ wl_surface_commit(pointer->cursor_surface);
+}
+
+static void wl_pointer_leave(void *data, struct wl_pointer *wl_pointer,
+ uint32_t serial, struct wl_surface *surface) {
+ struct swaybar *bar = data;
+ bar->pointer.current = NULL;
+}
+
+static void wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
+ uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
+ struct swaybar *bar = data;
+ bar->pointer.x = wl_fixed_to_int(surface_x);
+ bar->pointer.y = wl_fixed_to_int(surface_y);
+}
+
+static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
+ uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
+ struct swaybar *bar = data;
+ struct swaybar_pointer *pointer = &bar->pointer;
+ struct swaybar_output *output = pointer->current;
+ if (!sway_assert(output, "button with no active output")) {
+ return;
+ }
+ if (state != WL_POINTER_BUTTON_STATE_PRESSED) {
+ return;
+ }
+ struct swaybar_hotspot *hotspot;
+ wl_list_for_each(hotspot, &output->hotspots, link) {
+ if (pointer->x >= hotspot->x
+ && pointer->y >= hotspot->y
+ && pointer->x < hotspot->x + hotspot->width
+ && pointer->y < hotspot->y + hotspot->height) {
+ hotspot->callback(output, pointer->x, pointer->y,
+ button, hotspot->data);
+ }
+ }
+}
+
+static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
+ uint32_t time, uint32_t axis, wl_fixed_t value) {
+ struct swaybar *bar = data;
+ struct swaybar_output *output = bar->pointer.current;
+ if (!sway_assert(output, "axis with no active output")) {
+ return;
+ }
+ double amt = wl_fixed_to_double(value);
+ if (!bar->config->wrap_scroll) {
+ int i = 0;
+ struct swaybar_workspace *ws = NULL;
+ wl_list_for_each(ws, &output->workspaces, link) {
+ if (ws->focused) {
+ break;
+ }
+ ++i;
+ }
+ int len = wl_list_length(&output->workspaces);
+ if (!sway_assert(i != len, "axis with null workspace")) {
+ return;
+ }
+ if (i == 0 && amt > 0) {
+ return; // Do not wrap
+ }
+ if (i == len - 1 && amt < 0) {
+ return; // Do not wrap
+ }
+ }
+
+ const char *workspace_name =
+ amt < 0 ? "prev_on_output" : "next_on_output";
+ ipc_send_workspace_command(bar, workspace_name);
+}
+
+static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {
+ // Who cares
+}
+
+static void wl_pointer_axis_source(void *data, struct wl_pointer *wl_pointer,
+ uint32_t axis_source) {
+ // Who cares
+}
+
+static void wl_pointer_axis_stop(void *data, struct wl_pointer *wl_pointer,
+ uint32_t time, uint32_t axis) {
+ // Who cares
+}
+
+static void wl_pointer_axis_discrete(void *data, struct wl_pointer *wl_pointer,
+ uint32_t axis, int32_t discrete) {
+ // Who cares
+}
+
+struct wl_pointer_listener pointer_listener = {
+ .enter = wl_pointer_enter,
+ .leave = wl_pointer_leave,
+ .motion = wl_pointer_motion,
+ .button = wl_pointer_button,
+ .axis = wl_pointer_axis,
+ .frame = wl_pointer_frame,
+ .axis_source = wl_pointer_axis_source,
+ .axis_stop = wl_pointer_axis_stop,
+ .axis_discrete = wl_pointer_axis_discrete,
+};
+
+static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
+ enum wl_seat_capability caps) {
+ struct swaybar *bar = data;
+ if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
+ bar->pointer.pointer = wl_seat_get_pointer(wl_seat);
+ wl_pointer_add_listener(bar->pointer.pointer, &pointer_listener, bar);
+ }
+}
+
+static void seat_handle_name(void *data, struct wl_seat *wl_seat,
+ const char *name) {
+ // Who cares
+}
+
+const struct wl_seat_listener seat_listener = {
+ .capabilities = seat_handle_capabilities,
+ .name = seat_handle_name,
+};
+
static void handle_global(void *data, struct wl_registry *registry,
uint32_t name, const char *interface, uint32_t version) {
struct swaybar *bar = data;
if (strcmp(interface, wl_compositor_interface.name) == 0) {
bar->compositor = wl_registry_bind(registry, name,
&wl_compositor_interface, 1);
+ } else if (strcmp(interface, wl_seat_interface.name) == 0) {
+ bar->seat = wl_registry_bind(registry, name,
+ &wl_seat_interface, 1);
+ wl_seat_add_listener(bar->seat, &seat_listener, bar);
} else if (strcmp(interface, wl_shm_interface.name) == 0) {
bar->shm = wl_registry_bind(registry, name,
&wl_shm_interface, 1);
@@ -74,6 +219,7 @@ static void handle_global(void *data, struct wl_registry *registry,
&wl_output_interface, 1);
output->index = index++;
wl_list_init(&output->workspaces);
+ wl_list_init(&output->hotspots);
wl_list_insert(&bar->outputs, &output->link);
} else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
bar->layer_shell = wl_registry_bind(
@@ -116,6 +262,15 @@ void bar_setup(struct swaybar *bar,
wl_registry_add_listener(registry, &registry_listener, bar);
wl_display_roundtrip(bar->display);
assert(bar->compositor && bar->layer_shell && bar->shm);
+ struct swaybar_pointer *pointer = &bar->pointer;
+
+ assert(pointer->cursor_theme = wl_cursor_theme_load(NULL, 16, bar->shm));
+ struct wl_cursor *cursor;
+ assert(cursor = wl_cursor_theme_get_cursor(
+ pointer->cursor_theme, "left_ptr"));
+ pointer->cursor_image = cursor->images[0];
+ assert(pointer->cursor_surface =
+ wl_compositor_create_surface(bar->compositor));
// TODO: we might not necessarily be meant to do all of the outputs
struct swaybar_output *output;
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 326f25cc..64583df0 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -8,6 +8,14 @@
#include "swaybar/ipc.h"
#include "ipc-client.h"
+void ipc_send_workspace_command(struct swaybar *bar, const char *ws) {
+ const char *fmt = "workspace \"%s\"";
+ uint32_t size = snprintf(NULL, 0, fmt, ws);
+ char command[size];
+ snprintf(command, size, fmt, ws);
+ ipc_single_command(bar->ipc_socketfd, IPC_COMMAND, command, &size);
+}
+
char *parse_font(const char *font) {
char *new_font = NULL;
if (strncmp("pango:", font, 6) == 0) {
diff --git a/swaybar/meson.build b/swaybar/meson.build
index d15e8b5c..bf6f6d7a 100644
--- a/swaybar/meson.build
+++ b/swaybar/meson.build
@@ -1,6 +1,5 @@
executable(
- 'swaybar',
- [
+ 'swaybar', [
'bar.c',
'config.c',
'event_loop.c',
@@ -20,6 +19,7 @@ executable(
pangocairo,
rt,
wayland_client,
+ wayland_cursor,
wlroots,
],
link_with: [lib_sway_common, lib_sway_client],
diff --git a/swaybar/render.c b/swaybar/render.c
index 3d9ef66b..c2358724 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 200809L
#include <limits.h>
#include <stdlib.h>
#include <stdint.h>
@@ -8,6 +9,7 @@
#include "pool-buffer.h"
#include "swaybar/bar.h"
#include "swaybar/config.h"
+#include "swaybar/ipc.h"
#include "swaybar/render.h"
#include "swaybar/status_line.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
@@ -108,9 +110,14 @@ static const char *strip_workspace_number(const char *ws_name) {
return ws_name;
}
+static void workspace_hotspot_callback(struct swaybar_output *output,
+ int x, int y, uint32_t button, void *data) {
+ ipc_send_workspace_command(output->bar, (const char *)data);
+}
+
static uint32_t render_workspace_button(cairo_t *cairo,
- struct swaybar_config *config, struct swaybar_workspace *ws,
- double *x, uint32_t height) {
+ struct swaybar_output *output, struct swaybar_config *config,
+ struct swaybar_workspace *ws, double *x, uint32_t height) {
const char *name = ws->name;
if (config->strip_workspace_numbers) {
name = strip_workspace_number(ws->name);
@@ -156,8 +163,18 @@ static uint32_t render_workspace_button(cairo_t *cairo,
cairo_move_to(cairo, *x + width / 2 - text_width / 2, (int)floor(text_y));
pango_printf(cairo, config->font, 1, true, "%s", name);
+ struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
+ hotspot->x = *x;
+ hotspot->y = 0;
+ hotspot->height = height;
+ hotspot->width = width;
+ hotspot->callback = workspace_hotspot_callback;
+ hotspot->destroy = free;
+ hotspot->data = strdup(name);
+ wl_list_insert(&output->hotspots, &hotspot->link);
+
*x += width;
- return ideal_height;
+ return height;
}
static uint32_t render_to_cairo(cairo_t *cairo,
@@ -184,8 +201,8 @@ static uint32_t render_to_cairo(cairo_t *cairo,
if (config->workspace_buttons) {
struct swaybar_workspace *ws;
wl_list_for_each_reverse(ws, &output->workspaces, link) {
- uint32_t h = render_workspace_button(
- cairo, config, ws, &x, output->height);
+ uint32_t h = render_workspace_button(cairo,
+ output, config, ws, &x, output->height);
max_height = h > max_height ? h : max_height;
}
}
@@ -203,8 +220,16 @@ static uint32_t render_to_cairo(cairo_t *cairo,
return max_height > output->height ? max_height : output->height;
}
-void render_frame(struct swaybar *bar,
- struct swaybar_output *output) {
+void render_frame(struct swaybar *bar, struct swaybar_output *output) {
+ struct swaybar_hotspot *hotspot, *tmp;
+ wl_list_for_each_safe(hotspot, tmp, &output->hotspots, link) {
+ if (hotspot->destroy) {
+ hotspot->destroy(hotspot->data);
+ }
+ wl_list_remove(&hotspot->link);
+ free(hotspot);
+ }
+
cairo_surface_t *recorder = cairo_recording_surface_create(
CAIRO_CONTENT_COLOR_ALPHA, NULL);
cairo_t *cairo = cairo_create(recorder);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 20:49:57 +0000