diff options
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/chgkbd.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xi/chgkbd.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c index 20f743b7c..c97293f88 100644 --- a/nx-X11/programs/Xserver/Xi/chgkbd.c +++ b/nx-X11/programs/Xserver/Xi/chgkbd.c @@ -80,12 +80,12 @@ SOFTWARE. int SProcXChangeKeyboardDevice(client) register ClientPtr client; - { +{ REQUEST(xChangeKeyboardDeviceReq); swaps(&stuff->length); REQUEST_SIZE_MATCH(xChangeKeyboardDeviceReq); - return(ProcXChangeKeyboardDevice(client)); - } + return (ProcXChangeKeyboardDevice(client)); +} /*********************************************************************** * @@ -97,15 +97,15 @@ 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; +{ + 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,29 +115,29 @@ ProcXChangeKeyboardDevice (client) rep.length = 0; rep.sequenceNumber = client->sequence; - dev = LookupDeviceIntRec (stuff->deviceid); + 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) { 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; @@ -145,15 +145,15 @@ ProcXChangeKeyboardDevice (client) { if (ChangeKeyboardDevice (xkbd, dev) != Success) { - SendErrorToClient(client, IReqCode, X_ChangeKeyboardDevice, 0, - BadDevice); + 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; @@ -161,33 +161,33 @@ ProcXChangeKeyboardDevice (client) df->traceGood = xf->traceGood; if (df->traceSize != xf->traceSize) { - Must_have_memory = TRUE; /* XXX */ - df->trace = (WindowPtr *) realloc(df->trace, + Must_have_memory = TRUE; /* XXX */ + df->trace = (WindowPtr *) realloc(df->trace, xf->traceSize * sizeof(WindowPtr)); - Must_have_memory = FALSE; /* XXX */ - } + 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, + 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); return Success; - } +} /*********************************************************************** * @@ -201,8 +201,8 @@ SRepXChangeKeyboardDevice (client, size, rep) ClientPtr client; int size; xChangeKeyboardDeviceReply *rep; - { +{ swaps(&rep->sequenceNumber); swapl(&rep->length); WriteToClient(client, size, rep); - } +} |