Merge branch 'master' into idle_v2

This commit is contained in:
Mattias Eriksson 2018-04-24 19:25:38 +02:00
commit ce344e1130
18 changed files with 238 additions and 74 deletions

View file

@ -131,6 +131,7 @@ sway_cmd cmd_output;
sway_cmd cmd_permit;
sway_cmd cmd_reject;
sway_cmd cmd_reload;
sway_cmd cmd_rename;
sway_cmd cmd_resize;
sway_cmd cmd_scratchpad;
sway_cmd cmd_seamless_mouse;

View file

@ -29,7 +29,7 @@ struct sway_cursor {
void sway_cursor_destroy(struct sway_cursor *cursor);
struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time);
void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time_msec);
void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec,
uint32_t button, enum wlr_button_state state);