alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: alex:master
Branches Tags
alex:master
alex:workspace-movement
..
compare: alex:workspace-movement
Branches Tags
alex:master
alex:workspace-movement

2 commits
master ... workspace-

Author SHA1 Message Date
Alex Janka 23910437c4 Merge branch 'master' into workspace-movement 2024-07-22 12:17:36 +10:00
Aidan Dang 4166fd3728 Add primary_selection config option 
See: https://github.com/swaywm/sway/issues/4511

Adds a bool config option `primary_selection`, which explicitly
enables/disables the primary selection clipboard. Defaults to enabled.

This is implemented as a launch-only option which enables or disables the creation of the
`zwp_primary_selection_device_manager_v1` global.

Co-authored-by: Tilde Rose <t1lde@protonmail.com>
 2024-07-19 15:07:32 +10:00
10 changed files with 15 additions and 500 deletions
Show stats Expand all files Collapse all files

1
.envrc
View file

@ -1 +0,0 @@
export PKG_CONFIG_PATH=/usr/lib/wlroots0.17/pkgconfig

8
.vscode/settings.json vendored
View file

@ -1,8 +0,0 @@
{
"editor.formatOnSave": false,
"C_Cpp.default.compileCommands": "/home/alex/forks/swayfx/builddir/compile_commands.json",
"C_Cpp.default.configurationProvider": "mesonbuild.mesonbuild",
"files.associations": {
"*.h": "c"
}
}

25
include/sway/input/text_input.h
View file

