XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 12:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

dix: getevents.c more C99 scoped declaration

Browse Source 
Signed-off-by: SuperDuperDeou <87223140+SuperDuperDeou@users.noreply.github.com>
This commit is contained in:
SuperDuperDeou
2025-07-21 12:18:34 +02:00
committed by Enrico Weigelt
parent fa6ff96f21
commit 952cbeda25
1 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
dix/getevents.c
View File

@@ -206,11 +206,9 @@ static void
set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,
BOOL use_unaccel, double *data)
{
int i;
use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask);
for (i = 0; i < valuator_mask_size(mask); i++) {
for (int i = 0; i < valuator_mask_size(mask); i++) {
if (valuator_mask_isset(mask, i)) {
double v;
@@ -229,11 +227,9 @@ set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,
static void
set_valuators(DeviceIntPtr dev, DeviceEvent *event, ValuatorMask *mask)
{
int i;
/* Set the data to the previous value for unset absolute axes. The values
* may be used when sent as part of an XI 1.x valuator event. */
for (i = 0; i < valuator_mask_size(mask); i++) {
for (int i = 0; i < valuator_mask_size(mask); i++) {
if (valuator_mask_isset(mask, i)) {
SetBit(event->valuators.mask, i);
if (valuator_get_mode(dev, i) == Absolute)
@@ -249,7 +245,6 @@ void
CreateClassesChangedEvent(InternalEvent *event,
DeviceIntPtr master, DeviceIntPtr slave, int flags)
{
int i;
DeviceChangedEvent *dce;
CARD32 ms = GetTimeInMillis();
@@ -266,12 +261,12 @@ CreateClassesChangedEvent(InternalEvent *event,
if (slave->button) {
dce->buttons.num_buttons = slave->button->numButtons;
for (i = 0; i < dce->buttons.num_buttons; i++)
for (int i = 0; i < dce->buttons.num_buttons; i++)
dce->buttons.names[i] = slave->button->labels[i];
}
if (slave->valuator) {
dce->num_valuators = slave->valuator->numAxes;
for (i = 0; i < dce->num_valuators; i++) {
for (int i = 0; i < dce->num_valuators; i++) {
dce->valuators[i].min = slave->valuator->axes[i].min_value;
dce->valuators[i].max = slave->valuator->axes[i].max_value;
dce->valuators[i].resolution = slave->valuator->axes[i].resolution;
@@ -405,8 +400,8 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord ** buff, unsigned long start,
unsigned long stop, ScreenPtr pScreen, BOOL core)
{
char *ibuff = NULL, *obuff;
int i = 0, ret = 0;
int j, coord;
int ret = 0;
int coord;
Time current;
/* The size of a single motion event. */
@@ -432,7 +427,7 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord ** buff, unsigned long start,
return 0;
obuff = (char *) *buff;
for (i = pDev->valuator->first_motion;
for (int i = pDev->valuator->first_motion;
i != pDev->valuator->last_motion;
i = (i + 1) % pDev->valuator->numMotionEvents) {
/* We index the input buffer by which element we're accessing, which
@@ -481,7 +476,7 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord ** buff, unsigned long start,
ocbuf = (INT32 *) (obuff + sizeof(Time));
icbuf = (INT32 *) (ibuff + sizeof(Time));
for (j = 0; j < MAX_VALUATORS; j++) {
for (int j = 0; j < MAX_VALUATORS; j++) {
if (j >= pDev->valuator->numAxes)
break;
@@ -540,7 +535,6 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,
{
char *buff = (char *) pDev->valuator->motion;
ValuatorClassPtr v;
int i;
if (!pDev->valuator->numMotionEvents)
return;
@@ -555,7 +549,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,
memset(buff, 0, sizeof(INT32) * 3 * MAX_VALUATORS);
for (i = 0; i < v->numAxes; i++) {
for (int i = 0; i < v->numAxes; i++) {
int val;
/* XI1 doesn't support mixed mode devices */
@@ -584,7 +578,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,
memset(buff, 0, sizeof(INT32) * pDev->valuator->numAxes);
for (i = 0; i < MAX_VALUATORS; i++) {
for (int i = 0; i < MAX_VALUATORS; i++) {
int val;
if (valuator_mask_size(mask) <= i || !valuator_mask_isset(mask, i)) {
@@ -655,9 +649,7 @@ clipAxis(DeviceIntPtr pDev, int axisNum, double *val)
static void
clipValuators(DeviceIntPtr pDev, ValuatorMask *mask)
{
int i;
for (i = 0; i < valuator_mask_size(mask); i++)
for (int i = 0; i < valuator_mask_size(mask); i++)
if (valuator_mask_isset(mask, i)) {
double val = valuator_mask_get_double(mask, i);
@@ -712,9 +704,7 @@ UpdateFromMaster(InternalEvent *events, DeviceIntPtr dev, int type,
static void
clipAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
{
int i;
for (i = 0; i < valuator_mask_size(mask); i++) {
for (int i = 0; i < valuator_mask_size(mask); i++) {
double val;
if (!valuator_mask_isset(mask, i))
@@ -780,7 +770,6 @@ scale_for_device_resolution(DeviceIntPtr dev, ValuatorMask *mask)
static void
moveRelative(DeviceIntPtr dev, int flags, ValuatorMask *mask)
{
int i;
Bool clip_xy = InputDevIsMaster(dev) || !InputDevIsFloating(dev);
ValuatorClassPtr v = dev->valuator;
@@ -793,7 +782,7 @@ moveRelative(DeviceIntPtr dev, int flags, ValuatorMask *mask)
}
/* calc other axes, clip, drop back into valuators */
for (i = 0; i < valuator_mask_size(mask); i++) {
for (int i = 0; i < valuator_mask_size(mask); i++) {
double val = dev->last.valuators[i];
if (!valuator_mask_isset(mask, i))
@@ -1011,9 +1000,7 @@ updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)
static void
queueEventList(DeviceIntPtr device, InternalEvent *events, int nevents)
{
int i;
for (i = 0; i < nevents; i++)
for (int i = 0; i < nevents; i++)
mieqEnqueue(device, &events[i]);
}
@@ -1244,15 +1231,13 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
static void
storeLastValuators(DeviceIntPtr dev, ValuatorMask *mask, double devx, double devy)
{
int i;
/* store desktop-wide in last.valuators */
if (valuator_mask_isset(mask, 0))
dev->last.valuators[0] = devx;
if (valuator_mask_isset(mask, 1))
dev->last.valuators[1] = devy;
for (i = 0; i < valuator_mask_size(mask); i++) {
for (int i = 0; i < valuator_mask_size(mask); i++) {
if (i == 0 || i == 1)
continue;
@@ -1664,7 +1649,6 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
ValuatorMask last_valuators;
ValuatorMask mask;
ValuatorMask scroll;
int i;
int realtype = type;
#ifdef XSERVER_DTRACE
@@ -1755,7 +1739,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
/* Now turn the smooth-scrolling axes back into emulated button presses
* for legacy clients, based on the integer delta between before and now */
for (i = 0; i < valuator_mask_size(&mask); i++) {
for (int i = 0; i < valuator_mask_size(&mask); i++) {
if ( !pDev->valuator || (i >= pDev->valuator->numAxes))
break;
@@ -1809,7 +1793,7 @@ int
GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
const ValuatorMask *mask_in)
{
int num_events = 1, i;
int num_events = 1;
DeviceEvent *event;
ValuatorMask mask;
@@ -1835,7 +1819,7 @@ GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
valuator_mask_copy(&mask, mask_in);
/* ignore relative axes for proximity. */
for (i = 0; i < valuator_mask_size(&mask); i++) {
for (int i = 0; i < valuator_mask_size(&mask); i++) {
if (valuator_mask_isset(&mask, i) &&
valuator_get_mode(pDev, i) == Relative)
valuator_mask_unset(&mask, i);
@@ -1935,7 +1919,6 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
ValuatorMask mask;
double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */
double devx = 0.0, devy = 0.0; /* desktop-wide in device coords */
int i;
int num_events = 0;
RawDeviceEvent *raw;
DDXTouchPointInfoPtr ti;
@@ -2017,7 +2000,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
* these come from the touchpoint in Absolute mode, or the sprite in
* Relative. */
if (t->mode == XIDirectTouch) {
for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) {
for (int i = 0; i < max(valuator_mask_size(&mask), 2); i++) {
double val;
if (valuator_mask_fetch_double(&mask, i, &val))
@@ -2081,7 +2064,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
}
set_valuators(dev, event, &mask);
for (i = 0; i < v->numAxes; i++) {
for (int i = 0; i < v->numAxes; i++) {
if (valuator_mask_isset(&mask, i))
v->axisVal[i] = valuator_mask_get(&mask, i);
}