Xi: Drop unused parameters from DeliverTouchEmulatedEvent
Some checks are pending
Build X servers / xserver-build-ubuntu (push) Waiting to run
Build X servers / drivers-build-ubuntu (push) Waiting to run
Build X servers / xserver-build-mingw32-ubuntu (push) Waiting to run
Build X servers / xserver-build-macos (push) Waiting to run
Build X servers / xserver-build-freebsd (push) Waiting to run
Build X servers / xserver-build-dragonflybsd (push) Waiting to run
Build X servers / xserver-build-netbsd (push) Waiting to run
Build X servers / xserver-build-cygwin (push) Waiting to run
Build X servers / Check Signed-Off-By (push) Waiting to run
Build X servers / Release pushed tag (push) Blocked by required conditions
check PRs for merge conflicts / notify (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_timeout (push) Waiting to run
delete old workflow runs / purge_deleted_branch_workflows (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (maint-25.0) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (master) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/AllocColor) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/ReplyNotSwappd) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/XvPortNotifyPtr) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/always-pciaccess) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/build-rootless) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/char-subscr) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/clang-tidy) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-api-xfree86) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-api-xfree86-backup) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-grabs) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/cleanup-os-export) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/client_array) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/conv-warnings) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/dix-config) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/dixconf-1) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/dixgetproperty) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/fmt) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/generations) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/geode) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-build) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-macos-deps) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/github-releases) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/glx_deferred) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/grouping) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/includes) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/includes-2) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/intel-2) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/io) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/log_req_len) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/logging) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/logging_submitted_1) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/maint-xnest) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/marshal) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/matrix-test) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/meson) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/misc.h) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/mpbt) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/netbsd) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/no-libsystemd) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/optional-pci) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/os-unexport) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/pciaccess) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/pedantic) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/pixmap-lifecycle) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/reallocarray) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/requests) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/screenproc) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/screenproc-wrap) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/swap0) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/swapping) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/swapping_new) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/warn-conv) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/win32_2) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xcb-marshal) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xf86_platform_bus_newabi) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xf86bigfont) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xi-properties) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-render) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-rootless) (push) Waiting to run
delete old workflow runs / delete_old_workflow_runs_branches (wip/xnest-shm) (push) Waiting to run

The parameters client and mask are set within the function, but
otherwise unused, so there's no reason to pass them in the first place.
Since this is a static function, ABI remains unaffected.

Signed-off-by: Aggelos Tselios <aggelostselios777@gmail.com>
This commit is contained in:
Aggelos Tselios 2026-02-10 01:40:49 +02:00 • committed by Enrico Weigelt
commit 92604954f8

View file

@ -1443,8 +1443,7 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti,
static int
DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
InternalEvent *ev, TouchListener * listener,
ClientPtr client, WindowPtr win, GrabPtr grab,
XI2Mask *xi2mask)
WindowPtr win, GrabPtr grab)
{
InternalEvent motion, button;
InternalEvent *ptrev = &motion;
@ -1454,11 +1453,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
/* There may be a pointer grab on the device */
if (!grab) {
grab = dev->deviceGrab.grab;
if (grab) {
win = grab->window;
xi2mask = grab->xi2mask;
client = dixClientForGrab(grab);
}
if (grab) win = grab->window;
}
/* We don't deliver pointer events to non-owners */
@ -1590,8 +1585,7 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
&mask))
return;
DeliverTouchEmulatedEvent(dev, ti, &motion, &ti->listeners[0], client,
win, grab, mask);
DeliverTouchEmulatedEvent(dev, ti, &motion, &ti->listeners[0], win, grab);
}
else {
InternalEvent button;
@ -2032,8 +2026,7 @@ DeliverTouchBeginEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
if (listener->type == TOUCH_LISTENER_POINTER_REGULAR ||
listener->type == TOUCH_LISTENER_POINTER_GRAB) {
rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win,
grab, xi2mask);
rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, win, grab);
if (rc == Success) {
listener->state = TOUCH_LISTENER_IS_OWNER;
/* async grabs cannot replay, so automatically accept this touch */
@ -2086,8 +2079,7 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
* This is part two of the hack in DeactivatePointerGrab
*/
if (listener->state != TOUCH_LISTENER_HAS_END) {
rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win,
grab, xi2mask);
rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, win, grab);
/* Once we send a TouchEnd to a legacy listener, we're already well
* past the accepting/rejecting stage (can only happen on
@ -2165,8 +2157,7 @@ DeliverTouchEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
else if (ev->any.type == ET_TouchUpdate) {
if (listener->type == TOUCH_LISTENER_POINTER_REGULAR ||
listener->type == TOUCH_LISTENER_POINTER_GRAB)
DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win, grab,
xi2mask);
DeliverTouchEmulatedEvent(dev, ti, ev, listener, win, grab);
else if (TouchResourceIsOwner(ti, listener->listener) ||
has_ownershipmask)
rc = DeliverOneTouchEvent(client, dev, ti, grab, win, ev);