@ -4,7 +4,6 @@
#include <wlr/types/wlr_text_input_v3.h>
#include <wlr/types/wlr_input_method_v2.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_fractional_scale_v1.h>
/**
* The relay structure manages the relationship between text-input and
@ -22,37 +21,18 @@ struct sway_input_method_relay {
struct sway_seat *seat;
struct wl_list text_inputs; // sway_text_input::link
struct wl_list input_popups; // sway_input_popup::link
struct wlr_input_method_v2 *input_method; // doesn't have to be present
struct wl_listener text_input_new;
struct wl_listener input_method_new;
struct wl_listener input_method_commit;
struct wl_listener input_method_new_popup_surface;
struct wl_listener input_method_grab_keyboard;
struct wl_listener input_method_destroy;
struct wl_listener input_method_keyboard_grab_destroy;
};
struct sway_input_popup {
struct sway_input_method_relay *relay;
struct wlr_input_popup_surface_v2 *popup_surface;
int x, y;
bool visible;
struct wl_list link;
struct wl_listener popup_map;
struct wl_listener popup_unmap;
struct wl_listener popup_destroy;
struct wl_listener popup_surface_commit;
struct wl_listener focused_surface_unmap;
};
struct sway_text_input {
struct sway_input_method_relay *relay;
@ -85,9 +65,4 @@ struct sway_text_input *sway_text_input_create(
struct sway_input_method_relay *relay,
struct wlr_text_input_v3 *text_input);
bool sway_input_popup_get_position(
struct sway_input_popup *popup, int *lx, int *ly);
void sway_input_popup_damage(struct sway_input_popup *popup);
#endif

4
include/sway/output.h
View file

@ -194,10 +194,6 @@ void output_unmanaged_for_each_surface(struct sway_output *output,
void *user_data);
#endif
void output_input_popups_for_each_surface(struct sway_output *output,
struct wl_list *input_popups, sway_surface_iterator_func_t iterator,
void *user_data);
void output_drag_icons_for_each_surface(struct sway_output *output,
struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
void *user_data);

52
sway/desktop/output.c
View file

@ -18,7 +18,6 @@
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_presentation_time.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_fractional_scale_v1.h>
#include <wlr/util/region.h>
#include "config.h"
#include "log.h"
@ -29,7 +28,6 @@
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/ipc-server.h"
#include "sway/input/text_input.h"
#include "sway/layers.h"
#include "sway/output.h"
#include "sway/server.h"
@ -277,31 +275,6 @@ void output_unmanaged_for_each_surface(struct sway_output *output,
}
#endif
void output_input_popups_for_each_surface(struct sway_output *output,
struct wl_list *input_popups, sway_surface_iterator_func_t iterator,
void *user_data) {
struct sway_input_popup *popup;
wl_list_for_each(popup, input_popups, link) {
int lx, ly;
if (!sway_input_popup_get_position(popup, &lx, &ly)) {
continue;
}
if (!popup->popup_surface->surface->mapped || !popup->visible) {
continue;
}
// damage the popup if surface is updated
sway_input_popup_damage(popup);
double ox = lx - output->lx;
double oy = ly - output->ly;
output_surface_for_each_surface(output,
popup->popup_surface->surface, ox, oy,
iterator, user_data);
}
}
void output_drag_icons_for_each_surface(struct sway_output *output,
struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
void *user_data) {
@ -412,9 +385,6 @@ overlay:
output_layer_for_each_surface(output,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
iterator, user_data);
output_input_popups_for_each_surface(
output, &input_manager_current_seat()->im_relay.input_popups,
iterator, user_data);
output_drag_icons_for_each_surface(output, &root->drag_icons,
iterator, user_data);
}
@ -1012,27 +982,6 @@ static void update_output_scale_iterator(struct sway_output *output,
surface_update_outputs(surface);
}
static void update_im_scale(struct sway_output *output) {
struct sway_seat* im_seat = input_manager_current_seat();
if (im_seat == NULL) {
return;
}
struct sway_input_method_relay* relay = &im_seat->im_relay;
struct sway_input_popup *popup;
wl_list_for_each(popup, &relay->input_popups, link) {
struct wl_list current_outputs = popup->popup_surface->surface->current_outputs;
struct wlr_surface_output *current_output;
wl_list_for_each(current_output, &current_outputs, link) {
if (current_output->output == output->wlr_output) {
double scale = current_output->output->scale;
wlr_fractional_scale_v1_notify_scale(popup->popup_surface->surface, scale);
wlr_surface_set_preferred_buffer_scale(popup->popup_surface->surface, ceil(scale));
break;
}
}
}
}
static void handle_commit(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, commit);
struct wlr_output_event_commit *event = data;
@ -1044,7 +993,6 @@ static void handle_commit(struct wl_listener *listener, void *data) {
if (event->state->committed & WLR_OUTPUT_STATE_SCALE) {
output_for_each_container(output, update_textures, NULL);
output_for_each_surface(output, update_output_scale_iterator, NULL);
update_im_scale(output);
}
if (event->state->committed & (

22
sway/desktop/render.c
View file

@ -285,6 +285,7 @@ void render_blur(struct fx_render_context *ctx, struct wlr_texture *texture,
.src_box = *src_box,
.dst_box = proj_box,
.transform = WL_OUTPUT_TRANSFORM_NORMAL,
.alpha = &deco_data.alpha,
.clip = &damage,
.filter_mode = WLR_SCALE_FILTER_BILINEAR,
},
@ -532,15 +533,6 @@ static void render_unmanaged(struct fx_render_context *ctx, struct wl_list *unma
}
#endif
static void render_input_popups(struct fx_render_context *ctx, struct wl_list *input_popups) {
struct render_data data = {
.deco_data = get_undecorated_decoration_data(),
.ctx = ctx,
};
output_input_popups_for_each_surface(ctx->output, input_popups,
render_surface_iterator, &data);
}
static void render_drag_icons(struct fx_render_context *ctx, struct wl_list *drag_icons) {
struct render_data data = {
.deco_data = get_undecorated_decoration_data(),
@ -1271,11 +1263,9 @@ static void render_top_border(struct fx_render_context *ctx, struct sway_contain
// Child border - top edge
memcpy(&color, colors->child_border, sizeof(float) * 4);
premultiply_alpha(color, con->alpha);
box.x = floor(state->x) +
(corner_radius != 0) * (corner_radius + state->border_thickness);
box.x = floor(state->x) + corner_radius;
box.y = floor(state->y);
box.width = state->width -
((corner_radius != 0) * 2 * (corner_radius + state->border_thickness));
box.width = state->width - (2 * corner_radius);
box.height = state->border_thickness;
adjust_box_to_workspace_offset(&box, on_focused_workspace, ctx->output);
scale_box(&box, output_scale);
@ -1879,9 +1869,6 @@ void output_render(struct fx_render_context *ctx) {
goto renderer_end;
}
struct sway_seat *seat = input_manager_current_seat();
struct sway_container *focus = seat_get_focused_container(seat);
if (output_has_opaque_overlay_layer_surface(output)) {
goto render_overlay;
}
@ -2034,6 +2021,8 @@ void output_render(struct fx_render_context *ctx) {
render_seatops(ctx);
struct sway_seat *seat = input_manager_current_seat();
struct sway_container *focus = seat_get_focused_container(seat);
if (focus && focus->view) {
struct decoration_data deco_data = {
.alpha = focus->alpha,
@ -2056,7 +2045,6 @@ render_overlay:
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
render_layer_popups(ctx,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
render_input_popups(ctx, &seat->im_relay.input_popups);
render_drag_icons(ctx, &root->drag_icons);
renderer_end:

29
sway/input/cursor.c
View file

@ -37,28 +37,6 @@ static uint32_t get_current_time_msec(void) {
return now.tv_sec * 1000 + now.tv_nsec / 1000000;
}
static struct wlr_surface *input_popup_surface_at(struct sway_output *output,
struct sway_input_method_relay *relay, double ox, double oy, double *sx, double *sy) {
struct sway_input_popup *popup;
wl_list_for_each(popup, &relay->input_popups, link) {
int lx, ly;
if (!sway_input_popup_get_position(popup, &lx, &ly)) {
continue;
}
if (!popup->visible) {
continue;
}
double _sx = ox - lx;
double _sy = oy - ly;
struct wlr_surface *sub = wlr_surface_surface_at(
popup->popup_surface->surface, _sx, _sy, sx, sy);
if (sub) {
return sub;
}
}
return NULL;
}
static struct wlr_surface *layer_surface_at(struct sway_output *output,
struct wl_list *layer, double ox, double oy, double *sx, double *sy) {
struct sway_layer_surface *sway_layer;
@ -142,13 +120,6 @@ struct sway_node *node_at_coords(
return NULL;
}
if ((*surface = input_popup_surface_at(output,
&seat->im_relay, ox, oy, sx, sy))) {
struct sway_cursor* cursor = seat->cursor;
// set cursot to left_ptr
cursor_set_image(cursor, "left_ptr", NULL);
return NULL;
}
// check for unmanaged views
#if HAVE_XWAYLAND
struct wl_list *unmanaged = &root->xwayland_unmanaged;

354
sway/input/text_input.c
View file

@ -1,14 +1,8 @@
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "log.h"
#include "sway/input/seat.h"
#include "sway/input/text_input.h"
#include "sway/tree/view.h"
#include "sway/tree/container.h"
#include "sway/desktop.h"
#include "sway/output.h"
#include "sway/layers.h"
static struct sway_text_input *relay_get_focusable_text_input(
struct sway_input_method_relay *relay) {
@ -32,333 +26,6 @@ static struct sway_text_input *relay_get_focused_text_input(
return NULL;
}
// damage the popup
void sway_input_popup_damage(struct sway_input_popup *popup) {
if (!popup->visible) {
return;
}
struct sway_text_input *text_input =
relay_get_focused_text_input(popup->relay);
if (text_input == NULL || text_input->input->focused_surface == NULL) {
return;
}
struct wlr_surface *focused_surface = text_input->input->focused_surface;
struct wlr_layer_surface_v1 *layer_surface =
wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
if (layer_surface != NULL) {
struct sway_layer_surface *layer =
layer_from_wlr_layer_surface_v1(layer_surface);
output_damage_surface(layer->layer_surface->output->data,
layer->geo.x + popup->x, layer->geo.y + popup->y,
popup->popup_surface->surface, true);
return;
}
struct sway_view *view = view_from_wlr_surface(
text_input->input->focused_surface);
if (view->container == NULL) {
sway_log(SWAY_INFO, "Tried to damage popup, but view is gone");
return;
}
desktop_damage_surface(popup->popup_surface->surface,
view->container->surface_x - view->geometry.x + popup->x,
view->container->surface_y - view->geometry.y + popup->y, true);
}
static void input_popup_update(struct sway_input_popup *popup) {
sway_input_popup_damage(popup);
struct sway_text_input *text_input =
relay_get_focused_text_input(popup->relay);
if (text_input == NULL || text_input->input->focused_surface == NULL) {
return;
}
if (!popup->popup_surface->surface->mapped) {
return;
}
bool cursor_rect = text_input->input->current.features
& WLR_TEXT_INPUT_V3_FEATURE_CURSOR_RECTANGLE;
struct wlr_surface *focused_surface = text_input->input->focused_surface;
struct wlr_box cursor = text_input->input->current.cursor_rectangle;
struct wlr_output *output;
struct wlr_box output_box;
struct wlr_box parent;
struct wlr_layer_surface_v1 *layer_surface =
wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
if (layer_surface != NULL) {
struct sway_layer_surface *layer =
layer_from_wlr_layer_surface_v1(layer_surface);
output = layer->layer_surface->output;
wlr_output_layout_get_box(root->output_layout, output, &output_box);
parent = layer->geo;
parent.x += output_box.x;
parent.y += output_box.y;
} else {
struct sway_view *view = view_from_wlr_surface(focused_surface);
output = wlr_output_layout_output_at(root->output_layout,
view->container->surface_x + view->geometry.x,
view->container->surface_y + view->geometry.y);
wlr_output_layout_get_box(root->output_layout, output, &output_box);
parent.x = view->container->surface_x + view->geometry.x;
parent.y = view->container->surface_y + view->geometry.y;
parent.width = view->geometry.width;
parent.height = view->geometry.height;
}
if (!cursor_rect) {
cursor.x = 0;
cursor.y = 0;
cursor.width = parent.width;
cursor.height = parent.height;
}
int popup_width = popup->popup_surface->surface->current.width;
int popup_height = popup->popup_surface->surface->current.height;
int x1 = parent.x + cursor.x;
int x2 = parent.x + cursor.x + cursor.width;
int y1 = parent.y + cursor.y;
int y2 = parent.y + cursor.y + cursor.height;
int x = x1;
int y = y2;
int available_right = output_box.x + output_box.width - x1;
int available_left = x2 - output_box.x;
if (available_right < popup_width && available_left > available_right) {
x = x2 - popup_width;
}
int available_down = output_box.y + output_box.height - y2;
int available_up = y1 - output_box.y;
if (available_down < popup_height && available_up > available_down) {
y = y1 - popup_height;
}
popup->x = x - parent.x;
popup->y = y - parent.y;
// Hide popup if cursor position is completely out of bounds
bool x1_in_bounds = (cursor.x >= 0 && cursor.x < parent.width);
bool y1_in_bounds = (cursor.y >= 0 && cursor.y < parent.height);
bool x2_in_bounds = (cursor.x + cursor.width >= 0
&& cursor.x + cursor.width < parent.width);
bool y2_in_bounds = (cursor.y + cursor.height >= 0
&& cursor.y + cursor.height < parent.height);
popup->visible =
(x1_in_bounds && y1_in_bounds) || (x2_in_bounds && y2_in_bounds);
if (cursor_rect) {
struct wlr_box box = {
.x = x1 - x,
.y = y1 - y,
.width = cursor.width,
.height = cursor.height,
};
wlr_input_popup_surface_v2_send_text_input_rectangle(
popup->popup_surface, &box);
}
sway_input_popup_damage(popup);
}
static void surface_send_enter_iterator(struct wlr_surface *surface,
int x, int y, void *data) {
struct wlr_output *wlr_output = data;
float scale = wlr_output->scale;
wlr_surface_send_enter(surface, wlr_output);
wlr_fractional_scale_v1_notify_scale(surface, scale);
wlr_surface_set_preferred_buffer_scale(surface, ceil(scale));
}
static void surface_send_leave_iterator(struct wlr_surface *surface,
int x, int y, void *data) {
struct wlr_output *wlr_output = data;
wlr_surface_send_leave(surface, wlr_output);
}
static void input_popup_send_outputs(struct sway_input_popup *popup,
wlr_surface_iterator_func_t iterator) {
struct sway_text_input *text_input =
relay_get_focused_text_input(popup->relay);
if (text_input == NULL || text_input->input->focused_surface == NULL) {
return;
}
struct wlr_surface *focused_surface = text_input->input->focused_surface;
struct wlr_layer_surface_v1 *layer_surface =
wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
if (layer_surface != NULL) {
struct sway_layer_surface *layer =
layer_from_wlr_layer_surface_v1(layer_surface);
wlr_surface_for_each_surface(popup->popup_surface->surface,
iterator, layer->layer_surface->output);
return;
}
struct sway_view *view = view_from_wlr_surface(focused_surface);
for (int i = 0; i < view->container->outputs->length; i++) {
struct sway_output *output = view->container->outputs->items[i];
wlr_surface_for_each_surface(popup->popup_surface->surface,
iterator, output->wlr_output);
}
}
static void handle_im_popup_map(struct wl_listener *listener, void *data) {
struct sway_input_popup *popup =
wl_container_of(listener, popup, popup_map);
input_popup_send_outputs(popup, surface_send_enter_iterator);
input_popup_update(popup);
}
static void handle_im_popup_unmap(struct wl_listener *listener, void *data) {
struct sway_input_popup *popup =
wl_container_of(listener, popup, popup_unmap);
input_popup_send_outputs(popup, surface_send_leave_iterator);
input_popup_update(popup);
}
static void handle_im_popup_destroy(struct wl_listener *listener, void *data) {
struct sway_input_popup *popup =
wl_container_of(listener, popup, popup_destroy);
wl_list_remove(&popup->focused_surface_unmap.link);
wl_list_remove(&popup->popup_surface_commit.link);
wl_list_remove(&popup->popup_destroy.link);
wl_list_remove(&popup->popup_unmap.link);
wl_list_remove(&popup->popup_map.link);
wl_list_remove(&popup->link);
free(popup);
}
static void handle_im_popup_surface_commit(struct wl_listener *listener,
void *data) {
struct sway_input_popup *popup =
wl_container_of(listener, popup, popup_surface_commit);
input_popup_update(popup);
}
static void handle_im_focused_surface_unmap(
struct wl_listener *listener, void *data) {
struct sway_input_popup *popup =
wl_container_of(listener, popup, focused_surface_unmap);
input_popup_update(popup);
}
static void input_popup_set_focus(struct sway_input_popup *popup,
struct wlr_surface *surface) {
wl_list_remove(&popup->focused_surface_unmap.link);
if (surface == NULL) {
wl_list_init(&popup->focused_surface_unmap.link);
input_popup_update(popup);
return;
}
struct wlr_layer_surface_v1 *layer_surface =
wlr_layer_surface_v1_try_from_wlr_surface(surface);
if (layer_surface != NULL) {
struct sway_layer_surface *layer =
layer_from_wlr_layer_surface_v1(layer_surface);
wl_signal_add(
&layer->layer_surface->surface->events.unmap, &popup->focused_surface_unmap);
input_popup_update(popup);
return;
}
struct sway_view *view = view_from_wlr_surface(surface);
wl_signal_add(&view->events.unmap, &popup->focused_surface_unmap);
// Since the focus has changed, the popup may have to adjust
}
static void handle_im_new_popup_surface(struct wl_listener *listener,
void *data) {
struct sway_input_method_relay *relay = wl_container_of(listener, relay,
input_method_new_popup_surface);
struct sway_input_popup *popup = calloc(1, sizeof(*popup));
popup->relay = relay;
popup->popup_surface = data;
popup->popup_surface->data = popup;
wl_signal_add(&popup->popup_surface->surface->events.map, &popup->popup_map);
popup->popup_map.notify = handle_im_popup_map;
wl_signal_add(
&popup->popup_surface->surface->events.unmap, &popup->popup_unmap);
popup->popup_unmap.notify = handle_im_popup_unmap;
wl_signal_add(
&popup->popup_surface->events.destroy, &popup->popup_destroy);
popup->popup_destroy.notify = handle_im_popup_destroy;
wl_signal_add(&popup->popup_surface->surface->events.commit,
&popup->popup_surface_commit);
popup->popup_surface_commit.notify = handle_im_popup_surface_commit;
wl_list_init(&popup->focused_surface_unmap.link);
popup->focused_surface_unmap.notify = handle_im_focused_surface_unmap;
struct sway_text_input *text_input = relay_get_focused_text_input(relay);
if (text_input != NULL) {
input_popup_set_focus(popup, text_input->input->focused_surface);
} else {
input_popup_set_focus(popup, NULL);
}
wl_list_insert(&relay->input_popups, &popup->link);
}
bool sway_input_popup_get_position(
struct sway_input_popup *popup, int *lx, int *ly) {
struct sway_text_input *text_input =
relay_get_focused_text_input(popup->relay);
if (text_input == NULL || text_input->input->focused_surface == NULL) {
*lx = 0;
*ly = 0;
return false;
}
struct wlr_surface *focused_surface = text_input->input->focused_surface;
struct wlr_layer_surface_v1 *layer_surface =
wlr_layer_surface_v1_try_from_wlr_surface(focused_surface);
if (layer_surface != NULL) {
struct sway_layer_surface *layer =
layer_from_wlr_layer_surface_v1(layer_surface);
*lx = layer->geo.x + popup->x;
*ly = layer->geo.y + popup->y;
return true;
}
struct sway_view *view = view_from_wlr_surface(
text_input->input->focused_surface);
if (view->container == NULL || view == NULL) {
sway_log(SWAY_INFO, "Tried to find popup, but view is gone");
return false;
}
*lx = view->container->surface_x - view->geometry.x + popup->x;
*ly = view->container->surface_y - view->geometry.y + popup->y;
return true;
}
static void text_input_send_enter(struct sway_text_input *text_input,
struct wlr_surface *surface) {
wlr_text_input_v3_send_enter(text_input->input, surface);
struct sway_input_popup *popup;
wl_list_for_each(popup, &text_input->relay->input_popups, link) {
input_popup_set_focus(popup, surface);
}
}
static void text_input_send_leave(struct sway_text_input *text_input,
struct wlr_surface *surface) {
wlr_text_input_v3_send_leave(text_input->input);
if (text_input->input->focused_surface == surface) {
struct sway_input_popup *popup;
wl_list_for_each(popup, &text_input->relay->input_popups, link) {
input_popup_set_focus(popup, NULL);
}
}
}
static void handle_im_commit(struct wl_listener *listener, void *data) {
struct sway_input_method_relay *relay = wl_container_of(listener, relay,
input_method_commit);
@ -442,7 +109,7 @@ static void handle_im_destroy(struct wl_listener *listener, void *data) {
// the input method returns
text_input_set_pending_focused_surface(text_input,
text_input->input->focused_surface);
text_input_send_leave(text_input, text_input->input->focused_surface);
wlr_text_input_v3_send_leave(text_input->input);
}
}
@ -466,13 +133,8 @@ static void relay_send_im_state(struct sway_input_method_relay *relay,
input->current.content_type.hint,
input->current.content_type.purpose);
}
struct sway_input_popup *popup;
wl_list_for_each(popup, &relay->input_popups, link) {
// send_text_input_rectangle is called in this function
input_popup_update(popup);
}
wlr_input_method_v2_send_done(input_method);
// TODO: pass intent
// TODO: pass intent, display popup size
}
static void handle_text_input_enable(struct wl_listener *listener, void *data) {
@ -612,9 +274,6 @@ static void relay_handle_input_method(struct wl_listener *listener,
wl_signal_add(&relay->input_method->events.commit,
&relay->input_method_commit);
relay->input_method_commit.notify = handle_im_commit;
wl_signal_add(&relay->input_method->events.new_popup_surface,
&relay->input_method_new_popup_surface);
relay->input_method_new_popup_surface.notify = handle_im_new_popup_surface;
wl_signal_add(&relay->input_method->events.grab_keyboard,
&relay->input_method_grab_keyboard);
relay->input_method_grab_keyboard.notify = handle_im_grab_keyboard;
@ -624,7 +283,8 @@ static void relay_handle_input_method(struct wl_listener *listener,
struct sway_text_input *text_input = relay_get_focusable_text_input(relay);
if (text_input) {
text_input_send_enter(text_input, text_input->pending_focused_surface);
wlr_text_input_v3_send_enter(text_input->input,
text_input->pending_focused_surface);
text_input_set_pending_focused_surface(text_input, NULL);
}
}
@ -633,7 +293,6 @@ void sway_input_method_relay_init(struct sway_seat *seat,
struct sway_input_method_relay *relay) {
relay->seat = seat;
wl_list_init(&relay->text_inputs);
wl_list_init(&relay->input_popups);
relay->text_input_new.notify = relay_handle_text_input;
wl_signal_add(&server.text_input->events.text_input,
@ -662,9 +321,8 @@ void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
} else if (text_input->input->focused_surface) {
assert(text_input->pending_focused_surface == NULL);
if (surface != text_input->input->focused_surface) {
text_input_send_leave(
text_input, text_input->input->focused_surface);
relay_disable_text_input(relay, text_input);
wlr_text_input_v3_send_leave(text_input->input);
} else {
sway_log(SWAY_DEBUG, "IM relay set_focus already focused");
continue;
@ -675,7 +333,7 @@ void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
&& wl_resource_get_client(text_input->input->resource)
== wl_resource_get_client(surface->resource)) {
if (relay->input_method) {
text_input_send_enter(text_input, surface);
wlr_text_input_v3_send_enter(text_input->input, surface);
} else {
text_input_set_pending_focused_surface(text_input, surface);
}

17
sway/tree/container.c
View file

@ -350,17 +350,11 @@ static struct sway_container *view_container_at(struct sway_node *parent,
}
struct sway_container *container = parent->sway_container;
int gaps = 0;
if (container->current.workspace) {
gaps = container->current.workspace->gaps_inner;
}
struct wlr_box box = {
.x = container->pending.x - (gaps / 2),
.y = container->pending.y - (gaps / 2),
.width = container->pending.width + gaps,
.height = container->pending.height + gaps,
.x = container->pending.x,
.y = container->pending.y,
.width = container->pending.width,
.height = container->pending.height,
};
if (wlr_box_contains_point(&box, lx, ly)) {
@ -403,9 +397,6 @@ static bool surface_is_popup(struct wlr_surface *surface) {
}
surface = subsurface->parent;
}
if (wlr_input_popup_surface_v2_try_from_wlr_surface(surface) != NULL) {
return true;
}
struct wlr_xdg_surface *xdg_surface =
wlr_xdg_surface_try_from_wlr_surface(surface);
return xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP && xdg_surface->popup != NULL;

3
sway/tree/view.c
View file

@ -1248,9 +1248,6 @@ struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
if (wlr_layer_surface_v1_try_from_wlr_surface(wlr_surface) != NULL) {
return NULL;
}
if (wlr_input_popup_surface_v2_try_from_wlr_surface(wlr_surface) != NULL) {
return NULL;
}
const char *role = wlr_surface->role ? wlr_surface->role->name : NULL;
sway_log(SWAY_DEBUG, "Surface of unknown type (role %s): %p",