diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-12-27 07:31:53 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-27 07:31:53 -0500 |
| commit | 069f120b70f364dc83d43dfff89ce731584299b5 (patch) | |
| tree | f8174c4dcae193b8ea3263e07c3e38989eb0ce80 | |
| parent | a79dc7df5103854b2cc5be20e153140862cda05a (diff) | |
rootston: remove input event ring buffer
| -rw-r--r-- | include/rootston/cursor.h | 9 | ||||
| -rw-r--r-- | rootston/cursor.c | 15 |
2 files changed, 2 insertions, 22 deletions
diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h index de6b7b92..19ac4034 100644 --- a/include/rootston/cursor.h +++ b/include/rootston/cursor.h @@ -10,12 +10,6 @@ enum roots_cursor_mode { ROOTS_CURSOR_ROTATE = 3, }; -struct roots_input_event { - uint32_t serial; - struct wlr_cursor *cursor; - struct wlr_input_device *device; -}; - struct roots_cursor { struct roots_seat *seat; struct wlr_cursor *cursor; @@ -32,9 +26,6 @@ struct roots_cursor { int view_x, view_y, view_width, view_height; float view_rotation; uint32_t resize_edges; - // Ring buffer of input events that could trigger move/resize/rotate - int input_events_idx; - struct roots_input_event input_events[16]; struct wl_listener motion; struct wl_listener motion_absolute; diff --git a/rootston/cursor.c b/rootston/cursor.c index ad15989d..8bd514cc 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -174,15 +174,10 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, } } - uint32_t serial; - if (is_touch) { - serial = wl_display_get_serial(desktop->server->wl_display); - } else { - serial = - wlr_seat_pointer_notify_button(seat->seat, time, button, state); + if (!is_touch) { + wlr_seat_pointer_notify_button(seat->seat, time, button, state); } - int i; switch (state) { case WLR_BUTTON_RELEASED: if (!is_touch) { @@ -190,12 +185,6 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, } break; case WLR_BUTTON_PRESSED: - i = cursor->input_events_idx; - cursor->input_events[i].serial = serial; - cursor->input_events[i].cursor = cursor->cursor; - cursor->input_events[i].device = device; - cursor->input_events_idx = (i + 1) - % (sizeof(cursor->input_events) / sizeof(cursor->input_events[0])); roots_seat_set_focus(seat, view); break; } |