summaryrefslogtreecommitdiff
path: root/Xi/chgfctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'Xi/chgfctl.c')
-rw-r--r--Xi/chgfctl.c582
1 files changed, 268 insertions, 314 deletions
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 09741507d..76914dcad 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -1,5 +1,3 @@
-/* $Xorg: chgfctl.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
-
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -45,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.3 2001/01/17 22:13:23 dawes Exp $ */
/********************************************************************
*
@@ -53,20 +50,20 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
+#define NEED_EVENTS /* for inputstr.h */
#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
-#include <X11/X.h> /* for inputstr.h */
-#include <X11/Xproto.h> /* Request macro */
-#include "inputstr.h" /* DeviceIntPtr */
+#include <X11/X.h> /* for inputstr.h */
+#include <X11/Xproto.h> /* Request macro */
+#include "inputstr.h" /* DeviceIntPtr */
#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h> /* control constants */
+#include <X11/extensions/XIproto.h> /* control constants */
#include "extnsionst.h"
-#include "extinit.h" /* LookupDeviceIntRec */
+#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
#include "chgfctl.h"
@@ -89,8 +86,8 @@ SProcXChangeFeedbackControl(register ClientPtr client)
swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq);
swapl(&stuff->mask, n);
- return(ProcXChangeFeedbackControl(client));
- }
+ return (ProcXChangeFeedbackControl(client));
+}
/***********************************************************************
*
@@ -113,116 +110,108 @@ ProcXChangeFeedbackControl(ClientPtr client)
REQUEST(xChangeFeedbackControlReq);
REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq);
- len = stuff->length - (sizeof(xChangeFeedbackControlReq) >>2);
- dev = LookupDeviceIntRec (stuff->deviceid);
- if (dev == NULL)
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadDevice);
+ len = stuff->length - (sizeof(xChangeFeedbackControlReq) >> 2);
+ dev = LookupDeviceIntRec(stuff->deviceid);
+ if (dev == NULL) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadDevice);
return Success;
- }
+ }
- switch (stuff->feedbackid)
- {
- case KbdFeedbackClass:
- if (len != (sizeof(xKbdFeedbackCtl)>>2))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl,
- 0, BadLength);
+ switch (stuff->feedbackid) {
+ case KbdFeedbackClass:
+ if (len != (sizeof(xKbdFeedbackCtl) >> 2)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+ 0, BadLength);
+ return Success;
+ }
+ for (k = dev->kbdfeed; k; k = k->next)
+ if (k->ctrl.id == ((xKbdFeedbackCtl *) & stuff[1])->id) {
+ ChangeKbdFeedback(client, dev, stuff->mask, k,
+ (xKbdFeedbackCtl *) & stuff[1]);
return Success;
- }
- for (k=dev->kbdfeed; k; k=k->next)
- if (k->ctrl.id == ((xKbdFeedbackCtl *) &stuff[1])->id)
- {
- ChangeKbdFeedback (client, dev, stuff->mask, k, (xKbdFeedbackCtl *)&stuff[1]);
- return Success;
- }
- break;
- case PtrFeedbackClass:
- if (len != (sizeof(xPtrFeedbackCtl)>>2))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl,
- 0, BadLength);
+ }
+ break;
+ case PtrFeedbackClass:
+ if (len != (sizeof(xPtrFeedbackCtl) >> 2)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+ 0, BadLength);
+ return Success;
+ }
+ for (p = dev->ptrfeed; p; p = p->next)
+ if (p->ctrl.id == ((xPtrFeedbackCtl *) & stuff[1])->id) {
+ ChangePtrFeedback(client, dev, stuff->mask, p,
+ (xPtrFeedbackCtl *) & stuff[1]);
return Success;
- }
- for (p=dev->ptrfeed; p; p=p->next)
- if (p->ctrl.id == ((xPtrFeedbackCtl *) &stuff[1])->id)
- {
- ChangePtrFeedback (client, dev, stuff->mask, p, (xPtrFeedbackCtl *)&stuff[1]);
- return Success;
- }
- break;
- case StringFeedbackClass:
- {
+ }
+ break;
+ case StringFeedbackClass:
+ {
register char n;
- xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]);
- if (client->swapped)
- {
- swaps(&f->num_keysyms,n);
- }
- if (len != ((sizeof(xStringFeedbackCtl)>>2) + f->num_keysyms))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl,
- 0, BadLength);
- return Success;
- }
- for (s=dev->stringfeed; s; s=s->next)
- if (s->ctrl.id == ((xStringFeedbackCtl *) &stuff[1])->id)
- {
- ChangeStringFeedback (client, dev, stuff->mask,s,(xStringFeedbackCtl *)&stuff[1]);
- return Success;
- }
- break;
+ xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]);
+
+ if (client->swapped) {
+ swaps(&f->num_keysyms, n);
}
- case IntegerFeedbackClass:
- if (len != (sizeof(xIntegerFeedbackCtl)>>2))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl,
- 0, BadLength);
+ if (len != ((sizeof(xStringFeedbackCtl) >> 2) + f->num_keysyms)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+ 0, BadLength);
return Success;
- }
- for (i=dev->intfeed; i; i=i->next)
- if (i->ctrl.id == ((xIntegerFeedbackCtl *) &stuff[1])->id)
- {
- ChangeIntegerFeedback (client, dev,stuff->mask,i,(xIntegerFeedbackCtl *)&stuff[1]);
+ }
+ for (s = dev->stringfeed; s; s = s->next)
+ if (s->ctrl.id == ((xStringFeedbackCtl *) & stuff[1])->id) {
+ ChangeStringFeedback(client, dev, stuff->mask, s,
+ (xStringFeedbackCtl *) & stuff[1]);
return Success;
- }
- break;
- case LedFeedbackClass:
- if (len != (sizeof(xLedFeedbackCtl)>>2))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl,
- 0, BadLength);
- return Success;
}
- for (l=dev->leds; l; l=l->next)
- if (l->ctrl.id == ((xLedFeedbackCtl *) &stuff[1])->id)
- {
- ChangeLedFeedback (client, dev, stuff->mask, l, (xLedFeedbackCtl *)&stuff[1]);
- return Success;
- }
break;
- case BellFeedbackClass:
- if (len != (sizeof(xBellFeedbackCtl)>>2))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl,
- 0, BadLength);
+ }
+ case IntegerFeedbackClass:
+ if (len != (sizeof(xIntegerFeedbackCtl) >> 2)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+ 0, BadLength);
+ return Success;
+ }
+ for (i = dev->intfeed; i; i = i->next)
+ if (i->ctrl.id == ((xIntegerFeedbackCtl *) & stuff[1])->id) {
+ ChangeIntegerFeedback(client, dev, stuff->mask, i,
+ (xIntegerFeedbackCtl *) & stuff[1]);
return Success;
- }
- for (b=dev->bell; b; b=b->next)
- if (b->ctrl.id == ((xBellFeedbackCtl *) &stuff[1])->id)
- {
- ChangeBellFeedback (client, dev, stuff->mask, b, (xBellFeedbackCtl *)&stuff[1]);
- return Success;
- }
- break;
- default:
- break;
+ }
+ break;
+ case LedFeedbackClass:
+ if (len != (sizeof(xLedFeedbackCtl) >> 2)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+ 0, BadLength);
+ return Success;
+ }
+ for (l = dev->leds; l; l = l->next)
+ if (l->ctrl.id == ((xLedFeedbackCtl *) & stuff[1])->id) {
+ ChangeLedFeedback(client, dev, stuff->mask, l,
+ (xLedFeedbackCtl *) & stuff[1]);
+ return Success;
+ }
+ break;
+ case BellFeedbackClass:
+ if (len != (sizeof(xBellFeedbackCtl) >> 2)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl,
+ 0, BadLength);
+ return Success;
}
+ for (b = dev->bell; b; b = b->next)
+ if (b->ctrl.id == ((xBellFeedbackCtl *) & stuff[1])->id) {
+ ChangeBellFeedback(client, dev, stuff->mask, b,
+ (xBellFeedbackCtl *) & stuff[1]);
+ return Success;
+ }
+ break;
+ default:
+ break;
+ }
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0, BadMatch);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0, BadMatch);
return Success;
- }
+}
/******************************************************************************
*
@@ -231,149 +220,130 @@ ProcXChangeFeedbackControl(ClientPtr client)
*/
int
-ChangeKbdFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, KbdFeedbackPtr k, xKbdFeedbackCtl *f)
+ChangeKbdFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ KbdFeedbackPtr k, xKbdFeedbackCtl * f)
{
register char n;
KeybdCtrl kctrl;
int t;
int key = DO_ALL;
- if (client->swapped)
- {
- swaps(&f->length,n);
- swaps(&f->pitch,n);
- swaps(&f->duration,n);
- swapl(&f->led_mask,n);
- swapl(&f->led_values,n);
- }
+ if (client->swapped) {
+ swaps(&f->length, n);
+ swaps(&f->pitch, n);
+ swaps(&f->duration, n);
+ swapl(&f->led_mask, n);
+ swapl(&f->led_values, n);
+ }
kctrl = k->ctrl;
- if (mask & DvKeyClickPercent)
- {
+ if (mask & DvKeyClickPercent) {
t = f->click;
if (t == -1)
t = defaultKeyboardControl.click;
- else if (t < 0 || t > 100)
- {
+ else if (t < 0 || t > 100) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
+ }
kctrl.click = t;
- }
+ }
- if (mask & DvPercent)
- {
+ if (mask & DvPercent) {
t = f->percent;
if (t == -1)
t = defaultKeyboardControl.bell;
- else if (t < 0 || t > 100)
- {
+ else if (t < 0 || t > 100) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- kctrl.bell = t;
}
+ kctrl.bell = t;
+ }
- if (mask & DvPitch)
- {
+ if (mask & DvPitch) {
t = f->pitch;
if (t == -1)
t = defaultKeyboardControl.bell_pitch;
- else if (t < 0)
- {
+ else if (t < 0) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- kctrl.bell_pitch = t;
}
+ kctrl.bell_pitch = t;
+ }
- if (mask & DvDuration)
- {
+ if (mask & DvDuration) {
t = f->duration;
if (t == -1)
t = defaultKeyboardControl.bell_duration;
- else if (t < 0)
- {
+ else if (t < 0) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
+ }
kctrl.bell_duration = t;
- }
+ }
- if (mask & DvLed)
- {
+ if (mask & DvLed) {
kctrl.leds &= ~(f->led_mask);
kctrl.leds |= (f->led_mask & f->led_values);
- }
+ }
- if (mask & DvKey)
- {
+ if (mask & DvKey) {
key = (KeyCode) f->key;
- if (key < 8 || key > 255)
- {
+ if (key < 8 || key > 255) {
client->errorValue = key;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- if (!(mask & DvAutoRepeatMode))
- {
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadMatch);
+ }
+ if (!(mask & DvAutoRepeatMode)) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadMatch);
return Success;
- }
}
+ }
- if (mask & DvAutoRepeatMode)
- {
+ if (mask & DvAutoRepeatMode) {
int inx = (key >> 3);
int kmask = (1 << (key & 7));
+
t = (CARD8) f->auto_repeat_mode;
- if (t == AutoRepeatModeOff)
- {
+ if (t == AutoRepeatModeOff) {
if (key == DO_ALL)
kctrl.autoRepeat = FALSE;
else
kctrl.autoRepeats[inx] &= ~kmask;
- }
- else if (t == AutoRepeatModeOn)
- {
+ } else if (t == AutoRepeatModeOn) {
if (key == DO_ALL)
kctrl.autoRepeat = TRUE;
else
kctrl.autoRepeats[inx] |= kmask;
- }
- else if (t == AutoRepeatModeDefault)
- {
+ } else if (t == AutoRepeatModeDefault) {
if (key == DO_ALL)
kctrl.autoRepeat = defaultKeyboardControl.autoRepeat;
else
kctrl.autoRepeats[inx] &= ~kmask;
- kctrl.autoRepeats[inx] =
- (kctrl.autoRepeats[inx] & ~kmask) |
- (defaultKeyboardControl.autoRepeats[inx] & kmask);
- }
- else
- {
+ kctrl.autoRepeats[inx] =
+ (kctrl.autoRepeats[inx] & ~kmask) |
+ (defaultKeyboardControl.autoRepeats[inx] & kmask);
+ } else {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- }
+ }
+ }
k->ctrl = kctrl;
- (*k->CtrlProc)(dev, &k->ctrl);
+ (*k->CtrlProc) (dev, &k->ctrl);
return Success;
- }
+}
/******************************************************************************
*
@@ -382,75 +352,69 @@ ChangeKbdFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, K
*/
int
-ChangePtrFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, PtrFeedbackPtr p, xPtrFeedbackCtl *f)
+ChangePtrFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ PtrFeedbackPtr p, xPtrFeedbackCtl * f)
{
register char n;
- PtrCtrl pctrl; /* might get BadValue part way through */
+ PtrCtrl pctrl; /* might get BadValue part way through */
- if (client->swapped)
- {
- swaps(&f->length,n);
- swaps(&f->num,n);
- swaps(&f->denom,n);
- swaps(&f->thresh,n);
- }
+ if (client->swapped) {
+ swaps(&f->length, n);
+ swaps(&f->num, n);
+ swaps(&f->denom, n);
+ swaps(&f->thresh, n);
+ }
pctrl = p->ctrl;
- if (mask & DvAccelNum)
- {
- int accelNum;
+ if (mask & DvAccelNum) {
+ int accelNum;
accelNum = f->num;
if (accelNum == -1)
pctrl.num = defaultPointerControl.num;
- else if (accelNum < 0)
- {
+ else if (accelNum < 0) {
client->errorValue = accelNum;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- else pctrl.num = accelNum;
- }
+ } else
+ pctrl.num = accelNum;
+ }
- if (mask & DvAccelDenom)
- {
- int accelDenom;
+ if (mask & DvAccelDenom) {
+ int accelDenom;
accelDenom = f->denom;
if (accelDenom == -1)
pctrl.den = defaultPointerControl.den;
- else if (accelDenom <= 0)
- {
+ else if (accelDenom <= 0) {
client->errorValue = accelDenom;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- else pctrl.den = accelDenom;
- }
+ } else
+ pctrl.den = accelDenom;
+ }
- if (mask & DvThreshold)
- {
- int threshold;
+ if (mask & DvThreshold) {
+ int threshold;
threshold = f->thresh;
if (threshold == -1)
pctrl.threshold = defaultPointerControl.threshold;
- else if (threshold < 0)
- {
+ else if (threshold < 0) {
client->errorValue = threshold;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- else pctrl.threshold = threshold;
- }
+ } else
+ pctrl.threshold = threshold;
+ }
p->ctrl = pctrl;
- (*p->CtrlProc)(dev, &p->ctrl);
+ (*p->CtrlProc) (dev, &p->ctrl);
return Success;
- }
+}
/******************************************************************************
*
@@ -459,20 +423,21 @@ ChangePtrFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, P
*/
int
-ChangeIntegerFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, IntegerFeedbackPtr i, xIntegerFeedbackCtl *f)
+ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev,
+ long unsigned int mask, IntegerFeedbackPtr i,
+ xIntegerFeedbackCtl * f)
{
register char n;
- if (client->swapped)
- {
- swaps(&f->length,n);
- swapl(&f->int_to_display,n);
- }
+ if (client->swapped) {
+ swaps(&f->length, n);
+ swapl(&f->int_to_display, n);
+ }
i->ctrl.integer_displayed = f->int_to_display;
- (*i->CtrlProc)(dev, &i->ctrl);
+ (*i->CtrlProc) (dev, &i->ctrl);
return Success;
- }
+}
/******************************************************************************
*
@@ -481,51 +446,47 @@ ChangeIntegerFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mas
*/
int
-ChangeStringFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, StringFeedbackPtr s, xStringFeedbackCtl *f)
+ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ StringFeedbackPtr s, xStringFeedbackCtl * f)
{
register char n;
register long *p;
- int i, j;
- KeySym *syms, *sup_syms;
-
- syms = (KeySym *) (f+1);
- if (client->swapped)
- {
- swaps(&f->length,n); /* swapped num_keysyms in calling proc */
- p = (long *) (syms);
- for (i=0; i<f->num_keysyms; i++)
- {
+ int i, j;
+ KeySym *syms, *sup_syms;
+
+ syms = (KeySym *) (f + 1);
+ if (client->swapped) {
+ swaps(&f->length, n); /* swapped num_keysyms in calling proc */
+ p = (long *)(syms);
+ for (i = 0; i < f->num_keysyms; i++) {
swapl(p, n);
p++;
- }
}
+ }
- if (f->num_keysyms > s->ctrl.max_symbols)
- {
- SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ if (f->num_keysyms > s->ctrl.max_symbols) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
+ }
sup_syms = s->ctrl.symbols_supported;
- for (i=0; i<f->num_keysyms; i++)
- {
- for (j=0; j<s->ctrl.num_symbols_supported; j++)
- if (*(syms+i) == *(sup_syms+j))
+ for (i = 0; i < f->num_keysyms; i++) {
+ for (j = 0; j < s->ctrl.num_symbols_supported; j++)
+ if (*(syms + i) == *(sup_syms + j))
break;
- if (j==s->ctrl.num_symbols_supported)
- {
- SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
- BadMatch);
+ if (j == s->ctrl.num_symbols_supported) {
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadMatch);
return Success;
- }
}
+ }
- s->ctrl.num_symbols_displayed = f->num_keysyms;
- for (i=0; i<f->num_keysyms; i++)
- *(s->ctrl.symbols_displayed+i) = *(syms+i);
- (*s->CtrlProc)(dev, &s->ctrl);
+ s->ctrl.num_symbols_displayed = f->num_keysyms;
+ for (i = 0; i < f->num_keysyms; i++)
+ *(s->ctrl.symbols_displayed + i) = *(syms + i);
+ (*s->CtrlProc) (dev, &s->ctrl);
return Success;
- }
+}
/******************************************************************************
*
@@ -534,68 +495,62 @@ ChangeStringFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask
*/
int
-ChangeBellFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, BellFeedbackPtr b, xBellFeedbackCtl *f)
+ChangeBellFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ BellFeedbackPtr b, xBellFeedbackCtl * f)
{
register char n;
int t;
- BellCtrl bctrl; /* might get BadValue part way through */
+ BellCtrl bctrl; /* might get BadValue part way through */
- if (client->swapped)
- {
- swaps(&f->length,n);
- swaps(&f->pitch,n);
- swaps(&f->duration,n);
- }
+ if (client->swapped) {
+ swaps(&f->length, n);
+ swaps(&f->pitch, n);
+ swaps(&f->duration, n);
+ }
bctrl = b->ctrl;
- if (mask & DvPercent)
- {
+ if (mask & DvPercent) {
t = f->percent;
if (t == -1)
t = defaultKeyboardControl.bell;
- else if (t < 0 || t > 100)
- {
+ else if (t < 0 || t > 100) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- bctrl.percent = t;
}
+ bctrl.percent = t;
+ }
- if (mask & DvPitch)
- {
+ if (mask & DvPitch) {
t = f->pitch;
if (t == -1)
t = defaultKeyboardControl.bell_pitch;
- else if (t < 0)
- {
+ else if (t < 0) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
- bctrl.pitch = t;
}
+ bctrl.pitch = t;
+ }
- if (mask & DvDuration)
- {
+ if (mask & DvDuration) {
t = f->duration;
if (t == -1)
t = defaultKeyboardControl.bell_duration;
- else if (t < 0)
- {
+ else if (t < 0) {
client->errorValue = t;
- SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, 0,
- BadValue);
+ SendErrorToClient(client, IReqCode, X_ChangeFeedbackControl, 0,
+ BadValue);
return Success;
- }
+ }
bctrl.duration = t;
- }
+ }
b->ctrl = bctrl;
- (*b->CtrlProc)(dev, &b->ctrl);
+ (*b->CtrlProc) (dev, &b->ctrl);
return Success;
- }
+}
/******************************************************************************
*
@@ -604,28 +559,27 @@ ChangeBellFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
*/
int
-ChangeLedFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, LedFeedbackPtr l, xLedFeedbackCtl *f)
+ChangeLedFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ LedFeedbackPtr l, xLedFeedbackCtl * f)
{
register char n;
- LedCtrl lctrl; /* might get BadValue part way through */
+ LedCtrl lctrl; /* might get BadValue part way through */
- if (client->swapped)
- {
- swaps(&f->length,n);
- swapl(&f->led_values,n);
- swapl(&f->led_mask,n);
- }
+ if (client->swapped) {
+ swaps(&f->length, n);
+ swapl(&f->led_values, n);
+ swapl(&f->led_mask, n);
+ }
f->led_mask &= l->ctrl.led_mask; /* set only supported leds */
f->led_values &= l->ctrl.led_mask; /* set only supported leds */
- if (mask & DvLed)
- {
+ if (mask & DvLed) {
lctrl.led_mask = f->led_mask;
lctrl.led_values = f->led_values;
- (*l->CtrlProc)(dev, &lctrl);
- l->ctrl.led_values &= ~(f->led_mask); /* zero changed leds */
- l->ctrl.led_values |= (f->led_mask & f->led_values);/* OR in set leds*/
- }
+ (*l->CtrlProc) (dev, &lctrl);
+ l->ctrl.led_values &= ~(f->led_mask); /* zero changed leds */
+ l->ctrl.led_values |= (f->led_mask & f->led_values); /* OR in set leds */
+ }
return Success;
- }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 09:28:53 +0000