mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add xwayland activate and fix EGL bug

Browse source
This commit is contained in:
Drew DeVault 2017-09-28 09:11:16 -04:00
parent 906a816abf
commit 220a6e9bf6
8 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rootston/cursor.c
View file

@ -100,7 +100,9 @@ static void do_cursor_button_press(struct roots_input *input,
input->input_events_idx = (i + 1)
% (sizeof(input->input_events) / sizeof(input->input_events[0]));
set_view_focus(input, desktop, view);
wlr_seat_keyboard_enter(input->wl_seat, view->wlr_surface);
if (view) {
wlr_seat_keyboard_enter(input->wl_seat, view->wlr_surface);
}
break;
}
}

2
rootston/desktop.c
View file

@ -23,6 +23,8 @@ void view_get_input_bounds(struct roots_view *view, struct wlr_box *box) {
return;
}
box->x = box->y = 0;
box->width = view->wlr_surface->current.width;
box->height = view->wlr_surface->current.height;
}
void view_activate(struct roots_view *view, bool activate) {

5
rootston/xwayland.c
View file

@ -17,6 +17,10 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
free(roots_surface);
}
static void x11_activate(struct roots_view *view, bool active) {
wlr_x11_window_activate(view->desktop->xwayland, view->x11_window);
}
void handle_xwayland_surface(struct wl_listener *listener, void *data) {
struct roots_desktop *desktop =
wl_container_of(listener, desktop, xwayland_surface);
@ -38,6 +42,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
view->roots_x11_surface = roots_surface;
view->wlr_surface = surface->surface;
view->desktop = desktop;
view->activate = x11_activate;
roots_surface->view = view;
wl_list_insert(&desktop->views, &view->link);
}