mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: fix a crash on missing keyboard device

Browse Source 
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
dev
Pekka Paalanen 13 years ago committed by Kristian Høgsberg
parent 43e1ba8073
commit bdc7cd06d1
1 changed files with 13 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      src/compositor.c

23
src/compositor.c
Unescape View File

@ -1656,16 +1656,19 @@ weston_surface_activate(struct weston_surface *surface,
{ {
struct weston_compositor *compositor = seat->compositor; struct weston_compositor *compositor = seat->compositor;
wl_keyboard_set_focus(seat->seat.keyboard, &surface->surface); if (seat->seat.keyboard) {
wl_data_device_set_keyboard_focus(&seat->seat); wl_keyboard_set_focus(seat->seat.keyboard, &surface->surface);
wl_data_device_set_keyboard_focus(&seat->seat);
if (seat->seat.keyboard->focus_resource) {
wl_keyboard_send_modifiers(seat->seat.keyboard->focus_resource, if (seat->seat.keyboard->focus_resource) {
wl_display_next_serial(compositor->wl_display), wl_keyboard_send_modifiers(
seat->xkb_state.mods_depressed, seat->seat.keyboard->focus_resource,
seat->xkb_state.mods_latched, wl_display_next_serial(compositor->wl_display),
seat->xkb_state.mods_locked, seat->xkb_state.mods_depressed,
seat->xkb_state.group); seat->xkb_state.mods_latched,
seat->xkb_state.mods_locked,
seat->xkb_state.group);
}
} }
wl_signal_emit(&compositor->activate_signal, surface); wl_signal_emit(&compositor->activate_signal, surface);

Write Preview
Loading…
Cancel
Save