diff options
| -rw-r--r-- | include/wlr/types/wlr_keyboard.h | 4 | ||||
| -rw-r--r-- | include/wlr/types/wlr_pointer.h | 24 | ||||
| -rw-r--r-- | include/wlr/types/wlr_touch.h | 8 | ||||
| -rw-r--r-- | types/wlr_cursor.c | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h index 39449aea..d53d3c30 100644 --- a/include/wlr/types/wlr_keyboard.h +++ b/include/wlr/types/wlr_keyboard.h @@ -73,8 +73,8 @@ struct wlr_keyboard { struct { /** - * The `key` event signals with a struct wlr_event_keyboard_key_event - * that a key has been pressed or released on the keyboard. This event is + * The `key` event signals with a struct wlr_keyboard_key_event that a + * key has been pressed or released on the keyboard. This event is * emitted before the xkb state of the keyboard has been updated * (including modifiers). */ diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index 73e641fc..cce2a5a8 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -24,22 +24,22 @@ struct wlr_pointer { char *output_name; struct { - struct wl_signal motion; // struct wlr_event_pointer_motion - struct wl_signal motion_absolute; // struct wlr_event_pointer_motion_absolute - struct wl_signal button; // struct wlr_event_pointer_button - struct wl_signal axis; // struct wlr_event_pointer_axis + struct wl_signal motion; // struct wlr_pointer_motion_event + struct wl_signal motion_absolute; // struct wlr_pointer_motion_absolute_event + struct wl_signal button; // struct wlr_pointer_button_event + struct wl_signal axis; // struct wlr_pointer_axis_event struct wl_signal frame; - struct wl_signal swipe_begin; // struct wlr_event_pointer_swipe_begin - struct wl_signal swipe_update; // struct wlr_event_pointer_swipe_update - struct wl_signal swipe_end; // struct wlr_event_pointer_swipe_end + struct wl_signal swipe_begin; // struct wlr_pointer_swipe_begin_event + struct wl_signal swipe_update; // struct wlr_pointer_swipe_update_event + struct wl_signal swipe_end; // struct wlr_pointer_swipe_end_event - struct wl_signal pinch_begin; // struct wlr_event_pointer_pinch_begin - struct wl_signal pinch_update; // struct wlr_event_pointer_pinch_update - struct wl_signal pinch_end; // struct wlr_event_pointer_pinch_end + struct wl_signal pinch_begin; // struct wlr_pointer_pinch_begin_event + struct wl_signal pinch_update; // struct wlr_pointer_pinch_update_event + struct wl_signal pinch_end; // struct wlr_pointer_pinch_end_event - struct wl_signal hold_begin; // struct wlr_event_pointer_hold_begin - struct wl_signal hold_end; // struct wlr_event_pointer_hold_end + struct wl_signal hold_begin; // struct wlr_pointer_hold_begin_event + struct wl_signal hold_end; // struct wlr_pointer_hold_end_event } events; void *data; diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index da294f76..82c4b861 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -24,10 +24,10 @@ struct wlr_touch { double width_mm, height_mm; struct { - struct wl_signal down; // struct wlr_event_touch_down - struct wl_signal up; // struct wlr_event_touch_up - struct wl_signal motion; // struct wlr_event_touch_motion - struct wl_signal cancel; // struct wlr_event_touch_cancel + struct wl_signal down; // struct wlr_touch_down_event + struct wl_signal up; // struct wlr_touch_up_event + struct wl_signal motion; // struct wlr_touch_motion_event + struct wl_signal cancel; // struct wlr_touch_cancel_event struct wl_signal frame; } events; diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index fd3ae5f5..d38d279e 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -365,7 +365,7 @@ void wlr_cursor_set_surface(struct wlr_cursor *cur, struct wlr_surface *surface, } static void handle_pointer_motion(struct wl_listener *listener, void *data) { - struct wlr_event_pointer_motion *event = data; + struct wlr_pointer_motion_event *event = data; struct wlr_cursor_device *device = wl_container_of(listener, device, motion); wlr_signal_emit_safe(&device->cursor->events.motion, event); |