Merge remote-tracking branch 'whot/for-keith'
This commit is contained in:
commit
3476eb3806
|
@ -1615,7 +1615,7 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
|
|||
/* Now turn the smooth-scrolling axes back into emulated button presses
|
||||
* for legacy clients, based on the integer delta between before and now */
|
||||
for (i = 0; i < valuator_mask_size(&mask); i++) {
|
||||
if (i >= pDev->valuator->numAxes)
|
||||
if ( !pDev->valuator || (i >= pDev->valuator->numAxes))
|
||||
break;
|
||||
|
||||
if (!valuator_mask_isset(&mask, i))
|
||||
|
|
|
@ -375,8 +375,10 @@ XkbResizeKeyType(XkbDescPtr xkb,
|
|||
nResize = 0;
|
||||
for (nTotal = 1, i = xkb->min_key_code; i <= xkb->max_key_code; i++) {
|
||||
width = XkbKeyGroupsWidth(xkb, i);
|
||||
if (width < type->num_levels)
|
||||
if (width < type->num_levels || width >= new_num_lvls) {
|
||||
nTotal += XkbKeyNumSyms(xkb,i);
|
||||
continue;
|
||||
}
|
||||
for (match = 0, g = XkbKeyNumGroups(xkb, i) - 1;
|
||||
(g >= 0) && (!match); g--) {
|
||||
if (XkbKeyKeyTypeIndex(xkb, i, g) == type_ndx) {
|
||||
|
@ -384,7 +386,7 @@ XkbResizeKeyType(XkbDescPtr xkb,
|
|||
match = 1;
|
||||
}
|
||||
}
|
||||
if ((!match) || (width >= new_num_lvls))
|
||||
if (!match)
|
||||
nTotal += XkbKeyNumSyms(xkb, i);
|
||||
else {
|
||||
nTotal += XkbKeyNumGroups(xkb, i) * new_num_lvls;
|
||||
|
|
Loading…
Reference in New Issue
Block a user