diff options
Diffstat (limited to 'nx-X11')
74 files changed, 3146 insertions, 4095 deletions
diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c index a814e3c3d..8981f9142 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.c +++ b/nx-X11/programs/Xserver/Xi/allowev.c @@ -55,14 +55,14 @@ 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 "allowev.h" @@ -75,15 +75,14 @@ SOFTWARE. */ int -SProcXAllowDeviceEvents(client) - register ClientPtr client; - { +SProcXAllowDeviceEvents(register ClientPtr client) +{ REQUEST(xAllowDeviceEventsReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xAllowDeviceEventsReq); swapl(&stuff->time); - return(ProcXAllowDeviceEvents(client)); - } + return (ProcXAllowDeviceEvents(client)); +} /*********************************************************************** * @@ -92,48 +91,44 @@ SProcXAllowDeviceEvents(client) */ int -ProcXAllowDeviceEvents(client) - register ClientPtr client; - { - TimeStamp time; - DeviceIntPtr thisdev; +ProcXAllowDeviceEvents(register ClientPtr client) +{ + TimeStamp time; + DeviceIntPtr thisdev; REQUEST(xAllowDeviceEventsReq); REQUEST_SIZE_MATCH(xAllowDeviceEventsReq); - thisdev = LookupDeviceIntRec (stuff->deviceid); - if (thisdev == NULL) - { + thisdev = LookupDeviceIntRec(stuff->deviceid); + if (thisdev == NULL) { SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadDevice); return Success; - } + } time = ClientTimeToServerTime(stuff->time); - switch (stuff->mode) - { - case ReplayThisDevice: - AllowSome(client, time, thisdev, NOT_GRABBED); - break; - case SyncThisDevice: - AllowSome(client, time, thisdev, FREEZE_NEXT_EVENT); - break; - case AsyncThisDevice: - AllowSome(client, time, thisdev, THAWED); - break; - case AsyncOtherDevices: - AllowSome(client, time, thisdev, THAW_OTHERS); - break; - case SyncAll: - AllowSome(client, time, thisdev, FREEZE_BOTH_NEXT_EVENT); - break; - case AsyncAll: - AllowSome(client, time, thisdev, THAWED_BOTH); - break; - default: - SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, - BadValue); - client->errorValue = stuff->mode; - return Success; - } - return Success; + switch (stuff->mode) { + case ReplayThisDevice: + AllowSome(client, time, thisdev, NOT_GRABBED); + break; + case SyncThisDevice: + AllowSome(client, time, thisdev, FREEZE_NEXT_EVENT); + break; + case AsyncThisDevice: + AllowSome(client, time, thisdev, THAWED); + break; + case AsyncOtherDevices: + AllowSome(client, time, thisdev, THAW_OTHERS); + break; + case SyncAll: + AllowSome(client, time, thisdev, FREEZE_BOTH_NEXT_EVENT); + break; + case AsyncAll: + AllowSome(client, time, thisdev, THAWED_BOTH); + break; + default: + SendErrorToClient(client, IReqCode, X_AllowDeviceEvents, 0, BadValue); + client->errorValue = stuff->mode; + return Success; } + return Success; +} diff --git a/nx-X11/programs/Xserver/Xi/allowev.h b/nx-X11/programs/Xserver/Xi/allowev.h index 5315667df..199744fea 100644 --- a/nx-X11/programs/Xserver/Xi/allowev.h +++ b/nx-X11/programs/Xserver/Xi/allowev.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef ALLOWEV_H #define ALLOWEV_H 1 -int -SProcXAllowDeviceEvents( - ClientPtr /* client */ - ); - -int -ProcXAllowDeviceEvents( - ClientPtr /* client */ - ); +int SProcXAllowDeviceEvents(ClientPtr /* client */ + ); + +int ProcXAllowDeviceEvents(ClientPtr /* client */ + ); #endif /* ALLOWEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c index b07885f9c..566df5906 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.c +++ b/nx-X11/programs/Xserver/Xi/chgdctl.c @@ -55,15 +55,15 @@ 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> /* control constants */ +#include <nx-X11/extensions/XIproto.h> /* control constants */ #include "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "chgdctl.h" @@ -76,15 +76,14 @@ SOFTWARE. */ int -SProcXChangeDeviceControl(client) - register ClientPtr client; - { +SProcXChangeDeviceControl(register ClientPtr client) +{ REQUEST(xChangeDeviceControlReq); swaps(&stuff->length); REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl)); swaps(&stuff->control); - return(ProcXChangeDeviceControl(client)); - } + return (ProcXChangeDeviceControl(client)); +} /*********************************************************************** * @@ -93,9 +92,8 @@ SProcXChangeDeviceControl(client) */ int -ProcXChangeDeviceControl(client) - ClientPtr client; - { +ProcXChangeDeviceControl(ClientPtr client) +{ unsigned len; int i, status; DeviceIntPtr dev; @@ -107,89 +105,73 @@ ProcXChangeDeviceControl(client) REQUEST(xChangeDeviceControlReq); REQUEST_AT_LEAST_EXTRA_SIZE(xChangeDeviceControlReq, sizeof(xDeviceCtl)); - len = stuff->length - (sizeof(xChangeDeviceControlReq) >>2); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadDevice); + len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_ChangeDeviceControl; rep.length = 0; rep.sequenceNumber = client->sequence; - switch (stuff->control) - { - case DEVICE_RESOLUTION: - r = (xDeviceResolutionCtl *) &stuff[1]; - if ((len < (sizeof(xDeviceResolutionCtl)>>2)) || - (len != (sizeof(xDeviceResolutionCtl)>>2) + - r->num_valuators)) - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, - 0, BadLength); - return Success; - } - if (!dev->valuator) - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadMatch); - return Success; - } - if ((dev->grab) && !SameClient(dev->grab, client)) - { - rep.status = AlreadyGrabbed; - WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), - &rep); - return Success; - } - resolution = (CARD32 *) (r + 1); - if (r->first_valuator + r->num_valuators > dev->valuator->numAxes) - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadValue); - return Success; - } - status = ChangeDeviceControl(client, dev, (xDeviceCtl*) r); - if (status == Success) - { - a = &dev->valuator->axes[r->first_valuator]; - for (i=0; i<r->num_valuators; i++) - if (*(resolution+i) < (a+i)->min_resolution || - *(resolution+i) > (a+i)->max_resolution) - { - SendErrorToClient (client, IReqCode, - X_ChangeDeviceControl, 0, BadValue); - return Success; - } - for (i=0; i<r->num_valuators; i++) - (a++)->resolution = *resolution++; - } - else if (status == DeviceBusy) - { - rep.status = DeviceBusy; - WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), - &rep); - return Success; - } - else - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadMatch); - return Success; + switch (stuff->control) { + case DEVICE_RESOLUTION: + r = (xDeviceResolutionCtl *) & stuff[1]; + if ((len < (sizeof(xDeviceResolutionCtl) >> 2)) || + (len != (sizeof(xDeviceResolutionCtl) >> 2) + r->num_valuators)) { + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, + 0, BadLength); + return Success; + } + if (!dev->valuator) { + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadMatch); + return Success; + } + if ((dev->grab) && !SameClient(dev->grab, client)) { + rep.status = AlreadyGrabbed; + WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); + return Success; + } + resolution = (CARD32 *) (r + 1); + if (r->first_valuator + r->num_valuators > dev->valuator->numAxes) { + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadValue); + return Success; + } + status = ChangeDeviceControl(client, dev, (xDeviceCtl *) r); + if (status == Success) { + a = &dev->valuator->axes[r->first_valuator]; + for (i = 0; i < r->num_valuators; i++) + if (*(resolution + i) < (a + i)->min_resolution || + *(resolution + i) > (a + i)->max_resolution) { + SendErrorToClient(client, IReqCode, + X_ChangeDeviceControl, 0, BadValue); + return Success; } - break; - default: - SendErrorToClient (client, IReqCode, X_ChangeDeviceControl, 0, - BadValue); + for (i = 0; i < r->num_valuators; i++) + (a++)->resolution = *resolution++; + } else if (status == DeviceBusy) { + rep.status = DeviceBusy; + WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); + return Success; + } else { + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, + BadMatch); return Success; } + break; + default: + SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0, BadValue); + return Success; + } WriteReplyToClient(client, sizeof(xChangeDeviceControlReply), &rep); return Success; - } +} /*********************************************************************** * @@ -199,13 +181,10 @@ ProcXChangeDeviceControl(client) */ void -SRepXChangeDeviceControl (client, size, rep) - ClientPtr client; - int size; - xChangeDeviceControlReply *rep; - { +SRepXChangeDeviceControl(ClientPtr client, int size, + xChangeDeviceControlReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } - +} diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.h b/nx-X11/programs/Xserver/Xi/chgdctl.h index 1d1a6214d..9cda225cb 100644 --- a/nx-X11/programs/Xserver/Xi/chgdctl.h +++ b/nx-X11/programs/Xserver/Xi/chgdctl.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGDCTL_H #define CHGDCTL_H 1 -int -SProcXChangeDeviceControl( - ClientPtr /* client */ - ); - -int -ProcXChangeDeviceControl( - ClientPtr /* client */ - ); - -void -SRepXChangeDeviceControl ( - ClientPtr /* client */, - int /* size */, - xChangeDeviceControlReply * /* rep */ - ); +int SProcXChangeDeviceControl(ClientPtr /* client */ + ); + +int ProcXChangeDeviceControl(ClientPtr /* client */ + ); + +void SRepXChangeDeviceControl(ClientPtr /* client */ , + int /* size */ , + xChangeDeviceControlReply * /* rep */ + ); #endif /* CHGDCTL_H */ diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c index a5ad73d11..31cb0a09e 100644 --- a/nx-X11/programs/Xserver/Xi/chgfctl.c +++ b/nx-X11/programs/Xserver/Xi/chgfctl.c @@ -55,14 +55,14 @@ 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> /* control constants */ +#include <nx-X11/extensions/XIproto.h> /* control constants */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "chgfctl.h" @@ -77,15 +77,14 @@ SOFTWARE. */ int -SProcXChangeFeedbackControl(client) - register ClientPtr client; - { +SProcXChangeFeedbackControl(register ClientPtr client) +{ REQUEST(xChangeFeedbackControlReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq); swapl(&stuff->mask); - return(ProcXChangeFeedbackControl(client)); - } + return (ProcXChangeFeedbackControl(client)); +} /*********************************************************************** * @@ -94,9 +93,8 @@ SProcXChangeFeedbackControl(client) */ int -ProcXChangeFeedbackControl(client) - ClientPtr client; - { +ProcXChangeFeedbackControl(ClientPtr client) +{ unsigned len; DeviceIntPtr dev; KbdFeedbackPtr k; @@ -109,117 +107,109 @@ ProcXChangeFeedbackControl(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: - { - xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]); + } + break; + case StringFeedbackClass: + { + xStringFeedbackCtl *f = ((xStringFeedbackCtl *) & stuff[1]); if (client->swapped) { if (len < (sizeof(xStringFeedbackCtl) + 3) >> 2) return BadLength; swaps(&f->num_keysyms); - } - if (len != ((sizeof(xStringFeedbackCtl)>>2) + f->num_keysyms)) - { - 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 (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; - } - 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 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; - } - break; - case LedFeedbackClass: - if (len != (sizeof(xLedFeedbackCtl)>>2)) - { - SendErrorToClient (client, IReqCode, X_ChangeFeedbackControl, - 0, BadLength); + break; + } + 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 (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); + } + 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; - } - 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 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; - } +} /****************************************************************************** * @@ -228,132 +218,110 @@ ProcXChangeFeedbackControl(client) */ int -ChangeKbdFeedback (client, dev, mask, k, f) - ClientPtr client; - DeviceIntPtr dev; - unsigned long mask; - KbdFeedbackPtr k; - xKbdFeedbackCtl *f; - { +ChangeKbdFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask, + KbdFeedbackPtr k, xKbdFeedbackCtl * f) +{ KeybdCtrl kctrl; int t; int key = DO_ALL; - if (client->swapped) - { + if (client->swapped) { swaps(&f->length); swaps(&f->pitch); swaps(&f->duration); swapl(&f->led_mask); swapl(&f->led_values); - } + } 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 @@ -361,20 +329,18 @@ ChangeKbdFeedback (client, dev, mask, k, f) kctrl.autoRepeats[inx] = (kctrl.autoRepeats[inx] & ~kmask) | (defaultKeyboardControl.autoRepeats[inx] & kmask); - } - else - { + } 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; - } +} /****************************************************************************** * @@ -383,79 +349,68 @@ ChangeKbdFeedback (client, dev, mask, k, f) */ int -ChangePtrFeedback (client, dev, mask, p, f) - ClientPtr client; - DeviceIntPtr dev; - unsigned long mask; - PtrFeedbackPtr p; - xPtrFeedbackCtl *f; - { - PtrCtrl pctrl; /* might get BadValue part way through */ +ChangePtrFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask, + PtrFeedbackPtr p, xPtrFeedbackCtl * f) +{ + PtrCtrl pctrl; /* might get BadValue part way through */ - if (client->swapped) - { + if (client->swapped) { swaps(&f->length); swaps(&f->num); swaps(&f->denom); swaps(&f->thresh); - } + } 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; - } +} /****************************************************************************** * @@ -464,23 +419,19 @@ ChangePtrFeedback (client, dev, mask, p, f) */ int -ChangeIntegerFeedback (client, dev, mask, i, f) - ClientPtr client; - DeviceIntPtr dev; - unsigned long mask; - IntegerFeedbackPtr i; - xIntegerFeedbackCtl *f; - { - if (client->swapped) - { +ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev, + long unsigned int mask, IntegerFeedbackPtr i, + xIntegerFeedbackCtl * f) +{ + if (client->swapped) { swaps(&f->length); swapl(&f->int_to_display); - } + } i->ctrl.integer_displayed = f->int_to_display; - (*i->CtrlProc)(dev, &i->ctrl); + (*i->CtrlProc) (dev, &i->ctrl); return Success; - } +} /****************************************************************************** * @@ -489,49 +440,42 @@ ChangeIntegerFeedback (client, dev, mask, i, f) */ int -ChangeStringFeedback (client, dev, mask, s, f) - ClientPtr client; - DeviceIntPtr dev; - unsigned long mask; - StringFeedbackPtr s; - xStringFeedbackCtl *f; - { - int i, j; - KeySym *syms, *sup_syms; - - syms = (KeySym *) (f+1); - if (client->swapped) - { +ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev, + long unsigned int mask, StringFeedbackPtr s, + xStringFeedbackCtl * f) +{ + int i, j; + KeySym *syms, *sup_syms; + + syms = (KeySym *) (f + 1); + if (client->swapped) { swaps(&f->length); /* swapped num_keysyms in calling proc */ SwapLongs((CARD32 *) syms, f->num_keysyms); - } + } - 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; - } +} /****************************************************************************** * @@ -540,72 +484,62 @@ ChangeStringFeedback (client, dev, mask, s, f) */ int -ChangeBellFeedback (client, dev, mask, b, f) - ClientPtr client; - DeviceIntPtr dev; - unsigned long mask; - BellFeedbackPtr b; - xBellFeedbackCtl *f; - { +ChangeBellFeedback(ClientPtr client, DeviceIntPtr dev, + long unsigned int mask, BellFeedbackPtr b, + xBellFeedbackCtl * f) +{ int t; - BellCtrl bctrl; /* might get BadValue part way through */ + BellCtrl bctrl; /* might get BadValue part way through */ - if (client->swapped) - { + if (client->swapped) { swaps(&f->length); swaps(&f->pitch); swaps(&f->duration); - } + } 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; - } +} /****************************************************************************** * @@ -614,32 +548,26 @@ ChangeBellFeedback (client, dev, mask, b, f) */ int -ChangeLedFeedback (client, dev, mask, l, f) - ClientPtr client; - DeviceIntPtr dev; - unsigned long mask; - LedFeedbackPtr l; - xLedFeedbackCtl *f; - { - LedCtrl lctrl; /* might get BadValue part way through */ +ChangeLedFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask, + LedFeedbackPtr l, xLedFeedbackCtl * f) +{ + LedCtrl lctrl; /* might get BadValue part way through */ - if (client->swapped) - { + if (client->swapped) { swaps(&f->length); swapl(&f->led_values); swapl(&f->led_mask); - } + } 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; - } +} diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.h b/nx-X11/programs/Xserver/Xi/chgfctl.h index ffcb3be8a..81e1153ec 100644 --- a/nx-X11/programs/Xserver/Xi/chgfctl.h +++ b/nx-X11/programs/Xserver/Xi/chgfctl.h @@ -30,68 +30,52 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGFCTL_H #define CHGFCTL_H 1 -int -SProcXChangeFeedbackControl( - ClientPtr /* client */ - ); - -int -ProcXChangeFeedbackControl( - ClientPtr /* client */ - ); - -int -ChangeKbdFeedback ( - ClientPtr /* client */, - DeviceIntPtr /* dev */, - unsigned long /* mask */, - KbdFeedbackPtr /* k */, - xKbdFeedbackCtl * /* f */ - ); - -int -ChangePtrFeedback ( - ClientPtr /* client */, - DeviceIntPtr /* dev */, - unsigned long /* mask */, - PtrFeedbackPtr /* p */, - xPtrFeedbackCtl * /* f */ - ); - -int -ChangeIntegerFeedback ( - ClientPtr /* client */, - DeviceIntPtr /* dev */, - unsigned long /* mask */, - IntegerFeedbackPtr /* i */, - xIntegerFeedbackCtl * /* f */ - ); - -int -ChangeStringFeedback ( - ClientPtr /* client */, - DeviceIntPtr /* dev */, - unsigned long /* mask */, - StringFeedbackPtr /* s */, - xStringFeedbackCtl * /* f */ - ); - -int -ChangeBellFeedback ( - ClientPtr /* client */, - DeviceIntPtr /* dev */, - unsigned long /* mask */, - BellFeedbackPtr /* b */, - xBellFeedbackCtl * /* f */ - ); - -int -ChangeLedFeedback ( - ClientPtr /* client */, - DeviceIntPtr /* dev */, - unsigned long /* mask */, - LedFeedbackPtr /* l */, - xLedFeedbackCtl * /* f */ - ); +int SProcXChangeFeedbackControl(ClientPtr /* client */ + ); + +int ProcXChangeFeedbackControl(ClientPtr /* client */ + ); + +int ChangeKbdFeedback(ClientPtr /* client */ , + DeviceIntPtr /* dev */ , + unsigned long /* mask */ , + KbdFeedbackPtr /* k */ , + xKbdFeedbackCtl * /* f */ + ); + +int ChangePtrFeedback(ClientPtr /* client */ , + DeviceIntPtr /* dev */ , + unsigned long /* mask */ , + PtrFeedbackPtr /* p */ , + xPtrFeedbackCtl * /* f */ + ); + +int ChangeIntegerFeedback(ClientPtr /* client */ , + DeviceIntPtr /* dev */ , + unsigned long /* mask */ , + IntegerFeedbackPtr /* i */ , + xIntegerFeedbackCtl * /* f */ + ); + +int ChangeStringFeedback(ClientPtr /* client */ , + DeviceIntPtr /* dev */ , + unsigned long /* mask */ , + StringFeedbackPtr /* s */ , + xStringFeedbackCtl * /* f */ + ); + +int ChangeBellFeedback(ClientPtr /* client */ , + DeviceIntPtr /* dev */ , + unsigned long /* mask */ , + BellFeedbackPtr /* b */ , + xBellFeedbackCtl * /* f */ + ); + +int ChangeLedFeedback(ClientPtr /* client */ , + DeviceIntPtr /* dev */ , + unsigned long /* mask */ , + LedFeedbackPtr /* l */ , + xLedFeedbackCtl * /* f */ + ); #endif /* CHGFCTL_H */ diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c index 1d45023cf..4e8b5ee70 100644 --- a/nx-X11/programs/Xserver/Xi/chgkbd.c +++ b/nx-X11/programs/Xserver/Xi/chgkbd.c @@ -55,15 +55,15 @@ 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 "XIstubs.h" #include "globals.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" @@ -78,14 +78,13 @@ SOFTWARE. */ int -SProcXChangeKeyboardDevice(client) - register ClientPtr client; - { +SProcXChangeKeyboardDevice(register ClientPtr client) +{ REQUEST(xChangeKeyboardDeviceReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xChangeKeyboardDeviceReq); - return(ProcXChangeKeyboardDevice(client)); - } + return (ProcXChangeKeyboardDevice(client)); +} /*********************************************************************** * @@ -95,17 +94,16 @@ SProcXChangeKeyboardDevice(client) */ int -ProcXChangeKeyboardDevice (client) - register ClientPtr client; - { - int i; - DeviceIntPtr xkbd = inputInfo.keyboard; - DeviceIntPtr dev; - FocusClassPtr xf = xkbd->focus; - FocusClassPtr df; - KeyClassPtr k; - xChangeKeyboardDeviceReply rep; - changeDeviceNotify ev; +ProcXChangeKeyboardDevice(register ClientPtr client) +{ + int i; + DeviceIntPtr xkbd = inputInfo.keyboard; + DeviceIntPtr dev; + FocusClassPtr xf = xkbd->focus; + FocusClassPtr df; + KeyClassPtr k; + xChangeKeyboardDeviceReply rep; + changeDeviceNotify ev; REQUEST(xChangeKeyboardDeviceReq); REQUEST_SIZE_MATCH(xChangeKeyboardDeviceReq); @@ -115,79 +113,75 @@ ProcXChangeKeyboardDevice (client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { rep.status = -1; - SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, - BadDevice); + SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, + BadDevice); return Success; - } + } k = dev->key; - if (k == NULL) - { + if (k == NULL) { rep.status = -1; - SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, - BadMatch); + SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, + BadMatch); return Success; - } + } if (((dev->grab) && !SameClient(dev->grab, client)) || - ((xkbd->grab) && !SameClient(xkbd->grab, client))) + ((xkbd->grab) && !SameClient(xkbd->grab, client))) rep.status = AlreadyGrabbed; else if ((dev->sync.frozen && - dev->sync.other && !SameClient(dev->sync.other, client)) || + dev->sync.other && !SameClient(dev->sync.other, client)) || (xkbd->sync.frozen && xkbd->sync.other && !SameClient(xkbd->sync.other, client))) rep.status = GrabFrozen; - else - { - if (ChangeKeyboardDevice (xkbd, dev) != Success) - { - SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, - BadDevice); + else { + if (ChangeKeyboardDevice(xkbd, dev) != Success) { + SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, + BadDevice); return Success; - } + } if (!dev->focus) - InitFocusClassDeviceStruct (dev); + InitFocusClassDeviceStruct(dev); if (!dev->kbdfeed) - InitKbdFeedbackClassDeviceStruct(dev, (BellProcPtr)NoopDDA, - (KbdCtrlProcPtr)NoopDDA); + InitKbdFeedbackClassDeviceStruct(dev, (BellProcPtr) NoopDDA, + (KbdCtrlProcPtr) NoopDDA); df = dev->focus; df->win = xf->win; df->revert = xf->revert; df->time = xf->time; df->traceGood = xf->traceGood; - if (df->traceSize != xf->traceSize) - { - Must_have_memory = TRUE; /* XXX */ - df->trace = (WindowPtr *) realloc(df->trace, - xf->traceSize * sizeof(WindowPtr)); - Must_have_memory = FALSE; /* XXX */ - } + if (df->traceSize != xf->traceSize) { + Must_have_memory = TRUE; /* XXX */ + df->trace = (WindowPtr *) realloc(df->trace, + xf->traceSize * + sizeof(WindowPtr)); + Must_have_memory = FALSE; /* XXX */ + } df->traceSize = xf->traceSize; - for (i=0; i<df->traceSize; i++) + for (i = 0; i < df->traceSize; i++) df->trace[i] = xf->trace[i]; - RegisterOtherDevice (xkbd); - RegisterKeyboardDevice (dev); + RegisterOtherDevice(xkbd); + RegisterKeyboardDevice(dev); ev.type = ChangeDeviceNotify; ev.deviceid = stuff->deviceid; ev.time = currentTime.milliseconds; ev.request = NewKeyboard; - SendEventToAllWindows (dev, ChangeDeviceNotifyMask, (xEvent *)&ev, 1); - SendMappingNotify (MappingKeyboard, k->curKeySyms.minKeyCode, - k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode + 1,client); + SendEventToAllWindows(dev, ChangeDeviceNotifyMask, (xEvent *) & ev, 1); + SendMappingNotify(MappingKeyboard, k->curKeySyms.minKeyCode, + k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode + + 1, client); rep.status = 0; - } + } - WriteReplyToClient (client, sizeof (xChangeKeyboardDeviceReply), - &rep); + WriteReplyToClient(client, sizeof(xChangeKeyboardDeviceReply), &rep); return Success; - } +} /*********************************************************************** * @@ -197,12 +191,10 @@ ProcXChangeKeyboardDevice (client) */ void -SRepXChangeKeyboardDevice (client, size, rep) - ClientPtr client; - int size; - xChangeKeyboardDeviceReply *rep; - { +SRepXChangeKeyboardDevice(ClientPtr client, int size, + xChangeKeyboardDeviceReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.h b/nx-X11/programs/Xserver/Xi/chgkbd.h index b7ed198f7..7a883b7f0 100644 --- a/nx-X11/programs/Xserver/Xi/chgkbd.h +++ b/nx-X11/programs/Xserver/Xi/chgkbd.h @@ -30,22 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGKBD_H #define CHGKBD_H 1 -int -SProcXChangeKeyboardDevice( - ClientPtr /* client */ - ); - -int -ProcXChangeKeyboardDevice ( - ClientPtr /* client */ - ); - -void -SRepXChangeKeyboardDevice ( - ClientPtr /* client */, - int /* size */, - xChangeKeyboardDeviceReply * /* rep */ - ); +int SProcXChangeKeyboardDevice(ClientPtr /* client */ + ); +int ProcXChangeKeyboardDevice(ClientPtr /* client */ + ); + +void SRepXChangeKeyboardDevice(ClientPtr /* client */ , + int /* size */ , + xChangeKeyboardDeviceReply * /* rep */ + ); #endif /* CHGKBD_H */ diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.c b/nx-X11/programs/Xserver/Xi/chgkmap.c index 8d5199848..604fcd9cf 100644 --- a/nx-X11/programs/Xserver/Xi/chgkmap.c +++ b/nx-X11/programs/Xserver/Xi/chgkmap.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 "exevents.h" #include "exglobals.h" @@ -75,9 +75,8 @@ SOFTWARE. */ int -SProcXChangeDeviceKeyMapping(client) - register ClientPtr client; - { +SProcXChangeDeviceKeyMapping(register ClientPtr client) +{ unsigned int count; REQUEST(xChangeDeviceKeyMappingReq); @@ -86,8 +85,8 @@ SProcXChangeDeviceKeyMapping(client) count = stuff->keyCodes * stuff->keySymsPerKeyCode; REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), count); - return(ProcXChangeDeviceKeyMapping(client)); - } + return (ProcXChangeDeviceKeyMapping(client)); +} /*********************************************************************** * @@ -96,10 +95,9 @@ SProcXChangeDeviceKeyMapping(client) */ int -ProcXChangeDeviceKeyMapping(client) - register ClientPtr client; - { - int ret; +ProcXChangeDeviceKeyMapping(register ClientPtr client) +{ + int ret; unsigned len; DeviceIntPtr dev; unsigned int count; @@ -110,21 +108,19 @@ ProcXChangeDeviceKeyMapping(client) count = stuff->keyCodes * stuff->keySymsPerKeyCode; REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32)); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceKeyMapping, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, + BadDevice); return Success; - } - len = stuff->length - (sizeof(xChangeDeviceKeyMappingReq) >> 2); + } + len = stuff->length - (sizeof(xChangeDeviceKeyMappingReq) >> 2); - ret = ChangeKeyMapping (client, dev, len, DeviceMappingNotify, - stuff->firstKeyCode, stuff->keyCodes, stuff->keySymsPerKeyCode, - (KeySym *)&stuff[1]); + ret = ChangeKeyMapping(client, dev, len, DeviceMappingNotify, + stuff->firstKeyCode, stuff->keyCodes, + stuff->keySymsPerKeyCode, (KeySym *) & stuff[1]); if (ret != Success) - SendErrorToClient (client, IReqCode, X_ChangeDeviceKeyMapping, 0, - ret); + SendErrorToClient(client, IReqCode, X_ChangeDeviceKeyMapping, 0, ret); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.h b/nx-X11/programs/Xserver/Xi/chgkmap.h index 22cab11ba..6ed6420fb 100644 --- a/nx-X11/programs/Xserver/Xi/chgkmap.h +++ b/nx-X11/programs/Xserver/Xi/chgkmap.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGKMAP_H #define CHGKMAP_H 1 -int -SProcXChangeDeviceKeyMapping( - ClientPtr /* client */ - ); - -int -ProcXChangeDeviceKeyMapping( - ClientPtr /* client */ - ); +int SProcXChangeDeviceKeyMapping(ClientPtr /* client */ + ); + +int ProcXChangeDeviceKeyMapping(ClientPtr /* client */ + ); #endif /* CHGKMAP_H */ diff --git a/nx-X11/programs/Xserver/Xi/chgprop.c b/nx-X11/programs/Xserver/Xi/chgprop.c index 80b8aea5f..b8d0403bf 100644 --- a/nx-X11/programs/Xserver/Xi/chgprop.c +++ b/nx-X11/programs/Xserver/Xi/chgprop.c @@ -55,14 +55,14 @@ 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 "windowstr.h" #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" @@ -77,9 +77,8 @@ SOFTWARE. */ int -SProcXChangeDeviceDontPropagateList(client) - register ClientPtr client; - { +SProcXChangeDeviceDontPropagateList(register ClientPtr client) +{ REQUEST(xChangeDeviceDontPropagateListReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq); @@ -88,8 +87,8 @@ SProcXChangeDeviceDontPropagateList(client) REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq, stuff->count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), stuff->count); - return(ProcXChangeDeviceDontPropagateList(client)); - } + return (ProcXChangeDeviceDontPropagateList(client)); +} /*********************************************************************** * @@ -98,51 +97,47 @@ SProcXChangeDeviceDontPropagateList(client) */ int -ProcXChangeDeviceDontPropagateList (client) - register ClientPtr client; - { - int i; - WindowPtr pWin; - struct tmask tmp[EMASKSIZE]; - OtherInputMasks *others; +ProcXChangeDeviceDontPropagateList(register ClientPtr client) +{ + int i; + WindowPtr pWin; + struct tmask tmp[EMASKSIZE]; + OtherInputMasks *others; REQUEST(xChangeDeviceDontPropagateListReq); REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq); - if (stuff->length !=(sizeof(xChangeDeviceDontPropagateListReq)>>2) + - stuff->count) - { - SendErrorToClient (client, IReqCode, X_ChangeDeviceDontPropagateList, 0, - BadLength); + if (stuff->length != (sizeof(xChangeDeviceDontPropagateListReq) >> 2) + + stuff->count) { + SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, + BadLength); return Success; - } + } - pWin = (WindowPtr) LookupWindow (stuff->window, client); - if (!pWin) - { + pWin = (WindowPtr) LookupWindow(stuff->window, client); + if (!pWin) { client->errorValue = stuff->window; - SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, - BadWindow); + SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, + BadWindow); return Success; - } + } - if (stuff->mode != AddToList && stuff->mode != DeleteFromList) - { + if (stuff->mode != AddToList && stuff->mode != DeleteFromList) { client->errorValue = stuff->window; - SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, - BadMode); + SendErrorToClient(client, IReqCode, X_ChangeDeviceDontPropagateList, 0, + BadMode); return Success; - } + } - if (CreateMaskFromList (client, (XEventClass *)&stuff[1], - stuff->count, tmp, NULL, X_ChangeDeviceDontPropagateList) != Success) - return Success; + if (CreateMaskFromList(client, (XEventClass *) & stuff[1], + stuff->count, tmp, NULL, + X_ChangeDeviceDontPropagateList) != Success) + return Success; others = wOtherInputMasks(pWin); if (!others && stuff->mode == DeleteFromList) return Success; - for (i=0; i<EMASKSIZE; i++) - { + for (i = 0; i < EMASKSIZE; i++) { if (tmp[i].mask == 0) continue; @@ -151,13 +146,13 @@ ProcXChangeDeviceDontPropagateList (client) else if (others) tmp[i].mask |= others->dontPropagateMask[i]; - if (DeviceEventSuppressForWindow (pWin,client,tmp[i].mask,i) != Success) - { - SendErrorToClient ( client, IReqCode, X_ChangeDeviceDontPropagateList, 0, - BadClass); + if (DeviceEventSuppressForWindow(pWin, client, tmp[i].mask, i) != + Success) { + SendErrorToClient(client, IReqCode, + X_ChangeDeviceDontPropagateList, 0, BadClass); return Success; - } } + } return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/chgprop.h b/nx-X11/programs/Xserver/Xi/chgprop.h index 19d091c10..36716180a 100644 --- a/nx-X11/programs/Xserver/Xi/chgprop.h +++ b/nx-X11/programs/Xserver/Xi/chgprop.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGPROP_H #define CHGPROP_H 1 -int -SProcXChangeDeviceDontPropagateList ( - ClientPtr /* client */ - ); - -int -ProcXChangeDeviceDontPropagateList ( - ClientPtr /* client */ - ); +int SProcXChangeDeviceDontPropagateList(ClientPtr /* client */ + ); + +int ProcXChangeDeviceDontPropagateList(ClientPtr /* client */ + ); #endif /* CHGPROP_H */ diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c index 7fef2a104..af2625f49 100644 --- a/nx-X11/programs/Xserver/Xi/chgptr.c +++ b/nx-X11/programs/Xserver/Xi/chgptr.c @@ -55,17 +55,17 @@ 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 "XIstubs.h" -#include "windowstr.h" /* window structure */ -#include "scrnintstr.h" /* screen structure */ +#include "windowstr.h" /* window structure */ +#include "scrnintstr.h" /* screen structure */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "dixevents.h" #include "exevents.h" @@ -81,14 +81,13 @@ SOFTWARE. */ int -SProcXChangePointerDevice(client) - register ClientPtr client; - { +SProcXChangePointerDevice(register ClientPtr client) +{ REQUEST(xChangePointerDeviceReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xChangePointerDeviceReq); - return(ProcXChangePointerDevice(client)); - } + return (ProcXChangePointerDevice(client)); +} /*********************************************************************** * @@ -97,14 +96,13 @@ SProcXChangePointerDevice(client) */ int -ProcXChangePointerDevice (client) - register ClientPtr client; - { - DeviceIntPtr xptr = inputInfo.pointer; - DeviceIntPtr dev; - ValuatorClassPtr v; - xChangePointerDeviceReply rep; - changeDeviceNotify ev; +ProcXChangePointerDevice(register ClientPtr client) +{ + DeviceIntPtr xptr = inputInfo.pointer; + DeviceIntPtr dev; + ValuatorClassPtr v; + xChangePointerDeviceReply rep; + changeDeviceNotify ev; REQUEST(xChangePointerDeviceReq); REQUEST_SIZE_MATCH(xChangePointerDeviceReq); @@ -114,75 +112,68 @@ ProcXChangePointerDevice (client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { rep.status = -1; - SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, - BadDevice); + SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, + BadDevice); return Success; - } + } v = dev->valuator; - if (v == NULL || v->numAxes < 2 || - stuff->xaxis >= v->numAxes || - stuff->yaxis >= v->numAxes) - { + if (v == NULL || v->numAxes < 2 || + stuff->xaxis >= v->numAxes || stuff->yaxis >= v->numAxes) { rep.status = -1; SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, BadMatch); return Success; - } + } if (((dev->grab) && !SameClient(dev->grab, client)) || - ((xptr->grab) && !SameClient(xptr->grab, client))) + ((xptr->grab) && !SameClient(xptr->grab, client))) rep.status = AlreadyGrabbed; else if ((dev->sync.frozen && - dev->sync.other && !SameClient(dev->sync.other, client)) || + dev->sync.other && !SameClient(dev->sync.other, client)) || (xptr->sync.frozen && xptr->sync.other && !SameClient(xptr->sync.other, client))) rep.status = GrabFrozen; - else - { - if (ChangePointerDevice ( - xptr, dev, stuff->xaxis, stuff->yaxis) != Success) - { - SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, - BadDevice); + else { + if (ChangePointerDevice(xptr, dev, stuff->xaxis, stuff->yaxis) != + Success) { + SendErrorToClient(client, IReqCode, X_ChangePointerDevice, 0, + BadDevice); return Success; - } + } if (dev->focus) DeleteFocusClassDeviceStruct(dev); if (!dev->button) - InitButtonClassDeviceStruct (dev, 0, NULL); + InitButtonClassDeviceStruct(dev, 0, NULL); if (!dev->ptrfeed) - InitPtrFeedbackClassDeviceStruct(dev, (PtrCtrlProcPtr)NoopDDA); - RegisterOtherDevice (xptr); - RegisterPointerDevice (dev); + InitPtrFeedbackClassDeviceStruct(dev, (PtrCtrlProcPtr) NoopDDA); + RegisterOtherDevice(xptr); + RegisterPointerDevice(dev); ev.type = ChangeDeviceNotify; ev.deviceid = stuff->deviceid; ev.time = currentTime.milliseconds; ev.request = NewPointer; - SendEventToAllWindows (dev, ChangeDeviceNotifyMask, (xEvent *)&ev, 1); - SendMappingNotify (MappingPointer, 0, 0, client); + SendEventToAllWindows(dev, ChangeDeviceNotifyMask, (xEvent *) & ev, 1); + SendMappingNotify(MappingPointer, 0, 0, client); rep.status = 0; - } + } - WriteReplyToClient (client, sizeof (xChangePointerDeviceReply), - &rep); + WriteReplyToClient(client, sizeof(xChangePointerDeviceReply), &rep); return Success; - } +} void -DeleteFocusClassDeviceStruct(dev) - DeviceIntPtr dev; - { +DeleteFocusClassDeviceStruct(DeviceIntPtr dev) +{ free(dev->focus->trace); free(dev->focus); dev->focus = NULL; - } +} /*********************************************************************** * @@ -191,23 +182,18 @@ DeleteFocusClassDeviceStruct(dev) */ void -SendEventToAllWindows (dev, mask, ev, count) - DeviceIntPtr dev; - Mask mask; - xEvent *ev; - int count; - { +SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count) +{ int i; WindowPtr pWin, p1; - for (i=0; i<screenInfo.numScreens; i++) - { + for (i = 0; i < screenInfo.numScreens; i++) { pWin = screenInfo.screens[i]->root; (void)DeliverEventsToWindow(pWin, ev, count, mask, NullGrab, dev->id); p1 = pWin->firstChild; - FindInterestedChildren (dev, p1, mask, ev, count); - } + FindInterestedChildren(dev, p1, mask, ev, count); } +} /*********************************************************************** * @@ -217,23 +203,18 @@ SendEventToAllWindows (dev, mask, ev, count) */ void -FindInterestedChildren (dev, p1, mask, ev, count) - DeviceIntPtr dev; - WindowPtr p1; - Mask mask; - xEvent *ev; - int count; - { +FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask, + xEvent * ev, int count) +{ WindowPtr p2; - while (p1) - { - p2 = p1->firstChild; + while (p1) { + p2 = p1->firstChild; (void)DeliverEventsToWindow(p1, ev, count, mask, NullGrab, dev->id); - FindInterestedChildren (dev, p2, mask, ev, count); + FindInterestedChildren(dev, p2, mask, ev, count); p1 = p1->nextSib; - } } +} /*********************************************************************** * @@ -243,12 +224,10 @@ FindInterestedChildren (dev, p1, mask, ev, count) */ void -SRepXChangePointerDevice (client, size, rep) - ClientPtr client; - int size; - xChangePointerDeviceReply *rep; - { +SRepXChangePointerDevice(ClientPtr client, int size, + xChangePointerDeviceReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/chgptr.h b/nx-X11/programs/Xserver/Xi/chgptr.h index f63d96876..aeda822aa 100644 --- a/nx-X11/programs/Xserver/Xi/chgptr.h +++ b/nx-X11/programs/Xserver/Xi/chgptr.h @@ -30,43 +30,32 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CHGPTR_H #define CHGPTR_H 1 -int -SProcXChangePointerDevice( - ClientPtr /* client */ - ); - -int -ProcXChangePointerDevice ( - ClientPtr /* client */ - ); - -void -DeleteFocusClassDeviceStruct( - DeviceIntPtr /* dev */ - ); - -void -SendEventToAllWindows ( - DeviceIntPtr /* dev */, - Mask /* mask */, - xEvent * /* ev */, - int /* count */ - ); - -void -FindInterestedChildren ( /* FIXME: could be static? */ - DeviceIntPtr /* dev */, - WindowPtr /* p1 */, - Mask /* mask */, - xEvent * /* ev */, - int /* count */ - ); - -void -SRepXChangePointerDevice ( - ClientPtr /* client */, - int /* size */, - xChangePointerDeviceReply * /* rep */ - ); +int SProcXChangePointerDevice(ClientPtr /* client */ + ); + +int ProcXChangePointerDevice(ClientPtr /* client */ + ); + +void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */ + ); + +void SendEventToAllWindows(DeviceIntPtr /* dev */ , + Mask /* mask */ , + xEvent * /* ev */ , + int /* count */ + ); + +void FindInterestedChildren( /* FIXME: could be static? */ + DeviceIntPtr /* dev */ , + WindowPtr /* p1 */ , + Mask /* mask */ , + xEvent * /* ev */ , + int /* count */ + ); + +void SRepXChangePointerDevice(ClientPtr /* client */ , + int /* size */ , + xChangePointerDeviceReply * /* rep */ + ); #endif /* CHGPTR_H */ diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c index 2ba90d0d1..b41474e70 100644 --- a/nx-X11/programs/Xserver/Xi/closedev.c +++ b/nx-X11/programs/Xserver/Xi/closedev.c @@ -55,16 +55,16 @@ 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 "windowstr.h" /* window structure */ -#include "scrnintstr.h" /* screen structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ +#include "scrnintstr.h" /* screen structure */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "closedev.h" @@ -76,14 +76,13 @@ SOFTWARE. */ int -SProcXCloseDevice(client) - register ClientPtr client; - { +SProcXCloseDevice(register ClientPtr client) +{ REQUEST(xCloseDeviceReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xCloseDeviceReq); - return(ProcXCloseDevice(client)); - } + return (ProcXCloseDevice(client)); +} /*********************************************************************** * @@ -92,41 +91,38 @@ SProcXCloseDevice(client) */ int -ProcXCloseDevice(client) - register ClientPtr client; - { - int i; - WindowPtr pWin, p1; - DeviceIntPtr d; +ProcXCloseDevice(register ClientPtr client) +{ + int i; + WindowPtr pWin, p1; + DeviceIntPtr d; REQUEST(xCloseDeviceReq); REQUEST_SIZE_MATCH(xCloseDeviceReq); - d = LookupDeviceIntRec (stuff->deviceid); - if (d == NULL) - { + d = LookupDeviceIntRec(stuff->deviceid); + if (d == NULL) { SendErrorToClient(client, IReqCode, X_CloseDevice, 0, BadDevice); - return Success; - } + return Success; + } if (d->grab && SameClient(d->grab, client)) - (*d->DeactivateGrab)(d); /* release active grab */ + (*d->DeactivateGrab) (d); /* release active grab */ /* Remove event selections from all windows for events from this device - and selected by this client. - Delete passive grabs from all windows for this device. */ + * and selected by this client. + * Delete passive grabs from all windows for this device. */ - for (i=0; i<screenInfo.numScreens; i++) - { + for (i = 0; i < screenInfo.numScreens; i++) { pWin = screenInfo.screens[i]->root; - DeleteDeviceEvents (d, pWin, client); + DeleteDeviceEvents(d, pWin, client); p1 = pWin->firstChild; - DeleteEventsFromChildren (d, p1, client); - } + DeleteEventsFromChildren(d, p1, client); + } - CloseInputDevice (d, client); + CloseInputDevice(d, client); return Success; - } +} /*********************************************************************** * @@ -136,21 +132,17 @@ ProcXCloseDevice(client) */ void -DeleteEventsFromChildren(dev, p1, client) - DeviceIntPtr dev; - WindowPtr p1; - ClientPtr client; - { +DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client) +{ WindowPtr p2; - while (p1) - { - p2 = p1->firstChild; - DeleteDeviceEvents (dev, p1, client); + while (p1) { + p2 = p1->firstChild; + DeleteDeviceEvents(dev, p1, client); DeleteEventsFromChildren(dev, p2, client); p1 = p1->nextSib; - } } +} /*********************************************************************** * @@ -160,26 +152,21 @@ DeleteEventsFromChildren(dev, p1, client) */ void -DeleteDeviceEvents (dev, pWin, client) - DeviceIntPtr dev; - WindowPtr pWin; - ClientPtr client; - { - InputClientsPtr others; - OtherInputMasks *pOthers; - GrabPtr grab, next; +DeleteDeviceEvents(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client) +{ + InputClientsPtr others; + OtherInputMasks *pOthers; + GrabPtr grab, next; if ((pOthers = wOtherInputMasks(pWin)) != 0) - for (others=pOthers->inputClients; others; - others = others->next) - if (SameClient(others,client)) + for (others = pOthers->inputClients; others; others = others->next) + if (SameClient(others, client)) others->mask[dev->id] = NoEventMask; - for (grab = wPassiveGrabs(pWin); grab; grab=next) - { + for (grab = wPassiveGrabs(pWin); grab; grab = next) { next = grab->next; if ((grab->device == dev) && (client->clientAsMask == CLIENT_BITS(grab->resource))) - FreeResource (grab->resource, RT_NONE); - } + FreeResource(grab->resource, RT_NONE); } +} diff --git a/nx-X11/programs/Xserver/Xi/closedev.h b/nx-X11/programs/Xserver/Xi/closedev.h index 61e42e2f0..6853d5002 100644 --- a/nx-X11/programs/Xserver/Xi/closedev.h +++ b/nx-X11/programs/Xserver/Xi/closedev.h @@ -30,28 +30,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef CLOSEDEV_H #define CLOSEDEV_H 1 -int -SProcXCloseDevice( - ClientPtr /* client */ - ); - -int -ProcXCloseDevice( - ClientPtr /* client */ - ); - -void -DeleteEventsFromChildren( - DeviceIntPtr /* dev */, - WindowPtr /* p1 */, - ClientPtr /* client */ - ); - -void -DeleteDeviceEvents ( - DeviceIntPtr /* dev */, - WindowPtr /* pWin */, - ClientPtr /* client */ - ); +int SProcXCloseDevice(ClientPtr /* client */ + ); + +int ProcXCloseDevice(ClientPtr /* client */ + ); + +void DeleteEventsFromChildren(DeviceIntPtr /* dev */ , + WindowPtr /* p1 */ , + ClientPtr /* client */ + ); + +void DeleteDeviceEvents(DeviceIntPtr /* dev */ , + WindowPtr /* pWin */ , + ClientPtr /* client */ + ); #endif /* CLOSEDEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c index 7fac4f972..a7091752b 100644 --- a/nx-X11/programs/Xserver/Xi/devbell.c +++ b/nx-X11/programs/Xserver/Xi/devbell.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 "devbell.h" @@ -74,13 +74,12 @@ SOFTWARE. */ int -SProcXDeviceBell(client) - register ClientPtr client; - { +SProcXDeviceBell(register ClientPtr client) +{ REQUEST(xDeviceBellReq); swaps(&stuff->length); - return(ProcXDeviceBell(client)); - } + return (ProcXDeviceBell(client)); +} /*********************************************************************** * @@ -89,9 +88,8 @@ SProcXDeviceBell(client) */ int -ProcXDeviceBell (client) - register ClientPtr client; - { +ProcXDeviceBell(register ClientPtr client) +{ DeviceIntPtr dev; KbdFeedbackPtr k; BellFeedbackPtr b; @@ -104,64 +102,55 @@ ProcXDeviceBell (client) REQUEST(xDeviceBellReq); REQUEST_SIZE_MATCH(xDeviceBellReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { client->errorValue = stuff->deviceid; SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadDevice); return Success; - } + } - if (stuff->percent < -100 || stuff->percent > 100) - { + if (stuff->percent < -100 || stuff->percent > 100) { client->errorValue = stuff->percent; SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); return Success; - } - if (stuff->feedbackclass == KbdFeedbackClass) - { - for (k=dev->kbdfeed; k; k=k->next) + } + if (stuff->feedbackclass == KbdFeedbackClass) { + for (k = dev->kbdfeed; k; k = k->next) if (k->ctrl.id == stuff->feedbackid) break; - if (!k) - { + if (!k) { client->errorValue = stuff->feedbackid; SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); return Success; - } + } base = k->ctrl.bell; proc = k->BellProc; ctrl = (void *) &(k->ctrl); class = KbdFeedbackClass; - } - else if (stuff->feedbackclass == BellFeedbackClass) - { - for (b=dev->bell; b; b=b->next) + } else if (stuff->feedbackclass == BellFeedbackClass) { + for (b = dev->bell; b; b = b->next) if (b->ctrl.id == stuff->feedbackid) break; - if (!b) - { + if (!b) { client->errorValue = stuff->feedbackid; SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); return Success; - } + } base = b->ctrl.percent; proc = b->BellProc; ctrl = (void *) &(b->ctrl); class = BellFeedbackClass; - } - else - { + } else { client->errorValue = stuff->feedbackclass; SendErrorToClient(client, IReqCode, X_DeviceBell, 0, BadValue); return Success; - } + } newpercent = (base * stuff->percent) / 100; if (stuff->percent < 0) - newpercent = base + newpercent; + newpercent = base + newpercent; else - newpercent = base - newpercent + stuff->percent; - (*proc)(newpercent, dev, ctrl, class); + newpercent = base - newpercent + stuff->percent; + (*proc) (newpercent, dev, ctrl, class); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/devbell.h b/nx-X11/programs/Xserver/Xi/devbell.h index d1289bedf..02a77a6b9 100644 --- a/nx-X11/programs/Xserver/Xi/devbell.h +++ b/nx-X11/programs/Xserver/Xi/devbell.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef DEVBELL_H #define DEVBELL_H 1 -int -SProcXDeviceBell ( - ClientPtr /* client */ - ); - -int -ProcXDeviceBell ( - ClientPtr /* client */ - ); +int SProcXDeviceBell(ClientPtr /* client */ + ); + +int ProcXDeviceBell(ClientPtr /* client */ + ); #endif /* DEVBELL_H */ diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c index 3b5a070b6..92b9f08ec 100644 --- a/nx-X11/programs/Xserver/Xi/exevents.c +++ b/nx-X11/programs/Xserver/Xi/exevents.c @@ -66,10 +66,10 @@ SOFTWARE. #include "region.h" #include "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" -#include "dixevents.h" /* DeliverFocusedEvent */ -#include "dixgrabs.h" /* CreateGrab() */ +#include "dixevents.h" /* DeliverFocusedEvent */ +#include "dixgrabs.h" /* CreateGrab() */ #include "chgptr.h" @@ -82,13 +82,11 @@ SOFTWARE. #define Motion_Filter(class) (DevicePointerMotionMask | \ (class)->state | (class)->motionMask) -static Bool ShouldFreeInputMasks( - WindowPtr /* pWin */, - Bool /* ignoreSelectedEvents */ - ); -static Bool MakeInputMasks ( - WindowPtr /* pWin */ - ); +static Bool ShouldFreeInputMasks(WindowPtr /* pWin */ , + Bool /* ignoreSelectedEvents */ + ); +static Bool MakeInputMasks(WindowPtr /* pWin */ + ); /************************************************************************** * @@ -97,153 +95,137 @@ static Bool MakeInputMasks ( */ void -RegisterOtherDevice (device) - DeviceIntPtr device; - { +RegisterOtherDevice(DeviceIntPtr device) +{ device->public.processInputProc = ProcessOtherEvent; device->public.realInputProc = ProcessOtherEvent; (device)->ActivateGrab = ActivateKeyboardGrab; (device)->DeactivateGrab = DeactivateKeyboardGrab; - } +} -/*ARGSUSED*/ -void -ProcessOtherEvent (xE, other, count) - xEventPtr xE; - register DeviceIntPtr other; - int count; - { - register BYTE *kptr; - register int i; - register CARD16 modifiers; - register CARD16 mask; - GrabPtr grab = other->grab; - Bool deactivateDeviceGrab = FALSE; - int key = 0, bit = 0, rootX, rootY; - ButtonClassPtr b = other->button; - KeyClassPtr k = other->key; - ValuatorClassPtr v = other->valuator; - deviceValuator *xV = (deviceValuator *) xE; + /*ARGSUSED*/ void +ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count) +{ + register BYTE *kptr; + register int i; + register CARD16 modifiers; + register CARD16 mask; + GrabPtr grab = other->grab; + Bool deactivateDeviceGrab = FALSE; + int key = 0, bit = 0, rootX, rootY; + ButtonClassPtr b = other->button; + KeyClassPtr k = other->key; + ValuatorClassPtr v = other->valuator; + deviceValuator *xV = (deviceValuator *) xE; if (xE->u.u.type != DeviceValuator) { - GetSpritePosition(&rootX, &rootY); - xE->u.keyButtonPointer.rootX = rootX; - xE->u.keyButtonPointer.rootY = rootY; - key = xE->u.u.detail; - NoticeEventTime(xE); - xE->u.keyButtonPointer.state = inputInfo.keyboard->key->state | - inputInfo.pointer->button->state; - bit = 1 << (key & 7); + GetSpritePosition(&rootX, &rootY); + xE->u.keyButtonPointer.rootX = rootX; + xE->u.keyButtonPointer.rootY = rootY; + key = xE->u.u.detail; + NoticeEventTime(xE); + xE->u.keyButtonPointer.state = inputInfo.keyboard->key->state | + inputInfo.pointer->button->state; + bit = 1 << (key & 7); } - if (DeviceEventCallback) - { + if (DeviceEventCallback) { DeviceEventInfoRec eventinfo; + eventinfo.events = (xEventPtr) xE; eventinfo.count = count; - CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); + CallCallbacks(&DeviceEventCallback, (void *) & eventinfo); } - for (i=1; i<count; i++) - if ((++xV)->type == DeviceValuator) - { + for (i = 1; i < count; i++) + if ((++xV)->type == DeviceValuator) { int first = xV->first_valuator; int *axisvals; - if (xV->num_valuators && (!v || (xV->num_valuators && (first + xV->num_valuators > v->numAxes)))) - FatalError("Bad valuators reported for device %s\n",other->name); + if (xV->num_valuators + && (!v + || (xV->num_valuators + && (first + xV->num_valuators > v->numAxes)))) + FatalError("Bad valuators reported for device %s\n", + other->name); xV->device_state = 0; if (k) xV->device_state |= k->state; if (b) - xV->device_state |= b->state; - if (v && v->axisVal) - { - axisvals = v->axisVal; - switch (xV->num_valuators) { - case 6: - *(axisvals+first+5) = xV->valuator5; - case 5: - *(axisvals+first+4) = xV->valuator4; - case 4: - *(axisvals+first+3) = xV->valuator3; - case 3: - *(axisvals+first+2) = xV->valuator2; - case 2: - *(axisvals+first+1) = xV->valuator1; - case 1: - *(axisvals+first) = xV->valuator0; - case 0: - default: - break; - } + xV->device_state |= b->state; + if (v && v->axisVal) { + axisvals = v->axisVal; + switch (xV->num_valuators) { + case 6: + *(axisvals + first + 5) = xV->valuator5; + case 5: + *(axisvals + first + 4) = xV->valuator4; + case 4: + *(axisvals + first + 3) = xV->valuator3; + case 3: + *(axisvals + first + 2) = xV->valuator2; + case 2: + *(axisvals + first + 1) = xV->valuator1; + case 1: + *(axisvals + first) = xV->valuator0; + case 0: + default: + break; } } - - if (xE->u.u.type == DeviceKeyPress) - { + } + + if (xE->u.u.type == DeviceKeyPress) { modifiers = k->modifierMap[key]; - kptr = &k->down[key >> 3]; - if (*kptr & bit) /* allow ddx to generate multiple downs */ - { - if (!modifiers) - { + kptr = &k->down[key >> 3]; + if (*kptr & bit) { /* allow ddx to generate multiple downs */ + if (!modifiers) { xE->u.u.type = DeviceKeyRelease; ProcessOtherEvent(xE, other, count); xE->u.u.type = DeviceKeyPress; /* release can have side effects, don't fall through */ ProcessOtherEvent(xE, other, count); - } - return; } + return; + } if (other->valuator) other->valuator->motionHintWindow = NullWindow; *kptr |= bit; k->prev_state = k->state; - for (i = 0, mask = 1; modifiers; i++, mask <<= 1) - { - if (mask & modifiers) - { + for (i = 0, mask = 1; modifiers; i++, mask <<= 1) { + if (mask & modifiers) { /* This key affects modifier "i" */ k->modifierKeyCount[i]++; k->state |= mask; modifiers &= ~mask; - } } - if (!grab && CheckDeviceGrabs(other, xE, 0, count)) - { + } + if (!grab && CheckDeviceGrabs(other, xE, 0, count)) { other->activatingKey = key; return; - } } - else if (xE->u.u.type == DeviceKeyRelease) - { - kptr = &k->down[key >> 3]; - if (!(*kptr & bit)) /* guard against duplicates */ + } else if (xE->u.u.type == DeviceKeyRelease) { + kptr = &k->down[key >> 3]; + if (!(*kptr & bit)) /* guard against duplicates */ return; modifiers = k->modifierMap[key]; if (other->valuator) other->valuator->motionHintWindow = NullWindow; *kptr &= ~bit; k->prev_state = k->state; - for (i = 0, mask = 1; modifiers; i++, mask <<= 1) - { - if (mask & modifiers) - { + for (i = 0, mask = 1; modifiers; i++, mask <<= 1) { + if (mask & modifiers) { /* This key affects modifier "i" */ - if (--k->modifierKeyCount[i] <= 0) - { + if (--k->modifierKeyCount[i] <= 0) { k->modifierKeyCount[i] = 0; k->state &= ~mask; - } - modifiers &= ~mask; } + modifiers &= ~mask; } + } if (other->fromPassiveGrab && (key == other->activatingKey)) deactivateDeviceGrab = TRUE; - } - else if (xE->u.u.type == DeviceButtonPress) - { - kptr = &b->down[key >> 3]; + } else if (xE->u.u.type == DeviceButtonPress) { + kptr = &b->down[key >> 3]; *kptr |= bit; if (other->valuator) other->valuator->motionHintWindow = NullWindow; @@ -251,33 +233,30 @@ ProcessOtherEvent (xE, other, count) b->motionMask = DeviceButtonMotionMask; xE->u.u.detail = b->map[key]; if (xE->u.u.detail == 0) - return; + return; if (xE->u.u.detail <= 5) b->state |= (Button1Mask >> 1) << xE->u.u.detail; - SetMaskForEvent(Motion_Filter(b),DeviceMotionNotify); + SetMaskForEvent(Motion_Filter(b), DeviceMotionNotify); if (!grab) if (CheckDeviceGrabs(other, xE, 0, count)) return; - } - else if (xE->u.u.type == DeviceButtonRelease) - { - kptr = &b->down[key >> 3]; + } else if (xE->u.u.type == DeviceButtonRelease) { + kptr = &b->down[key >> 3]; *kptr &= ~bit; if (other->valuator) other->valuator->motionHintWindow = NullWindow; if (!--b->buttonsDown) - b->motionMask = 0; + b->motionMask = 0; xE->u.u.detail = b->map[key]; if (xE->u.u.detail == 0) return; if (xE->u.u.detail <= 5) b->state &= ~((Button1Mask >> 1) << xE->u.u.detail); - SetMaskForEvent(Motion_Filter(b),DeviceMotionNotify); + SetMaskForEvent(Motion_Filter(b), DeviceMotionNotify); if (!b->state && other->fromPassiveGrab) deactivateDeviceGrab = TRUE; - } - else if (xE->u.u.type == ProximityIn) + } else if (xE->u.u.type == ProximityIn) other->valuator->mode &= ~OutOfProximity; else if (xE->u.u.type == ProximityOut) other->valuator->mode |= OutOfProximity; @@ -291,15 +270,15 @@ ProcessOtherEvent (xE, other, count) other, count); if (deactivateDeviceGrab == TRUE) - (*other->DeactivateGrab)(other); - } + (*other->DeactivateGrab) (other); +} int -InitProximityClassDeviceStruct( DeviceIntPtr dev) +InitProximityClassDeviceStruct(DeviceIntPtr dev) { register ProximityClassPtr proxc; - proxc = (ProximityClassPtr)malloc(sizeof(ProximityClassRec)); + proxc = (ProximityClassPtr) malloc(sizeof(ProximityClassRec)); if (!proxc) return FALSE; dev->proximity = proxc; @@ -307,13 +286,8 @@ InitProximityClassDeviceStruct( DeviceIntPtr dev) } void -InitValuatorAxisStruct( DeviceIntPtr dev, - int axnum, - int minval, - int maxval, - int resolution, - int min_res, - int max_res ) +InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval, + int resolution, int min_res, int max_res) { register AxisInfoPtr ax = dev->valuator->axes + axnum; @@ -325,13 +299,8 @@ InitValuatorAxisStruct( DeviceIntPtr dev, } static void -FixDeviceStateNotify ( - DeviceIntPtr dev, - deviceStateNotify *ev, - KeyClassPtr k, - ButtonClassPtr b, - ValuatorClassPtr v, - int first) +FixDeviceStateNotify(DeviceIntPtr dev, deviceStateNotify * ev, KeyClassPtr k, + ButtonClassPtr b, ValuatorClassPtr v, int first) { ev->type = DeviceStateNotify; ev->deviceid = dev->id; @@ -344,37 +313,33 @@ FixDeviceStateNotify ( if (b) { ev->classes_reported |= (1 << ButtonClass); ev->num_buttons = b->numButtons; - memmove((char *) &ev->buttons[0], (char *) b->down, 4); - } - else if (k) { + memmove((char *)&ev->buttons[0], (char *)b->down, 4); + } else if (k) { ev->classes_reported |= (1 << KeyClass); ev->num_keys = k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode; - memmove((char *) &ev->keys[0], (char *) k->down, 4); - } + memmove((char *)&ev->keys[0], (char *)k->down, 4); + } if (v) { int nval = v->numAxes - first; + ev->classes_reported |= (1 << ValuatorClass); ev->classes_reported |= (dev->valuator->mode << ModeBitsShift); ev->num_valuators = nval < 3 ? nval : 3; - switch (ev->num_valuators) - { - case 3: - ev->valuator2 = v->axisVal[first+2]; - case 2: - ev->valuator1 = v->axisVal[first+1]; - case 1: - ev->valuator0 = v->axisVal[first]; + switch (ev->num_valuators) { + case 3: + ev->valuator2 = v->axisVal[first + 2]; + case 2: + ev->valuator1 = v->axisVal[first + 1]; + case 1: + ev->valuator0 = v->axisVal[first]; break; - } } } +} static void -FixDeviceValuator ( - DeviceIntPtr dev, - deviceValuator *ev, - ValuatorClassPtr v, - int first) +FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v, + int first) { int nval = v->numAxes - first; @@ -383,24 +348,22 @@ FixDeviceValuator ( ev->num_valuators = nval < 3 ? nval : 3; ev->first_valuator = first; switch (ev->num_valuators) { - case 3: - ev->valuator2 = v->axisVal[first+2]; - case 2: - ev->valuator1 = v->axisVal[first+1]; - case 1: - ev->valuator0 = v->axisVal[first]; + case 3: + ev->valuator2 = v->axisVal[first + 2]; + case 2: + ev->valuator1 = v->axisVal[first + 1]; + case 1: + ev->valuator0 = v->axisVal[first]; break; - } - first += ev->num_valuators; } + first += ev->num_valuators; +} void -DeviceFocusEvent(dev, type, mode, detail, pWin) - DeviceIntPtr dev; - int type, mode, detail; - register WindowPtr pWin; - { - deviceFocus event; +DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, + register WindowPtr pWin) +{ + deviceFocus event; if (type == FocusIn) type = DeviceFocusIn; @@ -414,29 +377,29 @@ DeviceFocusEvent(dev, type, mode, detail, pWin) event.window = pWin->drawable.id; event.time = currentTime.milliseconds; - (void) DeliverEventsToWindow(pWin, (xEvent *)&event, 1, - DeviceFocusChangeMask, NullGrab, dev->id); + (void)DeliverEventsToWindow(pWin, (xEvent *) & event, 1, + DeviceFocusChangeMask, NullGrab, dev->id); - if ((type == DeviceFocusIn) && + if ((type == DeviceFocusIn) && (wOtherInputMasks(pWin)) && (wOtherInputMasks(pWin)->inputEvents[dev->id] & DeviceStateNotifyMask)) - { - int evcount = 1; - deviceStateNotify *ev, *sev; - deviceKeyStateNotify *kev; + { + int evcount = 1; + deviceStateNotify *ev, *sev; + deviceKeyStateNotify *kev; deviceButtonStateNotify *bev; KeyClassPtr k; ButtonClassPtr b; ValuatorClassPtr v; - int nval=0, nkeys=0, nbuttons=0, first=0; + int nval = 0, nkeys = 0, nbuttons = 0, first = 0; - if ((b=dev->button) != NULL) { + if ((b = dev->button) != NULL) { nbuttons = b->numButtons; if (nbuttons > 32) evcount++; } - if ((k=dev->key) != NULL) { + if ((k = dev->key) != NULL) { nkeys = k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode; if (nkeys > 32) evcount++; @@ -444,7 +407,7 @@ DeviceFocusEvent(dev, type, mode, detail, pWin) evcount++; } } - if ((v=dev->valuator) != NULL) { + if ((v = dev->valuator) != NULL) { nval = v->numAxes; if (nval > 3) @@ -458,103 +421,89 @@ DeviceFocusEvent(dev, type, mode, detail, pWin) } sev = ev = (deviceStateNotify *) malloc(evcount * sizeof(xEvent)); - FixDeviceStateNotify (dev, ev, NULL, NULL, NULL, first); + FixDeviceStateNotify(dev, ev, NULL, NULL, NULL, first); if (b != NULL) { - FixDeviceStateNotify (dev, ev++, NULL, b, v, first); + FixDeviceStateNotify(dev, ev++, NULL, b, v, first); first += 3; nval -= 3; if (nbuttons > 32) { - (ev-1)->deviceid |= MORE_EVENTS; - bev = (deviceButtonStateNotify *) ev++; + (ev - 1)->deviceid |= MORE_EVENTS; + bev = (deviceButtonStateNotify *) ev++; bev->type = DeviceButtonStateNotify; bev->deviceid = dev->id; - memmove((char *) &bev->buttons[0], (char *) &b->down[4], 28); + memmove((char *)&bev->buttons[0], (char *)&b->down[4], 28); } if (nval > 0) { - (ev-1)->deviceid |= MORE_EVENTS; - FixDeviceValuator (dev, (deviceValuator *) ev++, v, first); + (ev - 1)->deviceid |= MORE_EVENTS; + FixDeviceValuator(dev, (deviceValuator *) ev++, v, first); first += 3; nval -= 3; } } if (k != NULL) { - FixDeviceStateNotify (dev, ev++, k, NULL, v, first); + FixDeviceStateNotify(dev, ev++, k, NULL, v, first); first += 3; nval -= 3; if (nkeys > 32) { - (ev-1)->deviceid |= MORE_EVENTS; - kev = (deviceKeyStateNotify *) ev++; + (ev - 1)->deviceid |= MORE_EVENTS; + kev = (deviceKeyStateNotify *) ev++; kev->type = DeviceKeyStateNotify; kev->deviceid = dev->id; - memmove((char *) &kev->keys[0], (char *) &k->down[4], 28); + memmove((char *)&kev->keys[0], (char *)&k->down[4], 28); } if (nval > 0) { - (ev-1)->deviceid |= MORE_EVENTS; - FixDeviceValuator (dev, (deviceValuator *) ev++, v, first); + (ev - 1)->deviceid |= MORE_EVENTS; + FixDeviceValuator(dev, (deviceValuator *) ev++, v, first); first += 3; nval -= 3; } } while (nval > 0) { - FixDeviceStateNotify (dev, ev++, NULL, NULL, v, first); + FixDeviceStateNotify(dev, ev++, NULL, NULL, v, first); first += 3; nval -= 3; if (nval > 0) { - (ev-1)->deviceid |= MORE_EVENTS; - FixDeviceValuator (dev, (deviceValuator *) ev++, v, first); + (ev - 1)->deviceid |= MORE_EVENTS; + FixDeviceValuator(dev, (deviceValuator *) ev++, v, first); first += 3; nval -= 3; } } - (void) DeliverEventsToWindow(pWin, (xEvent *)sev, evcount, - DeviceStateNotifyMask, NullGrab, dev->id); - free (sev); - } + (void)DeliverEventsToWindow(pWin, (xEvent *) sev, evcount, + DeviceStateNotifyMask, NullGrab, dev->id); + free(sev); } +} int -GrabButton( - ClientPtr client, - DeviceIntPtr dev, - BYTE this_device_mode, - BYTE other_devices_mode, - CARD16 modifiers, - DeviceIntPtr modifier_device, - CARD8 button, - Window grabWindow, - BOOL ownerEvents, - Cursor rcursor, - Window rconfineTo, - Mask eventMask) +GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode, + BYTE other_devices_mode, CARD16 modifiers, + DeviceIntPtr modifier_device, CARD8 button, Window grabWindow, + BOOL ownerEvents, Cursor rcursor, Window rconfineTo, Mask eventMask) { WindowPtr pWin, confineTo; CursorPtr cursor; GrabPtr grab; if ((this_device_mode != GrabModeSync) && - (this_device_mode != GrabModeAsync)) - { + (this_device_mode != GrabModeAsync)) { client->errorValue = this_device_mode; - return BadValue; + return BadValue; } if ((other_devices_mode != GrabModeSync) && - (other_devices_mode != GrabModeAsync)) - { + (other_devices_mode != GrabModeAsync)) { client->errorValue = other_devices_mode; - return BadValue; + return BadValue; } - if ((modifiers != AnyModifier) && - (modifiers & ~AllModifiersMask)) - { + if ((modifiers != AnyModifier) && (modifiers & ~AllModifiersMask)) { client->errorValue = modifiers; return BadValue; } - if ((ownerEvents != xFalse) && (ownerEvents != xTrue)) - { + if ((ownerEvents != xFalse) && (ownerEvents != xTrue)) { client->errorValue = ownerEvents; return BadValue; } @@ -563,324 +512,266 @@ GrabButton( return BadWindow; if (rconfineTo == None) confineTo = NullWindow; - else - { + else { confineTo = LookupWindow(rconfineTo, client); if (!confineTo) return BadWindow; } if (rcursor == None) cursor = NullCursor; - else - { - cursor = (CursorPtr)LookupIDByType(rcursor, RT_CURSOR); - if (!cursor) - { + else { + cursor = (CursorPtr) LookupIDByType(rcursor, RT_CURSOR); + if (!cursor) { client->errorValue = rcursor; return BadCursor; } } grab = CreateGrab(client->index, dev, pWin, eventMask, - (Bool)ownerEvents, (Bool) this_device_mode, (Bool)other_devices_mode, - modifier_device, modifiers, DeviceButtonPress, button, confineTo, - cursor); + (Bool) ownerEvents, (Bool) this_device_mode, + (Bool) other_devices_mode, modifier_device, modifiers, + DeviceButtonPress, button, confineTo, cursor); if (!grab) return BadAlloc; return AddPassiveGrabToList(grab); - } +} int -GrabKey( - ClientPtr client, - DeviceIntPtr dev, - BYTE this_device_mode, - BYTE other_devices_mode, - CARD16 modifiers, - DeviceIntPtr modifier_device, - CARD8 key, - Window grabWindow, - BOOL ownerEvents, - Mask mask) +GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode, + BYTE other_devices_mode, CARD16 modifiers, + DeviceIntPtr modifier_device, CARD8 key, Window grabWindow, + BOOL ownerEvents, Mask mask) { WindowPtr pWin; GrabPtr grab; KeyClassPtr k = dev->key; - if (k==NULL) + if (k == NULL) return BadMatch; if ((other_devices_mode != GrabModeSync) && - (other_devices_mode != GrabModeAsync)) - { + (other_devices_mode != GrabModeAsync)) { client->errorValue = other_devices_mode; - return BadValue; + return BadValue; } if ((this_device_mode != GrabModeSync) && - (this_device_mode != GrabModeAsync)) - { + (this_device_mode != GrabModeAsync)) { client->errorValue = this_device_mode; - return BadValue; + return BadValue; } - if (((key > k->curKeySyms.maxKeyCode) || - (key < k->curKeySyms.minKeyCode)) - && (key != AnyKey)) - { + if (((key > k->curKeySyms.maxKeyCode) || (key < k->curKeySyms.minKeyCode)) + && (key != AnyKey)) { client->errorValue = key; - return BadValue; + return BadValue; } - if ((modifiers != AnyModifier) && - (modifiers & ~AllModifiersMask)) - { + if ((modifiers != AnyModifier) && (modifiers & ~AllModifiersMask)) { client->errorValue = modifiers; return BadValue; } - if ((ownerEvents != xTrue) && (ownerEvents != xFalse)) - { + if ((ownerEvents != xTrue) && (ownerEvents != xFalse)) { client->errorValue = ownerEvents; - return BadValue; + return BadValue; } pWin = LookupWindow(grabWindow, client); if (!pWin) return BadWindow; - grab = CreateGrab(client->index, dev, pWin, - mask, ownerEvents, this_device_mode, other_devices_mode, - modifier_device, modifiers, DeviceKeyPress, key, NullWindow, - NullCursor); + grab = CreateGrab(client->index, dev, pWin, + mask, ownerEvents, this_device_mode, other_devices_mode, + modifier_device, modifiers, DeviceKeyPress, key, + NullWindow, NullCursor); if (!grab) return BadAlloc; return AddPassiveGrabToList(grab); - } +} int -SelectForWindow(dev, pWin, client, mask, exclusivemasks, validmasks) - DeviceIntPtr dev; - WindowPtr pWin; - ClientPtr client; - Mask mask; - Mask exclusivemasks; - Mask validmasks; +SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client, + Mask mask, Mask exclusivemasks, Mask validmasks) { int mskidx = dev->id; int i, ret; Mask check; InputClientsPtr others; - if (mask & ~validmasks) - { + if (mask & ~validmasks) { client->errorValue = mask; return BadValue; } check = (mask & exclusivemasks); - if (wOtherInputMasks(pWin)) - { - if (check & wOtherInputMasks(pWin)->inputEvents[mskidx]) - { /* It is illegal for two different - clients to select on any of the - events for maskcheck. However, - it is OK, for some client to - continue selecting on one of those - events. */ - for (others = wOtherInputMasks(pWin)->inputClients; others; - others = others->next) - { - if (!SameClient(others, client) && (check & - others->mask[mskidx])) + if (wOtherInputMasks(pWin)) { + if (check & wOtherInputMasks(pWin)->inputEvents[mskidx]) { /* It is illegal for two different + * clients to select on any of the + * events for maskcheck. However, + * it is OK, for some client to + * continue selecting on one of those + * events. */ + for (others = wOtherInputMasks(pWin)->inputClients; others; + others = others->next) { + if (!SameClient(others, client) && (check & + others->mask[mskidx])) return BadAccess; - } - } - for (others = wOtherInputMasks(pWin)->inputClients; others; - others = others->next) - { - if (SameClient(others, client)) - { + } + } + for (others = wOtherInputMasks(pWin)->inputClients; others; + others = others->next) { + if (SameClient(others, client)) { check = others->mask[mskidx]; others->mask[mskidx] = mask; - if (mask == 0) - { - for (i=0; i<EMASKSIZE; i++) + if (mask == 0) { + for (i = 0; i < EMASKSIZE; i++) if (i != mskidx && others->mask[i] != 0) break; - if (i == EMASKSIZE) - { + if (i == EMASKSIZE) { RecalculateDeviceDeliverableEvents(pWin); if (ShouldFreeInputMasks(pWin, FALSE)) FreeResource(others->resource, RT_NONE); - return Success; - } + return Success; } + } goto maskSet; - } } } + } check = 0; - if ((ret = AddExtensionClient (pWin, client, mask, mskidx)) != Success) + if ((ret = AddExtensionClient(pWin, client, mask, mskidx)) != Success) return ret; -maskSet: + maskSet: if (dev->valuator) if ((dev->valuator->motionHintWindow == pWin) && (mask & DevicePointerMotionHintMask) && - !(check & DevicePointerMotionHintMask) && - !dev->grab) + !(check & DevicePointerMotionHintMask) && !dev->grab) dev->valuator->motionHintWindow = NullWindow; RecalculateDeviceDeliverableEvents(pWin); return Success; } -int -AddExtensionClient (pWin, client, mask, mskidx) - WindowPtr pWin; - ClientPtr client; - Mask mask; - int mskidx; - { +int +AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx) +{ InputClientsPtr others; - if (!pWin->optional && !MakeWindowOptional (pWin)) + if (!pWin->optional && !MakeWindowOptional(pWin)) return BadAlloc; others = (InputClients *) malloc(sizeof(InputClients)); if (!others) return BadAlloc; - if (!pWin->optional->inputMasks && !MakeInputMasks (pWin)) + if (!pWin->optional->inputMasks && !MakeInputMasks(pWin)) return BadAlloc; - bzero((char *) &others->mask[0], sizeof(Mask)*EMASKSIZE); + bzero((char *)&others->mask[0], sizeof(Mask) * EMASKSIZE); others->mask[mskidx] = mask; others->resource = FakeClientID(client->index); others->next = pWin->optional->inputMasks->inputClients; pWin->optional->inputMasks->inputClients = others; - if (!AddResource(others->resource, RT_INPUTCLIENT, (void *)pWin)) + if (!AddResource(others->resource, RT_INPUTCLIENT, (void *) pWin)) return BadAlloc; return Success; - } +} static Bool -MakeInputMasks (pWin) - WindowPtr pWin; - { +MakeInputMasks(WindowPtr pWin) +{ struct _OtherInputMasks *imasks; - imasks = (struct _OtherInputMasks *) - malloc (sizeof (struct _OtherInputMasks)); + imasks = (struct _OtherInputMasks *) + malloc(sizeof(struct _OtherInputMasks)); if (!imasks) return FALSE; - bzero((char *) imasks, sizeof (struct _OtherInputMasks)); + bzero((char *)imasks, sizeof(struct _OtherInputMasks)); pWin->optional->inputMasks = imasks; return TRUE; - } +} void -RecalculateDeviceDeliverableEvents(pWin) - WindowPtr pWin; - { +RecalculateDeviceDeliverableEvents(WindowPtr pWin) +{ register InputClientsPtr others; - struct _OtherInputMasks *inputMasks; /* default: NULL */ + struct _OtherInputMasks *inputMasks; /* default: NULL */ register WindowPtr pChild, tmp; int i; pChild = pWin; - while (1) - { - if ((inputMasks = wOtherInputMasks(pChild)) != 0) - { - for (others = inputMasks->inputClients; others; - others = others->next) - { - for (i=0; i<EMASKSIZE; i++) + while (1) { + if ((inputMasks = wOtherInputMasks(pChild)) != 0) { + for (others = inputMasks->inputClients; others; + others = others->next) { + for (i = 0; i < EMASKSIZE; i++) inputMasks->inputEvents[i] |= others->mask[i]; - } - for (i=0; i<EMASKSIZE; i++) + } + for (i = 0; i < EMASKSIZE; i++) inputMasks->deliverableEvents[i] = inputMasks->inputEvents[i]; - for (tmp = pChild->parent; tmp; tmp=tmp->parent) + for (tmp = pChild->parent; tmp; tmp = tmp->parent) if (wOtherInputMasks(tmp)) - for (i=0; i<EMASKSIZE; i++) + for (i = 0; i < EMASKSIZE; i++) inputMasks->deliverableEvents[i] |= - (wOtherInputMasks(tmp)->deliverableEvents[i] - & ~inputMasks->dontPropagateMask[i] & PropagateMask[i]); - } - if (pChild->firstChild) - { + (wOtherInputMasks(tmp)->deliverableEvents[i] + & ~inputMasks-> + dontPropagateMask[i] & PropagateMask[i]); + } + if (pChild->firstChild) { pChild = pChild->firstChild; continue; - } + } while (!pChild->nextSib && (pChild != pWin)) pChild = pChild->parent; if (pChild == pWin) break; pChild = pChild->nextSib; - } } +} int -InputClientGone(pWin, id) - register WindowPtr pWin; - XID id; - { +InputClientGone(register WindowPtr pWin, XID id) +{ register InputClientsPtr other, prev; + if (!wOtherInputMasks(pWin)) - return(Success); + return (Success); prev = 0; - for (other = wOtherInputMasks(pWin)->inputClients; other; - other = other->next) - { - if (other->resource == id) - { - if (prev) - { + for (other = wOtherInputMasks(pWin)->inputClients; other; + other = other->next) { + if (other->resource == id) { + if (prev) { prev->next = other->next; free(other); - } - else if (!(other->next)) - { - if (ShouldFreeInputMasks(pWin, TRUE)) - { + } else if (!(other->next)) { + if (ShouldFreeInputMasks(pWin, TRUE)) { wOtherInputMasks(pWin)->inputClients = other->next; free(wOtherInputMasks(pWin)); pWin->optional->inputMasks = (OtherInputMasks *) NULL; - CheckWindowOptionalNeed (pWin); + CheckWindowOptionalNeed(pWin); free(other); - } - else - { + } else { other->resource = FakeClientID(0); - if (!AddResource(other->resource, RT_INPUTCLIENT, - (void *)pWin)) + if (!AddResource(other->resource, RT_INPUTCLIENT, + (void *) pWin)) return BadAlloc; - } } - else - { + } else { wOtherInputMasks(pWin)->inputClients = other->next; free(other); - } - RecalculateDeviceDeliverableEvents(pWin); - return(Success); } + RecalculateDeviceDeliverableEvents(pWin); + return (Success); + } prev = other; - } + } FatalError("client not on device event list"); /*NOTREACHED*/ - } +} int -SendEvent (client, d, dest, propagate, ev, mask, count) - ClientPtr client; - DeviceIntPtr d; - Window dest; - Bool propagate; - xEvent *ev; - Mask mask; - int count; - { +SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate, + xEvent * ev, Mask mask, int count) +{ WindowPtr pWin; - WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */ - WindowPtr spriteWin=GetSpriteWindow(); + WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */ + WindowPtr spriteWin = GetSpriteWindow(); if (dest == PointerWindow) pWin = spriteWin; - else if (dest == InputFocus) - { + else if (dest == InputFocus) { WindowPtr inputFocus; - + if (!d->focus) inputFocus = spriteWin; else @@ -893,33 +784,27 @@ SendEvent (client, d, dest, propagate, ev, mask, count) return Success; /* If the input focus is PointerRootWin, send the event to where - the pointer is if possible, then perhaps propogate up to root. */ - if (inputFocus == PointerRootWin) + * the pointer is if possible, then perhaps propogate up to root. */ + if (inputFocus == PointerRootWin) inputFocus = GetCurrentRootWindow(); - if (IsParent(inputFocus, spriteWin)) - { + if (IsParent(inputFocus, spriteWin)) { effectiveFocus = inputFocus; pWin = spriteWin; - } - else + } else effectiveFocus = pWin = inputFocus; - } - else + } else pWin = LookupWindow(dest, client); if (!pWin) return BadWindow; - if ((propagate != xFalse) && (propagate != xTrue)) - { + if ((propagate != xFalse) && (propagate != xTrue)) { client->errorValue = propagate; return BadValue; } ev->u.u.type |= 0x80; - if (propagate) - { - for (;pWin; pWin = pWin->parent) - { - if (DeliverEventsToWindow( pWin, ev, count, mask, NullGrab, d->id)) + if (propagate) { + for (; pWin; pWin = pWin->parent) { + if (DeliverEventsToWindow(pWin, ev, count, mask, NullGrab, d->id)) return Success; if (pWin == effectiveFocus) return Success; @@ -928,158 +813,140 @@ SendEvent (client, d, dest, propagate, ev, mask, count) if (!mask) break; } - } - else - (void)(DeliverEventsToWindow( pWin, ev, count, mask, NullGrab, d->id)); + } else + (void)(DeliverEventsToWindow(pWin, ev, count, mask, NullGrab, d->id)); return Success; - } +} int -SetButtonMapping (client, dev, nElts, map) - ClientPtr client; - DeviceIntPtr dev; - int nElts; - BYTE *map; - { +SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map) +{ register int i; ButtonClassPtr b = dev->button; if (b == NULL) return BadMatch; - if (nElts != b->numButtons) - { + if (nElts != b->numButtons) { client->errorValue = nElts; return BadValue; } if (BadDeviceMap(&map[0], nElts, 1, 255, &client->errorValue)) return BadValue; - for (i=0; i < nElts; i++) - if ((b->map[i + 1] != map[i]) && - BitIsOn(b->down, i + 1)) - return MappingBusy; + for (i = 0; i < nElts; i++) + if ((b->map[i + 1] != map[i]) && BitIsOn(b->down, i + 1)) + return MappingBusy; for (i = 0; i < nElts; i++) b->map[i + 1] = map[i]; return Success; - } +} -int -SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k) - ClientPtr client; - DeviceIntPtr dev; - int len; - int rlen; - int numKeyPerModifier; - KeyCode *inputMap; - KeyClassPtr *k; +int +SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen, + int numKeyPerModifier, KeyCode * inputMap, KeyClassPtr * k) { KeyCode *map = NULL; int inputMapLen; register int i; - + *k = dev->key; if (*k == NULL) return BadMatch; - if (len != ((numKeyPerModifier<<1) + rlen)) + if (len != ((numKeyPerModifier << 1) + rlen)) return BadLength; - inputMapLen = 8*numKeyPerModifier; + inputMapLen = 8 * numKeyPerModifier; /* - * Now enforce the restriction that "all of the non-zero keycodes must be - * in the range specified by min-keycode and max-keycode in the - * connection setup (else a Value error)" + * Now enforce the restriction that "all of the non-zero keycodes must be + * in the range specified by min-keycode and max-keycode in the + * connection setup (else a Value error)" */ i = inputMapLen; while (i--) { if (inputMap[i] && (inputMap[i] < (*k)->curKeySyms.minKeyCode || inputMap[i] > (*k)->curKeySyms.maxKeyCode)) { - client->errorValue = inputMap[i]; - return -1; /* BadValue collides with MappingFailed */ - } + client->errorValue = inputMap[i]; + return -1; /* BadValue collides with MappingFailed */ + } } /* - * Now enforce the restriction that none of the old or new - * modifier keys may be down while we change the mapping, and - * that the DDX layer likes the choice. + * Now enforce the restriction that none of the old or new + * modifier keys may be down while we change the mapping, and + * that the DDX layer likes the choice. */ - if (!AllModifierKeysAreUp (dev, (*k)->modifierKeyMap, - (int)(*k)->maxKeysPerModifier, inputMap, (int)numKeyPerModifier) - || - !AllModifierKeysAreUp(dev, inputMap, (int)numKeyPerModifier, - (*k)->modifierKeyMap, (int)(*k)->maxKeysPerModifier)) { + if (!AllModifierKeysAreUp(dev, (*k)->modifierKeyMap, + (int)(*k)->maxKeysPerModifier, inputMap, + (int)numKeyPerModifier) + || !AllModifierKeysAreUp(dev, inputMap, (int)numKeyPerModifier, + (*k)->modifierKeyMap, + (int)(*k)->maxKeysPerModifier)) { return MappingBusy; } else { for (i = 0; i < inputMapLen; i++) { - if (inputMap[i] && !LegalModifier(inputMap[i], (DevicePtr)dev)) { + if (inputMap[i] && !LegalModifier(inputMap[i], (DevicePtr) dev)) { return MappingFailed; } } } /* - * Now build the keyboard's modifier bitmap from the - * list of keycodes. + * Now build the keyboard's modifier bitmap from the + * list of keycodes. */ if (inputMapLen) { - map = (KeyCode *)malloc(inputMapLen); - if (!map) - return BadAlloc; + map = (KeyCode *) malloc(inputMapLen); + if (!map) + return BadAlloc; } if ((*k)->modifierKeyMap) - free((*k)->modifierKeyMap); + free((*k)->modifierKeyMap); if (inputMapLen) { - (*k)->modifierKeyMap = map; - memmove((char *)(*k)->modifierKeyMap, (char *)inputMap, inputMapLen); + (*k)->modifierKeyMap = map; + memmove((char *)(*k)->modifierKeyMap, (char *)inputMap, inputMapLen); } else (*k)->modifierKeyMap = NULL; (*k)->maxKeysPerModifier = numKeyPerModifier; for (i = 0; i < MAP_LENGTH; i++) - (*k)->modifierMap[i] = 0; - for (i = 0; i < inputMapLen; i++) if (inputMap[i]) { - (*k)->modifierMap[inputMap[i]] - |= (1<<(i/ (*k)->maxKeysPerModifier)); - } + (*k)->modifierMap[i] = 0; + for (i = 0; i < inputMapLen; i++) + if (inputMap[i]) { + (*k)->modifierMap[inputMap[i]] + |= (1 << (i / (*k)->maxKeysPerModifier)); + } - return(MappingSuccess); - } + return (MappingSuccess); +} void -SendDeviceMappingNotify( - CARD8 request, - KeyCode firstKeyCode, - CARD8 count, - DeviceIntPtr dev) +SendDeviceMappingNotify(CARD8 request, + KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev) { xEvent event; - deviceMappingNotify *ev = (deviceMappingNotify *) &event; + deviceMappingNotify *ev = (deviceMappingNotify *) & event; ev->type = DeviceMappingNotify; ev->request = request; ev->deviceid = dev->id; ev->time = currentTime.milliseconds; - if (request == MappingKeyboard) - { + if (request == MappingKeyboard) { ev->firstKeyCode = firstKeyCode; ev->count = count; - } - - SendEventToAllWindows (dev, DeviceMappingNotifyMask, (xEvent *)ev, 1); } + SendEventToAllWindows(dev, DeviceMappingNotifyMask, (xEvent *) ev, 1); +} + int -ChangeKeyMapping( - ClientPtr client, - DeviceIntPtr dev, - unsigned len, - int type, - KeyCode firstKeyCode, - CARD8 keyCodes, - CARD8 keySymsPerKeyCode, - KeySym *map) +ChangeKeyMapping(ClientPtr client, + DeviceIntPtr dev, + unsigned len, + int type, + KeyCode firstKeyCode, + CARD8 keyCodes, CARD8 keySymsPerKeyCode, KeySym * map) { KeySymsRec keysyms; KeyClassPtr k = dev->key; @@ -1088,18 +955,16 @@ ChangeKeyMapping( return (BadMatch); if (len != (keyCodes * keySymsPerKeyCode)) - return BadLength; + return BadLength; if ((firstKeyCode < k->curKeySyms.minKeyCode) || - (firstKeyCode + keyCodes - 1 > k->curKeySyms.maxKeyCode)) - { - client->errorValue = firstKeyCode; - return BadValue; + (firstKeyCode + keyCodes - 1 > k->curKeySyms.maxKeyCode)) { + client->errorValue = firstKeyCode; + return BadValue; } - if (keySymsPerKeyCode == 0) - { - client->errorValue = 0; - return BadValue; + if (keySymsPerKeyCode == 0) { + client->errorValue = 0; + return BadValue; } keysyms.minKeyCode = firstKeyCode; keysyms.maxKeyCode = firstKeyCode + keyCodes - 1; @@ -1107,195 +972,169 @@ ChangeKeyMapping( keysyms.map = map; if (!SetKeySymsMap(&k->curKeySyms, &keysyms)) return BadAlloc; - SendDeviceMappingNotify(MappingKeyboard, firstKeyCode, keyCodes, - dev); + SendDeviceMappingNotify(MappingKeyboard, firstKeyCode, keyCodes, dev); return client->noClientException; - } +} void -DeleteWindowFromAnyExtEvents(pWin, freeResources) - WindowPtr pWin; - Bool freeResources; - { - int i; - DeviceIntPtr dev; - InputClientsPtr ic; +DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources) +{ + int i; + DeviceIntPtr dev; + InputClientsPtr ic; struct _OtherInputMasks *inputMasks; - for (dev=inputInfo.devices; dev; dev=dev->next) - { - if (dev == inputInfo.pointer || - dev == inputInfo.keyboard) + for (dev = inputInfo.devices; dev; dev = dev->next) { + if (dev == inputInfo.pointer || dev == inputInfo.keyboard) continue; DeleteDeviceFromAnyExtEvents(pWin, dev); - } + } - for (dev=inputInfo.off_devices; dev; dev=dev->next) + for (dev = inputInfo.off_devices; dev; dev = dev->next) DeleteDeviceFromAnyExtEvents(pWin, dev); if (freeResources) - while ((inputMasks = wOtherInputMasks(pWin)) != 0) - { + while ((inputMasks = wOtherInputMasks(pWin)) != 0) { ic = inputMasks->inputClients; - for (i=0; i<EMASKSIZE; i++) + for (i = 0; i < EMASKSIZE; i++) inputMasks->dontPropagateMask[i] = 0; FreeResource(ic->resource, RT_NONE); - } - } + } +} void -DeleteDeviceFromAnyExtEvents(pWin, dev) - WindowPtr pWin; - DeviceIntPtr dev; - { - WindowPtr parent; +DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev) +{ + WindowPtr parent; /* Deactivate any grabs performed on this window, before making - any input focus changes. - Deactivating a device grab should cause focus events. */ + * any input focus changes. + * Deactivating a device grab should cause focus events. */ if (dev->grab && (dev->grab->window == pWin)) - (*dev->DeactivateGrab)(dev); + (*dev->DeactivateGrab) (dev); /* If the focus window is a root window (ie. has no parent) - then don't delete the focus from it. */ - - if (dev->focus && (pWin==dev->focus->win) && (pWin->parent != NullWindow)) - { + * then don't delete the focus from it. */ + + if (dev->focus && (pWin == dev->focus->win) && (pWin->parent != NullWindow)) { int focusEventMode = NotifyNormal; - /* If a grab is in progress, then alter the mode of focus events. */ + /* If a grab is in progress, then alter the mode of focus events. */ if (dev->grab) focusEventMode = NotifyWhileGrabbed; - switch (dev->focus->revert) - { - case RevertToNone: + switch (dev->focus->revert) { + case RevertToNone: + DoFocusEvents(dev, pWin, NoneWin, focusEventMode); + dev->focus->win = NoneWin; + dev->focus->traceGood = 0; + break; + case RevertToParent: + parent = pWin; + do { + parent = parent->parent; + dev->focus->traceGood--; + } + while (!parent->realized); + DoFocusEvents(dev, pWin, parent, focusEventMode); + dev->focus->win = parent; + dev->focus->revert = RevertToNone; + break; + case RevertToPointerRoot: + DoFocusEvents(dev, pWin, PointerRootWin, focusEventMode); + dev->focus->win = PointerRootWin; + dev->focus->traceGood = 0; + break; + case RevertToFollowKeyboard: + if (inputInfo.keyboard->focus->win) { + DoFocusEvents(dev, pWin, inputInfo.keyboard->focus->win, + focusEventMode); + dev->focus->win = FollowKeyboardWin; + dev->focus->traceGood = 0; + } else { DoFocusEvents(dev, pWin, NoneWin, focusEventMode); dev->focus->win = NoneWin; dev->focus->traceGood = 0; - break; - case RevertToParent: - parent = pWin; - do - { - parent = parent->parent; - dev->focus->traceGood--; - } while (!parent->realized); - DoFocusEvents(dev, pWin, parent, focusEventMode); - dev->focus->win = parent; - dev->focus->revert = RevertToNone; - break; - case RevertToPointerRoot: - DoFocusEvents(dev, pWin, PointerRootWin, focusEventMode); - dev->focus->win = PointerRootWin; - dev->focus->traceGood = 0; - break; - case RevertToFollowKeyboard: - if (inputInfo.keyboard->focus->win) { - DoFocusEvents(dev, pWin, inputInfo.keyboard->focus->win, - focusEventMode); - dev->focus->win = FollowKeyboardWin; - dev->focus->traceGood = 0; - } else { - DoFocusEvents(dev, pWin, NoneWin, focusEventMode); - dev->focus->win = NoneWin; - dev->focus->traceGood = 0; - } - break; } + break; } + } if (dev->valuator) if (dev->valuator->motionHintWindow == pWin) dev->valuator->motionHintWindow = NullWindow; - } +} int -MaybeSendDeviceMotionNotifyHint (pEvents, mask) - deviceKeyButtonPointer *pEvents; - Mask mask; - { +MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask) +{ DeviceIntPtr dev; - dev = LookupDeviceIntRec (pEvents->deviceid & DEVICE_BITS); - if (pEvents->type == DeviceMotionNotify) - { - if (mask & DevicePointerMotionHintMask) - { - if (WID(dev->valuator->motionHintWindow) == pEvents->event) - { - return 1; /* don't send, but pretend we did */ - } - pEvents->detail = NotifyHint; + dev = LookupDeviceIntRec(pEvents->deviceid & DEVICE_BITS); + if (pEvents->type == DeviceMotionNotify) { + if (mask & DevicePointerMotionHintMask) { + if (WID(dev->valuator->motionHintWindow) == pEvents->event) { + return 1; /* don't send, but pretend we did */ } - else - { + pEvents->detail = NotifyHint; + } else { pEvents->detail = NotifyNormal; - } } - return (0); } + return (0); +} void -CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask) - WindowPtr pWin; - int type; - deviceKeyButtonPointer *xE; - GrabPtr grab; - ClientPtr client; - Mask deliveryMask; - { +CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type, + deviceKeyButtonPointer * xE, GrabPtr grab, + ClientPtr client, Mask deliveryMask) +{ DeviceIntPtr dev; - dev = LookupDeviceIntRec (xE->deviceid & DEVICE_BITS); + dev = LookupDeviceIntRec(xE->deviceid & DEVICE_BITS); if (type == DeviceMotionNotify) dev->valuator->motionHintWindow = pWin; - else if ((type == DeviceButtonPress) && (!grab) && - (deliveryMask & DeviceButtonGrabMask)) - { + else if ((type == DeviceButtonPress) && (!grab) && + (deliveryMask & DeviceButtonGrabMask)) { GrabRec tempGrab; tempGrab.device = dev; tempGrab.resource = client->clientAsMask; tempGrab.window = pWin; - tempGrab.ownerEvents = (deliveryMask & DeviceOwnerGrabButtonMask) ? TRUE : FALSE; + tempGrab.ownerEvents = + (deliveryMask & DeviceOwnerGrabButtonMask) ? TRUE : FALSE; tempGrab.eventMask = deliveryMask; tempGrab.keyboardMode = GrabModeAsync; tempGrab.pointerMode = GrabModeAsync; tempGrab.confineTo = NullWindow; tempGrab.cursor = NullCursor; - (*dev->ActivateGrab)(dev, &tempGrab, currentTime, TRUE); - } + (*dev->ActivateGrab) (dev, &tempGrab, currentTime, TRUE); } +} Mask -DeviceEventMaskForClient(dev, pWin, client) - DeviceIntPtr dev; - WindowPtr pWin; - ClientPtr client; - { +DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client) +{ register InputClientsPtr other; if (!wOtherInputMasks(pWin)) return 0; - for (other = wOtherInputMasks(pWin)->inputClients; other; - other = other->next) - { + for (other = wOtherInputMasks(pWin)->inputClients; other; + other = other->next) { if (SameClient(other, client)) return other->mask[dev->id]; - } - return 0; } + return 0; +} void -MaybeStopDeviceHint(dev, client) - register DeviceIntPtr dev; - ClientPtr client; +MaybeStopDeviceHint(register DeviceIntPtr dev, ClientPtr client) { WindowPtr pWin; GrabPtr grab = dev->grab; + pWin = dev->valuator->motionHintWindow; if ((grab && SameClient(grab, client) && @@ -1310,54 +1149,45 @@ MaybeStopDeviceHint(dev, client) } int -DeviceEventSuppressForWindow(pWin, client, mask, maskndx) - WindowPtr pWin; - ClientPtr client; - Mask mask; - int maskndx; - { - struct _OtherInputMasks *inputMasks = wOtherInputMasks (pWin); +DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask, + int maskndx) +{ + struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin); - if (mask & ~PropagateMask[maskndx]) - { + if (mask & ~PropagateMask[maskndx]) { client->errorValue = mask; return BadValue; - } + } - if (mask == 0) - { + if (mask == 0) { if (inputMasks) inputMasks->dontPropagateMask[maskndx] = mask; - } - else - { + } else { if (!inputMasks) - AddExtensionClient (pWin, client, 0, 0); + AddExtensionClient(pWin, client, 0, 0); inputMasks = wOtherInputMasks(pWin); inputMasks->dontPropagateMask[maskndx] = mask; - } + } RecalculateDeviceDeliverableEvents(pWin); if (ShouldFreeInputMasks(pWin, FALSE)) - FreeResource(inputMasks->inputClients->resource, RT_NONE); + FreeResource(inputMasks->inputClients->resource, RT_NONE); return Success; - } +} static Bool -ShouldFreeInputMasks (pWin, ignoreSelectedEvents) - WindowPtr pWin; - Bool ignoreSelectedEvents; - { +ShouldFreeInputMasks(WindowPtr pWin, Bool ignoreSelectedEvents) +{ int i; Mask allInputEventMasks = 0; - struct _OtherInputMasks *inputMasks = wOtherInputMasks (pWin); + struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin); - for (i=0; i<EMASKSIZE; i++) + for (i = 0; i < EMASKSIZE; i++) allInputEventMasks |= inputMasks->dontPropagateMask[i]; if (!ignoreSelectedEvents) - for (i=0; i<EMASKSIZE; i++) + for (i = 0; i < EMASKSIZE; i++) allInputEventMasks |= inputMasks->inputEvents[i]; if (allInputEventMasks == 0) return TRUE; else return FALSE; - } +} diff --git a/nx-X11/programs/Xserver/Xi/exglobals.h b/nx-X11/programs/Xserver/Xi/exglobals.h index e8d84e25f..c64b84875 100644 --- a/nx-X11/programs/Xserver/Xi/exglobals.h +++ b/nx-X11/programs/Xserver/Xi/exglobals.h @@ -35,45 +35,45 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef EXGLOBALS_H #define EXGLOBALS_H 1 -extern int IReqCode; -extern int BadDevice; -extern int BadEvent; -extern int BadMode; -extern int DeviceBusy; -extern int BadClass; +extern int IReqCode; +extern int BadDevice; +extern int BadEvent; +extern int BadMode; +extern int DeviceBusy; +extern int BadClass; -extern Mask DevicePointerMotionMask; -extern Mask DevicePointerMotionHintMask; -extern Mask DeviceFocusChangeMask; -extern Mask DeviceStateNotifyMask; -extern Mask ChangeDeviceNotifyMask; -extern Mask DeviceMappingNotifyMask; -extern Mask DeviceOwnerGrabButtonMask; -extern Mask DeviceButtonGrabMask; -extern Mask DeviceButtonMotionMask; -extern Mask PropagateMask[]; +extern Mask DevicePointerMotionMask; +extern Mask DevicePointerMotionHintMask; +extern Mask DeviceFocusChangeMask; +extern Mask DeviceStateNotifyMask; +extern Mask ChangeDeviceNotifyMask; +extern Mask DeviceMappingNotifyMask; +extern Mask DeviceOwnerGrabButtonMask; +extern Mask DeviceButtonGrabMask; +extern Mask DeviceButtonMotionMask; +extern Mask PropagateMask[]; -extern int DeviceValuator; -extern int DeviceKeyPress; -extern int DeviceKeyRelease; -extern int DeviceButtonPress; -extern int DeviceButtonRelease; -extern int DeviceMotionNotify; -extern int DeviceFocusIn; -extern int DeviceFocusOut; -extern int ProximityIn; -extern int ProximityOut; -extern int DeviceStateNotify; -extern int DeviceKeyStateNotify; -extern int DeviceButtonStateNotify; -extern int DeviceMappingNotify; -extern int ChangeDeviceNotify; +extern int DeviceValuator; +extern int DeviceKeyPress; +extern int DeviceKeyRelease; +extern int DeviceButtonPress; +extern int DeviceButtonRelease; +extern int DeviceMotionNotify; +extern int DeviceFocusIn; +extern int DeviceFocusOut; +extern int ProximityIn; +extern int ProximityOut; +extern int DeviceStateNotify; +extern int DeviceKeyStateNotify; +extern int DeviceButtonStateNotify; +extern int DeviceMappingNotify; +extern int ChangeDeviceNotify; -extern int RT_INPUTCLIENT; +extern int RT_INPUTCLIENT; #if 0 /* FIXME: in dix */ -extern InputInfo inputInfo; +extern InputInfo inputInfo; #endif #endif /* EXGLOBALS_H */ diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c index d0052b1fb..a50552cfe 100644 --- a/nx-X11/programs/Xserver/Xi/extinit.c +++ b/nx-X11/programs/Xserver/Xi/extinit.c @@ -60,8 +60,8 @@ SOFTWARE. #include <nx-X11/X.h> #include <nx-X11/Xproto.h> #include "inputstr.h" -#include "gcstruct.h" /* pointer for extnsionst.h*/ -#include "extnsionst.h" /* extension entry */ +#include "gcstruct.h" /* pointer for extnsionst.h */ +#include "extnsionst.h" /* extension entry */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> @@ -111,35 +111,37 @@ SOFTWARE. #include "ungrdevb.h" #include "ungrdevk.h" -static Mask lastExtEventMask = 1; -int ExtEventIndex; -Mask ExtValidMasks[EMASKSIZE]; -Mask ExtExclusiveMasks[EMASKSIZE]; +static Mask lastExtEventMask = 1; +int ExtEventIndex; +Mask ExtValidMasks[EMASKSIZE]; +Mask ExtExclusiveMasks[EMASKSIZE]; -struct dev_type +struct dev_type +{ + Atom type; + char *name; +} dev_type[] = { { - Atom type; - char *name; - }dev_type [] = {{0,XI_KEYBOARD}, - {0,XI_MOUSE}, - {0,XI_TABLET}, - {0,XI_TOUCHSCREEN}, - {0,XI_TOUCHPAD}, - {0,XI_BARCODE}, - {0,XI_BUTTONBOX}, - {0,XI_KNOB_BOX}, - {0,XI_ONE_KNOB}, - {0,XI_NINE_KNOB}, - {0,XI_TRACKBALL}, - {0,XI_QUADRATURE}, - {0,XI_ID_MODULE}, - {0,XI_SPACEBALL}, - {0,XI_DATAGLOVE}, - {0,XI_EYETRACKER}, - {0,XI_CURSORKEYS}, - {0,XI_FOOTMOUSE}}; - -CARD8 event_base [numInputClasses]; + 0, XI_KEYBOARD}, { + 0, XI_MOUSE}, { + 0, XI_TABLET}, { + 0, XI_TOUCHSCREEN}, { + 0, XI_TOUCHPAD}, { + 0, XI_BARCODE}, { + 0, XI_BUTTONBOX}, { + 0, XI_KNOB_BOX}, { + 0, XI_ONE_KNOB}, { + 0, XI_NINE_KNOB}, { + 0, XI_TRACKBALL}, { + 0, XI_QUADRATURE}, { + 0, XI_ID_MODULE}, { + 0, XI_SPACEBALL}, { + 0, XI_DATAGLOVE}, { + 0, XI_EYETRACKER}, { + 0, XI_CURSORKEYS}, { +0, XI_FOOTMOUSE}}; + +CARD8 event_base[numInputClasses]; XExtEventInfo EventInfo[32]; /***************************************************************** @@ -148,40 +150,40 @@ XExtEventInfo EventInfo[32]; * */ -int IReqCode = 0; -int BadDevice = 0; -int BadEvent = 1; -int BadMode = 2; -int DeviceBusy = 3; -int BadClass = 4; - -Mask DevicePointerMotionMask; -Mask DevicePointerMotionHintMask; -Mask DeviceFocusChangeMask; -Mask DeviceStateNotifyMask; -Mask ChangeDeviceNotifyMask; -Mask DeviceMappingNotifyMask; -Mask DeviceOwnerGrabButtonMask; -Mask DeviceButtonGrabMask; -Mask DeviceButtonMotionMask; - -int DeviceValuator; -int DeviceKeyPress; -int DeviceKeyRelease; -int DeviceButtonPress; -int DeviceButtonRelease; -int DeviceMotionNotify; -int DeviceFocusIn; -int DeviceFocusOut; -int ProximityIn; -int ProximityOut; -int DeviceStateNotify; -int DeviceKeyStateNotify; -int DeviceButtonStateNotify; -int DeviceMappingNotify; -int ChangeDeviceNotify; - -int RT_INPUTCLIENT; +int IReqCode = 0; +int BadDevice = 0; +int BadEvent = 1; +int BadMode = 2; +int DeviceBusy = 3; +int BadClass = 4; + +Mask DevicePointerMotionMask; +Mask DevicePointerMotionHintMask; +Mask DeviceFocusChangeMask; +Mask DeviceStateNotifyMask; +Mask ChangeDeviceNotifyMask; +Mask DeviceMappingNotifyMask; +Mask DeviceOwnerGrabButtonMask; +Mask DeviceButtonGrabMask; +Mask DeviceButtonMotionMask; + +int DeviceValuator; +int DeviceKeyPress; +int DeviceKeyRelease; +int DeviceButtonPress; +int DeviceButtonRelease; +int DeviceMotionNotify; +int DeviceFocusIn; +int DeviceFocusOut; +int ProximityIn; +int ProximityOut; +int DeviceStateNotify; +int DeviceKeyStateNotify; +int DeviceButtonStateNotify; +int DeviceMappingNotify; +int ChangeDeviceNotify; + +int RT_INPUTCLIENT; /***************************************************************** * @@ -189,9 +191,9 @@ int RT_INPUTCLIENT; * */ -extern XExtensionVersion AllExtensionVersions[]; +extern XExtensionVersion AllExtensionVersions[]; -Mask PropagateMask[MAX_DEVICES]; +Mask PropagateMask[MAX_DEVICES]; /***************************************************************** * @@ -203,7 +205,7 @@ static XExtensionVersion thisversion = {XI_Present, SERVER_XI_MAJOR_VERSION, SERVER_XI_MINOR_VERSION, - }; +}; /********************************************************************** * @@ -217,20 +219,19 @@ static XExtensionVersion thisversion = */ void -XInputExtensionInit() +XInputExtensionInit(void) { ExtensionEntry *extEntry; extEntry = AddExtension(INAME, IEVENTS, IERRORS, ProcIDispatch, - SProcIDispatch, IResetProc, StandardMinorOpcode); - if (extEntry) - { + SProcIDispatch, IResetProc, StandardMinorOpcode); + if (extEntry) { IReqCode = extEntry->base; - AllExtensionVersions[IReqCode-128] = thisversion; - MakeDeviceTypeAtoms (); - RT_INPUTCLIENT = CreateNewResourceType((DeleteType)InputClientGone); - FixExtensionEvents (extEntry); - ReplySwapVector[IReqCode] = (ReplySwapPtr)SReplyIDispatch; + AllExtensionVersions[IReqCode - 128] = thisversion; + MakeDeviceTypeAtoms(); + RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone); + FixExtensionEvents(extEntry); + ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch; EventSwapVector[DeviceValuator] = SEventIDispatch; EventSwapVector[DeviceKeyPress] = SEventIDispatch; EventSwapVector[DeviceKeyRelease] = SEventIDispatch; @@ -246,12 +247,10 @@ XInputExtensionInit() EventSwapVector[DeviceButtonStateNotify] = SEventIDispatch; EventSwapVector[DeviceMappingNotify] = SEventIDispatch; EventSwapVector[ChangeDeviceNotify] = SEventIDispatch; - } - else - { + } else { FatalError("IExtensionInit: AddExtensions failed\n"); - } } +} /************************************************************************* * @@ -261,86 +260,84 @@ XInputExtensionInit() */ int -ProcIDispatch (client) - register ClientPtr client; +ProcIDispatch(register ClientPtr client) { REQUEST(xReq); if (stuff->data == X_GetExtensionVersion) - return(ProcXGetExtensionVersion(client)); + return (ProcXGetExtensionVersion(client)); if (stuff->data == X_ListInputDevices) - return(ProcXListInputDevices(client)); + return (ProcXListInputDevices(client)); else if (stuff->data == X_OpenDevice) - return(ProcXOpenDevice(client)); + return (ProcXOpenDevice(client)); else if (stuff->data == X_CloseDevice) - return(ProcXCloseDevice(client)); + return (ProcXCloseDevice(client)); else if (stuff->data == X_SetDeviceMode) - return(ProcXSetDeviceMode(client)); + return (ProcXSetDeviceMode(client)); else if (stuff->data == X_SelectExtensionEvent) - return(ProcXSelectExtensionEvent(client)); + return (ProcXSelectExtensionEvent(client)); else if (stuff->data == X_GetSelectedExtensionEvents) - return(ProcXGetSelectedExtensionEvents(client)); + return (ProcXGetSelectedExtensionEvents(client)); else if (stuff->data == X_ChangeDeviceDontPropagateList) - return(ProcXChangeDeviceDontPropagateList(client)); + return (ProcXChangeDeviceDontPropagateList(client)); else if (stuff->data == X_GetDeviceDontPropagateList) - return(ProcXGetDeviceDontPropagateList(client)); + return (ProcXGetDeviceDontPropagateList(client)); else if (stuff->data == X_GetDeviceMotionEvents) - return(ProcXGetDeviceMotionEvents(client)); + return (ProcXGetDeviceMotionEvents(client)); else if (stuff->data == X_ChangeKeyboardDevice) - return(ProcXChangeKeyboardDevice(client)); + return (ProcXChangeKeyboardDevice(client)); else if (stuff->data == X_ChangePointerDevice) - return(ProcXChangePointerDevice(client)); + return (ProcXChangePointerDevice(client)); else if (stuff->data == X_GrabDevice) - return(ProcXGrabDevice(client)); + return (ProcXGrabDevice(client)); else if (stuff->data == X_UngrabDevice) - return(ProcXUngrabDevice(client)); + return (ProcXUngrabDevice(client)); else if (stuff->data == X_GrabDeviceKey) - return(ProcXGrabDeviceKey(client)); + return (ProcXGrabDeviceKey(client)); else if (stuff->data == X_UngrabDeviceKey) - return(ProcXUngrabDeviceKey(client)); + return (ProcXUngrabDeviceKey(client)); else if (stuff->data == X_GrabDeviceButton) - return(ProcXGrabDeviceButton(client)); + return (ProcXGrabDeviceButton(client)); else if (stuff->data == X_UngrabDeviceButton) - return(ProcXUngrabDeviceButton(client)); + return (ProcXUngrabDeviceButton(client)); else if (stuff->data == X_AllowDeviceEvents) - return(ProcXAllowDeviceEvents(client)); + return (ProcXAllowDeviceEvents(client)); else if (stuff->data == X_GetDeviceFocus) - return(ProcXGetDeviceFocus(client)); + return (ProcXGetDeviceFocus(client)); else if (stuff->data == X_SetDeviceFocus) - return(ProcXSetDeviceFocus(client)); + return (ProcXSetDeviceFocus(client)); else if (stuff->data == X_GetFeedbackControl) - return(ProcXGetFeedbackControl(client)); + return (ProcXGetFeedbackControl(client)); else if (stuff->data == X_ChangeFeedbackControl) - return(ProcXChangeFeedbackControl(client)); + return (ProcXChangeFeedbackControl(client)); else if (stuff->data == X_GetDeviceKeyMapping) - return(ProcXGetDeviceKeyMapping(client)); + return (ProcXGetDeviceKeyMapping(client)); else if (stuff->data == X_ChangeDeviceKeyMapping) - return(ProcXChangeDeviceKeyMapping(client)); + return (ProcXChangeDeviceKeyMapping(client)); else if (stuff->data == X_GetDeviceModifierMapping) - return(ProcXGetDeviceModifierMapping(client)); + return (ProcXGetDeviceModifierMapping(client)); else if (stuff->data == X_SetDeviceModifierMapping) - return(ProcXSetDeviceModifierMapping(client)); + return (ProcXSetDeviceModifierMapping(client)); else if (stuff->data == X_GetDeviceButtonMapping) - return(ProcXGetDeviceButtonMapping(client)); + return (ProcXGetDeviceButtonMapping(client)); else if (stuff->data == X_SetDeviceButtonMapping) - return(ProcXSetDeviceButtonMapping(client)); + return (ProcXSetDeviceButtonMapping(client)); else if (stuff->data == X_QueryDeviceState) - return(ProcXQueryDeviceState(client)); + return (ProcXQueryDeviceState(client)); else if (stuff->data == X_SendExtensionEvent) - return(ProcXSendExtensionEvent(client)); + return (ProcXSendExtensionEvent(client)); else if (stuff->data == X_DeviceBell) - return(ProcXDeviceBell(client)); + return (ProcXDeviceBell(client)); else if (stuff->data == X_SetDeviceValuators) - return(ProcXSetDeviceValuators(client)); + return (ProcXSetDeviceValuators(client)); else if (stuff->data == X_GetDeviceControl) - return(ProcXGetDeviceControl(client)); + return (ProcXGetDeviceControl(client)); else if (stuff->data == X_ChangeDeviceControl) - return(ProcXChangeDeviceControl(client)); - else - { + return (ProcXChangeDeviceControl(client)); + else { SendErrorToClient(client, IReqCode, stuff->data, 0, BadRequest); - } - return(BadRequest); } + return (BadRequest); +} /******************************************************************************* * @@ -352,86 +349,84 @@ ProcIDispatch (client) */ int -SProcIDispatch(client) - register ClientPtr client; +SProcIDispatch(register ClientPtr client) { REQUEST(xReq); if (stuff->data == X_GetExtensionVersion) - return(SProcXGetExtensionVersion(client)); + return (SProcXGetExtensionVersion(client)); if (stuff->data == X_ListInputDevices) - return(SProcXListInputDevices(client)); + return (SProcXListInputDevices(client)); else if (stuff->data == X_OpenDevice) - return(SProcXOpenDevice(client)); + return (SProcXOpenDevice(client)); else if (stuff->data == X_CloseDevice) - return(SProcXCloseDevice(client)); + return (SProcXCloseDevice(client)); else if (stuff->data == X_SetDeviceMode) - return(SProcXSetDeviceMode(client)); + return (SProcXSetDeviceMode(client)); else if (stuff->data == X_SelectExtensionEvent) - return(SProcXSelectExtensionEvent(client)); + return (SProcXSelectExtensionEvent(client)); else if (stuff->data == X_GetSelectedExtensionEvents) - return(SProcXGetSelectedExtensionEvents(client)); + return (SProcXGetSelectedExtensionEvents(client)); else if (stuff->data == X_ChangeDeviceDontPropagateList) - return(SProcXChangeDeviceDontPropagateList(client)); + return (SProcXChangeDeviceDontPropagateList(client)); else if (stuff->data == X_GetDeviceDontPropagateList) - return(SProcXGetDeviceDontPropagateList(client)); + return (SProcXGetDeviceDontPropagateList(client)); else if (stuff->data == X_GetDeviceMotionEvents) - return(SProcXGetDeviceMotionEvents(client)); + return (SProcXGetDeviceMotionEvents(client)); else if (stuff->data == X_ChangeKeyboardDevice) - return(SProcXChangeKeyboardDevice(client)); + return (SProcXChangeKeyboardDevice(client)); else if (stuff->data == X_ChangePointerDevice) - return(SProcXChangePointerDevice(client)); + return (SProcXChangePointerDevice(client)); else if (stuff->data == X_GrabDevice) - return(SProcXGrabDevice(client)); + return (SProcXGrabDevice(client)); else if (stuff->data == X_UngrabDevice) - return(SProcXUngrabDevice(client)); + return (SProcXUngrabDevice(client)); else if (stuff->data == X_GrabDeviceKey) - return(SProcXGrabDeviceKey(client)); + return (SProcXGrabDeviceKey(client)); else if (stuff->data == X_UngrabDeviceKey) - return(SProcXUngrabDeviceKey(client)); + return (SProcXUngrabDeviceKey(client)); else if (stuff->data == X_GrabDeviceButton) - return(SProcXGrabDeviceButton(client)); + return (SProcXGrabDeviceButton(client)); else if (stuff->data == X_UngrabDeviceButton) - return(SProcXUngrabDeviceButton(client)); + return (SProcXUngrabDeviceButton(client)); else if (stuff->data == X_AllowDeviceEvents) - return(SProcXAllowDeviceEvents(client)); + return (SProcXAllowDeviceEvents(client)); else if (stuff->data == X_GetDeviceFocus) - return(SProcXGetDeviceFocus(client)); + return (SProcXGetDeviceFocus(client)); else if (stuff->data == X_SetDeviceFocus) - return(SProcXSetDeviceFocus(client)); + return (SProcXSetDeviceFocus(client)); else if (stuff->data == X_GetFeedbackControl) - return(SProcXGetFeedbackControl(client)); + return (SProcXGetFeedbackControl(client)); else if (stuff->data == X_ChangeFeedbackControl) - return(SProcXChangeFeedbackControl(client)); + return (SProcXChangeFeedbackControl(client)); else if (stuff->data == X_GetDeviceKeyMapping) - return(SProcXGetDeviceKeyMapping(client)); + return (SProcXGetDeviceKeyMapping(client)); else if (stuff->data == X_ChangeDeviceKeyMapping) - return(SProcXChangeDeviceKeyMapping(client)); + return (SProcXChangeDeviceKeyMapping(client)); else if (stuff->data == X_GetDeviceModifierMapping) - return(SProcXGetDeviceModifierMapping(client)); + return (SProcXGetDeviceModifierMapping(client)); else if (stuff->data == X_SetDeviceModifierMapping) - return(SProcXSetDeviceModifierMapping(client)); + return (SProcXSetDeviceModifierMapping(client)); else if (stuff->data == X_GetDeviceButtonMapping) - return(SProcXGetDeviceButtonMapping(client)); + return (SProcXGetDeviceButtonMapping(client)); else if (stuff->data == X_SetDeviceButtonMapping) - return(SProcXSetDeviceButtonMapping(client)); + return (SProcXSetDeviceButtonMapping(client)); else if (stuff->data == X_QueryDeviceState) - return(SProcXQueryDeviceState(client)); + return (SProcXQueryDeviceState(client)); else if (stuff->data == X_SendExtensionEvent) - return(SProcXSendExtensionEvent(client)); + return (SProcXSendExtensionEvent(client)); else if (stuff->data == X_DeviceBell) - return(SProcXDeviceBell(client)); + return (SProcXDeviceBell(client)); else if (stuff->data == X_SetDeviceValuators) - return(SProcXSetDeviceValuators(client)); + return (SProcXSetDeviceValuators(client)); else if (stuff->data == X_GetDeviceControl) - return(SProcXGetDeviceControl(client)); + return (SProcXGetDeviceControl(client)); else if (stuff->data == X_ChangeDeviceControl) - return(SProcXChangeDeviceControl(client)); - else - { + return (SProcXChangeDeviceControl(client)); + else { SendErrorToClient(client, IReqCode, stuff->data, 0, BadRequest); - } - return(BadRequest); } + return (BadRequest); +} /********************************************************************** * @@ -446,58 +441,69 @@ SProcIDispatch(client) SRepX##code (client, len, (x##code##Reply *) rep) void -SReplyIDispatch (client, len, rep) - ClientPtr client; - int len; - xGrabDeviceReply *rep; /* All we look at is the type field */ -{ /* This is common to all replies */ +SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep) + /* All we look at is the type field */ +{ /* This is common to all replies */ if (rep->RepType == X_GetExtensionVersion) - SRepXGetExtensionVersion (client, len, (xGetExtensionVersionReply *)rep); + SRepXGetExtensionVersion(client, len, + (xGetExtensionVersionReply *) rep); else if (rep->RepType == X_ListInputDevices) - SRepXListInputDevices (client, len, (xListInputDevicesReply *)rep); + SRepXListInputDevices(client, len, (xListInputDevicesReply *) rep); else if (rep->RepType == X_OpenDevice) - SRepXOpenDevice (client, len, (xOpenDeviceReply *)rep); + SRepXOpenDevice(client, len, (xOpenDeviceReply *) rep); else if (rep->RepType == X_SetDeviceMode) - SRepXSetDeviceMode (client, len, (xSetDeviceModeReply *) rep); + SRepXSetDeviceMode(client, len, (xSetDeviceModeReply *) rep); else if (rep->RepType == X_GetSelectedExtensionEvents) - SRepXGetSelectedExtensionEvents (client, len, (xGetSelectedExtensionEventsReply *) rep); + SRepXGetSelectedExtensionEvents(client, len, + (xGetSelectedExtensionEventsReply *) + rep); else if (rep->RepType == X_GetDeviceDontPropagateList) - SRepXGetDeviceDontPropagateList (client, len, (xGetDeviceDontPropagateListReply *)rep); + SRepXGetDeviceDontPropagateList(client, len, + (xGetDeviceDontPropagateListReply *) + rep); else if (rep->RepType == X_GetDeviceMotionEvents) - SRepXGetDeviceMotionEvents (client, len, (xGetDeviceMotionEventsReply *) rep); + SRepXGetDeviceMotionEvents(client, len, + (xGetDeviceMotionEventsReply *) rep); else if (rep->RepType == X_ChangeKeyboardDevice) - SRepXChangeKeyboardDevice (client, len, (xChangeKeyboardDeviceReply *) rep); + SRepXChangeKeyboardDevice(client, len, + (xChangeKeyboardDeviceReply *) rep); else if (rep->RepType == X_ChangePointerDevice) - SRepXChangePointerDevice (client, len, (xChangePointerDeviceReply *)rep); + SRepXChangePointerDevice(client, len, + (xChangePointerDeviceReply *) rep); else if (rep->RepType == X_GrabDevice) - SRepXGrabDevice (client, len, (xGrabDeviceReply *)rep); + SRepXGrabDevice(client, len, (xGrabDeviceReply *) rep); else if (rep->RepType == X_GetDeviceFocus) - SRepXGetDeviceFocus (client, len, (xGetDeviceFocusReply *)rep); + SRepXGetDeviceFocus(client, len, (xGetDeviceFocusReply *) rep); else if (rep->RepType == X_GetFeedbackControl) - SRepXGetFeedbackControl (client, len, (xGetFeedbackControlReply *)rep); + SRepXGetFeedbackControl(client, len, (xGetFeedbackControlReply *) rep); else if (rep->RepType == X_GetDeviceKeyMapping) - SRepXGetDeviceKeyMapping (client, len, (xGetDeviceKeyMappingReply *)rep); + SRepXGetDeviceKeyMapping(client, len, + (xGetDeviceKeyMappingReply *) rep); else if (rep->RepType == X_GetDeviceModifierMapping) - SRepXGetDeviceModifierMapping (client, len, (xGetDeviceModifierMappingReply *)rep); + SRepXGetDeviceModifierMapping(client, len, + (xGetDeviceModifierMappingReply *) rep); else if (rep->RepType == X_SetDeviceModifierMapping) - SRepXSetDeviceModifierMapping (client, len, (xSetDeviceModifierMappingReply *)rep); + SRepXSetDeviceModifierMapping(client, len, + (xSetDeviceModifierMappingReply *) rep); else if (rep->RepType == X_GetDeviceButtonMapping) - SRepXGetDeviceButtonMapping (client, len, (xGetDeviceButtonMappingReply *)rep); + SRepXGetDeviceButtonMapping(client, len, + (xGetDeviceButtonMappingReply *) rep); else if (rep->RepType == X_SetDeviceButtonMapping) - SRepXSetDeviceButtonMapping (client, len, (xSetDeviceButtonMappingReply *)rep); + SRepXSetDeviceButtonMapping(client, len, + (xSetDeviceButtonMappingReply *) rep); else if (rep->RepType == X_QueryDeviceState) - SRepXQueryDeviceState (client, len, (xQueryDeviceStateReply *)rep); + SRepXQueryDeviceState(client, len, (xQueryDeviceStateReply *) rep); else if (rep->RepType == X_SetDeviceValuators) - SRepXSetDeviceValuators (client, len, (xSetDeviceValuatorsReply *)rep); + SRepXSetDeviceValuators(client, len, (xSetDeviceValuatorsReply *) rep); else if (rep->RepType == X_GetDeviceControl) - SRepXGetDeviceControl (client, len, (xGetDeviceControlReply *)rep); + SRepXGetDeviceControl(client, len, (xGetDeviceControlReply *) rep); else if (rep->RepType == X_ChangeDeviceControl) - SRepXChangeDeviceControl (client, len, (xChangeDeviceControlReply *)rep); - else - { - FatalError("XINPUT confused sending swapped reply"); - } + SRepXChangeDeviceControl(client, len, + (xChangeDeviceControlReply *) rep); + else { + FatalError("XINPUT confused sending swapped reply"); } +} /***************************************************************************** * @@ -508,68 +514,51 @@ SReplyIDispatch (client, len, rep) #define DO_SWAP(func,type) func ((type *)from, (type *)to) void -SEventIDispatch (from, to) - xEvent *from; - xEvent *to; +SEventIDispatch(xEvent * from, xEvent * to) { - int type = from->u.u.type & 0177; + int type = from->u.u.type & 0177; if (type == DeviceValuator) DO_SWAP(SEventDeviceValuator, deviceValuator); - else if (type == DeviceKeyPress) - { - SKeyButtonPtrEvent (from, to); + else if (type == DeviceKeyPress) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == DeviceKeyRelease) - { - SKeyButtonPtrEvent (from, to); + } else if (type == DeviceKeyRelease) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == DeviceButtonPress) - { - SKeyButtonPtrEvent (from, to); + } else if (type == DeviceButtonPress) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == DeviceButtonRelease) - { - SKeyButtonPtrEvent (from, to); + } else if (type == DeviceButtonRelease) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == DeviceMotionNotify) - { - SKeyButtonPtrEvent (from, to); + } else if (type == DeviceMotionNotify) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == DeviceFocusIn) - DO_SWAP(SEventFocus, deviceFocus); + } else if (type == DeviceFocusIn) + DO_SWAP(SEventFocus, deviceFocus); else if (type == DeviceFocusOut) - DO_SWAP(SEventFocus, deviceFocus); - else if (type == ProximityIn) - { - SKeyButtonPtrEvent (from, to); + DO_SWAP(SEventFocus, deviceFocus); + else if (type == ProximityIn) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == ProximityOut) - { - SKeyButtonPtrEvent (from, to); + } else if (type == ProximityOut) { + SKeyButtonPtrEvent(from, to); to->u.keyButtonPointer.pad1 = from->u.keyButtonPointer.pad1; - } - else if (type == DeviceStateNotify) - DO_SWAP(SDeviceStateNotifyEvent, deviceStateNotify); + } else if (type == DeviceStateNotify) + DO_SWAP(SDeviceStateNotifyEvent, deviceStateNotify); else if (type == DeviceKeyStateNotify) - DO_SWAP(SDeviceKeyStateNotifyEvent, deviceKeyStateNotify); + DO_SWAP(SDeviceKeyStateNotifyEvent, deviceKeyStateNotify); else if (type == DeviceButtonStateNotify) - DO_SWAP(SDeviceButtonStateNotifyEvent, deviceButtonStateNotify); + DO_SWAP(SDeviceButtonStateNotifyEvent, deviceButtonStateNotify); else if (type == DeviceMappingNotify) - DO_SWAP(SDeviceMappingNotifyEvent, deviceMappingNotify); + DO_SWAP(SDeviceMappingNotifyEvent, deviceMappingNotify); else if (type == ChangeDeviceNotify) - DO_SWAP(SChangeDeviceNotifyEvent, changeDeviceNotify); - else - { + DO_SWAP(SChangeDeviceNotifyEvent, changeDeviceNotify); + else { FatalError("XInputExtension: Impossible event!\n"); - } } +} /************************************************************************ * @@ -578,11 +567,9 @@ SEventIDispatch (from, to) */ void -SEventDeviceValuator (from, to) - deviceValuator *from; - deviceValuator *to; - { - register int i; +SEventDeviceValuator(deviceValuator * from, deviceValuator * to) +{ + register int i; INT32 *ip B32; *to = *from; @@ -591,76 +578,65 @@ SEventDeviceValuator (from, to) ip = &to->valuator0; for (i=0; i<6; i++) { - swapl((ip+i)); /* macro - braces are required */ - } + swapl((ip + i)); /* macro - braces are required */ } +} void -SEventFocus (from, to) - deviceFocus *from; - deviceFocus *to; +SEventFocus(deviceFocus * from, deviceFocus * to) { *to = *from; swaps(&to->sequenceNumber); swapl(&to->time); swapl(&to->window); - } +} void -SDeviceStateNotifyEvent (from, to) - deviceStateNotify *from; - deviceStateNotify *to; +SDeviceStateNotifyEvent(deviceStateNotify * from, deviceStateNotify * to) { - register int i; + register int i; INT32 *ip B32; *to = *from; swaps(&to->sequenceNumber); swapl(&to->time); ip = &to->valuator0; - for (i=0; i<3; i++) - { - swapl((ip+i)); /* macro - braces are required */ - } + for (i = 0; i < 3; i++) { + swapl((ip + i)); /* macro - braces are required */ } +} void -SDeviceKeyStateNotifyEvent (from, to) - deviceKeyStateNotify *from; - deviceKeyStateNotify *to; +SDeviceKeyStateNotifyEvent(deviceKeyStateNotify * from, + deviceKeyStateNotify * to) { *to = *from; swaps(&to->sequenceNumber); - } +} void -SDeviceButtonStateNotifyEvent (from, to) - deviceButtonStateNotify *from; - deviceButtonStateNotify *to; +SDeviceButtonStateNotifyEvent(deviceButtonStateNotify * from, + deviceButtonStateNotify * to) { *to = *from; swaps(&to->sequenceNumber); - } +} void -SChangeDeviceNotifyEvent (from, to) - changeDeviceNotify *from; - changeDeviceNotify *to; +SChangeDeviceNotifyEvent(changeDeviceNotify * from, changeDeviceNotify * to) { *to = *from; swaps(&to->sequenceNumber); swapl(&to->time); - } +} void -SDeviceMappingNotifyEvent (from, to) - deviceMappingNotify *from; - deviceMappingNotify *to; +SDeviceMappingNotifyEvent(deviceMappingNotify * from, deviceMappingNotify * to) { *to = *from; swaps(&to->sequenceNumber); swapl(&to->time); - } +} /************************************************************************ * @@ -669,25 +645,24 @@ SDeviceMappingNotifyEvent (from, to) */ void -FixExtensionEvents (extEntry) - ExtensionEntry *extEntry; +FixExtensionEvents(ExtensionEntry * extEntry) { - Mask mask; - - DeviceValuator = extEntry->eventBase; - DeviceKeyPress = DeviceValuator + 1; - DeviceKeyRelease = DeviceKeyPress + 1; - DeviceButtonPress = DeviceKeyRelease + 1; - DeviceButtonRelease = DeviceButtonPress + 1; - DeviceMotionNotify = DeviceButtonRelease + 1; - DeviceFocusIn = DeviceMotionNotify + 1; - DeviceFocusOut = DeviceFocusIn + 1; - ProximityIn = DeviceFocusOut + 1; - ProximityOut = ProximityIn + 1; - DeviceStateNotify = ProximityOut + 1; - DeviceMappingNotify = DeviceStateNotify + 1; - ChangeDeviceNotify = DeviceMappingNotify + 1; - DeviceKeyStateNotify = ChangeDeviceNotify + 1; + Mask mask; + + DeviceValuator = extEntry->eventBase; + DeviceKeyPress = DeviceValuator + 1; + DeviceKeyRelease = DeviceKeyPress + 1; + DeviceButtonPress = DeviceKeyRelease + 1; + DeviceButtonRelease = DeviceButtonPress + 1; + DeviceMotionNotify = DeviceButtonRelease + 1; + DeviceFocusIn = DeviceMotionNotify + 1; + DeviceFocusOut = DeviceFocusIn + 1; + ProximityIn = DeviceFocusOut + 1; + ProximityOut = ProximityIn + 1; + DeviceStateNotify = ProximityOut + 1; + DeviceMappingNotify = DeviceStateNotify + 1; + ChangeDeviceNotify = DeviceMappingNotify + 1; + DeviceKeyStateNotify = ChangeDeviceNotify + 1; DeviceButtonStateNotify = DeviceKeyStateNotify + 1; event_base[KeyClass] = DeviceKeyPress; @@ -703,66 +678,66 @@ FixExtensionEvents (extEntry) DeviceBusy += extEntry->errorBase; BadClass += extEntry->errorBase; - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, DeviceKeyPress); - AllowPropagateSuppress (mask); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, DeviceKeyPress); + AllowPropagateSuppress(mask); - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, DeviceKeyRelease); - AllowPropagateSuppress (mask); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, DeviceKeyRelease); + AllowPropagateSuppress(mask); - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, DeviceButtonPress); - AllowPropagateSuppress (mask); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, DeviceButtonPress); + AllowPropagateSuppress(mask); - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, DeviceButtonRelease); - AllowPropagateSuppress (mask); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, DeviceButtonRelease); + AllowPropagateSuppress(mask); - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, ProximityIn); - SetMaskForExtEvent (mask, ProximityOut); - AllowPropagateSuppress (mask); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, ProximityIn); + SetMaskForExtEvent(mask, ProximityOut); + AllowPropagateSuppress(mask); - mask = GetNextExtEventMask (); + mask = GetNextExtEventMask(); DeviceStateNotifyMask = mask; - SetMaskForExtEvent (mask, DeviceStateNotify); + SetMaskForExtEvent(mask, DeviceStateNotify); - mask = GetNextExtEventMask (); + mask = GetNextExtEventMask(); DevicePointerMotionMask = mask; - SetMaskForExtEvent (mask, DeviceMotionNotify); - AllowPropagateSuppress (mask); + SetMaskForExtEvent(mask, DeviceMotionNotify); + AllowPropagateSuppress(mask); DevicePointerMotionHintMask = GetNextExtEventMask(); - SetEventInfo (DevicePointerMotionHintMask, _devicePointerMotionHint); - SetEventInfo (GetNextExtEventMask(), _deviceButton1Motion); - SetEventInfo (GetNextExtEventMask(), _deviceButton2Motion); - SetEventInfo (GetNextExtEventMask(), _deviceButton3Motion); - SetEventInfo (GetNextExtEventMask(), _deviceButton4Motion); - SetEventInfo (GetNextExtEventMask(), _deviceButton5Motion); + SetEventInfo(DevicePointerMotionHintMask, _devicePointerMotionHint); + SetEventInfo(GetNextExtEventMask(), _deviceButton1Motion); + SetEventInfo(GetNextExtEventMask(), _deviceButton2Motion); + SetEventInfo(GetNextExtEventMask(), _deviceButton3Motion); + SetEventInfo(GetNextExtEventMask(), _deviceButton4Motion); + SetEventInfo(GetNextExtEventMask(), _deviceButton5Motion); DeviceButtonMotionMask = GetNextExtEventMask(); - SetEventInfo (DeviceButtonMotionMask, _deviceButtonMotion); + SetEventInfo(DeviceButtonMotionMask, _deviceButtonMotion); - DeviceFocusChangeMask = GetNextExtEventMask (); - SetMaskForExtEvent (DeviceFocusChangeMask, DeviceFocusIn); - SetMaskForExtEvent (DeviceFocusChangeMask, DeviceFocusOut); + DeviceFocusChangeMask = GetNextExtEventMask(); + SetMaskForExtEvent(DeviceFocusChangeMask, DeviceFocusIn); + SetMaskForExtEvent(DeviceFocusChangeMask, DeviceFocusOut); - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, DeviceMappingNotify); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, DeviceMappingNotify); DeviceMappingNotifyMask = mask; - mask = GetNextExtEventMask (); - SetMaskForExtEvent (mask, ChangeDeviceNotify); + mask = GetNextExtEventMask(); + SetMaskForExtEvent(mask, ChangeDeviceNotify); ChangeDeviceNotifyMask = mask; DeviceButtonGrabMask = GetNextExtEventMask(); - SetEventInfo (DeviceButtonGrabMask, _deviceButtonGrab); - SetExclusiveAccess (DeviceButtonGrabMask); + SetEventInfo(DeviceButtonGrabMask, _deviceButtonGrab); + SetExclusiveAccess(DeviceButtonGrabMask); DeviceOwnerGrabButtonMask = GetNextExtEventMask(); - SetEventInfo (DeviceOwnerGrabButtonMask, _deviceOwnerGrabButton); - SetEventInfo (0, _noExtensionEvent); - } + SetEventInfo(DeviceOwnerGrabButtonMask, _deviceOwnerGrabButton); + SetEventInfo(0, _noExtensionEvent); +} /************************************************************************ * @@ -772,19 +747,18 @@ FixExtensionEvents (extEntry) */ void -RestoreExtensionEvents () +RestoreExtensionEvents(void) { - int i; + int i; IReqCode = 0; - for (i=0; i<ExtEventIndex-1; i++) - { + for (i = 0; i < ExtEventIndex - 1; i++) { if ((EventInfo[i].type >= LASTEvent) && (EventInfo[i].type < 128)) - SetMaskForEvent(0,EventInfo[i].type); - EventInfo[i].mask = 0; - EventInfo[i].type = 0; - } + SetMaskForEvent(0, EventInfo[i].type); + EventInfo[i].mask = 0; + EventInfo[i].type = 0; + } ExtEventIndex = 0; lastExtEventMask = 1; DeviceValuator = 0; @@ -809,7 +783,7 @@ RestoreExtensionEvents () DeviceBusy = 3; BadClass = 4; - } +} /*********************************************************************** * @@ -820,9 +794,8 @@ RestoreExtensionEvents () */ void -IResetProc(unused) - ExtensionEntry *unused; - { +IResetProc(ExtensionEntry * unused) +{ ReplySwapVector[IReqCode] = ReplyNotSwappd; EventSwapVector[DeviceValuator] = NotImplemented; @@ -840,8 +813,8 @@ IResetProc(unused) EventSwapVector[DeviceButtonStateNotify] = NotImplemented; EventSwapVector[DeviceMappingNotify] = NotImplemented; EventSwapVector[ChangeDeviceNotify] = NotImplemented; - RestoreExtensionEvents (); - } + RestoreExtensionEvents(); +} /*********************************************************************** * @@ -849,16 +822,13 @@ IResetProc(unused) * */ -void -AssignTypeAndName (dev, type, name) - DeviceIntPtr dev; - Atom type; - char *name; + void +AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name) { dev->type = type; - dev->name = (char *) malloc(strlen(name)+1); - strcpy (dev->name, name); - } + dev->name = (char *)malloc(strlen(name) + 1); + strcpy(dev->name, name); +} /*********************************************************************** * @@ -867,14 +837,14 @@ AssignTypeAndName (dev, type, name) */ void -MakeDeviceTypeAtoms () - { +MakeDeviceTypeAtoms(void) +{ int i; - for (i=0; i<NUMTYPES; i++) - dev_type[i].type = - MakeAtom (dev_type[i].name, strlen(dev_type[i].name), 1); - } + for (i = 0; i < NUMTYPES; i++) + dev_type[i].type = + MakeAtom(dev_type[i].name, strlen(dev_type[i].name), 1); +} /************************************************************************** * @@ -884,22 +854,19 @@ MakeDeviceTypeAtoms () */ DeviceIntPtr -LookupDeviceIntRec ( - CARD8 id) +LookupDeviceIntRec(CARD8 id) { DeviceIntPtr dev; - for (dev=inputInfo.devices; dev; dev=dev->next) - { - if (dev->id == id) - { + for (dev = inputInfo.devices; dev; dev = dev->next) { + if (dev->id == id) { if (id == inputInfo.pointer->id || id == inputInfo.keyboard->id) return (NULL); return (dev); - } } - return (NULL); } + return (NULL); +} /************************************************************************** * @@ -910,14 +877,13 @@ LookupDeviceIntRec ( */ void -SetExclusiveAccess (mask) - Mask mask; - { +SetExclusiveAccess(Mask mask) +{ int i; - for (i=0; i<MAX_DEVICES; i++) + for (i = 0; i < MAX_DEVICES; i++) ExtExclusiveMasks[i] |= mask; - } +} /************************************************************************** * @@ -927,14 +893,13 @@ SetExclusiveAccess (mask) */ void -AllowPropagateSuppress (mask) - Mask mask; - { +AllowPropagateSuppress(Mask mask) +{ int i; - for (i=0; i<MAX_DEVICES; i++) + for (i = 0; i < MAX_DEVICES; i++) PropagateMask[i] |= mask; - } +} /************************************************************************** * @@ -942,22 +907,21 @@ AllowPropagateSuppress (mask) * */ -Mask -GetNextExtEventMask () - { +Mask +GetNextExtEventMask(void) +{ int i; Mask mask = lastExtEventMask; - if (lastExtEventMask == 0) - { + if (lastExtEventMask == 0) { FatalError("GetNextExtEventMask: no more events are available."); - } + } lastExtEventMask <<= 1; - for (i=0; i<MAX_DEVICES; i++) + for (i = 0; i < MAX_DEVICES; i++) ExtValidMasks[i] |= mask; return mask; - } +} /************************************************************************** * @@ -966,18 +930,16 @@ GetNextExtEventMask () */ void -SetMaskForExtEvent(mask, event) - Mask mask; - int event; - { +SetMaskForExtEvent(Mask mask, int event) +{ EventInfo[ExtEventIndex].mask = mask; EventInfo[ExtEventIndex++].type = event; if ((event < LASTEvent) || (event >= 128)) FatalError("MaskForExtensionEvent: bogus event number"); - SetMaskForEvent(mask,event); - } + SetMaskForEvent(mask, event); +} /************************************************************************** * @@ -993,10 +955,8 @@ SetMaskForExtEvent(mask, event) */ void -SetEventInfo(mask, constant) - Mask mask; - int constant; - { +SetEventInfo(Mask mask, int constant) +{ EventInfo[ExtEventIndex].mask = mask; EventInfo[ExtEventIndex++].type = constant; - } +} diff --git a/nx-X11/programs/Xserver/Xi/getbmap.c b/nx-X11/programs/Xserver/Xi/getbmap.c index af497869c..696685b61 100644 --- a/nx-X11/programs/Xserver/Xi/getbmap.c +++ b/nx-X11/programs/Xserver/Xi/getbmap.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 "getbmap.h" @@ -73,13 +73,12 @@ SOFTWARE. */ int -SProcXGetDeviceButtonMapping(client) - register ClientPtr client; - { +SProcXGetDeviceButtonMapping(register ClientPtr client) +{ REQUEST(xGetDeviceButtonMappingReq); swaps(&stuff->length); - return(ProcXGetDeviceButtonMapping(client)); - } + return (ProcXGetDeviceButtonMapping(client)); +} /*********************************************************************** * @@ -88,12 +87,11 @@ SProcXGetDeviceButtonMapping(client) */ int -ProcXGetDeviceButtonMapping (client) - register ClientPtr client; - { - DeviceIntPtr dev; - xGetDeviceButtonMappingReply rep; - ButtonClassPtr b; +ProcXGetDeviceButtonMapping(register ClientPtr client) +{ + DeviceIntPtr dev; + xGetDeviceButtonMappingReply rep; + ButtonClassPtr b; REQUEST(xGetDeviceButtonMappingReq); REQUEST_SIZE_MATCH(xGetDeviceButtonMappingReq); @@ -104,28 +102,25 @@ ProcXGetDeviceButtonMapping (client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0, + BadDevice); return Success; - } + } b = dev->button; - if (b == NULL) - { - SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0, - BadMatch); + if (b == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceButtonMapping, 0, + BadMatch); return Success; - } + } rep.nElts = b->numButtons; - rep.length = (rep.nElts + (4-1))/4; - WriteReplyToClient (client, sizeof (xGetDeviceButtonMappingReply), &rep); - WriteToClient(client, rep.nElts, - (char *)&b->map[1]); + rep.length = (rep.nElts + (4 - 1)) / 4; + WriteReplyToClient(client, sizeof(xGetDeviceButtonMappingReply), &rep); + WriteToClient(client, rep.nElts, &b->map[1]); return Success; - } +} /*********************************************************************** * @@ -135,12 +130,10 @@ ProcXGetDeviceButtonMapping (client) */ void -SRepXGetDeviceButtonMapping (client, size, rep) - ClientPtr client; - int size; - xGetDeviceButtonMappingReply *rep; - { +SRepXGetDeviceButtonMapping(ClientPtr client, int size, + xGetDeviceButtonMappingReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getbmap.h b/nx-X11/programs/Xserver/Xi/getbmap.h index 85d2e63e9..d95b3c67c 100644 --- a/nx-X11/programs/Xserver/Xi/getbmap.h +++ b/nx-X11/programs/Xserver/Xi/getbmap.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETBMAP_H #define GETBMAP_H 1 -int -SProcXGetDeviceButtonMapping( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceButtonMapping ( - ClientPtr /* client */ - ); - -void -SRepXGetDeviceButtonMapping ( - ClientPtr /* client */, - int /* size */, - xGetDeviceButtonMappingReply * /* rep */ - ); +int SProcXGetDeviceButtonMapping(ClientPtr /* client */ + ); + +int ProcXGetDeviceButtonMapping(ClientPtr /* client */ + ); + +void SRepXGetDeviceButtonMapping(ClientPtr /* client */ , + int /* size */ , + xGetDeviceButtonMappingReply * /* rep */ + ); #endif /* GETBMAP_H */ diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c index c315f0bb6..7cc96cb2b 100644 --- a/nx-X11/programs/Xserver/Xi/getdctl.c +++ b/nx-X11/programs/Xserver/Xi/getdctl.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 "getdctl.h" @@ -74,15 +74,14 @@ SOFTWARE. */ int -SProcXGetDeviceControl(client) - register ClientPtr client; - { +SProcXGetDeviceControl(register ClientPtr client) +{ REQUEST(xGetDeviceControlReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xGetDeviceControlReq); swaps(&stuff->control); - return(ProcXGetDeviceControl(client)); - } + return (ProcXGetDeviceControl(client)); +} /*********************************************************************** * @@ -91,10 +90,9 @@ SProcXGetDeviceControl(client) */ int -ProcXGetDeviceControl(client) - ClientPtr client; - { - int total_length = 0; +ProcXGetDeviceControl(ClientPtr client) +{ + int total_length = 0; char *buf, *savbuf; register DeviceIntPtr dev; xGetDeviceControlReply rep; @@ -102,62 +100,53 @@ ProcXGetDeviceControl(client) REQUEST(xGetDeviceControlReq); REQUEST_SIZE_MATCH(xGetDeviceControlReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_GetDeviceControl; rep.length = 0; rep.sequenceNumber = client->sequence; - switch (stuff->control) - { - case DEVICE_RESOLUTION: - if (!dev->valuator) - { - SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, - BadMatch); - return Success; - } - total_length = sizeof (xDeviceResolutionState) + - (3 * sizeof(int) * dev->valuator->numAxes); - break; - default: - SendErrorToClient (client, IReqCode, X_GetDeviceControl, 0, - BadValue); + switch (stuff->control) { + case DEVICE_RESOLUTION: + if (!dev->valuator) { + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, + BadMatch); return Success; } + total_length = sizeof(xDeviceResolutionState) + + (3 * sizeof(int) * dev->valuator->numAxes); + break; + default: + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadValue); + return Success; + } - buf = (char *) malloc (total_length); - if (!buf) - { - SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, - BadAlloc); + buf = (char *)malloc(total_length); + if (!buf) { + SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0, BadAlloc); return Success; - } - savbuf=buf; - - switch (stuff->control) - { - case DEVICE_RESOLUTION: - CopySwapDeviceResolution(client, dev->valuator, buf, - total_length); - break; - default: - break; - } + } + savbuf = buf; + + switch (stuff->control) { + case DEVICE_RESOLUTION: + CopySwapDeviceResolution(client, dev->valuator, buf, total_length); + break; + default: + break; + } - rep.length = (total_length+3) >> 2; + rep.length = (total_length + 3) >> 2; WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep); WriteToClient(client, total_length, savbuf); - free (savbuf); + free(savbuf); return Success; - } +} /*********************************************************************** * @@ -166,40 +155,35 @@ ProcXGetDeviceControl(client) */ void -CopySwapDeviceResolution (client, v, buf, length) - ClientPtr client; - ValuatorClassPtr v; - char *buf; - int length; - { - AxisInfoPtr a; +CopySwapDeviceResolution(ClientPtr client, ValuatorClassPtr v, char *buf, + int length) +{ + AxisInfoPtr a; xDeviceResolutionState *r; int i, *iptr; r = (xDeviceResolutionState *) buf; r->control = DEVICE_RESOLUTION; - r->length = length; - r->num_valuators = v->numAxes; - buf += sizeof (xDeviceResolutionState); - iptr = (int *) buf; - for (i=0,a=v->axes; i<v->numAxes; i++,a++) + r->length = length; + r->num_valuators = v->numAxes; + buf += sizeof(xDeviceResolutionState); + iptr = (int *)buf; + for (i = 0, a = v->axes; i < v->numAxes; i++, a++) *iptr++ = a->resolution; - for (i=0,a=v->axes; i<v->numAxes; i++,a++) + for (i = 0, a = v->axes; i < v->numAxes; i++, a++) *iptr++ = a->min_resolution; - for (i=0,a=v->axes; i<v->numAxes; i++,a++) + for (i = 0, a = v->axes; i < v->numAxes; i++, a++) *iptr++ = a->max_resolution; - if (client->swapped) - { - swaps (&r->control); - swaps (&r->length); - swapl (&r->num_valuators); - iptr = (int *) buf; - for (i=0; i < (3 * v->numAxes); i++,iptr++) - { - swapl (iptr); - } + if (client->swapped) { + swaps(&r->control); + swaps(&r->length); + swapl(&r->num_valuators); + iptr = (int *)buf; + for (i = 0; i < (3 * v->numAxes); i++, iptr++) { + swapl(iptr); } } +} /*********************************************************************** * @@ -209,13 +193,9 @@ CopySwapDeviceResolution (client, v, buf, length) */ void -SRepXGetDeviceControl (client, size, rep) - ClientPtr client; - int size; - xGetDeviceControlReply *rep; - { +SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } - +} diff --git a/nx-X11/programs/Xserver/Xi/getdctl.h b/nx-X11/programs/Xserver/Xi/getdctl.h index 0618b4d01..c7cfb19d2 100644 --- a/nx-X11/programs/Xserver/Xi/getdctl.h +++ b/nx-X11/programs/Xserver/Xi/getdctl.h @@ -30,29 +30,21 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETDCTL_H #define GETDCTL_H 1 -int -SProcXGetDeviceControl ( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceControl ( - ClientPtr /* client */ - ); - -void -CopySwapDeviceResolution ( - ClientPtr /* client */, - ValuatorClassPtr /* v */, - char * /* buf */, - int /* length */ - ); - -void -SRepXGetDeviceControl ( - ClientPtr /* client */, - int /* size */, - xGetDeviceControlReply * /* rep */ - ); +int SProcXGetDeviceControl(ClientPtr /* client */ + ); + +int ProcXGetDeviceControl(ClientPtr /* client */ + ); + +void CopySwapDeviceResolution(ClientPtr /* client */ , + ValuatorClassPtr /* v */ , + char * /* buf */ , + int /* length */ + ); + +void SRepXGetDeviceControl(ClientPtr /* client */ , + int /* size */ , + xGetDeviceControlReply * /* rep */ + ); #endif /* GETDCTL_H */ 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); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getfctl.h b/nx-X11/programs/Xserver/Xi/getfctl.h index f8441b0b3..7d2d17ab1 100644 --- a/nx-X11/programs/Xserver/Xi/getfctl.h +++ b/nx-X11/programs/Xserver/Xi/getfctl.h @@ -30,63 +30,45 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETFCTL_H #define GETFCTL_H 1 -int -SProcXGetFeedbackControl( - ClientPtr /* client */ - ); - -int -ProcXGetFeedbackControl( - ClientPtr /* client */ - ); - -void -CopySwapKbdFeedback ( - ClientPtr /* client */, - KbdFeedbackPtr /* k */, - char ** /* buf */ - ); - -void -CopySwapPtrFeedback ( - ClientPtr /* client */, - PtrFeedbackPtr /* p */, - char ** /* buf */ - ); - -void -CopySwapIntegerFeedback ( - ClientPtr /* client */, - IntegerFeedbackPtr /* i */, - char ** /* buf */ - ); - -void -CopySwapStringFeedback ( - ClientPtr /* client */, - StringFeedbackPtr /* s */, - char ** /* buf */ - ); - -void -CopySwapLedFeedback ( - ClientPtr /* client */, - LedFeedbackPtr /* l */, - char ** /* buf */ - ); - -void -CopySwapBellFeedback ( - ClientPtr /* client */, - BellFeedbackPtr /* b */, - char ** /* buf */ - ); - -void -SRepXGetFeedbackControl ( - ClientPtr /* client */, - int /* size */, - xGetFeedbackControlReply * /* rep */ - ); +int SProcXGetFeedbackControl(ClientPtr /* client */ + ); + +int ProcXGetFeedbackControl(ClientPtr /* client */ + ); + +void CopySwapKbdFeedback(ClientPtr /* client */ , + KbdFeedbackPtr /* k */ , + char ** /* buf */ + ); + +void CopySwapPtrFeedback(ClientPtr /* client */ , + PtrFeedbackPtr /* p */ , + char ** /* buf */ + ); + +void CopySwapIntegerFeedback(ClientPtr /* client */ , + IntegerFeedbackPtr /* i */ , + char ** /* buf */ + ); + +void CopySwapStringFeedback(ClientPtr /* client */ , + StringFeedbackPtr /* s */ , + char ** /* buf */ + ); + +void CopySwapLedFeedback(ClientPtr /* client */ , + LedFeedbackPtr /* l */ , + char ** /* buf */ + ); + +void CopySwapBellFeedback(ClientPtr /* client */ , + BellFeedbackPtr /* b */ , + char ** /* buf */ + ); + +void SRepXGetFeedbackControl(ClientPtr /* client */ , + int /* size */ , + xGetFeedbackControlReply * /* rep */ + ); #endif /* GETFCTL_H */ diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c index 6f30b011a..5111522f2 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.c +++ b/nx-X11/programs/Xserver/Xi/getfocus.c @@ -55,14 +55,14 @@ SOFTWARE. #include <dix-config.h> #endif -#include <nx-X11/X.h> /* for inputstr.h */ -#include <nx-X11/Xproto.h> /* Request macro */ -#include "windowstr.h" /* focus struct */ -#include "inputstr.h" /* DeviceIntPtr */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "windowstr.h" /* focus struct */ +#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 "getfocus.h" @@ -74,13 +74,12 @@ SOFTWARE. */ int -SProcXGetDeviceFocus(client) - register ClientPtr client; - { +SProcXGetDeviceFocus(register ClientPtr client) +{ REQUEST(xGetDeviceFocusReq); swaps(&stuff->length); - return(ProcXGetDeviceFocus(client)); - } + return (ProcXGetDeviceFocus(client)); +} /*********************************************************************** * @@ -89,22 +88,20 @@ SProcXGetDeviceFocus(client) */ int -ProcXGetDeviceFocus(client) - ClientPtr client; - { - DeviceIntPtr dev; - FocusClassPtr focus; +ProcXGetDeviceFocus(ClientPtr client) +{ + DeviceIntPtr dev; + FocusClassPtr focus; xGetDeviceFocusReply rep; REQUEST(xGetDeviceFocusReq); REQUEST_SIZE_MATCH(xGetDeviceFocusReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL || !dev->focus) - { + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL || !dev->focus) { SendErrorToClient(client, IReqCode, X_GetDeviceFocus, 0, BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_GetDeviceFocus; @@ -119,14 +116,14 @@ ProcXGetDeviceFocus(client) rep.focus = PointerRoot; else if (focus->win == FollowKeyboardWin) rep.focus = FollowKeyboard; - else + else rep.focus = focus->win->drawable.id; rep.time = focus->time.milliseconds; rep.revertTo = focus->revert; - WriteReplyToClient (client, sizeof(xGetDeviceFocusReply), &rep); + WriteReplyToClient(client, sizeof(xGetDeviceFocusReply), &rep); return Success; - } +} /*********************************************************************** * @@ -136,14 +133,11 @@ ProcXGetDeviceFocus(client) */ void -SRepXGetDeviceFocus (client, size, rep) - ClientPtr client; - int size; - xGetDeviceFocusReply *rep; - { +SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swapl(&rep->focus); swapl(&rep->time); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getfocus.h b/nx-X11/programs/Xserver/Xi/getfocus.h index a404ee422..c3f2d67b6 100644 --- a/nx-X11/programs/Xserver/Xi/getfocus.h +++ b/nx-X11/programs/Xserver/Xi/getfocus.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETFOCUS_H #define GETFOCUS_H 1 -int -SProcXGetDeviceFocus( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceFocus( - ClientPtr /* client */ - ); - -void -SRepXGetDeviceFocus ( - ClientPtr /* client */, - int /* size */, - xGetDeviceFocusReply * /* rep */ - ); +int SProcXGetDeviceFocus(ClientPtr /* client */ + ); + +int ProcXGetDeviceFocus(ClientPtr /* client */ + ); + +void SRepXGetDeviceFocus(ClientPtr /* client */ , + int /* size */ , + xGetDeviceFocusReply * /* rep */ + ); #endif /* GETFOCUS_H */ diff --git a/nx-X11/programs/Xserver/Xi/getkmap.c b/nx-X11/programs/Xserver/Xi/getkmap.c index 84f8a10a8..419d1080f 100644 --- a/nx-X11/programs/Xserver/Xi/getkmap.c +++ b/nx-X11/programs/Xserver/Xi/getkmap.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 "swaprep.h" @@ -75,13 +75,12 @@ SOFTWARE. */ int -SProcXGetDeviceKeyMapping(client) - register ClientPtr client; - { +SProcXGetDeviceKeyMapping(register ClientPtr client) +{ REQUEST(xGetDeviceKeyMappingReq); swaps(&stuff->length); - return(ProcXGetDeviceKeyMapping(client)); - } + return (ProcXGetDeviceKeyMapping(client)); +} /*********************************************************************** * @@ -90,65 +89,56 @@ SProcXGetDeviceKeyMapping(client) */ int -ProcXGetDeviceKeyMapping(client) - register ClientPtr client; - { +ProcXGetDeviceKeyMapping(register ClientPtr client) +{ xGetDeviceKeyMappingReply rep; DeviceIntPtr dev; - KeySymsPtr k; + KeySymsPtr k; REQUEST(xGetDeviceKeyMappingReq); REQUEST_SIZE_MATCH(xGetDeviceKeyMappingReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, + BadDevice); return Success; - } + } - if (dev->key == NULL) - { - SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0, - BadMatch); + if (dev->key == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, BadMatch); return Success; - } - k = &dev->key->curKeySyms; + } + k = &dev->key->curKeySyms; if ((stuff->firstKeyCode < k->minKeyCode) || - (stuff->firstKeyCode > k->maxKeyCode)) - { + (stuff->firstKeyCode > k->maxKeyCode)) { client->errorValue = stuff->firstKeyCode; - SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0, - BadValue); + SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, BadValue); return Success; - } + } - if (stuff->firstKeyCode + stuff->count > k->maxKeyCode + 1) - { + if (stuff->firstKeyCode + stuff->count > k->maxKeyCode + 1) { client->errorValue = stuff->count; - SendErrorToClient (client, IReqCode, X_GetDeviceKeyMapping, 0, - BadValue); + SendErrorToClient(client, IReqCode, X_GetDeviceKeyMapping, 0, BadValue); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_GetDeviceKeyMapping; rep.sequenceNumber = client->sequence; rep.keySymsPerKeyCode = k->mapWidth; - rep.length = (k->mapWidth * stuff->count); /* KeySyms are 4 bytes */ + rep.length = (k->mapWidth * stuff->count); /* KeySyms are 4 bytes */ WriteReplyToClient(client, sizeof(xGetDeviceKeyMappingReply), &rep); - client->pSwapReplyFunc = (ReplySwapPtr)CopySwap32Write; - WriteSwappedDataToClient( - client, - k->mapWidth * stuff->count * sizeof(KeySym), - &k->map[(stuff->firstKeyCode - k->minKeyCode) * - k->mapWidth]); + client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write; + WriteSwappedDataToClient(client, + k->mapWidth * stuff->count * sizeof(KeySym), + &k->map[(stuff->firstKeyCode - k->minKeyCode) * + k->mapWidth]); return Success; - } +} /*********************************************************************** * @@ -158,13 +148,10 @@ ProcXGetDeviceKeyMapping(client) */ void -SRepXGetDeviceKeyMapping (client, size, rep) - ClientPtr client; - int size; - xGetDeviceKeyMappingReply *rep; - { +SRepXGetDeviceKeyMapping(ClientPtr client, int size, + xGetDeviceKeyMappingReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } - +} diff --git a/nx-X11/programs/Xserver/Xi/getkmap.h b/nx-X11/programs/Xserver/Xi/getkmap.h index 4e8b4ba3a..58c8f12e6 100644 --- a/nx-X11/programs/Xserver/Xi/getkmap.h +++ b/nx-X11/programs/Xserver/Xi/getkmap.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETKMAP_H #define GETKMAP_H 1 -int -SProcXGetDeviceKeyMapping( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceKeyMapping( - ClientPtr /* client */ - ); - -void -SRepXGetDeviceKeyMapping ( - ClientPtr /* client */, - int /* size */, - xGetDeviceKeyMappingReply * /* rep */ - ); +int SProcXGetDeviceKeyMapping(ClientPtr /* client */ + ); + +int ProcXGetDeviceKeyMapping(ClientPtr /* client */ + ); + +void SRepXGetDeviceKeyMapping(ClientPtr /* client */ , + int /* size */ , + xGetDeviceKeyMappingReply * /* rep */ + ); #endif /* GETKMAP_H */ diff --git a/nx-X11/programs/Xserver/Xi/getmmap.c b/nx-X11/programs/Xserver/Xi/getmmap.c index 53f2a6aec..ce11e3e28 100644 --- a/nx-X11/programs/Xserver/Xi/getmmap.c +++ b/nx-X11/programs/Xserver/Xi/getmmap.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> /* Request macro */ +#include <nx-X11/extensions/XIproto.h> /* Request macro */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "getmmap.h" @@ -74,13 +74,12 @@ SOFTWARE. */ int -SProcXGetDeviceModifierMapping(client) - register ClientPtr client; - { +SProcXGetDeviceModifierMapping(register ClientPtr client) +{ REQUEST(xGetDeviceModifierMappingReq); swaps(&stuff->length); - return(ProcXGetDeviceModifierMapping(client)); - } + return (ProcXGetDeviceModifierMapping(client)); +} /*********************************************************************** * @@ -89,47 +88,44 @@ SProcXGetDeviceModifierMapping(client) */ int -ProcXGetDeviceModifierMapping(client) - ClientPtr client; - { - CARD8 maxkeys; - DeviceIntPtr dev; - xGetDeviceModifierMappingReply rep; - KeyClassPtr kp; - +ProcXGetDeviceModifierMapping(ClientPtr client) +{ + CARD8 maxkeys; + DeviceIntPtr dev; + xGetDeviceModifierMappingReply rep; + KeyClassPtr kp; + REQUEST(xGetDeviceModifierMappingReq); REQUEST_SIZE_MATCH(xGetDeviceModifierMappingReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_GetDeviceModifierMapping, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceModifierMapping, 0, + BadDevice); return Success; - } + } kp = dev->key; - if (kp == NULL) - { - SendErrorToClient (client, IReqCode, X_GetDeviceModifierMapping, 0, - BadMatch); + if (kp == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceModifierMapping, 0, + BadMatch); return Success; - } - maxkeys = kp->maxKeysPerModifier; + } + maxkeys = kp->maxKeysPerModifier; rep.repType = X_Reply; rep.RepType = X_GetDeviceModifierMapping; rep.numKeyPerModifier = maxkeys; rep.sequenceNumber = client->sequence; /* length counts 4 byte quantities - there are 8 modifiers 1 byte big */ - rep.length = 2*maxkeys; + rep.length = 2 * maxkeys; WriteReplyToClient(client, sizeof(xGetDeviceModifierMappingReply), &rep); /* Reply with the (modified by DDX) map that SetModifierMapping passed in */ - WriteToClient(client, 8*maxkeys, kp->modifierKeyMap); + WriteToClient(client, 8 * maxkeys, kp->modifierKeyMap); return Success; - } +} /*********************************************************************** * @@ -139,12 +135,10 @@ ProcXGetDeviceModifierMapping(client) */ void -SRepXGetDeviceModifierMapping (client, size, rep) - ClientPtr client; - int size; - xGetDeviceModifierMappingReply *rep; - { +SRepXGetDeviceModifierMapping(ClientPtr client, int size, + xGetDeviceModifierMappingReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getmmap.h b/nx-X11/programs/Xserver/Xi/getmmap.h index 32d7061e2..9a93bb8c5 100644 --- a/nx-X11/programs/Xserver/Xi/getmmap.h +++ b/nx-X11/programs/Xserver/Xi/getmmap.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETMMAP_H #define GETMMAP_H 1 -int -SProcXGetDeviceModifierMapping( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceModifierMapping( - ClientPtr /* client */ - ); - -void -SRepXGetDeviceModifierMapping ( - ClientPtr /* client */, - int /* size */, - xGetDeviceModifierMappingReply * /* rep */ - ); +int SProcXGetDeviceModifierMapping(ClientPtr /* client */ + ); + +int ProcXGetDeviceModifierMapping(ClientPtr /* client */ + ); + +void SRepXGetDeviceModifierMapping(ClientPtr /* client */ , + int /* size */ , + xGetDeviceModifierMappingReply * /* rep */ + ); #endif /* GETMMAP_H */ diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c index 569efcd1f..77075c92b 100644 --- a/nx-X11/programs/Xserver/Xi/getprop.c +++ b/nx-X11/programs/Xserver/Xi/getprop.c @@ -55,21 +55,21 @@ 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 "windowstr.h" /* window structs */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structs */ #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 "swaprep.h" #include "getprop.h" -extern XExtEventInfo EventInfo[]; -extern int ExtEventIndex; +extern XExtEventInfo EventInfo[]; +extern int ExtEventIndex; /*********************************************************************** * @@ -78,15 +78,14 @@ extern int ExtEventIndex; */ int -SProcXGetDeviceDontPropagateList(client) - register ClientPtr client; - { +SProcXGetDeviceDontPropagateList(register ClientPtr client) +{ REQUEST(xGetDeviceDontPropagateListReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq); swapl(&stuff->window); - return(ProcXGetDeviceDontPropagateList(client)); - } + return (ProcXGetDeviceDontPropagateList(client)); +} /*********************************************************************** * @@ -95,15 +94,14 @@ SProcXGetDeviceDontPropagateList(client) */ int -ProcXGetDeviceDontPropagateList (client) - register ClientPtr client; - { - CARD16 count = 0; - int i; - XEventClass *buf = NULL, *tbuf; - WindowPtr pWin; - xGetDeviceDontPropagateListReply rep; - OtherInputMasks *others; +ProcXGetDeviceDontPropagateList(register ClientPtr client) +{ + CARD16 count = 0; + int i; + XEventClass *buf = NULL, *tbuf; + WindowPtr pWin; + xGetDeviceDontPropagateListReply rep; + OtherInputMasks *others; REQUEST(xGetDeviceDontPropagateListReq); REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq); @@ -114,44 +112,39 @@ ProcXGetDeviceDontPropagateList (client) rep.length = 0; rep.count = 0; - pWin = (WindowPtr) LookupWindow (stuff->window, client); - if (!pWin) - { + pWin = (WindowPtr) LookupWindow(stuff->window, client); + if (!pWin) { client->errorValue = stuff->window; - SendErrorToClient(client, IReqCode, X_GetDeviceDontPropagateList, 0, - BadWindow); + SendErrorToClient(client, IReqCode, X_GetDeviceDontPropagateList, 0, + BadWindow); return Success; - } - - if ((others = wOtherInputMasks(pWin)) != 0) - { - for (i=0; i<EMASKSIZE; i++) - tbuf = ClassFromMask (NULL, others->dontPropagateMask[i], i, - &count, COUNT); - if (count) - { + } + + if ((others = wOtherInputMasks(pWin)) != 0) { + for (i = 0; i < EMASKSIZE; i++) + tbuf = ClassFromMask(NULL, others->dontPropagateMask[i], i, + &count, COUNT); + if (count) { rep.count = count; - buf = (XEventClass *) malloc (rep.count * sizeof(XEventClass)); - rep.length = (rep.count * sizeof (XEventClass) + 3) >> 2; + buf = (XEventClass *) malloc(rep.count * sizeof(XEventClass)); + rep.length = (rep.count * sizeof(XEventClass) + 3) >> 2; tbuf = buf; - for (i=0; i<EMASKSIZE; i++) - tbuf = ClassFromMask (tbuf, others->dontPropagateMask[i], i, - NULL, CREATE); - } + for (i = 0; i < EMASKSIZE; i++) + tbuf = ClassFromMask(tbuf, others->dontPropagateMask[i], i, + NULL, CREATE); } + } - WriteReplyToClient (client, sizeof (xGetDeviceDontPropagateListReply), - &rep); + WriteReplyToClient(client, sizeof(xGetDeviceDontPropagateListReply), &rep); - if (count) - { - client->pSwapReplyFunc = (ReplySwapPtr)Swap32Write; - WriteSwappedDataToClient( client, count * sizeof(XEventClass), buf); - free (buf); - } - return Success; + if (count) { + client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; + WriteSwappedDataToClient(client, count * sizeof(XEventClass), buf); + free(buf); } + return Success; +} /*********************************************************************** * @@ -161,31 +154,25 @@ ProcXGetDeviceDontPropagateList (client) */ XEventClass -*ClassFromMask (buf, mask, maskndx, count, mode) - XEventClass *buf; - Mask mask; - int maskndx; - CARD16 *count; - int mode; - { - int i,j; - int id = maskndx; - Mask tmask = 0x80000000; - - for (i=0; i<32; i++,tmask>>=1) - if (tmask & mask) - { - for (j=0; j<ExtEventIndex; j++) - if (EventInfo[j].mask == tmask) - { + * ClassFromMask(XEventClass * buf, Mask mask, int maskndx, CARD16 * count, + int mode) +{ + int i, j; + int id = maskndx; + Mask tmask = 0x80000000; + + for (i = 0; i < 32; i++, tmask >>= 1) + if (tmask & mask) { + for (j = 0; j < ExtEventIndex; j++) + if (EventInfo[j].mask == tmask) { if (mode == COUNT) (*count)++; else - *buf++ = (id << 8) | EventInfo[j].type; - } - } + *buf++ = (id << 8) | EventInfo[j].type; + } + } return (buf); - } +} /*********************************************************************** * @@ -195,13 +182,11 @@ XEventClass */ void -SRepXGetDeviceDontPropagateList (client, size, rep) - ClientPtr client; - int size; - xGetDeviceDontPropagateListReply *rep; - { +SRepXGetDeviceDontPropagateList(ClientPtr client, int size, + xGetDeviceDontPropagateListReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->count); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getprop.h b/nx-X11/programs/Xserver/Xi/getprop.h index fd9011603..1a7b128b2 100644 --- a/nx-X11/programs/Xserver/Xi/getprop.h +++ b/nx-X11/programs/Xserver/Xi/getprop.h @@ -30,30 +30,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETPROP_H #define GETPROP_H 1 -int -SProcXGetDeviceDontPropagateList( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceDontPropagateList ( - ClientPtr /* client */ - ); - -XEventClass * -ClassFromMask ( - XEventClass * /* buf */, - Mask /* mask */, - int /* maskndx */, - CARD16 * /* count */, - int /* mode */ - ); - -void -SRepXGetDeviceDontPropagateList ( - ClientPtr /* client */, - int /* size */, - xGetDeviceDontPropagateListReply * /* rep */ - ); +int SProcXGetDeviceDontPropagateList(ClientPtr /* client */ + ); + +int ProcXGetDeviceDontPropagateList(ClientPtr /* client */ + ); + +XEventClass *ClassFromMask(XEventClass * /* buf */ , + Mask /* mask */ , + int /* maskndx */ , + CARD16 * /* count */ , + int /* mode */ + ); + +void SRepXGetDeviceDontPropagateList(ClientPtr /* client */ , + int /* size */ , + xGetDeviceDontPropagateListReply * /* rep */ + ); #endif /* GETPROP_H */ diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c index bac74317b..b36b833d3 100644 --- a/nx-X11/programs/Xserver/Xi/getselev.c +++ b/nx-X11/programs/Xserver/Xi/getselev.c @@ -55,14 +55,14 @@ SOFTWARE. #include <dix-config.h> #endif -#include <nx-X11/X.h> /* for inputstr.h */ -#include <nx-X11/Xproto.h> /* Request macro */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window struct */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window struct */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "swaprep.h" @@ -76,15 +76,14 @@ SOFTWARE. */ int -SProcXGetSelectedExtensionEvents(client) - register ClientPtr client; - { +SProcXGetSelectedExtensionEvents(register ClientPtr client) +{ REQUEST(xGetSelectedExtensionEventsReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq); swapl(&stuff->window); - return(ProcXGetSelectedExtensionEvents(client)); - } + return (ProcXGetSelectedExtensionEvents(client)); +} /*********************************************************************** * @@ -94,18 +93,17 @@ SProcXGetSelectedExtensionEvents(client) */ int -ProcXGetSelectedExtensionEvents(client) - register ClientPtr client; - { - int i; - int total_length = 0; - xGetSelectedExtensionEventsReply rep; - WindowPtr pWin; - XEventClass *buf = NULL; - XEventClass *tclient; - XEventClass *aclient; - OtherInputMasks *pOthers; - InputClientsPtr others; +ProcXGetSelectedExtensionEvents(register ClientPtr client) +{ + int i; + int total_length = 0; + xGetSelectedExtensionEventsReply rep; + WindowPtr pWin; + XEventClass *buf = NULL; + XEventClass *tclient; + XEventClass *aclient; + OtherInputMasks *pOthers; + InputClientsPtr others; REQUEST(xGetSelectedExtensionEventsReq); REQUEST_SIZE_MATCH(xGetSelectedExtensionEventsReq); @@ -117,55 +115,53 @@ ProcXGetSelectedExtensionEvents(client) rep.this_client_count = 0; rep.all_clients_count = 0; - if (!(pWin = LookupWindow(stuff->window, client))) - { - SendErrorToClient(client, IReqCode, X_GetSelectedExtensionEvents, 0, - BadWindow); + if (!(pWin = LookupWindow(stuff->window, client))) { + SendErrorToClient(client, IReqCode, X_GetSelectedExtensionEvents, 0, + BadWindow); return Success; - } - - if ((pOthers = wOtherInputMasks(pWin)) != 0) - { - for (others = pOthers->inputClients; others; others=others->next) - for (i=0; i<EMASKSIZE; i++) - tclient = ClassFromMask (NULL, others->mask[i], i, - &rep.all_clients_count, COUNT); - - for (others = pOthers->inputClients; others; others=others->next) - if (SameClient(others, client)) - { - for (i=0; i<EMASKSIZE; i++) - tclient = ClassFromMask (NULL, others->mask[i], i, - &rep.this_client_count, COUNT); + } + + if ((pOthers = wOtherInputMasks(pWin)) != 0) { + for (others = pOthers->inputClients; others; others = others->next) + for (i = 0; i < EMASKSIZE; i++) + tclient = ClassFromMask(NULL, others->mask[i], i, + &rep.all_clients_count, COUNT); + + for (others = pOthers->inputClients; others; others = others->next) + if (SameClient(others, client)) { + for (i = 0; i < EMASKSIZE; i++) + tclient = ClassFromMask(NULL, others->mask[i], i, + &rep.this_client_count, COUNT); break; - } + } - total_length = (rep.all_clients_count + rep.this_client_count) * - sizeof (XEventClass); + total_length = (rep.all_clients_count + rep.this_client_count) * + sizeof(XEventClass); rep.length = (total_length + 3) >> 2; - buf = (XEventClass *) malloc (total_length); + buf = (XEventClass *) malloc(total_length); tclient = buf; aclient = buf + rep.this_client_count; if (others) - for (i=0; i<EMASKSIZE; i++) - tclient = ClassFromMask (tclient, others->mask[i], i, NULL, CREATE); - - for (others = pOthers->inputClients; others; others=others->next) - for (i=0; i<EMASKSIZE; i++) - aclient = ClassFromMask (aclient, others->mask[i], i, NULL, CREATE); - } + for (i = 0; i < EMASKSIZE; i++) + tclient = + ClassFromMask(tclient, others->mask[i], i, NULL, CREATE); + + for (others = pOthers->inputClients; others; others = others->next) + for (i = 0; i < EMASKSIZE; i++) + aclient = + ClassFromMask(aclient, others->mask[i], i, NULL, CREATE); + } - WriteReplyToClient (client, sizeof(xGetSelectedExtensionEventsReply), &rep); + WriteReplyToClient(client, sizeof(xGetSelectedExtensionEventsReply), &rep); - if (total_length) - { + if (total_length) { client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient( client, total_length, buf); - free (buf); - } - return Success; + WriteSwappedDataToClient(client, total_length, buf); + free(buf); } + return Success; +} /*********************************************************************** * @@ -175,14 +171,12 @@ ProcXGetSelectedExtensionEvents(client) */ void -SRepXGetSelectedExtensionEvents (client, size, rep) - ClientPtr client; - int size; - xGetSelectedExtensionEventsReply *rep; - { +SRepXGetSelectedExtensionEvents(ClientPtr client, int size, + xGetSelectedExtensionEventsReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->this_client_count); swaps(&rep->all_clients_count); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getselev.h b/nx-X11/programs/Xserver/Xi/getselev.h index ef9e3b606..5e7a65914 100644 --- a/nx-X11/programs/Xserver/Xi/getselev.h +++ b/nx-X11/programs/Xserver/Xi/getselev.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETSELEV_H #define GETSELEV_H 1 -int -SProcXGetSelectedExtensionEvents( - ClientPtr /* client */ - ); - -int -ProcXGetSelectedExtensionEvents( - ClientPtr /* client */ - ); - -void -SRepXGetSelectedExtensionEvents ( - ClientPtr /* client */, - int /* size */, - xGetSelectedExtensionEventsReply * /* rep */ - ); +int SProcXGetSelectedExtensionEvents(ClientPtr /* client */ + ); + +int ProcXGetSelectedExtensionEvents(ClientPtr /* client */ + ); + +void SRepXGetSelectedExtensionEvents(ClientPtr /* client */ , + int /* size */ , + xGetSelectedExtensionEventsReply * /* rep */ + ); #endif /* GETSELEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c index 00381a91c..d66175d58 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.c +++ b/nx-X11/programs/Xserver/Xi/getvers.c @@ -55,18 +55,18 @@ 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 "getvers.h" -XExtensionVersion AllExtensionVersions[128]; +XExtensionVersion AllExtensionVersions[128]; /*********************************************************************** * @@ -75,15 +75,14 @@ XExtensionVersion AllExtensionVersions[128]; */ int -SProcXGetExtensionVersion(client) - register ClientPtr client; - { +SProcXGetExtensionVersion(register ClientPtr client) +{ REQUEST(xGetExtensionVersionReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq); swaps(&stuff->nbytes); - return(ProcXGetExtensionVersion(client)); - } + return (ProcXGetExtensionVersion(client)); +} /*********************************************************************** * @@ -92,21 +91,19 @@ SProcXGetExtensionVersion(client) */ int -ProcXGetExtensionVersion (client) - register ClientPtr client; - { - xGetExtensionVersionReply rep; +ProcXGetExtensionVersion(register ClientPtr client) +{ + xGetExtensionVersionReply rep; REQUEST(xGetExtensionVersionReq); REQUEST_AT_LEAST_SIZE(xGetExtensionVersionReq); - if (stuff->length != (sizeof(xGetExtensionVersionReq) + - stuff->nbytes + 3)>>2) - { - SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0, - BadLength); + if (stuff->length != (sizeof(xGetExtensionVersionReq) + + stuff->nbytes + 3) >> 2) { + SendErrorToClient(client, IReqCode, X_GetExtensionVersion, 0, + BadLength); return Success; - } + } memset(&rep, 0, sizeof(xGetExtensionVersionReply)); rep.repType = X_Reply; @@ -117,17 +114,14 @@ ProcXGetExtensionVersion (client) rep.minor_version = 0; rep.present = TRUE; - if (rep.present) - { - rep.major_version = - AllExtensionVersions[IReqCode-128].major_version; - rep.minor_version = - AllExtensionVersions[IReqCode-128].minor_version; - } - WriteReplyToClient (client, sizeof (xGetExtensionVersionReply), &rep); + if (rep.present) { + rep.major_version = AllExtensionVersions[IReqCode - 128].major_version; + rep.minor_version = AllExtensionVersions[IReqCode - 128].minor_version; + } + WriteReplyToClient(client, sizeof(xGetExtensionVersionReply), &rep); return Success; - } +} /*********************************************************************** * @@ -137,14 +131,12 @@ ProcXGetExtensionVersion (client) */ void -SRepXGetExtensionVersion (client, size, rep) - ClientPtr client; - int size; - xGetExtensionVersionReply *rep; - { +SRepXGetExtensionVersion(ClientPtr client, int size, + xGetExtensionVersionReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swaps(&rep->major_version); swaps(&rep->minor_version); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/getvers.h b/nx-X11/programs/Xserver/Xi/getvers.h index a09e2da2d..c67e77a0f 100644 --- a/nx-X11/programs/Xserver/Xi/getvers.h +++ b/nx-X11/programs/Xserver/Xi/getvers.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GETVERS_H #define GETVERS_H 1 -int -SProcXGetExtensionVersion( - ClientPtr /* client */ - ); - -int -ProcXGetExtensionVersion ( - ClientPtr /* client */ - ); - -void -SRepXGetExtensionVersion ( - ClientPtr /* client */, - int /* size */, - xGetExtensionVersionReply * /* rep */ - ); +int SProcXGetExtensionVersion(ClientPtr /* client */ + ); + +int ProcXGetExtensionVersion(ClientPtr /* client */ + ); + +void SRepXGetExtensionVersion(ClientPtr /* client */ , + int /* size */ , + xGetExtensionVersionReply * /* rep */ + ); #endif /* GETVERS_H */ diff --git a/nx-X11/programs/Xserver/Xi/grabdev.c b/nx-X11/programs/Xserver/Xi/grabdev.c index 8d8a5491e..dc95e7cf5 100644 --- a/nx-X11/programs/Xserver/Xi/grabdev.c +++ b/nx-X11/programs/Xserver/Xi/grabdev.c @@ -51,26 +51,25 @@ SOFTWARE. * */ - #ifdef HAVE_DIX_CONFIG_H #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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #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 "dixevents.h" /* GrabDevice */ +#include "dixevents.h" /* GrabDevice */ #include "grabdev.h" -extern XExtEventInfo EventInfo[]; -extern int ExtEventIndex; +extern XExtEventInfo EventInfo[]; +extern int ExtEventIndex; /*********************************************************************** * @@ -79,9 +78,8 @@ extern int ExtEventIndex; */ int -SProcXGrabDevice(client) - register ClientPtr client; - { +SProcXGrabDevice(register ClientPtr client) +{ REQUEST(xGrabDeviceReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xGrabDeviceReq); @@ -94,8 +92,8 @@ SProcXGrabDevice(client) SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return(ProcXGrabDevice(client)); - } + return (ProcXGrabDevice(client)); +} /*********************************************************************** * @@ -104,52 +102,49 @@ SProcXGrabDevice(client) */ int -ProcXGrabDevice(client) - ClientPtr client; - { - int error; - xGrabDeviceReply rep; - DeviceIntPtr dev; - struct tmask tmp[EMASKSIZE]; +ProcXGrabDevice(ClientPtr client) +{ + int error; + xGrabDeviceReply rep; + DeviceIntPtr dev; + struct tmask tmp[EMASKSIZE]; REQUEST(xGrabDeviceReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceReq); - if (stuff->length !=(sizeof(xGrabDeviceReq)>>2) + stuff->event_count) - { - SendErrorToClient (client, IReqCode, X_GrabDevice, 0, BadLength); + if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count) { + SendErrorToClient(client, IReqCode, X_GrabDevice, 0, BadLength); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_GrabDevice; rep.sequenceNumber = client->sequence; rep.length = 0; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { SendErrorToClient(client, IReqCode, X_GrabDevice, 0, BadDevice); return Success; - } + } - if (CreateMaskFromList (client, (XEventClass *)&stuff[1], - stuff->event_count, tmp, dev, X_GrabDevice) != Success) + if (CreateMaskFromList(client, (XEventClass *) & stuff[1], + stuff->event_count, tmp, dev, + X_GrabDevice) != Success) return Success; - error = GrabDevice (client, dev, stuff->this_device_mode, - stuff->other_devices_mode, stuff->grabWindow, stuff->ownerEvents, - stuff->time, tmp[stuff->deviceid].mask, &rep.status); + error = GrabDevice(client, dev, stuff->this_device_mode, + stuff->other_devices_mode, stuff->grabWindow, + stuff->ownerEvents, stuff->time, + tmp[stuff->deviceid].mask, &rep.status); - if (error != Success) - { + if (error != Success) { SendErrorToClient(client, IReqCode, X_GrabDevice, 0, error); return Success; - } + } WriteReplyToClient(client, sizeof(xGrabDeviceReply), &rep); return Success; - } - +} /*********************************************************************** * @@ -158,49 +153,39 @@ ProcXGrabDevice(client) */ int -CreateMaskFromList (client, list, count, mask, dev, req) - ClientPtr client; - XEventClass *list; - int count; - struct tmask mask[]; - DeviceIntPtr dev; - int req; - { - int i,j; - int device; - DeviceIntPtr tdev; - - for (i=0; i<EMASKSIZE; i++) - { +CreateMaskFromList(ClientPtr client, XEventClass * list, int count, + struct tmask *mask, DeviceIntPtr dev, int req) +{ + int i, j; + int device; + DeviceIntPtr tdev; + + for (i = 0; i < EMASKSIZE; i++) { mask[i].mask = 0; mask[i].dev = NULL; - } + } - for (i=0; i<count; i++, list++) - { + for (i = 0; i < count; i++, list++) { device = *list >> 8; - if (device > 255) - { + if (device > 255) { SendErrorToClient(client, IReqCode, req, 0, BadClass); return BadClass; - } - tdev = LookupDeviceIntRec (device); - if (tdev==NULL || (dev != NULL && tdev != dev)) - { + } + tdev = LookupDeviceIntRec(device); + if (tdev == NULL || (dev != NULL && tdev != dev)) { SendErrorToClient(client, IReqCode, req, 0, BadClass); return BadClass; - } + } - for (j=0; j<ExtEventIndex; j++) - if (EventInfo[j].type == (*list & 0xff)) - { + for (j = 0; j < ExtEventIndex; j++) + if (EventInfo[j].type == (*list & 0xff)) { mask[device].mask |= EventInfo[j].mask; mask[device].dev = (Pointer) tdev; break; - } - } - return Success; + } } + return Success; +} /*********************************************************************** * @@ -210,12 +195,9 @@ CreateMaskFromList (client, list, count, mask, dev, req) */ void -SRepXGrabDevice (client, size, rep) - ClientPtr client; - int size; - xGrabDeviceReply *rep; - { +SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/grabdev.h b/nx-X11/programs/Xserver/Xi/grabdev.h index 9e9196c47..881982fd2 100644 --- a/nx-X11/programs/Xserver/Xi/grabdev.h +++ b/nx-X11/programs/Xserver/Xi/grabdev.h @@ -30,31 +30,23 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GRABDEV_H #define GRABDEV_H 1 -int -SProcXGrabDevice( - ClientPtr /* client */ - ); - -int -ProcXGrabDevice( - ClientPtr /* client */ - ); - -int -CreateMaskFromList ( - ClientPtr /* client */, - XEventClass * /* list */, - int /* count */, - struct tmask /* mask */[], - DeviceIntPtr /* dev */, - int /* req */ - ); - -void -SRepXGrabDevice ( - ClientPtr /* client */, - int /* size */, - xGrabDeviceReply * /* rep */ - ); +int SProcXGrabDevice(ClientPtr /* client */ + ); + +int ProcXGrabDevice(ClientPtr /* client */ + ); + +int CreateMaskFromList(ClientPtr /* client */ , + XEventClass * /* list */ , + int /* count */ , + struct tmask /* mask */ [], + DeviceIntPtr /* dev */ , + int /* req */ + ); + +void SRepXGrabDevice(ClientPtr /* client */ , + int /* size */ , + xGrabDeviceReply * /* rep */ + ); #endif /* GRABDEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c index edf1d763b..922a819fc 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevb.c +++ b/nx-X11/programs/Xserver/Xi/grabdevb.c @@ -55,15 +55,15 @@ 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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "grabdev.h" @@ -76,9 +76,8 @@ SOFTWARE. */ int -SProcXGrabDeviceButton(client) - register ClientPtr client; - { +SProcXGrabDeviceButton(register ClientPtr client) +{ REQUEST(xGrabDeviceButtonReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq); @@ -89,8 +88,8 @@ SProcXGrabDeviceButton(client) stuff->event_count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return(ProcXGrabDeviceButton(client)); - } + return (ProcXGrabDeviceButton(client)); +} /*********************************************************************** * @@ -99,61 +98,55 @@ SProcXGrabDeviceButton(client) */ int -ProcXGrabDeviceButton(client) - ClientPtr client; - { - int ret; - DeviceIntPtr dev; - DeviceIntPtr mdev; - XEventClass *class; - struct tmask tmp[EMASKSIZE]; +ProcXGrabDeviceButton(ClientPtr client) +{ + int ret; + DeviceIntPtr dev; + DeviceIntPtr mdev; + XEventClass *class; + struct tmask tmp[EMASKSIZE]; REQUEST(xGrabDeviceButtonReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceButtonReq); - if (stuff->length !=(sizeof(xGrabDeviceButtonReq)>>2) + stuff->event_count) - { - SendErrorToClient (client, IReqCode, X_GrabDeviceButton, 0, BadLength); + if (stuff->length != + (sizeof(xGrabDeviceButtonReq) >> 2) + stuff->event_count) { + SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, BadLength); return Success; - } + } - dev = LookupDeviceIntRec (stuff->grabbed_device); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->grabbed_device); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, BadDevice); return Success; - } - if (stuff->modifier_device != UseXKeyboard) - { - mdev = LookupDeviceIntRec (stuff->modifier_device); - if (mdev == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, - BadDevice); + } + if (stuff->modifier_device != UseXKeyboard) { + mdev = LookupDeviceIntRec(stuff->modifier_device); + if (mdev == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, + BadDevice); return Success; - } - if (mdev->key == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, - BadMatch); + } + if (mdev->key == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, + BadMatch); return Success; - } } - else + } else mdev = (DeviceIntPtr) LookupKeyboardDevice(); class = (XEventClass *) (&stuff[1]); /* first word of values */ - if ((ret = CreateMaskFromList (client, class, - stuff->event_count, tmp, dev, X_GrabDeviceButton)) != Success) - return Success; - ret = GrabButton(client, dev, stuff->this_device_mode, - stuff->other_devices_mode, stuff->modifiers, mdev, stuff->button, - stuff->grabWindow, stuff->ownerEvents, (Cursor)0, (Window)0, - tmp[stuff->grabbed_device].mask); + if ((ret = CreateMaskFromList(client, class, + stuff->event_count, tmp, dev, + X_GrabDeviceButton)) != Success) + return Success; + ret = GrabButton(client, dev, stuff->this_device_mode, + stuff->other_devices_mode, stuff->modifiers, mdev, + stuff->button, stuff->grabWindow, stuff->ownerEvents, + (Cursor) 0, (Window) 0, tmp[stuff->grabbed_device].mask); if (ret != Success) SendErrorToClient(client, IReqCode, X_GrabDeviceButton, 0, ret); - return(Success); - } + return (Success); +} diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.h b/nx-X11/programs/Xserver/Xi/grabdevb.h index 29f0401e1..84a27b3d9 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevb.h +++ b/nx-X11/programs/Xserver/Xi/grabdevb.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GRABDEVB_H #define GRABDEVB_H 1 -int -SProcXGrabDeviceButton( - ClientPtr /* client */ - ); - -int -ProcXGrabDeviceButton( - ClientPtr /* client */ - ); +int SProcXGrabDeviceButton(ClientPtr /* client */ + ); + +int ProcXGrabDeviceButton(ClientPtr /* client */ + ); #endif /* GRABDEVB_H */ diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c index cc7d2f034..aceeec170 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.c +++ b/nx-X11/programs/Xserver/Xi/grabdevk.c @@ -55,15 +55,15 @@ 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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "grabdev.h" @@ -76,9 +76,8 @@ SOFTWARE. */ int -SProcXGrabDeviceKey(client) - register ClientPtr client; - { +SProcXGrabDeviceKey(register ClientPtr client) +{ REQUEST(xGrabDeviceKeyReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq); @@ -87,8 +86,8 @@ SProcXGrabDeviceKey(client) swaps(&stuff->event_count); REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count); - return(ProcXGrabDeviceKey(client)); - } + return (ProcXGrabDeviceKey(client)); +} /*********************************************************************** * @@ -97,66 +96,57 @@ SProcXGrabDeviceKey(client) */ int -ProcXGrabDeviceKey(client) - ClientPtr client; - { - int ret; - DeviceIntPtr dev; - DeviceIntPtr mdev; - XEventClass *class; - struct tmask tmp[EMASKSIZE]; +ProcXGrabDeviceKey(ClientPtr client) +{ + int ret; + DeviceIntPtr dev; + DeviceIntPtr mdev; + XEventClass *class; + struct tmask tmp[EMASKSIZE]; REQUEST(xGrabDeviceKeyReq); REQUEST_AT_LEAST_SIZE(xGrabDeviceKeyReq); - if (stuff->length !=(sizeof(xGrabDeviceKeyReq)>>2) + stuff->event_count) - { - SendErrorToClient (client, IReqCode, X_GrabDeviceKey, 0, BadLength); + if (stuff->length != (sizeof(xGrabDeviceKeyReq) >> 2) + stuff->event_count) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadLength); return Success; - } + } - dev = LookupDeviceIntRec (stuff->grabbed_device); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->grabbed_device); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadDevice); return Success; - } + } - if (stuff->modifier_device != UseXKeyboard) - { - mdev = LookupDeviceIntRec (stuff->modifier_device); - if (mdev == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, - BadDevice); + if (stuff->modifier_device != UseXKeyboard) { + mdev = LookupDeviceIntRec(stuff->modifier_device); + if (mdev == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadDevice); return Success; - } - if (mdev->key == NULL) - { - SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, - BadMatch); + } + if (mdev->key == NULL) { + SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, BadMatch); return Success; - } } - else + } else mdev = (DeviceIntPtr) LookupKeyboardDevice(); class = (XEventClass *) (&stuff[1]); /* first word of values */ - if ((ret = CreateMaskFromList (client, class, - stuff->event_count, tmp, dev, X_GrabDeviceKey)) != Success) - return Success; + if ((ret = CreateMaskFromList(client, class, + stuff->event_count, tmp, dev, + X_GrabDeviceKey)) != Success) + return Success; - ret = GrabKey(client, dev, stuff->this_device_mode, - stuff->other_devices_mode, stuff->modifiers, mdev, stuff->key, - stuff->grabWindow, stuff->ownerEvents, tmp[stuff->grabbed_device].mask); + ret = GrabKey(client, dev, stuff->this_device_mode, + stuff->other_devices_mode, stuff->modifiers, mdev, + stuff->key, stuff->grabWindow, stuff->ownerEvents, + tmp[stuff->grabbed_device].mask); - if (ret != Success) - { + if (ret != Success) { SendErrorToClient(client, IReqCode, X_GrabDeviceKey, 0, ret); - return Success; - } + return Success; + } return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.h b/nx-X11/programs/Xserver/Xi/grabdevk.h index baa2d1533..e34913628 100644 --- a/nx-X11/programs/Xserver/Xi/grabdevk.h +++ b/nx-X11/programs/Xserver/Xi/grabdevk.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GRABDEVK_H #define GRABDEVK_H 1 -int -SProcXGrabDeviceKey( - ClientPtr /* client */ - ); - -int -ProcXGrabDeviceKey( - ClientPtr /* client */ - ); +int SProcXGrabDeviceKey(ClientPtr /* client */ + ); + +int ProcXGrabDeviceKey(ClientPtr /* client */ + ); #endif /* GRABDEVK_H */ diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.c b/nx-X11/programs/Xserver/Xi/gtmotion.c index 9c04ca30e..72209d1b4 100644 --- a/nx-X11/programs/Xserver/Xi/gtmotion.c +++ b/nx-X11/programs/Xserver/Xi/gtmotion.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 "exevents.h" #include "exglobals.h" @@ -74,16 +74,15 @@ SOFTWARE. */ int -SProcXGetDeviceMotionEvents(client) -register ClientPtr client; - { +SProcXGetDeviceMotionEvents(register ClientPtr client) +{ REQUEST(xGetDeviceMotionEventsReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq); swapl(&stuff->start); swapl(&stuff->stop); - return(ProcXGetDeviceMotionEvents(client)); - } + return (ProcXGetDeviceMotionEvents(client)); +} /**************************************************************************** * @@ -92,36 +91,33 @@ register ClientPtr client; */ int -ProcXGetDeviceMotionEvents(client) - ClientPtr client; +ProcXGetDeviceMotionEvents(ClientPtr client) { INT32 *coords = NULL, *bufptr; xGetDeviceMotionEventsReply rep; unsigned long i; - int num_events, axes, size = 0, tsize; + int num_events, axes, size = 0, tsize; unsigned long nEvents; DeviceIntPtr dev; TimeStamp start, stop; - int length = 0; - ValuatorClassPtr v; + int length = 0; + ValuatorClassPtr v; REQUEST(xGetDeviceMotionEventsReq); REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, + BadDevice); return Success; - } + } v = dev->valuator; - if (v==NULL || v->numAxes == 0) - { - SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, - BadMatch); + if (v == NULL || v->numAxes == 0) { + SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, + BadMatch); return Success; - } + } if (dev->valuator->motionHintWindow) MaybeStopDeviceHint(dev, client); axes = v->numAxes; @@ -135,49 +131,43 @@ ProcXGetDeviceMotionEvents(client) start = ClientTimeToServerTime(stuff->start); stop = ClientTimeToServerTime(stuff->stop); if (CompareTimeStamps(start, stop) == LATER || - CompareTimeStamps(start, currentTime) == LATER) - { - WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep); - return Success; - } + CompareTimeStamps(start, currentTime) == LATER) { + WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep); + return Success; + } if (CompareTimeStamps(stop, currentTime) == LATER) - stop = currentTime; + stop = currentTime; num_events = v->numMotionEvents; - if (num_events) - { - size = sizeof(Time) + (axes * sizeof (INT32)); + if (num_events) { + size = sizeof(Time) + (axes * sizeof(INT32)); tsize = num_events * size; coords = (INT32 *) malloc(tsize); if (!coords) { - SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, - BadAlloc); + SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0, + BadAlloc); return Success; - } - rep.nEvents = (v->GetMotionProc) ( - dev, (xTimecoord *)coords, /* XXX */ - start.milliseconds, stop.milliseconds, (ScreenPtr)NULL); - } - if (rep.nEvents > 0) - { - length = (rep.nEvents * size +3) >> 2; - rep.length = length; } + rep.nEvents = (v->GetMotionProc) (dev, (xTimecoord *) coords, /* XXX */ + start.milliseconds, stop.milliseconds, + (ScreenPtr) NULL); + } + if (rep.nEvents > 0) { + length = (rep.nEvents * size + 3) >> 2; + rep.length = length; + } nEvents = rep.nEvents; WriteReplyToClient(client, sizeof(xGetDeviceMotionEventsReply), &rep); - if (nEvents) - { - if (client->swapped) - { + if (nEvents) { + if (client->swapped) { bufptr = coords; - for (i=0; i<nEvents * (axes+1); i++) - { + for (i = 0; i < nEvents * (axes + 1); i++) { swapl(bufptr); bufptr++; - } } + } WriteToClient(client, length * 4, coords); - } + } if (coords) free(coords); return Success; @@ -191,13 +181,11 @@ ProcXGetDeviceMotionEvents(client) */ void -SRepXGetDeviceMotionEvents (client, size, rep) - ClientPtr client; - int size; - xGetDeviceMotionEventsReply *rep; - { +SRepXGetDeviceMotionEvents(ClientPtr client, int size, + xGetDeviceMotionEventsReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); swapl(&rep->nEvents); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.h b/nx-X11/programs/Xserver/Xi/gtmotion.h index 986eb5bad..cdd8825cc 100644 --- a/nx-X11/programs/Xserver/Xi/gtmotion.h +++ b/nx-X11/programs/Xserver/Xi/gtmotion.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef GTMOTION_H #define GTMOTION_H 1 -int -SProcXGetDeviceMotionEvents( - ClientPtr /* client */ - ); - -int -ProcXGetDeviceMotionEvents( - ClientPtr /* client */ - ); - -void -SRepXGetDeviceMotionEvents ( - ClientPtr /* client */, - int /* size */, - xGetDeviceMotionEventsReply * /* rep */ - ); +int SProcXGetDeviceMotionEvents(ClientPtr /* client */ + ); + +int ProcXGetDeviceMotionEvents(ClientPtr /* client */ + ); + +void SRepXGetDeviceMotionEvents(ClientPtr /* client */ , + int /* size */ , + xGetDeviceMotionEventsReply * /* rep */ + ); #endif /* GTMOTION_H */ diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c index 95896d49d..bd62fa022 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.c +++ b/nx-X11/programs/Xserver/Xi/listdev.c @@ -55,19 +55,19 @@ 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 "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ -#include "exglobals.h" /* FIXME */ +#include "extinit.h" /* LookupDeviceIntRec */ +#include "exglobals.h" /* FIXME */ #include "listdev.h" -#define VPC 20 /* Max # valuators per chunk */ +#define VPC 20 /* Max # valuators per chunk */ /*********************************************************************** * @@ -76,13 +76,12 @@ SOFTWARE. */ int -SProcXListInputDevices(client) - register ClientPtr client; - { +SProcXListInputDevices(register ClientPtr client) +{ REQUEST(xListInputDevicesReq); swaps(&stuff->length); - return(ProcXListInputDevices(client)); - } + return (ProcXListInputDevices(client)); +} /*********************************************************************** * @@ -91,20 +90,19 @@ SProcXListInputDevices(client) */ int -ProcXListInputDevices (client) - register ClientPtr client; - { - xListInputDevicesReply rep; - int numdevs; - int namesize = 1; /* need 1 extra byte for strcpy */ - int size = 0; - int total_length; - char *devbuf; - char *classbuf; - char *namebuf; - char *savbuf; - xDeviceInfo *dev; - DeviceIntPtr d; +ProcXListInputDevices(register ClientPtr client) +{ + xListInputDevicesReply rep; + int numdevs; + int namesize = 1; /* need 1 extra byte for strcpy */ + int size = 0; + int total_length; + char *devbuf; + char *classbuf; + char *namebuf; + char *savbuf; + xDeviceInfo *dev; + DeviceIntPtr d; REQUEST_SIZE_MATCH(xListInputDevicesReq); @@ -114,33 +112,33 @@ ProcXListInputDevices (client) rep.length = 0; rep.sequenceNumber = client->sequence; - AddOtherInputDevices (); + AddOtherInputDevices(); numdevs = inputInfo.numDevices; - for (d=inputInfo.devices; d; d=d->next) - SizeDeviceInfo (d, &namesize, &size); - for (d=inputInfo.off_devices; d; d=d->next) - SizeDeviceInfo (d, &namesize, &size); + for (d = inputInfo.devices; d; d = d->next) + SizeDeviceInfo(d, &namesize, &size); + for (d = inputInfo.off_devices; d; d = d->next) + SizeDeviceInfo(d, &namesize, &size); - total_length = numdevs * sizeof (xDeviceInfo) + size + namesize; + total_length = numdevs * sizeof(xDeviceInfo) + size + namesize; devbuf = (char *) calloc (1, total_length); - classbuf = devbuf + (numdevs * sizeof (xDeviceInfo)); + classbuf = devbuf + (numdevs * sizeof(xDeviceInfo)); namebuf = classbuf + size; savbuf = devbuf; dev = (xDeviceInfoPtr) devbuf; - for (d=inputInfo.devices; d; d=d->next,dev++) - ListDeviceInfo (client, d, dev, &devbuf, &classbuf, &namebuf); - for (d=inputInfo.off_devices; d; d=d->next,dev++) - ListDeviceInfo (client, d, dev, &devbuf, &classbuf, &namebuf); + for (d = inputInfo.devices; d; d = d->next, dev++) + ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf); + for (d = inputInfo.off_devices; d; d = d->next, dev++) + ListDeviceInfo(client, d, dev, &devbuf, &classbuf, &namebuf); rep.ndevices = numdevs; rep.length = (total_length + 3) >> 2; - WriteReplyToClient (client, sizeof (xListInputDevicesReply), &rep); + WriteReplyToClient(client, sizeof(xListInputDevicesReply), &rep); WriteToClient(client, total_length, savbuf); - free (savbuf); + free(savbuf); return Success; - } +} /*********************************************************************** * @@ -150,27 +148,23 @@ ProcXListInputDevices (client) */ void -SizeDeviceInfo (d, namesize, size) - DeviceIntPtr d; - int *namesize; - int *size; - { +SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size) +{ int chunks; *namesize += 1; if (d->name) - *namesize += strlen (d->name); + *namesize += strlen(d->name); if (d->key != NULL) - *size += sizeof (xKeyInfo); + *size += sizeof(xKeyInfo); if (d->button != NULL) - *size += sizeof (xButtonInfo); - if (d->valuator != NULL) - { - chunks = ((int) d->valuator->numAxes + 19) / VPC; - *size += (chunks * sizeof(xValuatorInfo) + - d->valuator->numAxes * sizeof(xAxisInfo)); - } + *size += sizeof(xButtonInfo); + if (d->valuator != NULL) { + chunks = ((int)d->valuator->numAxes + 19) / VPC; + *size += (chunks * sizeof(xValuatorInfo) + + d->valuator->numAxes * sizeof(xAxisInfo)); } +} /*********************************************************************** * @@ -179,31 +173,24 @@ SizeDeviceInfo (d, namesize, size) */ void -ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) - ClientPtr client; - DeviceIntPtr d; - xDeviceInfoPtr dev; - char **devbuf; - char **classbuf; - char **namebuf; - { - CopyDeviceName (namebuf, d->name); - CopySwapDevice (client, d, 0, devbuf); - if (d->key != NULL) - { +ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev, + char **devbuf, char **classbuf, char **namebuf) +{ + CopyDeviceName(namebuf, d->name); + CopySwapDevice(client, d, 0, devbuf); + if (d->key != NULL) { CopySwapKeyClass(client, d->key, classbuf); dev->num_classes++; - } - if (d->button != NULL) - { + } + if (d->button != NULL) { CopySwapButtonClass(client, d->button, classbuf); dev->num_classes++; - } - if (d->valuator != NULL) - { - dev->num_classes += CopySwapValuatorClass(client, d->valuator, classbuf); - } } + if (d->valuator != NULL) { + dev->num_classes += + CopySwapValuatorClass(client, d->valuator, classbuf); + } +} /*********************************************************************** * @@ -216,24 +203,19 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) */ void -CopyDeviceName (namebuf, name) - char **namebuf; - char *name; - { - char *nameptr = (char *) *namebuf; - - if (name) - { - *nameptr++ = strlen (name); - strcpy (nameptr, name); - *namebuf += (strlen (name)+1); - } - else - { +CopyDeviceName(char **namebuf, char *name) +{ + char *nameptr = (char *)*namebuf; + + if (name) { + *nameptr++ = strlen(name); + strcpy(nameptr, name); + *namebuf += (strlen(name) + 1); + } else { *nameptr++ = 0; *namebuf += 1; - } } +} /*********************************************************************** * @@ -242,15 +224,12 @@ CopyDeviceName (namebuf, name) */ void -CopySwapDevice (client, d, num_classes, buf) - register ClientPtr client; - DeviceIntPtr d; - int num_classes; - char **buf; - { +CopySwapDevice(register ClientPtr client, DeviceIntPtr d, int num_classes, + char **buf) +{ xDeviceInfoPtr dev; - dev = (xDeviceInfoPtr) *buf; + dev = (xDeviceInfoPtr) * buf; dev->id = d->id; dev->type = d->type; @@ -261,12 +240,11 @@ CopySwapDevice (client, d, num_classes, buf) dev->use = IsXPointer; else dev->use = IsXExtensionDevice; - if (client->swapped) - { + if (client->swapped) { swapl(&dev->type); /* macro - braces are required */ - } - *buf += sizeof (xDeviceInfo); } + *buf += sizeof(xDeviceInfo); +} /*********************************************************************** * @@ -275,25 +253,21 @@ CopySwapDevice (client, d, num_classes, buf) */ void -CopySwapKeyClass (client, k, buf) - register ClientPtr client; - KeyClassPtr k; - char **buf; - { - xKeyInfoPtr k2; - - k2 = (xKeyInfoPtr) *buf; +CopySwapKeyClass(register ClientPtr client, KeyClassPtr k, char **buf) +{ + xKeyInfoPtr k2; + + k2 = (xKeyInfoPtr) * buf; k2->class = KeyClass; - k2->length = sizeof (xKeyInfo); + k2->length = sizeof(xKeyInfo); k2->min_keycode = k->curKeySyms.minKeyCode; k2->max_keycode = k->curKeySyms.maxKeyCode; k2->num_keys = k2->max_keycode - k2->min_keycode + 1; - if (client->swapped) - { + if (client->swapped) { swaps(&k2->num_keys); - } - *buf += sizeof (xKeyInfo); } + *buf += sizeof(xKeyInfo); +} /*********************************************************************** * @@ -302,23 +276,19 @@ CopySwapKeyClass (client, k, buf) */ void -CopySwapButtonClass (client, b, buf) - register ClientPtr client; - ButtonClassPtr b; - char **buf; - { - xButtonInfoPtr b2; - - b2 = (xButtonInfoPtr) *buf; +CopySwapButtonClass(register ClientPtr client, ButtonClassPtr b, char **buf) +{ + xButtonInfoPtr b2; + + b2 = (xButtonInfoPtr) * buf; b2->class = ButtonClass; - b2->length = sizeof (xButtonInfo); + b2->length = sizeof(xButtonInfo); b2->num_buttons = b->numButtons; - if (client->swapped) - { + if (client->swapped) { swaps(&b2->num_buttons); /* macro - braces are required */ - } - *buf += sizeof (xButtonInfo); } + *buf += sizeof(xButtonInfo); +} /*********************************************************************** * @@ -333,34 +303,31 @@ CopySwapButtonClass (client, b, buf) */ int -CopySwapValuatorClass (client, v, buf) - register ClientPtr client; - ValuatorClassPtr v; - char **buf; +CopySwapValuatorClass(register ClientPtr client, ValuatorClassPtr v, char **buf) { - int i, j, axes, t_axes; - xValuatorInfoPtr v2; - AxisInfo *a; - xAxisInfoPtr a2; + int i, j, axes, t_axes; + xValuatorInfoPtr v2; + AxisInfo *a; + xAxisInfoPtr a2; - for (i=0,axes=v->numAxes; i < ((v->numAxes+19)/VPC); i++, axes-=VPC) { + for (i = 0, axes = v->numAxes; i < ((v->numAxes + 19) / VPC); + i++, axes -= VPC) { t_axes = axes < VPC ? axes : VPC; if (t_axes < 0) t_axes = v->numAxes % VPC; - v2 = (xValuatorInfoPtr) *buf; + v2 = (xValuatorInfoPtr) * buf; v2->class = ValuatorClass; - v2->length = sizeof (xValuatorInfo) + t_axes * sizeof (xAxisInfo); - v2->num_axes = t_axes; - v2->mode = v->mode & DeviceMode; - v2->motion_buffer_size = v->numMotionEvents; - if (client->swapped) - { + v2->length = sizeof(xValuatorInfo) + t_axes * sizeof(xAxisInfo); + v2->num_axes = t_axes; + v2->mode = v->mode & DeviceMode; + v2->motion_buffer_size = v->numMotionEvents; + if (client->swapped) { swapl(&v2->motion_buffer_size); - } - *buf += sizeof (xValuatorInfo); + } + *buf += sizeof(xValuatorInfo); a = v->axes + (VPC * i); - a2 = (xAxisInfoPtr) *buf; - for (j=0; j<t_axes; j++) { + a2 = (xAxisInfoPtr) * buf; + for (j = 0; j < t_axes; j++) { a2->min_value = a->min_value; a2->max_value = a->max_value; a2->resolution = a->resolution; @@ -371,7 +338,7 @@ CopySwapValuatorClass (client, v, buf) } a2++; a++; - *buf += sizeof (xAxisInfo); + *buf += sizeof(xAxisInfo); } } return (i); @@ -385,12 +352,9 @@ CopySwapValuatorClass (client, v, buf) */ void -SRepXListInputDevices (client, size, rep) - ClientPtr client; - int size; - xListInputDevicesReply *rep; - { +SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/listdev.h b/nx-X11/programs/Xserver/Xi/listdev.h index 629dca215..bdd67ce70 100644 --- a/nx-X11/programs/Xserver/Xi/listdev.h +++ b/nx-X11/programs/Xserver/Xi/listdev.h @@ -30,73 +30,53 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef LISTDEV_H #define LISTDEV_H 1 -int -SProcXListInputDevices( - ClientPtr /* client */ - ); - -int -ProcXListInputDevices ( - ClientPtr /* client */ - ); - -void -SizeDeviceInfo ( - DeviceIntPtr /* d */, - int * /* namesize */, - int * /* size */ - ); - -void -ListDeviceInfo ( - ClientPtr /* client */, - DeviceIntPtr /* d */, - xDeviceInfoPtr /* dev */, - char ** /* devbuf */, - char ** /* classbuf */, - char ** /* namebuf */ - ); - -void -CopyDeviceName ( - char ** /* namebuf */, - char * /* name */ - ); - -void -CopySwapDevice ( - ClientPtr /* client */, - DeviceIntPtr /* d */, - int /* num_classes */, - char ** /* buf */ - ); - -void -CopySwapKeyClass ( - ClientPtr /* client */, - KeyClassPtr /* k */, - char ** /* buf */ - ); - -void -CopySwapButtonClass ( - ClientPtr /* client */, - ButtonClassPtr /* b */, - char ** /* buf */ - ); - -int -CopySwapValuatorClass ( - ClientPtr /* client */, - ValuatorClassPtr /* v */, - char ** /* buf */ - ); - -void -SRepXListInputDevices ( - ClientPtr /* client */, - int /* size */, - xListInputDevicesReply * /* rep */ - ); +int SProcXListInputDevices(ClientPtr /* client */ + ); + +int ProcXListInputDevices(ClientPtr /* client */ + ); + +void SizeDeviceInfo(DeviceIntPtr /* d */ , + int * /* namesize */ , + int * /* size */ + ); + +void ListDeviceInfo(ClientPtr /* client */ , + DeviceIntPtr /* d */ , + xDeviceInfoPtr /* dev */ , + char ** /* devbuf */ , + char ** /* classbuf */ , + char ** /* namebuf */ + ); + +void CopyDeviceName(char ** /* namebuf */ , + char * /* name */ + ); + +void CopySwapDevice(ClientPtr /* client */ , + DeviceIntPtr /* d */ , + int /* num_classes */ , + char ** /* buf */ + ); + +void CopySwapKeyClass(ClientPtr /* client */ , + KeyClassPtr /* k */ , + char ** /* buf */ + ); + +void CopySwapButtonClass(ClientPtr /* client */ , + ButtonClassPtr /* b */ , + char ** /* buf */ + ); + +int CopySwapValuatorClass(ClientPtr /* client */ , + ValuatorClassPtr /* v */ , + char ** /* buf */ + ); + +void SRepXListInputDevices(ClientPtr /* client */ , + int /* size */ , + xListInputDevicesReply * /* rep */ + ); #endif /* LISTDEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c index 1b0a2476b..5927546de 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.c +++ b/nx-X11/programs/Xserver/Xi/opendev.c @@ -55,20 +55,20 @@ 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 "XIstubs.h" -#include "windowstr.h" /* window structure */ +#include "windowstr.h" /* window structure */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "opendev.h" -extern CARD8 event_base []; +extern CARD8 event_base[]; /*********************************************************************** * @@ -78,13 +78,12 @@ extern CARD8 event_base []; */ int -SProcXOpenDevice(client) - register ClientPtr client; - { +SProcXOpenDevice(register ClientPtr client) +{ REQUEST(xOpenDeviceReq); swaps(&stuff->length); - return(ProcXOpenDevice(client)); - } + return (ProcXOpenDevice(client)); +} /*********************************************************************** * @@ -93,45 +92,40 @@ SProcXOpenDevice(client) */ int -ProcXOpenDevice(client) - register ClientPtr client; - { - xInputClassInfo evbase [numInputClasses]; +ProcXOpenDevice(register ClientPtr client) +{ + xInputClassInfo evbase[numInputClasses]; Bool enableit = FALSE; - int j=0; + int j = 0; int status = Success; - xOpenDeviceReply rep; + xOpenDeviceReply rep; DeviceIntPtr dev; REQUEST(xOpenDeviceReq); REQUEST_SIZE_MATCH(xOpenDeviceReq); - if (stuff->deviceid == inputInfo.pointer->id || - stuff->deviceid == inputInfo.keyboard->id) - { + if (stuff->deviceid == inputInfo.pointer->id || + stuff->deviceid == inputInfo.keyboard->id) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); - return Success; - } + return Success; + } - if ((dev = LookupDeviceIntRec(stuff->deviceid)) == NULL) /* not open */ - { - for (dev=inputInfo.off_devices; dev; dev=dev->next) + if ((dev = LookupDeviceIntRec(stuff->deviceid)) == NULL) { /* not open */ + for (dev = inputInfo.off_devices; dev; dev = dev->next) if (dev->id == stuff->deviceid) break; - if (dev == NULL) - { + if (dev == NULL) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); return Success; - } - enableit = TRUE; } + enableit = TRUE; + } - OpenInputDevice (dev, client, &status); - if (status != Success) - { + OpenInputDevice(dev, client, &status); + if (status != Success) { SendErrorToClient(client, IReqCode, X_OpenDevice, 0, status); return Success; - } + } if (enableit && dev->inited && dev->startup) (void)EnableDevice(dev); @@ -139,45 +133,39 @@ ProcXOpenDevice(client) rep.repType = X_Reply; rep.RepType = X_OpenDevice; rep.sequenceNumber = client->sequence; - if (dev->key != NULL) - { + if (dev->key != NULL) { evbase[j].class = KeyClass; evbase[j++].event_type_base = event_base[KeyClass]; - } - if (dev->button != NULL) - { + } + if (dev->button != NULL) { evbase[j].class = ButtonClass; evbase[j++].event_type_base = event_base[ButtonClass]; - } - if (dev->valuator != NULL) - { + } + if (dev->valuator != NULL) { evbase[j].class = ValuatorClass; evbase[j++].event_type_base = event_base[ValuatorClass]; - } + } if (dev->kbdfeed != NULL || dev->ptrfeed != NULL || dev->leds != NULL || - dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) - { + dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) { evbase[j].class = FeedbackClass; evbase[j++].event_type_base = event_base[FeedbackClass]; - } - if (dev->focus != NULL) - { + } + if (dev->focus != NULL) { evbase[j].class = FocusClass; evbase[j++].event_type_base = event_base[FocusClass]; - } - if (dev->proximity != NULL) - { + } + if (dev->proximity != NULL) { evbase[j].class = ProximityClass; evbase[j++].event_type_base = event_base[ProximityClass]; - } + } evbase[j].class = OtherClass; evbase[j++].event_type_base = event_base[OtherClass]; - rep.length = (j * sizeof (xInputClassInfo) + 3) >> 2; + rep.length = (j * sizeof(xInputClassInfo) + 3) >> 2; rep.num_classes = j; - WriteReplyToClient (client, sizeof (xOpenDeviceReply), &rep); + WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep); WriteToClient(client, j * sizeof (xInputClassInfo), evbase); return (Success); - } +} /*********************************************************************** * @@ -187,12 +175,9 @@ ProcXOpenDevice(client) */ void -SRepXOpenDevice (client, size, rep) - ClientPtr client; - int size; - xOpenDeviceReply *rep; - { +SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/opendev.h b/nx-X11/programs/Xserver/Xi/opendev.h index 68b89da4c..9665fe9cb 100644 --- a/nx-X11/programs/Xserver/Xi/opendev.h +++ b/nx-X11/programs/Xserver/Xi/opendev.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef OPENDEV_H #define OPENDEV_H 1 -int -SProcXOpenDevice( - ClientPtr /* client */ - ); - -int -ProcXOpenDevice( - ClientPtr /* client */ - ); - -void -SRepXOpenDevice ( - ClientPtr /* client */, - int /* size */, - xOpenDeviceReply * /* rep */ - ); +int SProcXOpenDevice(ClientPtr /* client */ + ); + +int ProcXOpenDevice(ClientPtr /* client */ + ); + +void SRepXOpenDevice(ClientPtr /* client */ , + int /* size */ , + xOpenDeviceReply * /* rep */ + ); #endif /* OPENDEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c index 4eeba4c5f..f7392f9fe 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.c +++ b/nx-X11/programs/Xserver/Xi/queryst.c @@ -36,14 +36,14 @@ from The Open Group. #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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" @@ -56,13 +56,12 @@ from The Open Group. */ int -SProcXQueryDeviceState(client) - register ClientPtr client; - { +SProcXQueryDeviceState(register ClientPtr client) +{ REQUEST(xQueryDeviceStateReq); swaps(&stuff->length); - return(ProcXQueryDeviceState(client)); - } + return (ProcXQueryDeviceState(client)); +} /*********************************************************************** * @@ -71,22 +70,21 @@ SProcXQueryDeviceState(client) */ int -ProcXQueryDeviceState(client) - register ClientPtr client; - { - int i; - int num_classes = 0; - int total_length = 0; - char *buf, *savbuf; - KeyClassPtr k; - xKeyState *tk; - ButtonClassPtr b; - xButtonState *tb; - ValuatorClassPtr v; - xValuatorState *tv; - xQueryDeviceStateReply rep; - DeviceIntPtr dev; - int *values; +ProcXQueryDeviceState(register ClientPtr client) +{ + int i; + int num_classes = 0; + int total_length = 0; + char *buf, *savbuf; + KeyClassPtr k; + xKeyState *tk; + ButtonClassPtr b; + xButtonState *tb; + ValuatorClassPtr v; + xValuatorState *tv; + xQueryDeviceStateReply rep; + DeviceIntPtr dev; + int *values; REQUEST(xQueryDeviceStateReq); REQUEST_SIZE_MATCH(xQueryDeviceStateReq); @@ -96,96 +94,83 @@ ProcXQueryDeviceState(client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadDevice); return Success; - } + } v = dev->valuator; if (v != NULL && v->motionHintWindow != NULL) MaybeStopDeviceHint(dev, client); k = dev->key; - if (k != NULL) - { - total_length += sizeof (xKeyState); + if (k != NULL) { + total_length += sizeof(xKeyState); num_classes++; - } + } b = dev->button; - if (b != NULL) - { - total_length += sizeof (xButtonState); + if (b != NULL) { + total_length += sizeof(xButtonState); num_classes++; - } + } - if (v != NULL) - { - total_length += (sizeof(xValuatorState) + - (v->numAxes * sizeof(int))); + if (v != NULL) { + total_length += (sizeof(xValuatorState) + (v->numAxes * sizeof(int))); num_classes++; - } - buf = (char *) malloc (total_length); - if (!buf) - { - SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, - BadAlloc); + } + buf = (char *)malloc(total_length); + if (!buf) { + SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0, BadAlloc); return Success; - } + } savbuf = buf; - if (k != NULL) - { + if (k != NULL) { tk = (xKeyState *) buf; tk->class = KeyClass; - tk->length = sizeof (xKeyState); + tk->length = sizeof(xKeyState); tk->num_keys = k->curKeySyms.maxKeyCode - k->curKeySyms.minKeyCode + 1; - for (i = 0; i<32; i++) + for (i = 0; i < 32; i++) tk->keys[i] = k->down[i]; - buf += sizeof (xKeyState); - } + buf += sizeof(xKeyState); + } - if (b != NULL) - { + if (b != NULL) { tb = (xButtonState *) buf; tb->class = ButtonClass; - tb->length = sizeof (xButtonState); + tb->length = sizeof(xButtonState); tb->num_buttons = b->numButtons; - for (i = 0; i<32; i++) + for (i = 0; i < 32; i++) tb->buttons[i] = b->down[i]; - buf += sizeof (xButtonState); - } + buf += sizeof(xButtonState); + } - if (v != NULL) - { + if (v != NULL) { tv = (xValuatorState *) buf; tv->class = ValuatorClass; - tv->length = sizeof (xValuatorState); + tv->length = sizeof(xValuatorState); tv->num_valuators = v->numAxes; tv->mode = v->mode; buf += sizeof(xValuatorState); - for (i=0, values=v->axisVal; i<v->numAxes; i++) - { - *((int *) buf) = *values++; - if (client->swapped) - { - swapl ((int *) buf);/* macro - braces needed */ - } - buf += sizeof(int); + for (i = 0, values = v->axisVal; i < v->numAxes; i++) { + *((int *)buf) = *values++; + if (client->swapped) { + swapl((int *)buf); /* macro - braces needed */ } + buf += sizeof(int); } + } rep.num_classes = num_classes; rep.length = (total_length + 3) >> 2; - WriteReplyToClient (client, sizeof(xQueryDeviceStateReply), &rep); + WriteReplyToClient(client, sizeof(xQueryDeviceStateReply), &rep); if (total_length > 0) - WriteToClient (client, total_length, savbuf); - free (savbuf); + WriteToClient(client, total_length, savbuf); + free(savbuf); return Success; - } +} /*********************************************************************** * @@ -195,12 +180,9 @@ ProcXQueryDeviceState(client) */ void -SRepXQueryDeviceState (client, size, rep) - ClientPtr client; - int size; - xQueryDeviceStateReply *rep; - { +SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/queryst.h b/nx-X11/programs/Xserver/Xi/queryst.h index 53378bb6c..9232ff666 100644 --- a/nx-X11/programs/Xserver/Xi/queryst.h +++ b/nx-X11/programs/Xserver/Xi/queryst.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef QUERYST_H #define QUERYST_H 1 -int -SProcXQueryDeviceState( - ClientPtr /* client */ - ); - -int -ProcXQueryDeviceState( - ClientPtr /* client */ - ); - -void -SRepXQueryDeviceState ( - ClientPtr /* client */, - int /* size */, - xQueryDeviceStateReply * /* rep */ - ); +int SProcXQueryDeviceState(ClientPtr /* client */ + ); + +int ProcXQueryDeviceState(ClientPtr /* client */ + ); + +void SRepXQueryDeviceState(ClientPtr /* client */ , + int /* size */ , + xQueryDeviceStateReply * /* rep */ + ); #endif /* QUERYST_H */ diff --git a/nx-X11/programs/Xserver/Xi/selectev.c b/nx-X11/programs/Xserver/Xi/selectev.c index 6887967ac..bb3d11b19 100644 --- a/nx-X11/programs/Xserver/Xi/selectev.c +++ b/nx-X11/programs/Xserver/Xi/selectev.c @@ -51,26 +51,27 @@ SOFTWARE. * */ + #ifdef HAVE_DIX_CONFIG_H #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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" #include "grabdev.h" #include "selectev.h" -extern Mask ExtExclusiveMasks[]; -extern Mask ExtValidMasks[]; +extern Mask ExtExclusiveMasks[]; +extern Mask ExtValidMasks[]; /*********************************************************************** * @@ -79,9 +80,8 @@ extern Mask ExtValidMasks[]; */ int -SProcXSelectExtensionEvent (client) -register ClientPtr client; - { +SProcXSelectExtensionEvent(register ClientPtr client) +{ REQUEST(xSelectExtensionEventReq); swaps(&stuff->length); REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); @@ -91,8 +91,8 @@ register ClientPtr client; stuff->count * sizeof(CARD32)); SwapLongs((CARD32 *) (&stuff[1]), stuff->count); - return(ProcXSelectExtensionEvent(client)); - } + return (ProcXSelectExtensionEvent(client)); +} /*********************************************************************** * @@ -101,48 +101,46 @@ register ClientPtr client; */ int -ProcXSelectExtensionEvent (client) - register ClientPtr client; - { - int ret; - int i; - WindowPtr pWin; - struct tmask tmp[EMASKSIZE]; +ProcXSelectExtensionEvent(register ClientPtr client) +{ + int ret; + int i; + WindowPtr pWin; + struct tmask tmp[EMASKSIZE]; REQUEST(xSelectExtensionEventReq); REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq); - if (stuff->length !=(sizeof(xSelectExtensionEventReq)>>2) + stuff->count) - { - SendErrorToClient (client, IReqCode, X_SelectExtensionEvent, 0, - BadLength); + if (stuff->length != (sizeof(xSelectExtensionEventReq) >> 2) + stuff->count) { + SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, + BadLength); return Success; - } + } - pWin = (WindowPtr) LookupWindow (stuff->window, client); - if (!pWin) - { + pWin = (WindowPtr) LookupWindow(stuff->window, client); + if (!pWin) { client->errorValue = stuff->window; - SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, - BadWindow); + SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, + BadWindow); return Success; - } + } - if ((ret = CreateMaskFromList (client, (XEventClass *)&stuff[1], - stuff->count, tmp, NULL, X_SelectExtensionEvent)) != Success) + if ((ret = CreateMaskFromList(client, (XEventClass *) & stuff[1], + stuff->count, tmp, NULL, + X_SelectExtensionEvent)) != Success) return Success; - for (i=0; i<EMASKSIZE; i++) - if (tmp[i].dev != NULL) - { - if ((ret = SelectForWindow((DeviceIntPtr)tmp[i].dev, pWin, client, tmp[i].mask, - ExtExclusiveMasks[i], ExtValidMasks[i])) != Success) - { - SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, - ret); + for (i = 0; i < EMASKSIZE; i++) + if (tmp[i].dev != NULL) { + if ((ret = + SelectForWindow((DeviceIntPtr) tmp[i].dev, pWin, client, + tmp[i].mask, ExtExclusiveMasks[i], + ExtValidMasks[i])) != Success) { + SendErrorToClient(client, IReqCode, X_SelectExtensionEvent, 0, + ret); return Success; - } } + } return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/selectev.h b/nx-X11/programs/Xserver/Xi/selectev.h index 69f8d65bc..60fb4476b 100644 --- a/nx-X11/programs/Xserver/Xi/selectev.h +++ b/nx-X11/programs/Xserver/Xi/selectev.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SELECTEV_H #define SELECTEV_H 1 -int -SProcXSelectExtensionEvent ( - ClientPtr /* client */ - ); - -int -ProcXSelectExtensionEvent ( - ClientPtr /* client */ - ); +int SProcXSelectExtensionEvent(ClientPtr /* client */ + ); + +int ProcXSelectExtensionEvent(ClientPtr /* client */ + ); #endif /* SELECTEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index a851c5120..ef7b9c4e9 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -56,21 +56,21 @@ 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 "windowstr.h" /* Window */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* Window */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" #include "grabdev.h" #include "sendexev.h" -extern int lastEvent; /* Defined in extension.c */ +extern int lastEvent; /* Defined in extension.c */ /*********************************************************************** * @@ -79,9 +79,8 @@ extern int lastEvent; /* Defined in extension.c */ */ int -SProcXSendExtensionEvent(client) - register ClientPtr client; - { +SProcXSendExtensionEvent(register ClientPtr client) +{ CARD32 *p; register int i; xEvent eventT; @@ -98,20 +97,19 @@ SProcXSendExtensionEvent(client) (stuff->num_events * (sizeof(xEvent) >> 2))) return BadLength; - eventP = (xEvent *) &stuff[1]; - for (i=0; i<stuff->num_events; i++,eventP++) - { + eventP = (xEvent *) & stuff[1]; + for (i = 0; i < stuff->num_events; i++, eventP++) { proc = EventSwapVector[eventP->u.u.type & 0177]; - if (proc == NotImplemented) /* no swapping proc; invalid event type? */ + if (proc == NotImplemented) /* no swapping proc; invalid event type? */ return (BadValue); - (*proc)(eventP, &eventT); + (*proc) (eventP, &eventT); *eventP = eventT; - } + } p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events); SwapLongs(p, stuff->count); - return(ProcXSendExtensionEvent(client)); - } + return (ProcXSendExtensionEvent(client)); +} /*********************************************************************** * @@ -121,33 +119,28 @@ SProcXSendExtensionEvent(client) */ int -ProcXSendExtensionEvent (client) - register ClientPtr client; - { - int ret; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; - struct tmask tmp[EMASKSIZE]; +ProcXSendExtensionEvent(register ClientPtr client) +{ + int ret; + DeviceIntPtr dev; + xEvent *first; + XEventClass *list; + struct tmask tmp[EMASKSIZE]; REQUEST(xSendExtensionEventReq); REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq); - if (stuff->length !=(sizeof(xSendExtensionEventReq)>>2) + stuff->count + - (stuff->num_events * (sizeof (xEvent) >> 2))) - { - SendErrorToClient (client, IReqCode, X_SendExtensionEvent, 0, - BadLength); + if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count + + (stuff->num_events * (sizeof(xEvent) >> 2))) { + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadLength); return Success; - } + } - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadDevice); return Success; - } + } /* the previous code here returned the unitialized variable ret, @@ -160,27 +153,25 @@ ProcXSendExtensionEvent (client) /* The client's event type must be one defined by an extension. */ - first = ((xEvent *) &stuff[1]); - if ( ! ((EXTENSION_EVENT_BASE <= first->u.u.type) && - (first->u.u.type < lastEvent)) ) - { + first = ((xEvent *) & stuff[1]); + if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && + (first->u.u.type < lastEvent))) { client->errorValue = first->u.u.type; - SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, - BadValue); + SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, BadValue); return Success; - } + } list = (XEventClass *) (first + stuff->num_events); - if ((ret = CreateMaskFromList (client, list, stuff->count, tmp, dev, - X_SendExtensionEvent)) != Success) + if ((ret = CreateMaskFromList(client, list, stuff->count, tmp, dev, + X_SendExtensionEvent)) != Success) return Success; - ret = (SendEvent (client, dev, stuff->destination, - stuff->propagate, (xEvent *)&stuff[1], tmp[stuff->deviceid].mask, - stuff->num_events)); + ret = (SendEvent(client, dev, stuff->destination, + stuff->propagate, (xEvent *) & stuff[1], + tmp[stuff->deviceid].mask, stuff->num_events)); if (ret != Success) SendErrorToClient(client, IReqCode, X_SendExtensionEvent, 0, ret); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/sendexev.h b/nx-X11/programs/Xserver/Xi/sendexev.h index e52eda6f1..e156f1ba2 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.h +++ b/nx-X11/programs/Xserver/Xi/sendexev.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SENDEXEV_H #define SENDEXEV_H 1 -int -SProcXSendExtensionEvent( - ClientPtr /* client */ - ); - -int -ProcXSendExtensionEvent( - ClientPtr /* client */ - ); +int SProcXSendExtensionEvent(ClientPtr /* client */ + ); + +int ProcXSendExtensionEvent(ClientPtr /* client */ + ); #endif /* SENDEXEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c index edaea78c7..d7a5b6782 100644 --- a/nx-X11/programs/Xserver/Xi/setbmap.c +++ b/nx-X11/programs/Xserver/Xi/setbmap.c @@ -58,14 +58,14 @@ 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 "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setbmap.h" @@ -77,13 +77,12 @@ SOFTWARE. */ int -SProcXSetDeviceButtonMapping(client) - register ClientPtr client; - { +SProcXSetDeviceButtonMapping(register ClientPtr client) +{ REQUEST(xSetDeviceButtonMappingReq); swaps(&stuff->length); - return(ProcXSetDeviceButtonMapping(client)); - } + return (ProcXSetDeviceButtonMapping(client)); +} /*********************************************************************** * @@ -92,23 +91,21 @@ SProcXSetDeviceButtonMapping(client) */ int -ProcXSetDeviceButtonMapping (client) - register ClientPtr client; - { - int ret; - xSetDeviceButtonMappingReply rep; +ProcXSetDeviceButtonMapping(register ClientPtr client) +{ + int ret; + xSetDeviceButtonMappingReply rep; DeviceIntPtr dev; REQUEST(xSetDeviceButtonMappingReq); REQUEST_AT_LEAST_SIZE(xSetDeviceButtonMappingReq); - if (stuff->length != (sizeof(xSetDeviceButtonMappingReq) + - stuff->map_length + 3)>>2) - { - SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, - BadLength); + if (stuff->length != (sizeof(xSetDeviceButtonMappingReq) + + stuff->map_length + 3) >> 2) { + SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, + BadLength); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_SetDeviceButtonMapping; @@ -116,32 +113,27 @@ ProcXSetDeviceButtonMapping (client) rep.sequenceNumber = client->sequence; rep.status = MappingSuccess; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, + BadDevice); return Success; - } + } - ret = SetButtonMapping (client, dev, stuff->map_length, (BYTE *)&stuff[1]); + ret = SetButtonMapping(client, dev, stuff->map_length, (BYTE *) & stuff[1]); - if (ret == BadValue || ret == BadMatch) - { - SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, - ret); + if (ret == BadValue || ret == BadMatch) { + SendErrorToClient(client, IReqCode, X_SetDeviceButtonMapping, 0, ret); return Success; - } - else - { + } else { rep.status = ret; WriteReplyToClient(client, sizeof(xSetDeviceButtonMappingReply), &rep); - } + } if (ret != MappingBusy) - SendDeviceMappingNotify(MappingPointer, 0, 0, dev); + SendDeviceMappingNotify(MappingPointer, 0, 0, dev); return Success; - } +} /*********************************************************************** * @@ -151,12 +143,10 @@ ProcXSetDeviceButtonMapping (client) */ void -SRepXSetDeviceButtonMapping (client, size, rep) - ClientPtr client; - int size; - xSetDeviceButtonMappingReply *rep; - { +SRepXSetDeviceButtonMapping(ClientPtr client, int size, + xSetDeviceButtonMappingReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/setbmap.h b/nx-X11/programs/Xserver/Xi/setbmap.h index 7dd00c416..20ad8e077 100644 --- a/nx-X11/programs/Xserver/Xi/setbmap.h +++ b/nx-X11/programs/Xserver/Xi/setbmap.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETBMAP_H #define SETBMAP_H 1 -int -SProcXSetDeviceButtonMapping( - ClientPtr /* client */ - ); - -int -ProcXSetDeviceButtonMapping( - ClientPtr /* client */ - ); - -void -SRepXSetDeviceButtonMapping( - ClientPtr /* client */, - int /* size */, - xSetDeviceButtonMappingReply * /* rep */ - ); +int SProcXSetDeviceButtonMapping(ClientPtr /* client */ + ); + +int ProcXSetDeviceButtonMapping(ClientPtr /* client */ + ); + +void SRepXSetDeviceButtonMapping(ClientPtr /* client */ , + int /* size */ , + xSetDeviceButtonMappingReply * /* rep */ + ); #endif /* SETBMAP_H */ diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c index bb6db7bcb..69a52757a 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.c +++ b/nx-X11/programs/Xserver/Xi/setdval.c @@ -55,14 +55,14 @@ 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 "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setdval.h" @@ -74,13 +74,12 @@ SOFTWARE. */ int -SProcXSetDeviceValuators(client) - register ClientPtr client; - { +SProcXSetDeviceValuators(register ClientPtr client) +{ REQUEST(xSetDeviceValuatorsReq); swaps(&stuff->length); - return(ProcXSetDeviceValuators(client)); - } + return (ProcXSetDeviceValuators(client)); +} /*********************************************************************** * @@ -89,11 +88,10 @@ SProcXSetDeviceValuators(client) */ int -ProcXSetDeviceValuators(client) - register ClientPtr client; - { +ProcXSetDeviceValuators(register ClientPtr client) +{ DeviceIntPtr dev; - xSetDeviceValuatorsReply rep; + xSetDeviceValuatorsReply rep; REQUEST(xSetDeviceValuatorsReq); REQUEST_AT_LEAST_SIZE(xSetDeviceValuatorsReq); @@ -104,48 +102,41 @@ ProcXSetDeviceValuators(client) rep.status = Success; rep.sequenceNumber = client->sequence; - if (stuff->length !=(sizeof(xSetDeviceValuatorsReq)>>2) + - stuff->num_valuators) - { - SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0, - BadLength); + if (stuff->length != (sizeof(xSetDeviceValuatorsReq) >> 2) + + stuff->num_valuators) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadLength); return Success; - } - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_SetDeviceValuators, 0, - BadDevice); + } + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadDevice); return Success; - } - if (dev->valuator == NULL) - { - SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, - BadMatch); + } + if (dev->valuator == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadMatch); return Success; - } + } - if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) - { - SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, - BadValue); + if (stuff->first_valuator + stuff->num_valuators > dev->valuator->numAxes) { + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, BadValue); return Success; - } + } if ((dev->grab) && !SameClient(dev->grab, client)) rep.status = AlreadyGrabbed; else - rep.status = SetDeviceValuators (client, dev, (int *) &stuff[1], - stuff->first_valuator, stuff->num_valuators); + rep.status = SetDeviceValuators(client, dev, (int *)&stuff[1], + stuff->first_valuator, + stuff->num_valuators); if (rep.status != Success && rep.status != AlreadyGrabbed) - SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, - rep.status); + SendErrorToClient(client, IReqCode, X_SetDeviceValuators, 0, + rep.status); else - WriteReplyToClient (client, sizeof (xSetDeviceValuatorsReply), &rep); + WriteReplyToClient(client, sizeof(xSetDeviceValuatorsReply), &rep); return Success; - } +} /*********************************************************************** * @@ -155,12 +146,10 @@ ProcXSetDeviceValuators(client) */ void -SRepXSetDeviceValuators (client, size, rep) - ClientPtr client; - int size; - xSetDeviceValuatorsReply *rep; - { +SRepXSetDeviceValuators(ClientPtr client, int size, + xSetDeviceValuatorsReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/setdval.h b/nx-X11/programs/Xserver/Xi/setdval.h index 2817b2688..40b431784 100644 --- a/nx-X11/programs/Xserver/Xi/setdval.h +++ b/nx-X11/programs/Xserver/Xi/setdval.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETDVAL_H #define SETDVAL_H 1 -int -SProcXSetDeviceValuators( - ClientPtr /* client */ - ); - -int -ProcXSetDeviceValuators( - ClientPtr /* client */ - ); - -void -SRepXSetDeviceValuators( - ClientPtr /* client */, - int /* size */, - xSetDeviceValuatorsReply * /* rep */ - ); +int SProcXSetDeviceValuators(ClientPtr /* client */ + ); + +int ProcXSetDeviceValuators(ClientPtr /* client */ + ); + +void SRepXSetDeviceValuators(ClientPtr /* client */ , + int /* size */ , + xSetDeviceValuatorsReply * /* rep */ + ); #endif /* SETDVAL_H */ diff --git a/nx-X11/programs/Xserver/Xi/setfocus.c b/nx-X11/programs/Xserver/Xi/setfocus.c index b88a9ba02..18ef2927e 100644 --- a/nx-X11/programs/Xserver/Xi/setfocus.c +++ b/nx-X11/programs/Xserver/Xi/setfocus.c @@ -55,17 +55,17 @@ SOFTWARE. #include <dix-config.h> #endif -#include <nx-X11/X.h> /* for inputstr.h */ -#include <nx-X11/Xproto.h> /* Request macro */ -#include "windowstr.h" /* focus struct */ -#include "inputstr.h" /* DeviceIntPtr */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "windowstr.h" /* focus struct */ +#include "inputstr.h" /* DeviceIntPtr */ #include <nx-X11/extensions/XI.h> #include <nx-X11/extensions/XIproto.h> #include "dixevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setfocus.h" @@ -77,16 +77,15 @@ SOFTWARE. */ int -SProcXSetDeviceFocus(client) - register ClientPtr client; - { +SProcXSetDeviceFocus(register ClientPtr client) +{ REQUEST(xSetDeviceFocusReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xSetDeviceFocusReq); swapl(&stuff->focus); swapl(&stuff->time); - return(ProcXSetDeviceFocus(client)); - } + return (ProcXSetDeviceFocus(client)); +} /*********************************************************************** * @@ -95,26 +94,24 @@ SProcXSetDeviceFocus(client) */ int -ProcXSetDeviceFocus(client) - register ClientPtr client; - { - int ret; - register DeviceIntPtr dev; +ProcXSetDeviceFocus(register ClientPtr client) +{ + int ret; + register DeviceIntPtr dev; REQUEST(xSetDeviceFocusReq); REQUEST_SIZE_MATCH(xSetDeviceFocusReq); - dev = LookupDeviceIntRec (stuff->device); - if (dev==NULL || !dev->focus) - { + dev = LookupDeviceIntRec(stuff->device); + if (dev == NULL || !dev->focus) { SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, BadDevice); return Success; - } + } - ret = SetInputFocus (client, dev, stuff->focus, stuff->revertTo, - stuff->time, TRUE); + ret = SetInputFocus(client, dev, stuff->focus, stuff->revertTo, + stuff->time, TRUE); if (ret != Success) SendErrorToClient(client, IReqCode, X_SetDeviceFocus, 0, ret); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/setfocus.h b/nx-X11/programs/Xserver/Xi/setfocus.h index 44f9457d7..3a49f8440 100644 --- a/nx-X11/programs/Xserver/Xi/setfocus.h +++ b/nx-X11/programs/Xserver/Xi/setfocus.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETFOCUS_H #define SETFOCUS_H 1 -int -SProcXSetDeviceFocus( - ClientPtr /* client */ - ); - -int -ProcXSetDeviceFocus( - ClientPtr /* client */ - ); +int SProcXSetDeviceFocus(ClientPtr /* client */ + ); + +int ProcXSetDeviceFocus(ClientPtr /* client */ + ); #endif /* SETFOCUS_H */ diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c index f50447952..74e08210e 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.c +++ b/nx-X11/programs/Xserver/Xi/setmmap.c @@ -55,14 +55,14 @@ 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 "exevents.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setmmap.h" @@ -75,13 +75,12 @@ SOFTWARE. */ int -SProcXSetDeviceModifierMapping(client) - register ClientPtr client; - { +SProcXSetDeviceModifierMapping(register ClientPtr client) +{ REQUEST(xSetDeviceModifierMappingReq); swaps(&stuff->length); - return(ProcXSetDeviceModifierMapping(client)); - } + return (ProcXSetDeviceModifierMapping(client)); +} /*********************************************************************** * @@ -90,24 +89,22 @@ SProcXSetDeviceModifierMapping(client) */ int -ProcXSetDeviceModifierMapping(client) - ClientPtr client; - { - int ret; - xSetDeviceModifierMappingReply rep; - DeviceIntPtr dev; - KeyClassPtr kp; - +ProcXSetDeviceModifierMapping(ClientPtr client) +{ + int ret; + xSetDeviceModifierMappingReply rep; + DeviceIntPtr dev; + KeyClassPtr kp; + REQUEST(xSetDeviceModifierMappingReq); REQUEST_AT_LEAST_SIZE(xSetDeviceModifierMappingReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_SetDeviceModifierMapping, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, + BadDevice); return Success; - } + } rep.repType = X_Reply; rep.RepType = X_SetDeviceModifierMapping; @@ -115,26 +112,24 @@ ProcXSetDeviceModifierMapping(client) rep.sequenceNumber = client->sequence; ret = SetModifierMapping(client, dev, stuff->length, - (sizeof (xSetDeviceModifierMappingReq)>>2), stuff->numKeyPerModifier, - (BYTE *)&stuff[1], &kp); + (sizeof(xSetDeviceModifierMappingReq) >> 2), + stuff->numKeyPerModifier, (BYTE *) & stuff[1], + &kp); - if (ret==MappingSuccess || ret==MappingBusy || ret==MappingFailed) - { + if (ret == MappingSuccess || ret == MappingBusy || ret == MappingFailed) { rep.success = ret; if (ret == MappingSuccess) - SendDeviceMappingNotify(MappingModifier, 0, 0, dev); - WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply),&rep); - } - else - { - if (ret==-1) - ret=BadValue; - SendErrorToClient (client, IReqCode, X_SetDeviceModifierMapping, 0,ret); - } - + SendDeviceMappingNotify(MappingModifier, 0, 0, dev); + WriteReplyToClient(client, sizeof(xSetDeviceModifierMappingReply), + &rep); + } else { + if (ret == -1) + ret = BadValue; + SendErrorToClient(client, IReqCode, X_SetDeviceModifierMapping, 0, ret); + } return Success; - } +} /*********************************************************************** * @@ -144,13 +139,10 @@ ProcXSetDeviceModifierMapping(client) */ void -SRepXSetDeviceModifierMapping (client, size, rep) - ClientPtr client; - int size; - xSetDeviceModifierMappingReply *rep; - { +SRepXSetDeviceModifierMapping(ClientPtr client, int size, + xSetDeviceModifierMappingReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } - +} diff --git a/nx-X11/programs/Xserver/Xi/setmmap.h b/nx-X11/programs/Xserver/Xi/setmmap.h index 7deb8bbf2..9b345da7c 100644 --- a/nx-X11/programs/Xserver/Xi/setmmap.h +++ b/nx-X11/programs/Xserver/Xi/setmmap.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETMMAP_H #define SETMMAP_H 1 -int -SProcXSetDeviceModifierMapping( - ClientPtr /* client */ - ); - -int -ProcXSetDeviceModifierMapping( - ClientPtr /* client */ - ); - -void -SRepXSetDeviceModifierMapping( - ClientPtr /* client */, - int /* size */, - xSetDeviceModifierMappingReply * /* rep */ - ); +int SProcXSetDeviceModifierMapping(ClientPtr /* client */ + ); + +int ProcXSetDeviceModifierMapping(ClientPtr /* client */ + ); + +void SRepXSetDeviceModifierMapping(ClientPtr /* client */ , + int /* size */ , + xSetDeviceModifierMappingReply * /* rep */ + ); #endif /* SETMMAP_H */ diff --git a/nx-X11/programs/Xserver/Xi/setmode.c b/nx-X11/programs/Xserver/Xi/setmode.c index 91287088d..4f6f81605 100644 --- a/nx-X11/programs/Xserver/Xi/setmode.c +++ b/nx-X11/programs/Xserver/Xi/setmode.c @@ -55,14 +55,14 @@ 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 "XIstubs.h" #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "setmode.h" @@ -74,13 +74,12 @@ SOFTWARE. */ int -SProcXSetDeviceMode(client) - register ClientPtr client; - { +SProcXSetDeviceMode(register ClientPtr client) +{ REQUEST(xSetDeviceModeReq); swaps(&stuff->length); - return(ProcXSetDeviceMode(client)); - } + return (ProcXSetDeviceMode(client)); +} /*********************************************************************** * @@ -89,11 +88,10 @@ SProcXSetDeviceMode(client) */ int -ProcXSetDeviceMode(client) - register ClientPtr client; - { +ProcXSetDeviceMode(register ClientPtr client) +{ DeviceIntPtr dev; - xSetDeviceModeReply rep; + xSetDeviceModeReply rep; REQUEST(xSetDeviceModeReq); REQUEST_SIZE_MATCH(xSetDeviceModeReq); @@ -103,33 +101,30 @@ ProcXSetDeviceMode(client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { - SendErrorToClient (client, IReqCode, X_SetDeviceMode, 0, BadDevice); + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, BadDevice); return Success; - } - if (dev->valuator == NULL) - { + } + if (dev->valuator == NULL) { SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, BadMatch); return Success; - } + } if ((dev->grab) && !SameClient(dev->grab, client)) rep.status = AlreadyGrabbed; else - rep.status = SetDeviceMode (client, dev, stuff->mode); + rep.status = SetDeviceMode(client, dev, stuff->mode); - if (rep.status == Success) - dev->valuator->mode = stuff->mode; - else if (rep.status != AlreadyGrabbed) - { + if (rep.status == Success) + dev->valuator->mode = stuff->mode; + else if (rep.status != AlreadyGrabbed) { SendErrorToClient(client, IReqCode, X_SetDeviceMode, 0, rep.status); - return Success; - } + return Success; + } - WriteReplyToClient (client, sizeof (xSetDeviceModeReply), &rep); + WriteReplyToClient(client, sizeof(xSetDeviceModeReply), &rep); return Success; - } +} /*********************************************************************** * @@ -139,12 +134,9 @@ ProcXSetDeviceMode(client) */ void -SRepXSetDeviceMode (client, size, rep) - ClientPtr client; - int size; - xSetDeviceModeReply *rep; - { +SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep) +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} diff --git a/nx-X11/programs/Xserver/Xi/setmode.h b/nx-X11/programs/Xserver/Xi/setmode.h index 95d90b7f4..021bfa02d 100644 --- a/nx-X11/programs/Xserver/Xi/setmode.h +++ b/nx-X11/programs/Xserver/Xi/setmode.h @@ -30,21 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef SETMODE_H #define SETMODE_H 1 -int -SProcXSetDeviceMode( - ClientPtr /* client */ - ); - -int -ProcXSetDeviceMode( - ClientPtr /* client */ - ); - -void -SRepXSetDeviceMode( - ClientPtr /* client */, - int /* size */, - xSetDeviceModeReply * /* rep */ - ); +int SProcXSetDeviceMode(ClientPtr /* client */ + ); + +int ProcXSetDeviceMode(ClientPtr /* client */ + ); + +void SRepXSetDeviceMode(ClientPtr /* client */ , + int /* size */ , + xSetDeviceModeReply * /* rep */ + ); #endif /* SETMODE_H */ diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c index e71db6051..e73785547 100644 --- a/nx-X11/programs/Xserver/Xi/stubs.c +++ b/nx-X11/programs/Xserver/Xi/stubs.c @@ -91,16 +91,13 @@ SOFTWARE. */ int -ChangeKeyboardDevice (old_dev, new_dev) - DeviceIntPtr old_dev; - DeviceIntPtr new_dev; - { +ChangeKeyboardDevice(DeviceIntPtr old_dev, DeviceIntPtr new_dev) +{ /*********************************************************************** DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c * **********************************************************************/ return BadMatch; - } - +} /*********************************************************************** * @@ -133,12 +130,9 @@ ChangeKeyboardDevice (old_dev, new_dev) */ int -ChangePointerDevice ( - DeviceIntPtr old_dev, - DeviceIntPtr new_dev, - unsigned char x, - unsigned char y) - { +ChangePointerDevice(DeviceIntPtr old_dev, + DeviceIntPtr new_dev, unsigned char x, unsigned char y) +{ /*********************************************************************** InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr* @@ -150,7 +144,7 @@ ChangePointerDevice ( axes_changed = FALSE; *************************************************************************/ return BadMatch; - } +} /*********************************************************************** * @@ -166,11 +160,9 @@ ChangePointerDevice ( */ void -CloseInputDevice (d, client) - DeviceIntPtr d; - ClientPtr client; - { - } +CloseInputDevice(DeviceIntPtr d, ClientPtr client) +{ +} /*********************************************************************** * @@ -199,8 +191,8 @@ CloseInputDevice (d, client) */ void -AddOtherInputDevices () - { +AddOtherInputDevices(void) +{ /********************************************************************** for each uninitialized device, do something like: @@ -214,7 +206,7 @@ AddOtherInputDevices () dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success); ************************************************************************/ - } +} /*********************************************************************** * @@ -239,12 +231,9 @@ AddOtherInputDevices () */ void -OpenInputDevice (dev, client, status) - DeviceIntPtr dev; - ClientPtr client; - int *status; - { - } +OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) +{ +} /**************************************************************************** * @@ -259,13 +248,10 @@ OpenInputDevice (dev, client, status) */ int -SetDeviceMode (client, dev, mode) - register ClientPtr client; - DeviceIntPtr dev; - int mode; - { +SetDeviceMode(register ClientPtr client, DeviceIntPtr dev, int mode) +{ return BadMatch; - } +} /**************************************************************************** * @@ -280,15 +266,11 @@ SetDeviceMode (client, dev, mode) */ int -SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators) - register ClientPtr client; - DeviceIntPtr dev; - int *valuators; - int first_valuator; - int num_valuators; - { +SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev, + int *valuators, int first_valuator, int num_valuators) +{ return BadMatch; - } +} /**************************************************************************** * @@ -299,16 +281,13 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators) */ int -ChangeDeviceControl (client, dev, control) - register ClientPtr client; - DeviceIntPtr dev; - xDeviceCtl *control; - { - switch (control->control) - { - case DEVICE_RESOLUTION: - return (BadMatch); - default: - return (BadMatch); - } +ChangeDeviceControl(register ClientPtr client, DeviceIntPtr dev, + xDeviceCtl * control) +{ + switch (control->control) { + case DEVICE_RESOLUTION: + return (BadMatch); + default: + return (BadMatch); } +} diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.c b/nx-X11/programs/Xserver/Xi/ungrdev.c index ea7f0f6f1..e84a1c3aa 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdev.c +++ b/nx-X11/programs/Xserver/Xi/ungrdev.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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #include <nx-X11/extensions/XIproto.h> #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ +#include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" #include "ungrdev.h" @@ -73,15 +73,14 @@ SOFTWARE. */ int -SProcXUngrabDevice(client) -register ClientPtr client; - { +SProcXUngrabDevice(register ClientPtr client) +{ REQUEST(xUngrabDeviceReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xUngrabDeviceReq); swapl(&stuff->time); - return(ProcXUngrabDevice(client)); - } + return (ProcXUngrabDevice(client)); +} /*********************************************************************** * @@ -90,28 +89,26 @@ register ClientPtr client; */ int -ProcXUngrabDevice(client) -register ClientPtr client; - { - DeviceIntPtr dev; - GrabPtr grab; - TimeStamp time; +ProcXUngrabDevice(register ClientPtr client) +{ + DeviceIntPtr dev; + GrabPtr grab; + TimeStamp time; REQUEST(xUngrabDeviceReq); REQUEST_SIZE_MATCH(xUngrabDeviceReq); - dev = LookupDeviceIntRec (stuff->deviceid); - if (dev == NULL) - { + dev = LookupDeviceIntRec(stuff->deviceid); + if (dev == NULL) { SendErrorToClient(client, IReqCode, X_UngrabDevice, 0, BadDevice); return Success; - } - grab = dev->grab; + } + grab = dev->grab; time = ClientTimeToServerTime(stuff->time); if ((CompareTimeStamps(time, currentTime) != LATER) && (CompareTimeStamps(time, dev->grabTime) != EARLIER) && (grab) && SameClient(grab, client)) - (*dev->DeactivateGrab)(dev); + (*dev->DeactivateGrab) (dev); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.h b/nx-X11/programs/Xserver/Xi/ungrdev.h index 6ecfa5f67..8e3c210a3 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdev.h +++ b/nx-X11/programs/Xserver/Xi/ungrdev.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef UNGRDEV_H #define UNGRDEV_H 1 -int -SProcXUngrabDevice( - ClientPtr /* client */ - ); - -int -ProcXUngrabDevice( - ClientPtr /* client */ - ); +int SProcXUngrabDevice(ClientPtr /* client */ + ); + +int ProcXUngrabDevice(ClientPtr /* client */ + ); #endif /* UNGRDEV_H */ diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.c b/nx-X11/programs/Xserver/Xi/ungrdevb.c index bbf3575ea..f5e086ef6 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevb.c +++ b/nx-X11/programs/Xserver/Xi/ungrdevb.c @@ -55,14 +55,14 @@ 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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #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 "dixgrabs.h" @@ -79,16 +79,15 @@ SOFTWARE. */ int -SProcXUngrabDeviceButton(client) - register ClientPtr client; - { +SProcXUngrabDeviceButton(register ClientPtr client) +{ REQUEST(xUngrabDeviceButtonReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xUngrabDeviceButtonReq); swapl(&stuff->grabWindow); swaps(&stuff->modifiers); - return(ProcXUngrabDeviceButton(client)); - } + return (ProcXUngrabDeviceButton(client)); +} /*********************************************************************** * @@ -97,65 +96,52 @@ SProcXUngrabDeviceButton(client) */ int -ProcXUngrabDeviceButton(client) - ClientPtr client; - { - DeviceIntPtr dev; - DeviceIntPtr mdev; - WindowPtr pWin; - GrabRec temporaryGrab; +ProcXUngrabDeviceButton(ClientPtr client) +{ + DeviceIntPtr dev; + DeviceIntPtr mdev; + WindowPtr pWin; + GrabRec temporaryGrab; REQUEST(xUngrabDeviceButtonReq); REQUEST_SIZE_MATCH(xUngrabDeviceButtonReq); - dev = LookupDeviceIntRec (stuff->grabbed_device); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->grabbed_device); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, BadDevice); return Success; - } - if (dev->button == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, - BadMatch); + } + if (dev->button == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, BadMatch); return Success; - } + } - if (stuff->modifier_device != UseXKeyboard) - { - mdev = LookupDeviceIntRec (stuff->modifier_device); - if (mdev == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, - BadDevice); + if (stuff->modifier_device != UseXKeyboard) { + mdev = LookupDeviceIntRec(stuff->modifier_device); + if (mdev == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, + BadDevice); return Success; - } - if (mdev->key == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, - BadMatch); + } + if (mdev->key == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, + BadMatch); return Success; - } } - else + } else mdev = (DeviceIntPtr) LookupKeyboardDevice(); pWin = LookupWindow(stuff->grabWindow, client); - if (!pWin) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, - BadWindow); + if (!pWin) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, BadWindow); return Success; - } + } if ((stuff->modifiers != AnyModifier) && - (stuff->modifiers & ~AllModifiersMask)) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, - BadValue); + (stuff->modifiers & ~AllModifiersMask)) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceButton, 0, BadValue); return Success; - } + } temporaryGrab.resource = client->clientAsMask; temporaryGrab.device = dev; @@ -169,4 +155,4 @@ ProcXUngrabDeviceButton(client) DeletePassiveGrabFromList(&temporaryGrab); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.h b/nx-X11/programs/Xserver/Xi/ungrdevb.h index 29dd761b5..400d61d9e 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevb.h +++ b/nx-X11/programs/Xserver/Xi/ungrdevb.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef UNGRDEVB_H #define UNGRDEVB_H 1 -int -SProcXUngrabDeviceButton( - ClientPtr /* client */ - ); - -int -ProcXUngrabDeviceButton( - ClientPtr /* client */ - ); +int SProcXUngrabDeviceButton(ClientPtr /* client */ + ); + +int ProcXUngrabDeviceButton(ClientPtr /* client */ + ); #endif /* UNGRDEVB_H */ diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.c b/nx-X11/programs/Xserver/Xi/ungrdevk.c index af3bb2348..42ebcd6ed 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevk.c +++ b/nx-X11/programs/Xserver/Xi/ungrdevk.c @@ -55,14 +55,14 @@ 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 "windowstr.h" /* window structure */ +#include <nx-X11/X.h> /* for inputstr.h */ +#include <nx-X11/Xproto.h> /* Request macro */ +#include "inputstr.h" /* DeviceIntPtr */ +#include "windowstr.h" /* window structure */ #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 "dixgrabs.h" @@ -79,16 +79,15 @@ SOFTWARE. */ int -SProcXUngrabDeviceKey(client) - register ClientPtr client; - { +SProcXUngrabDeviceKey(register ClientPtr client) +{ REQUEST(xUngrabDeviceKeyReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xUngrabDeviceKeyReq); swapl(&stuff->grabWindow); swaps(&stuff->modifiers); - return(ProcXUngrabDeviceKey(client)); - } + return (ProcXUngrabDeviceKey(client)); +} /*********************************************************************** * @@ -97,76 +96,61 @@ SProcXUngrabDeviceKey(client) */ int -ProcXUngrabDeviceKey(client) - ClientPtr client; - { - DeviceIntPtr dev; - DeviceIntPtr mdev; - WindowPtr pWin; - GrabRec temporaryGrab; +ProcXUngrabDeviceKey(ClientPtr client) +{ + DeviceIntPtr dev; + DeviceIntPtr mdev; + WindowPtr pWin; + GrabRec temporaryGrab; REQUEST(xUngrabDeviceKeyReq); REQUEST_SIZE_MATCH(xUngrabDeviceKeyReq); - dev = LookupDeviceIntRec (stuff->grabbed_device); - if (dev == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, - BadDevice); + dev = LookupDeviceIntRec(stuff->grabbed_device); + if (dev == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, BadDevice); return Success; - } - if (dev->key == NULL) - { + } + if (dev->key == NULL) { SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, BadMatch); return Success; - } + } - if (stuff->modifier_device != UseXKeyboard) - { - mdev = LookupDeviceIntRec (stuff->modifier_device); - if (mdev == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, - BadDevice); + if (stuff->modifier_device != UseXKeyboard) { + mdev = LookupDeviceIntRec(stuff->modifier_device); + if (mdev == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, + BadDevice); return Success; - } - if (mdev->key == NULL) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, - BadMatch); + } + if (mdev->key == NULL) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, BadMatch); return Success; - } } - else + } else mdev = (DeviceIntPtr) LookupKeyboardDevice(); pWin = LookupWindow(stuff->grabWindow, client); - if (!pWin) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, - BadWindow); + if (!pWin) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, BadWindow); return Success; - } + } if (((stuff->key > dev->key->curKeySyms.maxKeyCode) || (stuff->key < dev->key->curKeySyms.minKeyCode)) - && (stuff->key != AnyKey)) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, - BadValue); + && (stuff->key != AnyKey)) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, BadValue); return Success; - } + } if ((stuff->modifiers != AnyModifier) && - (stuff->modifiers & ~AllModifiersMask)) - { - SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, - BadValue); + (stuff->modifiers & ~AllModifiersMask)) { + SendErrorToClient(client, IReqCode, X_UngrabDeviceKey, 0, BadValue); return Success; - } + } temporaryGrab.resource = client->clientAsMask; temporaryGrab.device = dev; temporaryGrab.window = pWin; - temporaryGrab.type = DeviceKeyPress; + temporaryGrab.type = DeviceKeyPress; temporaryGrab.modifierDevice = mdev; temporaryGrab.modifiersDetail.exact = stuff->modifiers; temporaryGrab.modifiersDetail.pMask = NULL; @@ -175,4 +159,4 @@ ProcXUngrabDeviceKey(client) DeletePassiveGrabFromList(&temporaryGrab); return Success; - } +} diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.h b/nx-X11/programs/Xserver/Xi/ungrdevk.h index be383b519..9dec17a10 100644 --- a/nx-X11/programs/Xserver/Xi/ungrdevk.h +++ b/nx-X11/programs/Xserver/Xi/ungrdevk.h @@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef UNGRDEVK_H #define UNGRDEVK_H 1 -int -SProcXUngrabDeviceKey( - ClientPtr /* client */ - ); - -int -ProcXUngrabDeviceKey( - ClientPtr /* client */ - ); +int SProcXUngrabDeviceKey(ClientPtr /* client */ + ); + +int ProcXUngrabDeviceKey(ClientPtr /* client */ + ); #endif /* UNGRDEVK_H */ |