frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2010-10-19 22:50:15 -07:00
parent 8806a04f7f 9872e0f011
commit d738175eaf
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/common/xf86DGA.c
View File

@ -1133,6 +1133,10 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
ev.root_x = event->dx; ev.root_x = event->dx;
ev.root_y = event->dy; ev.root_y = event->dy;
ev.corestate = event->state; ev.corestate = event->state;
/* DGA is core only, so valuators.data doesn't actually matter.
* Mask must be set for EventToCore to create motion events. */
SetBit(ev.valuators.mask, 0);
SetBit(ev.valuators.mask, 1);
DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE); DeliverGrabbedEvent ((InternalEvent*)&ev, mouse, FALSE);
} }
} }

37
xkb/xkb.c
View File

@ -1677,20 +1677,6 @@ xkbSymMapWireDesc* wire = *wireRtrn;
if (!(XkbKeySymsMask&req->present)) if (!(XkbKeySymsMask&req->present))
return 1; return 1;
CHK_REQ_KEY_RANGE2(0x11,req->firstKeySym,req->nKeySyms,req,(*errorRtrn),0); CHK_REQ_KEY_RANGE2(0x11,req->firstKeySym,req->nKeySyms,req,(*errorRtrn),0);
map = &xkb->map->key_sym_map[xkb->min_key_code];
for (i=xkb->min_key_code;i<(unsigned)req->firstKeySym;i++,map++) {
register int g,ng,w;
ng= XkbNumGroups(map->group_info);
for (w=g=0;g<ng;g++) {
if (map->kt_index[g]>=(unsigned)nTypes) {
*errorRtrn = _XkbErrCode4(0x13,i,g,map->kt_index[g]);
return 0;
}
if (mapWidths[map->kt_index[g]]>w)
w= mapWidths[map->kt_index[g]];
}
symsPerKey[i] = w*ng;
}
for (i=0;i<req->nKeySyms;i++) { for (i=0;i<req->nKeySyms;i++) {
KeySym *pSyms; KeySym *pSyms;
register unsigned nG; register unsigned nG;
@ -2343,8 +2329,10 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq *req, char* va
XkbDescPtr xkb; XkbDescPtr xkb;
int error; int error;
int nTypes = 0, nActions; int nTypes = 0, nActions;
CARD8 mapWidths[XkbMaxLegalKeyCode + 1]; CARD8 mapWidths[XkbMaxLegalKeyCode + 1] = {0};
CARD16 symsPerKey[XkbMaxLegalKeyCode + 1]; CARD16 symsPerKey[XkbMaxLegalKeyCode + 1] = {0};
XkbSymMapPtr map;
int i;
xkbi= dev->key->xkbInfo; xkbi= dev->key->xkbInfo;
xkb = xkbi->desc; xkb = xkbi->desc;
@ -2373,6 +2361,23 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq *req, char* va
client->errorValue = nTypes; client->errorValue = nTypes;
return BadValue; return BadValue;
} }
/* symsPerKey/mapWidths must be filled regardless of client-side flags */
map = &xkb->map->key_sym_map[xkb->min_key_code];
for (i=xkb->min_key_code;i<xkb->max_key_code;i++,map++) {
register int g,ng,w;
ng= XkbNumGroups(map->group_info);
for (w=g=0;g<ng;g++) {
if (map->kt_index[g]>=(unsigned)nTypes) {
client->errorValue = _XkbErrCode4(0x13,i,g,map->kt_index[g]);
return 0;
}
if (mapWidths[map->kt_index[g]]>w)
w= mapWidths[map->kt_index[g]];
}
symsPerKey[i] = w*ng;
}
if ((req->present & XkbKeySymsMask) && if ((req->present & XkbKeySymsMask) &&
(!CheckKeySyms(client,xkb,req,nTypes,mapWidths,symsPerKey, (!CheckKeySyms(client,xkb,req,nTypes,mapWidths,symsPerKey,
(xkbSymMapWireDesc **)&values,&error))) { (xkbSymMapWireDesc **)&values,&error))) {