XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xkb: xkb.c: refactor to use c99 style declarations

Browse Source 
Signed-off-by: sesankm <26676400+sesankm@users.noreply.github.com>
This commit is contained in:
sesankm
2025-09-01 19:26:33 -05:00
committed by Enrico Weigelt
parent 61f9234ee8
commit 0e43e8c2aa
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
xkb/xkb.c
View File

@@ -616,33 +616,27 @@ ProcXkbGetState(ClientPtr client)
int
ProcXkbLatchLockState(ClientPtr client)
{
int status;
DeviceIntPtr dev, tmpd;
XkbStateRec oldState, *newState;
CARD16 changed;
xkbStateNotify sn;
XkbEventCauseRec cause;
REQUEST(xkbLatchLockStateReq);
REQUEST_SIZE_MATCH(xkbLatchLockStateReq);
if (!(client->xkbClientFlags & _XkbClientInitialized))
return BadAccess;
DeviceIntPtr dev;
CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
CHK_MASK_MATCH(0x01, stuff->affectModLocks, stuff->modLocks);
CHK_MASK_MATCH(0x01, stuff->affectModLatches, stuff->modLatches);
status = Success;
int status = Success;
for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
for (DeviceIntPtr tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
if ((tmpd == dev) ||
(!InputDevIsMaster(tmpd) && GetMaster(tmpd, MASTER_KEYBOARD) == dev)) {
if (!tmpd->key || !tmpd->key->xkbInfo)
continue;
oldState = tmpd->key->xkbInfo->state;
newState = &tmpd->key->xkbInfo->state;
XkbStateRec oldState = tmpd->key->xkbInfo->state;
XkbStateRec *newState = &tmpd->key->xkbInfo->state;
if (stuff->affectModLocks) {
newState->locked_mods &= ~stuff->affectModLocks;
newState->locked_mods |=
@@ -661,16 +655,19 @@ ProcXkbLatchLockState(ClientPtr client)
XkbComputeDerivedState(tmpd->key->xkbInfo);
changed = XkbStateChangedFlags(&oldState, newState);
CARD16 changed = XkbStateChangedFlags(&oldState, newState);
if (changed) {
sn.keycode = 0;
sn.eventType = 0;
sn.requestMajor = XkbReqCode;
sn.requestMinor = X_kbLatchLockState;
sn.changed = changed;
xkbStateNotify sn = {
.keycode = 0,
.eventType = 0,
.requestMajor = XkbReqCode,
.requestMinor = X_kbLatchLockState,
.changed = changed
};
XkbSendStateNotify(tmpd, &sn);
changed = XkbIndicatorsToUpdate(tmpd, changed, FALSE);
if (changed) {
XkbEventCauseRec cause;
XkbSetCauseXkbReq(&cause, X_kbLatchLockState, client);
XkbUpdateIndicators(tmpd, changed, TRUE, NULL, &cause);
}