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

libweston: Make better use of global coord helpers

Browse Source 
Use wesotn_coord_sub/add() in many more places.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2023-07-18 13:51:07 -05:00
parent 18cce195d3
commit cec0ab7d23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desktop-shell/shell.c
View File

@ -1328,9 +1328,9 @@ surface_tablet_tool_move(struct shell_surface *shsurf, struct weston_tablet_tool
if (!move)
return -1;
offset.c = weston_coord_sub(
weston_view_get_pos_offset_global(shsurf->view).c,
tool->grab_pos.c);
offset = weston_coord_global_sub(
weston_view_get_pos_offset_global(shsurf->view),
tool->grab_pos);
move->dx = wl_fixed_from_double(offset.c.x);
move->dy = wl_fixed_from_double(offset.c.y);
@ -4723,9 +4723,9 @@ handle_output_move_layer(struct desktop_shell *shell,
if (view->output != output)
continue;
pos.c = weston_coord_add(
weston_view_get_pos_offset_global(view).c,
output->move.c);
pos = weston_coord_global_add(
weston_view_get_pos_offset_global(view),
output->move);
weston_view_set_position(view, pos);
}
}

12
kiosk-shell/kiosk-shell.c
View File

@ -1283,9 +1283,9 @@ kiosk_shell_handle_output_moved(struct wl_listener *listener, void *data)
if (view->output != output)
continue;
pos.c = weston_coord_add(
weston_view_get_pos_offset_global(view).c,
output->move.c);
pos = weston_coord_global_add(
weston_view_get_pos_offset_global(view),
output->move);
weston_view_set_position(view, pos);
}
@ -1296,9 +1296,9 @@ kiosk_shell_handle_output_moved(struct wl_listener *listener, void *data)
if (view->output != output)
continue;
pos.c = weston_coord_add(
weston_view_get_pos_offset_global(view).c,
output->move.c);
pos = weston_coord_global_add(
weston_view_get_pos_offset_global(view),
output->move);
weston_view_set_position(view, pos);
}
}

2
libweston/backend-x11/x11.c
View File

@ -1453,7 +1453,7 @@ x11_backend_deliver_motion_event(struct x11_backend *b,
motion_event = (struct weston_pointer_motion_event) {
.mask = WESTON_POINTER_MOTION_REL,
.rel = weston_coord_sub(pos.c, b->prev_pos.c),
.rel = weston_coord_global_sub(pos, b->prev_pos).c,
};
weston_compositor_get_time(&time);
notify_motion(&b->core_seat, &time, &motion_event);

2
tests/weston-test.c
View File

@ -398,7 +398,7 @@ move_pointer(struct wl_client *client, struct wl_resource *resource,
pos.c = weston_coord(x, y);
event = (struct weston_pointer_motion_event) {
.mask = WESTON_POINTER_MOTION_REL,
.rel = weston_coord_sub(pos.c, pointer->pos.c),
.rel = weston_coord_global_sub(pos, pointer->pos).c,
};
timespec_from_proto(&time, tv_sec_hi, tv_sec_lo, tv_nsec);