mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-13 15:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Remove unused function parameters

Browse Source 
Input device add/remove events are dispatched unconditionally now, so the boolean parameters that control whether events are sent are unused.
This commit is contained in:
Frank Praznik
2025-11-20 11:27:22 -05:00
parent 61bf7087f5
commit 4a769b6475
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/wayland/SDL_waylandevents.c
View File

@@ -2348,7 +2348,7 @@ static const struct wl_keyboard_listener keyboard_listener = {
keyboard_handle_repeat_info, // Version 4
};
static void Wayland_SeatDestroyPointer(SDL_WaylandSeat *seat, bool send_event)
static void Wayland_SeatDestroyPointer(SDL_WaylandSeat *seat)
{
Wayland_CursorStateRelease(&seat->pointer.cursor_state);
@@ -2395,7 +2395,7 @@ static void Wayland_SeatDestroyPointer(SDL_WaylandSeat *seat, bool send_event)
SDL_zero(seat->pointer);
}
static void Wayland_SeatDestroyKeyboard(SDL_WaylandSeat *seat, bool send_event)
static void Wayland_SeatDestroyKeyboard(SDL_WaylandSeat *seat)
{
// Make sure focus is removed from a surface before the keyboard is destroyed.
if (seat->keyboard.focus) {
@@ -2505,7 +2505,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, enum w
SDL_AddMouse(seat->pointer.sdl_id, name_fmt);
} else if (!(capabilities & WL_SEAT_CAPABILITY_POINTER) && seat->pointer.wl_pointer) {
Wayland_SeatDestroyPointer(seat, true);
Wayland_SeatDestroyPointer(seat);
}
if ((capabilities & WL_SEAT_CAPABILITY_TOUCH) && !seat->touch.wl_touch) {
@@ -2539,7 +2539,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, enum w
SDL_AddKeyboard(seat->keyboard.sdl_id, name_fmt);
} else if (!(capabilities & WL_SEAT_CAPABILITY_KEYBOARD) && seat->keyboard.wl_keyboard) {
Wayland_SeatDestroyKeyboard(seat, true);
Wayland_SeatDestroyKeyboard(seat);
}
Wayland_SeatRegisterInputTimestampListeners(seat);
@@ -3581,9 +3581,9 @@ static void Wayland_remove_all_pens_callback(SDL_PenID instance_id, void *handle
SDL_free(sdltool);
}
static void Wayland_SeatDestroyTablet(SDL_WaylandSeat *seat, bool send_events)
static void Wayland_SeatDestroyTablet(SDL_WaylandSeat *seat, bool shutting_down)
{
if (send_events) {
if (!shutting_down) {
SDL_WaylandPenTool *tool, *temp;
wl_list_for_each_safe (tool, temp, &seat->tablet.tool_list, link) {
// Remove all tools for this seat, sending PROXIMITY_OUT events.
@@ -3666,7 +3666,7 @@ void Wayland_DisplayRemoveWindowReferencesFromSeats(SDL_VideoData *display, SDL_
}
}
void Wayland_SeatDestroy(SDL_WaylandSeat *seat, bool send_events)
void Wayland_SeatDestroy(SDL_WaylandSeat *seat, bool shutting_down)
{
if (!seat) {
return;
@@ -3710,10 +3710,10 @@ void Wayland_SeatDestroy(SDL_WaylandSeat *seat, bool send_events)
zwp_text_input_v3_destroy(seat->text_input.zwp_text_input);
}
Wayland_SeatDestroyKeyboard(seat, send_events);
Wayland_SeatDestroyPointer(seat, send_events);
Wayland_SeatDestroyKeyboard(seat);
Wayland_SeatDestroyPointer(seat);
Wayland_SeatDestroyTouch(seat);
Wayland_SeatDestroyTablet(seat, send_events);
Wayland_SeatDestroyTablet(seat, shutting_down);
if (wl_seat_get_version(seat->wl_seat) >= WL_SEAT_RELEASE_SINCE_VERSION) {
wl_seat_release(seat->wl_seat);

2
src/video/wayland/SDL_waylandevents_c.h
View File

@@ -279,7 +279,7 @@ extern void Wayland_DisplayInitPrimarySelectionDeviceManager(SDL_VideoData *disp
extern void Wayland_DisplayCreateTextInputManager(SDL_VideoData *d, uint32_t id);
extern void Wayland_DisplayCreateSeat(SDL_VideoData *display, struct wl_seat *wl_seat, Uint32 id);
extern void Wayland_SeatDestroy(SDL_WaylandSeat *seat, bool send_events);
extern void Wayland_SeatDestroy(SDL_WaylandSeat *seat, bool shutting_down);
extern void Wayland_SeatUpdatePointerGrab(SDL_WaylandSeat *seat);
extern void Wayland_DisplayUpdatePointerGrabs(SDL_VideoData *display, SDL_WindowData *window);

4
src/video/wayland/SDL_waylandvideo.c
View File

@@ -1374,7 +1374,7 @@ static void handle_registry_remove_global(void *data, struct wl_registry *regist
if (seat->pointer.wl_pointer) {
SDL_RemoveMouse(seat->pointer.sdl_id);
}
Wayland_SeatDestroy(seat, true);
Wayland_SeatDestroy(seat, false);
}
}
}
@@ -1520,7 +1520,7 @@ static void Wayland_VideoCleanup(SDL_VideoDevice *_this)
SDL_free(data->output_list);
wl_list_for_each_safe (seat, tmp, &data->seat_list, link) {
Wayland_SeatDestroy(seat, false);
Wayland_SeatDestroy(seat, true);
}
Wayland_FiniMouse(data);