Merge remote-tracking branch 'whot/for-keith'
This commit is contained in:
commit
6bd7ad9144
|
@ -1475,7 +1475,6 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
|
||||||
PtrFeedbackPtr feedc;
|
PtrFeedbackPtr feedc;
|
||||||
|
|
||||||
BUG_RETURN_VAL(dev == NULL, FALSE);
|
BUG_RETURN_VAL(dev == NULL, FALSE);
|
||||||
BUG_RETURN_VAL(dev->ptrfeed != NULL, FALSE);
|
|
||||||
|
|
||||||
feedc = malloc(sizeof(PtrFeedbackClassRec));
|
feedc = malloc(sizeof(PtrFeedbackClassRec));
|
||||||
if (!feedc)
|
if (!feedc)
|
||||||
|
@ -1519,7 +1518,6 @@ InitStringFeedbackClassDeviceStruct(DeviceIntPtr dev,
|
||||||
StringFeedbackPtr feedc;
|
StringFeedbackPtr feedc;
|
||||||
|
|
||||||
BUG_RETURN_VAL(dev == NULL, FALSE);
|
BUG_RETURN_VAL(dev == NULL, FALSE);
|
||||||
BUG_RETURN_VAL(dev->stringfeed != NULL, FALSE);
|
|
||||||
|
|
||||||
feedc = malloc(sizeof(StringFeedbackClassRec));
|
feedc = malloc(sizeof(StringFeedbackClassRec));
|
||||||
if (!feedc)
|
if (!feedc)
|
||||||
|
@ -1556,7 +1554,6 @@ InitBellFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
|
||||||
BellFeedbackPtr feedc;
|
BellFeedbackPtr feedc;
|
||||||
|
|
||||||
BUG_RETURN_VAL(dev == NULL, FALSE);
|
BUG_RETURN_VAL(dev == NULL, FALSE);
|
||||||
BUG_RETURN_VAL(dev->bell != NULL, FALSE);
|
|
||||||
|
|
||||||
feedc = malloc(sizeof(BellFeedbackClassRec));
|
feedc = malloc(sizeof(BellFeedbackClassRec));
|
||||||
if (!feedc)
|
if (!feedc)
|
||||||
|
@ -1578,7 +1575,6 @@ InitLedFeedbackClassDeviceStruct(DeviceIntPtr dev, LedCtrlProcPtr controlProc)
|
||||||
LedFeedbackPtr feedc;
|
LedFeedbackPtr feedc;
|
||||||
|
|
||||||
BUG_RETURN_VAL(dev == NULL, FALSE);
|
BUG_RETURN_VAL(dev == NULL, FALSE);
|
||||||
BUG_RETURN_VAL(dev->leds != NULL, FALSE);
|
|
||||||
|
|
||||||
feedc = malloc(sizeof(LedFeedbackClassRec));
|
feedc = malloc(sizeof(LedFeedbackClassRec));
|
||||||
if (!feedc)
|
if (!feedc)
|
||||||
|
@ -1601,7 +1597,6 @@ InitIntegerFeedbackClassDeviceStruct(DeviceIntPtr dev,
|
||||||
IntegerFeedbackPtr feedc;
|
IntegerFeedbackPtr feedc;
|
||||||
|
|
||||||
BUG_RETURN_VAL(dev == NULL, FALSE);
|
BUG_RETURN_VAL(dev == NULL, FALSE);
|
||||||
BUG_RETURN_VAL(dev->intfeed != NULL, FALSE);
|
|
||||||
|
|
||||||
feedc = malloc(sizeof(IntegerFeedbackClassRec));
|
feedc = malloc(sizeof(IntegerFeedbackClassRec));
|
||||||
if (!feedc)
|
if (!feedc)
|
||||||
|
|
|
@ -4260,12 +4260,6 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
|
||||||
thisDev);
|
thisDev);
|
||||||
}
|
}
|
||||||
if (!deliveries) {
|
if (!deliveries) {
|
||||||
/* XXX: In theory, we could pass the internal events through to
|
|
||||||
* everything and only convert just before hitting the wire. We can't
|
|
||||||
* do that yet, so DGE is the last stop for internal events. From here
|
|
||||||
* onwards, we deal with core/XI events.
|
|
||||||
*/
|
|
||||||
|
|
||||||
sendCore = (IsMaster(thisDev) && thisDev->coreEvents);
|
sendCore = (IsMaster(thisDev) && thisDev->coreEvents);
|
||||||
/* try core event */
|
/* try core event */
|
||||||
if ((sendCore && grab->grabtype == CORE) || grab->grabtype != CORE)
|
if ((sendCore && grab->grabtype == CORE) || grab->grabtype != CORE)
|
||||||
|
|
Loading…
Reference in New Issue