aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xi/getfctl.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-26 01:00:54 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 01:00:54 +0100
commit05152b788ab184f45df1f64182791c88a09dc6f9 (patch)
tree4232012c65ee251fef529950a420689154778847 /nx-X11/programs/Xserver/Xi/getfctl.c
parente247900edd20c140faf42ba0759bf59cbd2f75ae (diff)
parent4598c0c3d215f7f2237a9ccee3a143025f2af005 (diff)
downloadnx-libs-05152b788ab184f45df1f64182791c88a09dc6f9.tar.gz
nx-libs-05152b788ab184f45df1f64182791c88a09dc6f9.tar.bz2
nx-libs-05152b788ab184f45df1f64182791c88a09dc6f9.zip
Merge branch 'uli42-pr/update_xi' into arctica-3.6.x
Attributes GH PR #644: https://github.com/ArcticaProject/nx-libs/pull/644
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/getfctl.c')
-rw-r--r--nx-X11/programs/Xserver/Xi/getfctl.c281
1 files changed, 120 insertions, 161 deletions
diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c
index a8845c72b..9f75753f3 100644
--- a/nx-X11/programs/Xserver/Xi/getfctl.c
+++ b/nx-X11/programs/Xserver/Xi/getfctl.c
@@ -55,13 +55,13 @@ SOFTWARE.
#include <dix-config.h>
#endif
-#include <nx-X11/X.h> /* for inputstr.h */
-#include <nx-X11/Xproto.h> /* Request macro */
-#include "inputstr.h" /* DeviceIntPtr */
+#include <nx-X11/X.h> /* for inputstr.h */
+#include <nx-X11/Xproto.h> /* Request macro */
+#include "inputstr.h" /* DeviceIntPtr */
#include <nx-X11/extensions/XI.h>
#include <nx-X11/extensions/XIproto.h>
#include "extnsionst.h"
-#include "extinit.h" /* LookupDeviceIntRec */
+#include "extinit.h" /* LookupDeviceIntRec */
#include "exglobals.h"
#include "getfctl.h"
@@ -74,13 +74,12 @@ SOFTWARE.
*/
int
-SProcXGetFeedbackControl(client)
- register ClientPtr client;
- {
+SProcXGetFeedbackControl(register ClientPtr client)
+{
REQUEST(xGetFeedbackControlReq);
swaps(&stuff->length);
- return(ProcXGetFeedbackControl(client));
- }
+ return (ProcXGetFeedbackControl(client));
+}
/***********************************************************************
*
@@ -89,10 +88,9 @@ SProcXGetFeedbackControl(client)
*/
int
-ProcXGetFeedbackControl(client)
- ClientPtr client;
- {
- int total_length = 0;
+ProcXGetFeedbackControl(ClientPtr client)
+{
+ int total_length = 0;
char *buf, *savbuf;
register DeviceIntPtr dev;
KbdFeedbackPtr k;
@@ -106,13 +104,11 @@ ProcXGetFeedbackControl(client)
REQUEST(xGetFeedbackControlReq);
REQUEST_SIZE_MATCH(xGetFeedbackControlReq);
- dev = LookupDeviceIntRec (stuff->deviceid);
- if (dev == NULL)
- {
- SendErrorToClient (client, IReqCode, X_GetFeedbackControl, 0,
- BadDevice);
+ dev = LookupDeviceIntRec(stuff->deviceid);
+ if (dev == NULL) {
+ SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, BadDevice);
return Success;
- }
+ }
rep.repType = X_Reply;
rep.RepType = X_GetFeedbackControl;
@@ -120,73 +116,63 @@ ProcXGetFeedbackControl(client)
rep.sequenceNumber = client->sequence;
rep.num_feedbacks = 0;
- for (k=dev->kbdfeed; k; k=k->next)
- {
+ for (k = dev->kbdfeed; k; k = k->next) {
rep.num_feedbacks++;
total_length += sizeof(xKbdFeedbackState);
- }
- for (p=dev->ptrfeed; p; p=p->next)
- {
+ }
+ for (p = dev->ptrfeed; p; p = p->next) {
rep.num_feedbacks++;
total_length += sizeof(xPtrFeedbackState);
- }
- for (s=dev->stringfeed; s; s=s->next)
- {
+ }
+ for (s = dev->stringfeed; s; s = s->next) {
rep.num_feedbacks++;
- total_length += sizeof(xStringFeedbackState) +
- (s->ctrl.num_symbols_supported * sizeof (KeySym));
- }
- for (i=dev->intfeed; i; i=i->next)
- {
+ total_length += sizeof(xStringFeedbackState) +
+ (s->ctrl.num_symbols_supported * sizeof(KeySym));
+ }
+ for (i = dev->intfeed; i; i = i->next) {
rep.num_feedbacks++;
total_length += sizeof(xIntegerFeedbackState);
- }
- for (l=dev->leds; l; l=l->next)
- {
+ }
+ for (l = dev->leds; l; l = l->next) {
rep.num_feedbacks++;
total_length += sizeof(xLedFeedbackState);
- }
- for (b=dev->bell; b; b=b->next)
- {
+ }
+ for (b = dev->bell; b; b = b->next) {
rep.num_feedbacks++;
total_length += sizeof(xBellFeedbackState);
- }
+ }
- if (total_length == 0)
- {
- SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0,
- BadMatch);
+ if (total_length == 0) {
+ SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, BadMatch);
return Success;
- }
+ }
- buf = (char *) malloc (total_length);
- if (!buf)
- {
- SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0,
- BadAlloc);
+ buf = (char *)malloc(total_length);
+ if (!buf) {
+ SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0, BadAlloc);
return Success;
- }
- savbuf=buf;
-
- for (k=dev->kbdfeed; k; k=k->next)
- CopySwapKbdFeedback (client, k, &buf);
- for (p=dev->ptrfeed; p; p=p->next)
- CopySwapPtrFeedback (client, p, &buf);
- for (s=dev->stringfeed; s; s=s->next)
- CopySwapStringFeedback (client, s, &buf);
- for (i=dev->intfeed; i; i=i->next)
- CopySwapIntegerFeedback (client, i, &buf);
- for (l=dev->leds; l; l=l->next)
- CopySwapLedFeedback (client, l, &buf);
- for (b=dev->bell; b; b=b->next)
- CopySwapBellFeedback (client, b, &buf);
-
- rep.length = (total_length+3) >> 2;
+ }
+ savbuf = buf;
+
+ for (k = dev->kbdfeed; k; k = k->next)
+ CopySwapKbdFeedback(client, k, &buf);
+ for (p = dev->ptrfeed; p; p = p->next)
+ CopySwapPtrFeedback(client, p, &buf);
+ for (s = dev->stringfeed; s; s = s->next)
+ CopySwapStringFeedback(client, s, &buf);
+ for (i = dev->intfeed; i; i = i->next)
+ CopySwapIntegerFeedback(client, i, &buf);
+ for (l = dev->leds; l; l = l->next)
+ CopySwapLedFeedback(client, l, &buf);
+ for (b = dev->bell; b; b = b->next)
+ CopySwapBellFeedback(client, b, &buf);
+
+ rep.length = (total_length + 3) >> 2;
WriteReplyToClient(client, sizeof(xGetFeedbackControlReply), &rep);
WriteToClient(client, total_length, savbuf);
- free (savbuf);
+ free(savbuf);
return Success;
- }
+}
/***********************************************************************
*
@@ -195,17 +181,14 @@ ProcXGetFeedbackControl(client)
*/
void
-CopySwapKbdFeedback (client, k, buf)
- ClientPtr client;
- KbdFeedbackPtr k;
- char **buf;
- {
- int i;
- xKbdFeedbackState *k2;
-
- k2 = (xKbdFeedbackState *) *buf;
+CopySwapKbdFeedback(ClientPtr client, KbdFeedbackPtr k, char **buf)
+{
+ int i;
+ xKbdFeedbackState *k2;
+
+ k2 = (xKbdFeedbackState *) * buf;
k2->class = KbdFeedbackClass;
- k2->length = sizeof (xKbdFeedbackState);
+ k2->length = sizeof(xKbdFeedbackState);
k2->id = k->ctrl.id;
k2->click = k->ctrl.click;
k2->percent = k->ctrl.bell;
@@ -213,18 +196,17 @@ CopySwapKbdFeedback (client, k, buf)
k2->duration = k->ctrl.bell_duration;
k2->led_mask = k->ctrl.leds;
k2->global_auto_repeat = k->ctrl.autoRepeat;
- for (i=0; i<32; i++)
+ for (i = 0; i < 32; i++)
k2->auto_repeats[i] = k->ctrl.autoRepeats[i];
- if (client->swapped)
- {
+ if (client->swapped) {
swaps(&k2->length);
swaps(&k2->pitch);
swaps(&k2->duration);
swapl(&k2->led_mask);
swapl(&k2->led_values);
- }
- *buf += sizeof (xKbdFeedbackState);
}
+ *buf += sizeof(xKbdFeedbackState);
+}
/***********************************************************************
*
@@ -233,29 +215,25 @@ CopySwapKbdFeedback (client, k, buf)
*/
void
-CopySwapPtrFeedback (client, p, buf)
- ClientPtr client;
- PtrFeedbackPtr p;
- char **buf;
- {
- xPtrFeedbackState *p2;
-
- p2 = (xPtrFeedbackState *) *buf;
+CopySwapPtrFeedback(ClientPtr client, PtrFeedbackPtr p, char **buf)
+{
+ xPtrFeedbackState *p2;
+
+ p2 = (xPtrFeedbackState *) * buf;
p2->class = PtrFeedbackClass;
- p2->length = sizeof (xPtrFeedbackState);
+ p2->length = sizeof(xPtrFeedbackState);
p2->id = p->ctrl.id;
p2->accelNum = p->ctrl.num;
p2->accelDenom = p->ctrl.den;
p2->threshold = p->ctrl.threshold;
- if (client->swapped)
- {
+ if (client->swapped) {
swaps(&p2->length);
swaps(&p2->accelNum);
swaps(&p2->accelDenom);
swaps(&p2->threshold);
- }
- *buf += sizeof (xPtrFeedbackState);
}
+ *buf += sizeof(xPtrFeedbackState);
+}
/***********************************************************************
*
@@ -264,29 +242,25 @@ CopySwapPtrFeedback (client, p, buf)
*/
void
-CopySwapIntegerFeedback (client, i, buf)
- ClientPtr client;
- IntegerFeedbackPtr i;
- char **buf;
- {
- xIntegerFeedbackState *i2;
-
- i2 = (xIntegerFeedbackState *) *buf;
+CopySwapIntegerFeedback(ClientPtr client, IntegerFeedbackPtr i, char **buf)
+{
+ xIntegerFeedbackState *i2;
+
+ i2 = (xIntegerFeedbackState *) * buf;
i2->class = IntegerFeedbackClass;
- i2->length = sizeof (xIntegerFeedbackState);
+ i2->length = sizeof(xIntegerFeedbackState);
i2->id = i->ctrl.id;
i2->resolution = i->ctrl.resolution;
i2->min_value = i->ctrl.min_value;
i2->max_value = i->ctrl.max_value;
- if (client->swapped)
- {
+ if (client->swapped) {
swaps(&i2->length);
swapl(&i2->resolution);
swapl(&i2->min_value);
swapl(&i2->max_value);
- }
- *buf += sizeof (xIntegerFeedbackState);
}
+ *buf += sizeof(xIntegerFeedbackState);
+}
/***********************************************************************
*
@@ -295,39 +269,34 @@ CopySwapIntegerFeedback (client, i, buf)
*/
void
-CopySwapStringFeedback (client, s, buf)
- ClientPtr client;
- StringFeedbackPtr s;
- char **buf;
- {
+CopySwapStringFeedback(ClientPtr client, StringFeedbackPtr s, char **buf)
+{
int i;
- xStringFeedbackState *s2;
- KeySym *kptr;
+ xStringFeedbackState *s2;
+ KeySym *kptr;
- s2 = (xStringFeedbackState *) *buf;
+ s2 = (xStringFeedbackState *) * buf;
s2->class = StringFeedbackClass;
- s2->length = sizeof (xStringFeedbackState) +
- s->ctrl.num_symbols_supported * sizeof (KeySym);
+ s2->length = sizeof(xStringFeedbackState) +
+ s->ctrl.num_symbols_supported * sizeof(KeySym);
s2->id = s->ctrl.id;
s2->max_symbols = s->ctrl.max_symbols;
s2->num_syms_supported = s->ctrl.num_symbols_supported;
- *buf += sizeof (xStringFeedbackState);
+ *buf += sizeof(xStringFeedbackState);
kptr = (KeySym *) (*buf);
- for (i=0; i<s->ctrl.num_symbols_supported; i++)
- *kptr++ = *(s->ctrl.symbols_supported+i);
- if (client->swapped)
- {
+ for (i = 0; i < s->ctrl.num_symbols_supported; i++)
+ *kptr++ = *(s->ctrl.symbols_supported + i);
+ if (client->swapped) {
swaps(&s2->length);
swaps(&s2->max_symbols);
swaps(&s2->num_syms_supported);
- kptr = (KeySym *) (*buf);
- for (i=0; i<s->ctrl.num_symbols_supported; i++,kptr++)
- {
+ kptr = (KeySym *) (*buf);
+ for (i = 0; i < s->ctrl.num_symbols_supported; i++, kptr++) {
swapl(kptr);
- }
}
- *buf += (s->ctrl.num_symbols_supported * sizeof (KeySym));
}
+ *buf += (s->ctrl.num_symbols_supported * sizeof(KeySym));
+}
/***********************************************************************
*
@@ -336,27 +305,23 @@ CopySwapStringFeedback (client, s, buf)
*/
void
-CopySwapLedFeedback (client, l, buf)
- ClientPtr client;
- LedFeedbackPtr l;
- char **buf;
- {
- xLedFeedbackState *l2;
-
- l2 = (xLedFeedbackState *) *buf;
+CopySwapLedFeedback(ClientPtr client, LedFeedbackPtr l, char **buf)
+{
+ xLedFeedbackState *l2;
+
+ l2 = (xLedFeedbackState *) * buf;
l2->class = LedFeedbackClass;
- l2->length = sizeof (xLedFeedbackState);
+ l2->length = sizeof(xLedFeedbackState);
l2->id = l->ctrl.id;
l2->led_values = l->ctrl.led_values;
l2->led_mask = l->ctrl.led_mask;
- if (client->swapped)
- {
+ if (client->swapped) {
swaps(&l2->length);
swapl(&l2->led_values);
swapl(&l2->led_mask);
- }
- *buf += sizeof (xLedFeedbackState);
}
+ *buf += sizeof(xLedFeedbackState);
+}
/***********************************************************************
*
@@ -365,28 +330,24 @@ CopySwapLedFeedback (client, l, buf)
*/
void
-CopySwapBellFeedback (client, b, buf)
- ClientPtr client;
- BellFeedbackPtr b;
- char **buf;
- {
- xBellFeedbackState *b2;
-
- b2 = (xBellFeedbackState *) *buf;
+CopySwapBellFeedback(ClientPtr client, BellFeedbackPtr b, char **buf)
+{
+ xBellFeedbackState *b2;
+
+ b2 = (xBellFeedbackState *) * buf;
b2->class = BellFeedbackClass;
- b2->length = sizeof (xBellFeedbackState);
+ b2->length = sizeof(xBellFeedbackState);
b2->id = b->ctrl.id;
b2->percent = b->ctrl.percent;
b2->pitch = b->ctrl.pitch;
b2->duration = b->ctrl.duration;
- if (client->swapped)
- {
+ if (client->swapped) {
swaps(&b2->length);
swaps(&b2->pitch);
swaps(&b2->duration);
- }
- *buf += sizeof (xBellFeedbackState);
}
+ *buf += sizeof(xBellFeedbackState);
+}
/***********************************************************************
*
@@ -396,13 +357,11 @@ CopySwapBellFeedback (client, b, buf)
*/
void
-SRepXGetFeedbackControl (client, size, rep)
- ClientPtr client;
- int size;
- xGetFeedbackControlReply *rep;
- {
+SRepXGetFeedbackControl(ClientPtr client, int size,
+ xGetFeedbackControlReply * rep)
+{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->num_feedbacks);
WriteToClient(client, size, rep);
- }
+}