mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move previous cursor_position inline.

Browse source
This commit is contained in:
Scott Leggett 2018-05-28 02:14:19 +10:00
parent d1ebbebea0
commit 1b8de39287
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/sway/input/cursor.h
View file

@ -6,7 +6,9 @@
struct sway_cursor { struct sway_cursor {
struct sway_seat *seat; struct sway_seat *seat;
struct wlr_cursor *cursor; struct wlr_cursor *cursor;
struct cursor_position *previous; struct {
double x, y;
} previous;
struct wlr_xcursor_manager *xcursor_manager; struct wlr_xcursor_manager *xcursor_manager;
struct wl_client *image_client; struct wl_client *image_client;
@ -28,10 +30,6 @@ struct sway_cursor {
struct wl_listener request_set_cursor; struct wl_listener request_set_cursor;
}; };
struct cursor_position {
double x, y;
};
void sway_cursor_destroy(struct sway_cursor *cursor); void sway_cursor_destroy(struct sway_cursor *cursor);
struct sway_cursor *sway_cursor_create(struct sway_seat *seat); struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec, void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,

14
sway/input/cursor.c
View file

@ -147,10 +147,10 @@ void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
// Find the container the pointer was previously over // Find the container the pointer was previously over
struct sway_container *prev_c = container_at_coords(cursor->seat, struct sway_container *prev_c = container_at_coords(cursor->seat,
cursor->previous->x, cursor->previous->y, &surface, &sx, &sy); cursor->previous.x, cursor->previous.y, &surface, &sx, &sy);
// Update the stored previous position // Update the stored previous position
cursor->previous->x = cursor->cursor->x; cursor->previous.x = cursor->cursor->x;
cursor->previous->y = cursor->cursor->y; cursor->previous.y = cursor->cursor->y;
struct sway_container *c = container_at_coords(cursor->seat, struct sway_container *c = container_at_coords(cursor->seat,
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
@ -476,15 +476,8 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
return NULL; return NULL;
} }
struct cursor_position *previous = calloc(1, sizeof(struct cursor_position));
if (!sway_assert(previous, "could not allocate sway cursor position")) {
free(cursor);
return NULL;
}
struct wlr_cursor *wlr_cursor = wlr_cursor_create(); struct wlr_cursor *wlr_cursor = wlr_cursor_create();
if (!sway_assert(wlr_cursor, "could not allocate wlr cursor")) { if (!sway_assert(wlr_cursor, "could not allocate wlr cursor")) {
free(previous);
free(cursor); free(cursor);
return NULL; return NULL;
} }
@ -535,7 +528,6 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
cursor->request_set_cursor.notify = handle_request_set_cursor; cursor->request_set_cursor.notify = handle_request_set_cursor;
cursor->cursor = wlr_cursor; cursor->cursor = wlr_cursor;
cursor->previous = previous;
return cursor; return cursor;
} }