andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: ProcXkbSetGeometry should work on all attached SDs.

Browse Source 
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
This commit is contained in:
Peter Hutterer 2008-08-01 16:41:40 +09:30
parent 5ba87c3327
commit d9ca9819e9
1 changed files with 71 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
xkb/xkb.c
View File

@ -5242,17 +5242,65 @@ char * wire;
return Success; return Success;
} }
/* FIXME: Needs to set geom on all core-sending devices. */ static int
int _XkbSetGeometry(ClientPtr client, DeviceIntPtr dev, xkbSetGeometryReq *stuff)
ProcXkbSetGeometry(ClientPtr client)
{ {
DeviceIntPtr dev;
XkbGeometryPtr geom,old;
XkbGeometrySizesRec sizes;
Status status;
XkbDescPtr xkb; XkbDescPtr xkb;
Bool new_name; Bool new_name;
xkbNewKeyboardNotify nkn; xkbNewKeyboardNotify nkn;
XkbGeometryPtr geom,old;
XkbGeometrySizesRec sizes;
Status status;
xkb= dev->key->xkbInfo->desc;
old= xkb->geom;
xkb->geom= NULL;
sizes.which= XkbGeomAllMask;
sizes.num_properties= stuff->nProperties;
sizes.num_colors= stuff->nColors;
sizes.num_shapes= stuff->nShapes;
sizes.num_sections= stuff->nSections;
sizes.num_doodads= stuff->nDoodads;
sizes.num_key_aliases= stuff->nKeyAliases;
if ((status= XkbAllocGeometry(xkb,&sizes))!=Success) {
xkb->geom= old;
return status;
}
geom= xkb->geom;
geom->name= stuff->name;
geom->width_mm= stuff->widthMM;
geom->height_mm= stuff->heightMM;
if ((status= _CheckSetGeom(geom,stuff,client))!=Success) {
XkbFreeGeometry(geom,XkbGeomAllMask,True);
xkb->geom= old;
return status;
}
new_name= (xkb->names->geometry!=geom->name);
xkb->names->geometry= geom->name;
if (old)
XkbFreeGeometry(old,XkbGeomAllMask,True);
if (new_name) {
xkbNamesNotify nn;
bzero(&nn,sizeof(xkbNamesNotify));
nn.changed= XkbGeometryNameMask;
XkbSendNamesNotify(dev,&nn);
}
nkn.deviceID= nkn.oldDeviceID= dev->id;
nkn.minKeyCode= nkn.oldMinKeyCode= xkb->min_key_code;
nkn.maxKeyCode= nkn.oldMaxKeyCode= xkb->max_key_code;
nkn.requestMajor= XkbReqCode;
nkn.requestMinor= X_kbSetGeometry;
nkn.changed= XkbNKN_GeometryMask;
XkbSendNewKeyboardNotify(dev,&nkn);
return Success;
}
int
ProcXkbSetGeometry(ClientPtr client)
{
DeviceIntPtr dev;
int rc;
REQUEST(xkbSetGeometryReq); REQUEST(xkbSetGeometryReq);
REQUEST_AT_LEAST_SIZE(xkbSetGeometryReq); REQUEST_AT_LEAST_SIZE(xkbSetGeometryReq);
@ -5263,47 +5311,24 @@ ProcXkbSetGeometry(ClientPtr client)
CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess); CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess);
CHK_ATOM_OR_NONE(stuff->name); CHK_ATOM_OR_NONE(stuff->name);
xkb= dev->key->xkbInfo->desc; rc = _XkbSetGeometry(client, dev, stuff);
old= xkb->geom; if (rc != Success)
xkb->geom= NULL; return rc;
sizes.which= XkbGeomAllMask; if (stuff->deviceSpec == XkbUseCoreKbd)
sizes.num_properties= stuff->nProperties; {
sizes.num_colors= stuff->nColors; DeviceIntPtr other;
sizes.num_shapes= stuff->nShapes; for (other = inputInfo.devices; other; other = other->next)
sizes.num_sections= stuff->nSections; {
sizes.num_doodads= stuff->nDoodads; if ((other != dev) && other->key && !other->isMaster && (other->u.master == dev))
sizes.num_key_aliases= stuff->nKeyAliases; {
if ((status= XkbAllocGeometry(xkb,&sizes))!=Success) { rc = XaceHook(XACE_DEVICE_ACCESS, client, other, DixManageAccess);
xkb->geom= old; if (rc == Success)
return status; _XkbSetGeometry(client, other, stuff);
}
}
} }
geom= xkb->geom;
geom->name= stuff->name;
geom->width_mm= stuff->widthMM;
geom->height_mm= stuff->heightMM;
if ((status= _CheckSetGeom(geom,stuff,client))!=Success) {
XkbFreeGeometry(geom,XkbGeomAllMask,True);
xkb->geom= old;
return status;
}
new_name= (xkb->names->geometry!=geom->name);
xkb->names->geometry= geom->name;
if (old)
XkbFreeGeometry(old,XkbGeomAllMask,True);
if (new_name) {
xkbNamesNotify nn;
bzero(&nn,sizeof(xkbNamesNotify));
nn.changed= XkbGeometryNameMask;
XkbSendNamesNotify(dev,&nn);
}
nkn.deviceID= nkn.oldDeviceID= dev->id;
nkn.minKeyCode= nkn.oldMinKeyCode= xkb->min_key_code;
nkn.maxKeyCode= nkn.oldMaxKeyCode= xkb->max_key_code;
nkn.requestMajor= XkbReqCode;
nkn.requestMinor= X_kbSetGeometry;
nkn.changed= XkbNKN_GeometryMask;
XkbSendNewKeyboardNotify(dev,&nkn);
return Success; return Success;
} }