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

zoom: Pick the first seat in seat_list instead of compositor->seat

Browse Source
This commit is contained in:
Kristian Høgsberg 2012-08-10 10:07:55 -04:00
parent 5ba31891a1
commit ef6f136d65
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/zoom.c
View File

@ -136,11 +136,21 @@ weston_zoom_frame_z(struct weston_animation *animation,
weston_output_damage(output); weston_output_damage(output);
} }
static struct weston_seat *
weston_zoom_pick_seat(struct weston_compositor *compositor)
{
return container_of(compositor->seat_list.next,
struct weston_seat, link);
}
static void static void
weston_zoom_frame_xy(struct weston_animation *animation, weston_zoom_frame_xy(struct weston_animation *animation,
struct weston_output *output, uint32_t msecs) struct weston_output *output, uint32_t msecs)
{ {
struct weston_seat *seat = weston_zoom_pick_seat(output->compositor);
wl_fixed_t x, y; wl_fixed_t x, y;
if (animation->frame_counter <= 1) if (animation->frame_counter <= 1)
output->zoom.spring_xy.timestamp = msecs; output->zoom.spring_xy.timestamp = msecs;
@ -157,13 +167,11 @@ weston_zoom_frame_xy(struct weston_animation *animation,
if (weston_spring_done(&output->zoom.spring_xy)) { if (weston_spring_done(&output->zoom.spring_xy)) {
output->zoom.spring_xy.current = output->zoom.spring_xy.target; output->zoom.spring_xy.current = output->zoom.spring_xy.target;
output->zoom.current.x = output->zoom.current.x =
(output->zoom.type == ZOOM_FOCUS_POINTER) ? output->zoom.type == ZOOM_FOCUS_POINTER ?
output->compositor->seat->pointer.x : seat->pointer.x : output->zoom.text_cursor.x;
output->zoom.text_cursor.x;
output->zoom.current.y = output->zoom.current.y =
(output->zoom.type == ZOOM_FOCUS_POINTER) ? output->zoom.type == ZOOM_FOCUS_POINTER ?
output->compositor->seat->pointer.y : seat->pointer.y : output->zoom.text_cursor.y;
output->zoom.text_cursor.y;
wl_list_remove(&animation->link); wl_list_remove(&animation->link);
wl_list_init(&animation->link); wl_list_init(&animation->link);
} }
@ -280,17 +288,16 @@ weston_zoom_transition(struct weston_output *output, uint32_t type,
WL_EXPORT void WL_EXPORT void
weston_output_update_zoom(struct weston_output *output, uint32_t type) weston_output_update_zoom(struct weston_output *output, uint32_t type)
{ {
wl_fixed_t x = output->compositor->seat->pointer.x; struct weston_seat *seat = weston_zoom_pick_seat(output->compositor);
wl_fixed_t y = output->compositor->seat->pointer.y; wl_fixed_t x = seat->pointer.x;
wl_fixed_t y = seat->pointer.y;
zoom_area_center_from_pointer(output, &x, &y); zoom_area_center_from_pointer(output, &x, &y);
if (type == ZOOM_FOCUS_POINTER) { if (type == ZOOM_FOCUS_POINTER) {
if (wl_list_empty(&output->zoom.animation_xy.link)) { if (wl_list_empty(&output->zoom.animation_xy.link)) {
output->zoom.current.x = output->zoom.current.x = seat->pointer.x;
output->compositor->seat->pointer.x; output->zoom.current.y = seat->pointer.y;
output->zoom.current.y =
output->compositor->seat->pointer.y;
} else { } else {
output->zoom.to.x = x; output->zoom.to.x = x;
output->zoom.to.y = y; output->zoom.to.y = y;