aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/output.c25
-rw-r--r--sway/config.c1
-rw-r--r--sway/config/output.c17
-rw-r--r--sway/desktop/xdg_shell.c277
-rw-r--r--sway/input/cursor.c11
-rw-r--r--sway/input/keyboard.c2
-rw-r--r--sway/meson.build3
-rw-r--r--sway/server.c9
-rw-r--r--sway/tree/container.c12
-rw-r--r--sway/tree/view.c23
10 files changed, 375 insertions, 5 deletions
diff --git a/sway/commands/output.c b/sway/commands/output.c
index f7e3372c..e8881f77 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -20,6 +20,25 @@ static char *bg_options[] = {
"tile",
};
+static struct cmd_results *cmd_output_dpms(struct output_config *output,
+ int *i, int argc, char **argv) {
+
+ if (++*i >= argc) {
+ return cmd_results_new(CMD_INVALID, "output", "Missing dpms argument.");
+ }
+
+ char *value = argv[*i];
+ if (strcmp(value, "on") == 0) {
+ output->dpms_state = DPMS_ON;
+ } else if (strcmp(value, "off") == 0) {
+ output->dpms_state = DPMS_OFF;
+ } else {
+ return cmd_results_new(CMD_INVALID, "output",
+ "Invalid dpms state, valid states are on/off.");
+ }
+ return NULL;
+}
+
static struct cmd_results *cmd_output_mode(struct output_config *output,
int *i, int argc, char **argv) {
if (++*i >= argc) {
@@ -263,6 +282,8 @@ struct cmd_results *cmd_output(int argc, char **argv) {
} else if (strcasecmp(command, "background") == 0 ||
strcasecmp(command, "bg") == 0) {
error = cmd_output_background(output, &i, argc, argv);
+ } else if (strcasecmp(command, "dpms") == 0) {
+ error = cmd_output_dpms(output, &i, argc, argv);
} else {
error = cmd_results_new(CMD_INVALID, "output",
"Invalid output subcommand: %s.", command);
@@ -285,10 +306,10 @@ struct cmd_results *cmd_output(int argc, char **argv) {
}
wlr_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
- "position %d,%d scale %f transform %d) (bg %s %s)",
+ "position %d,%d scale %f transform %d) (bg %s %s) (dpms %d)",
output->name, output->enabled, output->width, output->height,
output->refresh_rate, output->x, output->y, output->scale,
- output->transform, output->background, output->background_option);
+ output->transform, output->background, output->background_option, output->dpms_state);
// Try to find the output container and apply configuration now. If
// this is during startup then there will be no container and config
diff --git a/sway/config.c b/sway/config.c
index 270c1d86..34c8a280 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -165,6 +165,7 @@ static void config_defaults(struct sway_config *config) {
config->floating_mod = 0;
config->dragging_key = BTN_LEFT;
config->resizing_key = BTN_RIGHT;
+
if (!(config->floating_scroll_up_cmd = strdup(""))) goto cleanup;
if (!(config->floating_scroll_down_cmd = strdup(""))) goto cleanup;
if (!(config->floating_scroll_left_cmd = strdup(""))) goto cleanup;
diff --git a/sway/config/output.c b/sway/config/output.c
index 68022278..ee2440ea 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -81,6 +81,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) {
free(dst->background_option);
dst->background_option = strdup(src->background_option);
}
+ if (src->dpms_state != 0) {
+ dst->dpms_state = src->dpms_state;
+ }
}
static void set_mode(struct wlr_output *output, int width, int height,
@@ -204,6 +207,20 @@ void apply_output_config(struct output_config *oc, struct sway_container *output
execvp(cmd[0], cmd);
}
}
+ if (oc && oc->dpms_state != DPMS_IGNORE) {
+ switch (oc->dpms_state) {
+ case DPMS_ON:
+ wlr_log(L_DEBUG, "Turning on screen");
+ wlr_output_enable(wlr_output, true);
+ break;
+ case DPMS_OFF:
+ wlr_log(L_DEBUG, "Turning off screen");
+ wlr_output_enable(wlr_output, false);
+ break;
+ case DPMS_IGNORE:
+ break;
+ }
+ }
}
void free_output_config(struct output_config *oc) {
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
new file mode 100644
index 00000000..48b659f2
--- /dev/null
+++ b/sway/desktop/xdg_shell.c
@@ -0,0 +1,277 @@
+#define _POSIX_C_SOURCE 199309L
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wayland-server.h>
+#include <wlr/types/wlr_xdg_shell.h>
+#include "sway/tree/container.h"
+#include "sway/tree/layout.h"
+#include "sway/server.h"
+#include "sway/tree/view.h"
+#include "sway/input/seat.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+static const struct sway_view_child_impl popup_impl;
+
+static void popup_destroy(struct sway_view_child *child) {
+ if (!sway_assert(child->impl == &popup_impl,
+ "Expected an xdg_shell popup")) {
+ return;
+ }
+ struct sway_xdg_popup *popup = (struct sway_xdg_popup *)child;
+ wl_list_remove(&popup->new_popup.link);
+ wl_list_remove(&popup->destroy.link);
+ free(popup);
+}
+
+static const struct sway_view_child_impl popup_impl = {
+ .destroy = popup_destroy,
+};
+
+static struct sway_xdg_popup *popup_create(
+ struct wlr_xdg_popup *wlr_popup, struct sway_view *view);
+
+static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
+ struct sway_xdg_popup *popup =
+ wl_container_of(listener, popup, new_popup);
+ struct wlr_xdg_popup *wlr_popup = data;
+ popup_create(wlr_popup, popup->child.view);
+}
+
+static void popup_handle_destroy(struct wl_listener *listener, void *data) {
+ struct sway_xdg_popup *popup = wl_container_of(listener, popup, destroy);
+ view_child_destroy(&popup->child);
+}
+
+static struct sway_xdg_popup *popup_create(
+ struct wlr_xdg_popup *wlr_popup, struct sway_view *view) {
+ struct wlr_xdg_surface *xdg_surface = wlr_popup->base;
+
+ struct sway_xdg_popup *popup =
+ calloc(1, sizeof(struct sway_xdg_popup));
+ if (popup == NULL) {
+ return NULL;
+ }
+ view_child_init(&popup->child, &popup_impl, view, xdg_surface->surface);
+
+ wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
+ popup->new_popup.notify = popup_handle_new_popup;
+ wl_signal_add(&xdg_surface->events.destroy, &popup->destroy);
+ popup->destroy.notify = popup_handle_destroy;
+
+ return popup;
+}
+
+
+static struct sway_xdg_shell_view *xdg_shell_view_from_view(
+ struct sway_view *view) {
+ if (!sway_assert(view->type == SWAY_VIEW_XDG_SHELL,
+ "Expected xdg_shell view")) {
+ return NULL;
+ }
+ return (struct sway_xdg_shell_view *)view;
+}
+
+static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
+ if (xdg_shell_view_from_view(view) == NULL) {
+ return NULL;
+ }
+ switch (prop) {
+ case VIEW_PROP_TITLE:
+ return view->wlr_xdg_surface->toplevel->title;
+ case VIEW_PROP_APP_ID:
+ return view->wlr_xdg_surface->toplevel->app_id;
+ default:
+ return NULL;
+ }
+}
+
+static void configure(struct sway_view *view, double ox, double oy, int width,
+ int height) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ xdg_shell_view_from_view(view);
+ if (xdg_shell_view == NULL) {
+ return;
+ }
+
+ xdg_shell_view->pending_width = width;
+ xdg_shell_view->pending_height = height;
+ wlr_xdg_toplevel_set_size(view->wlr_xdg_surface, width, height);
+}
+
+static void set_activated(struct sway_view *view, bool activated) {
+ if (xdg_shell_view_from_view(view) == NULL) {
+ return;
+ }
+ struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
+ if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+ wlr_xdg_toplevel_set_activated(surface, activated);
+ }
+}
+
+static void set_fullscreen(struct sway_view *view, bool fullscreen) {
+ if (xdg_shell_view_from_view(view) == NULL) {
+ return;
+ }
+ struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
+ wlr_xdg_toplevel_set_fullscreen(surface, fullscreen);
+}
+
+static void for_each_surface(struct sway_view *view,
+ wlr_surface_iterator_func_t iterator, void *user_data) {
+ if (xdg_shell_view_from_view(view) == NULL) {
+ return;
+ }
+ wlr_xdg_surface_for_each_surface(view->wlr_xdg_surface, iterator,
+ user_data);
+}
+
+static void _close(struct sway_view *view) {
+ if (xdg_shell_view_from_view(view) == NULL) {
+ return;
+ }
+ struct wlr_xdg_surface *surface = view->wlr_xdg_surface;
+ if (surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+ wlr_xdg_surface_send_close(surface);
+ }
+}
+
+static void destroy(struct sway_view *view) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ xdg_shell_view_from_view(view);
+ if (xdg_shell_view == NULL) {
+ return;
+ }
+ wl_list_remove(&xdg_shell_view->destroy.link);
+ wl_list_remove(&xdg_shell_view->map.link);
+ wl_list_remove(&xdg_shell_view->unmap.link);
+ wl_list_remove(&xdg_shell_view->request_fullscreen.link);
+ free(xdg_shell_view);
+}
+
+static const struct sway_view_impl view_impl = {
+ .get_prop = get_prop,
+ .configure = configure,
+ .set_activated = set_activated,
+ .set_fullscreen = set_fullscreen,
+ .for_each_surface = for_each_surface,
+ .close = _close,
+ .destroy = destroy,
+};
+
+static void handle_commit(struct wl_listener *listener, void *data) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ wl_container_of(listener, xdg_shell_view, commit);
+ struct sway_view *view = &xdg_shell_view->view;
+ // NOTE: We intentionally discard the view's desired width here
+ // TODO: Store this for restoration when moving to floating plane
+ // TODO: Let floating views do whatever
+ view_update_size(view, xdg_shell_view->pending_width,
+ xdg_shell_view->pending_height);
+ view_update_title(view, false);
+ view_damage_from(view);
+}
+
+static void handle_new_popup(struct wl_listener *listener, void *data) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ wl_container_of(listener, xdg_shell_view, new_popup);
+ struct wlr_xdg_popup *wlr_popup = data;
+ popup_create(wlr_popup, &xdg_shell_view->view);
+}
+
+static void handle_unmap(struct wl_listener *listener, void *data) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ wl_container_of(listener, xdg_shell_view, unmap);
+
+ view_unmap(&xdg_shell_view->view);
+
+ wl_list_remove(&xdg_shell_view->commit.link);
+ wl_list_remove(&xdg_shell_view->new_popup.link);
+}
+
+static void handle_map(struct wl_listener *listener, void *data) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ wl_container_of(listener, xdg_shell_view, map);
+ struct sway_view *view = &xdg_shell_view->view;
+ struct wlr_xdg_surface *xdg_surface = view->wlr_xdg_surface;
+
+ view_map(view, view->wlr_xdg_surface->surface);
+
+ xdg_shell_view->commit.notify = handle_commit;
+ wl_signal_add(&xdg_surface->surface->events.commit,
+ &xdg_shell_view->commit);
+
+ xdg_shell_view->new_popup.notify = handle_new_popup;
+ wl_signal_add(&xdg_surface->events.new_popup,
+ &xdg_shell_view->new_popup);
+
+ if (xdg_surface->toplevel->client_pending.fullscreen) {
+ view_set_fullscreen(view, true);
+ }
+}
+
+static void handle_destroy(struct wl_listener *listener, void *data) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ wl_container_of(listener, xdg_shell_view, destroy);
+ view_destroy(&xdg_shell_view->view);
+}
+
+static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
+ struct sway_xdg_shell_view *xdg_shell_view =
+ wl_container_of(listener, xdg_shell_view, request_fullscreen);
+ struct wlr_xdg_toplevel_set_fullscreen_event *e = data;
+ struct wlr_xdg_surface *xdg_surface =
+ xdg_shell_view->view.wlr_xdg_surface;
+
+ if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL,
+ "xdg_shell requested fullscreen of surface with role %i",
+ xdg_surface->role)) {
+ return;
+ }
+ if (!xdg_surface->mapped) {
+ return;
+ }
+
+ view_set_fullscreen(&xdg_shell_view->view, e->fullscreen);
+}
+
+void handle_xdg_shell_surface(struct wl_listener *listener, void *data) {
+ struct sway_server *server = wl_container_of(listener, server,
+ xdg_shell_surface);
+ struct wlr_xdg_surface *xdg_surface = data;
+
+ if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
+ wlr_log(L_DEBUG, "New xdg_shell popup");
+ return;
+ }
+
+ wlr_log(L_DEBUG, "New xdg_shell toplevel title='%s' app_id='%s'",
+ xdg_surface->toplevel->title, xdg_surface->toplevel->app_id);
+ wlr_xdg_surface_ping(xdg_surface);
+ wlr_xdg_toplevel_set_maximized(xdg_surface, true);
+
+ struct sway_xdg_shell_view *xdg_shell_view =
+ calloc(1, sizeof(struct sway_xdg_shell_view));
+ if (!sway_assert(xdg_shell_view, "Failed to allocate view")) {
+ return;
+ }
+
+ view_init(&xdg_shell_view->view, SWAY_VIEW_XDG_SHELL, &view_impl);
+ xdg_shell_view->view.wlr_xdg_surface = xdg_surface;
+
+ // TODO:
+ // - Look up pid and open on appropriate workspace
+
+ xdg_shell_view->map.notify = handle_map;
+ wl_signal_add(&xdg_surface->events.map, &xdg_shell_view->map);
+
+ xdg_shell_view->unmap.notify = handle_unmap;
+ wl_signal_add(&xdg_surface->events.unmap, &xdg_shell_view->unmap);
+
+ xdg_shell_view->destroy.notify = handle_destroy;
+ wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_view->destroy);
+
+ xdg_shell_view->request_fullscreen.notify = handle_request_fullscreen;
+ wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen,
+ &xdg_shell_view->request_fullscreen);
+}
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 51ce86e1..9259c475 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -7,6 +7,7 @@
#endif
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h>
+#include <wlr/types/wlr_idle.h>
#include "list.h"
#include "log.h"
#include "sway/input/cursor.h"
@@ -172,6 +173,7 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec)
static void handle_cursor_motion(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, motion);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_motion *event = data;
wlr_cursor_move(cursor->cursor, event->device,
event->delta_x, event->delta_y);
@@ -182,6 +184,7 @@ static void handle_cursor_motion_absolute(
struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, motion_absolute);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_motion_absolute *event = data;
wlr_cursor_warp_absolute(cursor->cursor, event->device, event->x, event->y);
cursor_send_pointer_motion(cursor, event->time_msec);
@@ -231,6 +234,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
static void handle_cursor_button(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_button *event = data;
dispatch_cursor_button(cursor,
event->time_msec, event->button, event->state);
@@ -238,6 +242,7 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
static void handle_cursor_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_pointer_axis *event = data;
wlr_seat_pointer_notify_axis(cursor->seat->wlr_seat, event->time_msec,
event->orientation, event->delta, event->delta_discrete, event->source);
@@ -245,6 +250,7 @@ static void handle_cursor_axis(struct wl_listener *listener, void *data) {
static void handle_touch_down(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_touch_down *event = data;
struct wlr_seat *seat = cursor->seat->wlr_seat;
@@ -271,6 +277,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
static void handle_touch_up(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_touch_up *event = data;
struct wlr_seat *seat = cursor->seat->wlr_seat;
// TODO: fall back to cursor simulation if client has not bound to touch
@@ -280,6 +287,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, touch_motion);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_touch_motion *event = data;
struct wlr_seat *seat = cursor->seat->wlr_seat;
@@ -331,6 +339,7 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
static void handle_tool_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_tablet_tool_axis *event = data;
struct sway_input_device *input_device = event->device->data;
@@ -353,6 +362,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_tablet_tool_tip *event = data;
dispatch_cursor_button(cursor, event->time_msec,
BTN_LEFT, event->state == WLR_TABLET_TOOL_TIP_DOWN ?
@@ -361,6 +371,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
static void handle_tool_button(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button);
+ wlr_idle_notify_activity(cursor->seat->input->server->idle, cursor->seat->wlr_seat);
struct wlr_event_tablet_tool_button *event = data;
// TODO: the user may want to configure which tool buttons are mapped to
// which simulated pointer buttons
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index dbf2ce01..c07557db 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -2,6 +2,7 @@
#include <limits.h>
#include <wlr/backend/multi.h>
#include <wlr/backend/session.h>
+#include <wlr/types/wlr_idle.h>
#include "sway/input/seat.h"
#include "sway/input/keyboard.h"
#include "sway/input/input-manager.h"
@@ -330,6 +331,7 @@ static void handle_keyboard_key(struct wl_listener *listener, void *data) {
struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
struct wlr_input_device *wlr_device =
keyboard->seat_device->input_device->wlr_device;
+ wlr_idle_notify_activity(keyboard->seat_device->sway_seat->input->server->idle, wlr_seat);
struct wlr_event_keyboard_key *event = data;
xkb_keycode_t keycode = event->keycode + 8;
diff --git a/sway/meson.build b/sway/meson.build
index acf4a3e4..570d4783 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -10,10 +10,11 @@ sway_sources = files(
'security.c',
'desktop/desktop.c',
- 'desktop/output.c',
'desktop/layer_shell.c',
+ 'desktop/output.c',
'desktop/wl_shell.c',
'desktop/xdg_shell_v6.c',
+ 'desktop/xdg_shell.c',
'desktop/xwayland.c',
'input/input-manager.c',
diff --git a/sway/server.c b/sway/server.c
index 8c41ee87..6147a39d 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -16,6 +16,7 @@
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/types/wlr_xdg_output.h>
#include <wlr/types/wlr_wl_shell.h>
+#include <wlr/types/wlr_idle.h>
#include <wlr/util/log.h>
// TODO WLR: make Xwayland optional
#include <wlr/xwayland.h>
@@ -61,6 +62,7 @@ bool server_init(struct sway_server *server) {
server->data_device_manager =
wlr_data_device_manager_create(server->wl_display);
+ server->idle = wlr_idle_create(server->wl_display);
wlr_screenshooter_create(server->wl_display);
wlr_gamma_control_manager_create(server->wl_display);
wlr_primary_selection_device_manager_create(server->wl_display);
@@ -81,6 +83,11 @@ bool server_init(struct sway_server *server) {
&server->xdg_shell_v6_surface);
server->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface;
+ server->xdg_shell = wlr_xdg_shell_create(server->wl_display);
+ wl_signal_add(&server->xdg_shell->events.new_surface,
+ &server->xdg_shell_surface);
+ server->xdg_shell_surface.notify = handle_xdg_shell_surface;
+
server->wl_shell = wlr_wl_shell_create(server->wl_display);
wl_signal_add(&server->wl_shell->events.new_surface,
&server->wl_shell_surface);
@@ -88,7 +95,7 @@ bool server_init(struct sway_server *server) {
// TODO make xwayland optional
server->xwayland =
- wlr_xwayland_create(server->wl_display, server->compositor, false);
+ wlr_xwayland_create(server->wl_display, server->compositor, true);
wl_signal_add(&server->xwayland->events.new_surface,
&server->xwayland_surface);
server->xwayland_surface.notify = handle_xwayland_surface;
diff --git a/sway/tree/container.c b/sway/tree/container.c
index fc35a81c..9f7294db 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -7,6 +7,8 @@
#include <wayland-server.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_wl_shell.h>
+#include <wlr/types/wlr_xdg_shell_v6.h>
+#include <wlr/types/wlr_xdg_shell.h>
#include "cairo.h"
#include "pango.h"
#include "sway/config.h"
@@ -459,6 +461,16 @@ struct sway_container *container_at(struct sway_container *parent,
sview->wlr_xdg_surface_v6,
view_sx, view_sy, &_sx, &_sy);
break;
+ case SWAY_VIEW_XDG_SHELL:
+ // the top left corner of the sway container is the
+ // coordinate of the top left corner of the window geometry
+ view_sx += sview->wlr_xdg_surface->geometry.x;
+ view_sy += sview->wlr_xdg_surface->geometry.y;
+
+ _surface = wlr_xdg_surface_surface_at(
+ sview->wlr_xdg_surface,
+ view_sx, view_sy, &_sx, &_sy);
+ break;
}
if (_surface) {
*sx = _sx;
diff --git a/sway/tree/view.c b/sway/tree/view.c
index a48a6619..a485e902 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -14,6 +14,8 @@
#include "sway/tree/layout.h"
#include "sway/tree/view.h"
#include "sway/tree/workspace.h"
+#include "sway/config.h"
+#include "pango.h"
void view_init(struct sway_view *view, enum sway_view_type type,
const struct sway_view_impl *impl) {
@@ -74,6 +76,8 @@ const char *view_get_type(struct sway_view *view) {
return "wl_shell";
case SWAY_VIEW_XDG_SHELL_V6:
return "xdg_shell_v6";
+ case SWAY_VIEW_XDG_SHELL:
+ return "xdg_shell";
case SWAY_VIEW_XWAYLAND:
return "xwayland";
}
@@ -607,6 +611,19 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) {
return len;
}
+static char *escape_title(char *buffer) {
+ int length = escape_markup_text(buffer, NULL, 0);
+ char *escaped_title = calloc(length + 1, sizeof(char));
+ int result = escape_markup_text(buffer, escaped_title, length);
+ if (result != length) {
+ wlr_log(L_ERROR, "Could not escape title: %s", buffer);
+ free(escaped_title);
+ return buffer;
+ }
+ free(buffer);
+ return escaped_title;
+}
+
void view_update_title(struct sway_view *view, bool force) {
if (!view->swayc) {
return;
@@ -626,11 +643,15 @@ void view_update_title(struct sway_view *view, bool force) {
free(view->swayc->formatted_title);
if (title) {
size_t len = parse_title_format(view, NULL);
- char *buffer = calloc(len + 1, 1);
+ char *buffer = calloc(len + 1, sizeof(char));
if (!sway_assert(buffer, "Unable to allocate title string")) {
return;
}
parse_title_format(view, buffer);
+ // now we have the title, but needs to be escaped when using pango markup
+ if (config->pango_markup) {
+ buffer = escape_title(buffer);
+ }
view->swayc->name = strdup(title);
view->swayc->formatted_title = buffer;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 18:59:41 +0000