aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-03-08 09:44:03 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:38:22 +0000
commita9ecf1449e731c2461ced75cc9c16247523aca47 (patch)
tree791e59758f4e2c03d12403c1b5f9f8ca3107acf4
parentmeson: generate bindings for wp-fractional-scale + wp-viewport (diff)
wayland: plumbing for wp-fractional-scale
* Bind the wp-viewporter and wp-fractional-scale-manager globals. * Create a viewport and fractional-scale when instantiating a window. * Add fractional-scale listener (that does nothing at the moment). * Destroy everything on teardown.
-rw-r--r--wayland.c61
-rw-r--r--wayland.h16
2 files changed, 77 insertions, 0 deletions
diff --git a/wayland.c b/wayland.c
index 51161cf0..7aa48e71 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1121,6 +1121,27 @@ handle_global(void *data, struct wl_registry *registry,
}
#endif
+#if defined(HAVE_FRACTIONAL_SCALE)
+ else if (strcmp(interface, wp_viewporter_interface.name) == 0) {
+ const uint32_t required = 1;
+ if (!verify_iface_version(interface, version, required))
+ return;
+
+ wayl->viewporter = wl_registry_bind(
+ wayl->registry, name, &wp_viewporter_interface, required);
+ }
+
+ else if (strcmp(interface, wp_fractional_scale_manager_v1_interface.name) == 0) {
+ const uint32_t required = 1;
+ if (!verify_iface_version(interface, version, required))
+ return;
+
+ wayl->fractional_scale_manager = wl_registry_bind(
+ wayl->registry, name,
+ &wp_fractional_scale_manager_v1_interface, required);
+ }
+#endif
+
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
else if (strcmp(interface, zwp_text_input_manager_v3_interface.name) == 0) {
const uint32_t required = 1;
@@ -1435,6 +1456,12 @@ wayl_destroy(struct wayland *wayl)
zwp_text_input_manager_v3_destroy(wayl->text_input_manager);
#endif
+#if defined(HAVE_FRACTIONAL_SCALE)
+ if (wayl->fractional_scale_manager != NULL)
+ wp_fractional_scale_manager_v1_destroy(wayl->fractional_scale_manager);
+ if (wayl->viewporter != NULL)
+ wp_viewporter_destroy(wayl->viewporter);
+#endif
#if defined(HAVE_XDG_ACTIVATION)
if (wayl->xdg_activation != NULL)
xdg_activation_v1_destroy(wayl->xdg_activation);
@@ -1469,6 +1496,21 @@ wayl_destroy(struct wayland *wayl)
free(wayl);
}
+#if defined(HAVE_FRACTIONAL_SCALE)
+static void fractional_scale_preferred_scale(
+ void *data, struct wp_fractional_scale_v1 *wp_fractional_scale_v1,
+ uint32_t scale)
+{
+ struct wl_window *win = data;
+ win->scale = (float)scale / 120.;
+ LOG_DBG("fractional scale: %.3f", win->scale);
+}
+
+static const struct wp_fractional_scale_v1_listener fractional_scale_listener = {
+ .preferred_scale = &fractional_scale_preferred_scale,
+};
+#endif
+
struct wl_window *
wayl_win_init(struct terminal *term, const char *token)
{
@@ -1499,6 +1541,19 @@ wayl_win_init(struct terminal *term, const char *token)
wl_surface_add_listener(win->surface, &surface_listener, win);
+#if defined(HAVE_FRACTIONAL_SCALE)
+ if (wayl->fractional_scale_manager != NULL && wayl->viewporter != NULL) {
+ LOG_ERR("LDKJFLDF");
+ win->viewport = wp_viewporter_get_viewport(wayl->viewporter, win->surface);
+
+ win->fractional_scale =
+ wp_fractional_scale_manager_v1_get_fractional_scale(
+ wayl->fractional_scale_manager, win->surface);
+ wp_fractional_scale_v1_add_listener(
+ win->fractional_scale, &fractional_scale_listener, win);
+ }
+#endif
+
win->xdg_surface = xdg_wm_base_get_xdg_surface(wayl->shell, win->surface);
xdg_surface_add_listener(win->xdg_surface, &xdg_surface_listener, win);
@@ -1653,6 +1708,12 @@ wayl_win_destroy(struct wl_window *win)
tll_remove(win->xdg_tokens, it);
}
#endif
+#if defined(HAVE_FRACTIONAL_SCALE)
+ if (win->fractional_scale != NULL)
+ wp_fractional_scale_v1_destroy(win->fractional_scale);
+ if (win->viewport != NULL)
+ wp_viewport_destroy(win->viewport);
+#endif
if (win->frame_callback != NULL)
wl_callback_destroy(win->frame_callback);
if (win->xdg_toplevel_decoration != NULL)
diff --git a/wayland.h b/wayland.h
index 0d627052..20edcb68 100644
--- a/wayland.h
+++ b/wayland.h
@@ -20,6 +20,11 @@
#include <xdg-activation-v1.h>
#endif
+#if defined(HAVE_FRACTIONAL_SCALE)
+ #include <viewporter.h>
+ #include <fractional-scale-v1.h>
+#endif
+
#include <fcft/fcft.h>
#include <tllist.h>
@@ -327,8 +332,14 @@ struct wl_window {
tll(struct xdg_activation_token_context *) xdg_tokens;
bool urgency_token_is_pending;
#endif
+#if defined(HAVE_FRACTIONAL_SCALE)
+ struct wp_viewport *viewport;
+ struct wp_fractional_scale_v1 *fractional_scale;
+#endif
bool unmapped;
+ float scale;
+
struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration;
enum csd_mode csd_mode;
@@ -414,6 +425,11 @@ struct wayland {
struct zwp_text_input_manager_v3 *text_input_manager;
#endif
+#if defined(HAVE_FRACTIONAL_SCALE)
+ struct wp_viewporter *viewporter;
+ struct wp_fractional_scale_manager_v1 *fractional_scale_manager;
+#endif
+
bool have_argb8888;
tll(struct monitor) monitors; /* All available outputs */
tll(struct seat) seats;