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

input: Rename weston_surface_activate to weston_seat_set_keyboard_focus

Browse Source 
The name suggests that it activates surfaces, but the code says it
rather just assigns keyboard focus.  Rename it for clarity, and so the
original function name could be used for something more appropriate
later.  Switch order of parameters since keyboard focus is a property of
the seat.  Update all callers as appropriate.

Change was asked for by pq, May 26, 2016:

 "This should be called weston_seat_set_keyboard_focus(seat, surface).
 Keyboard focus is a property of the seat."

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Bryce Harrington
2016-06-29 19:04:06 -07:00
committed by Pekka Paalanen
parent a5bb91dcdc
commit 260c2ffd97
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fullscreen-shell/fullscreen-shell.c
+4 -4
View File
@@ -89,7 +89,7 @@ pointer_focus_changed(struct wl_listener *listener, void *data)
struct weston_pointer *pointer = data;
if (pointer->focus && pointer->focus->surface->resource)
weston_surface_activate(pointer->focus->surface, pointer->seat);
weston_seat_set_keyboard_focus(pointer->seat, pointer->focus->surface);
}
static void
@@ -118,7 +118,7 @@ seat_caps_changed(struct wl_listener *l, void *data)
if (keyboard && keyboard->focus != NULL) {
wl_list_for_each(fsout, &listener->shell->output_list, link) {
if (fsout->surface) {
weston_surface_activate(fsout->surface, seat);
weston_seat_set_keyboard_focus(seat, fsout->surface);
return;
}
}
@@ -704,7 +704,7 @@ fullscreen_shell_present_surface(struct wl_client *client,
weston_seat_get_keyboard(seat);
if (keyboard && !keyboard->focus)
weston_surface_activate(surface, seat);
weston_seat_set_keyboard_focus(seat, surface);
}
}
}
@@ -755,7 +755,7 @@ fullscreen_shell_present_surface_for_mode(struct wl_client *client,
weston_seat_get_keyboard(seat);
if (keyboard && !keyboard->focus)
weston_surface_activate(surface, seat);
weston_seat_set_keyboard_focus(seat, surface);
}
}