aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
authorrandom human <random.bored.human@gmail.com>2018-10-04 00:43:35 +0530
committerAlex Maese <memaese@hotmail.com>2018-12-21 12:20:48 -0600
commit68137dca3f0b20c5610a30e4c3820984b387dda5 (patch)
tree421f4e8f7897dee9a2ce525c71f3398966b305f8 /rootston
parent42ffa413fb6695c144557bf37effc1ce3d46fb5b (diff)
relative_pointer: implementation and code fixes
In particular, modified public creator and destructor function names, added a display destroy listener, safely extract user data from resources, send correct time (in usecs) in rootston, etc.
Diffstat (limited to 'rootston')
-rw-r--r--rootston/cursor.c4
-rw-r--r--rootston/desktop.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 45d7b40e..4c5fdb36 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -311,7 +311,7 @@ void roots_cursor_handle_motion(struct roots_cursor *cursor,
double dy = event->delta_y;
wlr_seat_pointer_notify_relative_motion(cursor->seat->seat,
- (uint64_t)event->time_msec, dx, dy, dx, dy);
+ (uint64_t)event->time_msec * 1000, dx, dy, dx, dy);
if (cursor->active_constraint) {
struct roots_view *view = cursor->pointer_view->view;
@@ -355,7 +355,7 @@ void roots_cursor_handle_motion_absolute(struct roots_cursor *cursor,
double dx = lx - cursor->cursor->x;
double dy = ly - cursor->cursor->y;
wlr_seat_pointer_notify_relative_motion(cursor->seat->seat,
- (uint64_t)event->time_msec, dx, dy, dx, dy);
+ (uint64_t)event->time_msec * 1000, dx, dy, dx, dy);
if (cursor->pointer_view) {
struct roots_view *view = cursor->pointer_view->view;
diff --git a/rootston/desktop.c b/rootston/desktop.c
index e4affe3b..77a52571 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -1082,7 +1082,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
desktop->foreign_toplevel_manager_v1 =
wlr_foreign_toplevel_manager_v1_create(server->wl_display);
desktop->relative_pointer_manager =
- wlr_relative_pointer_v1_create(server->wl_display);
+ wlr_relative_pointer_manager_v1_create(server->wl_display);
return desktop;
}