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

Merge remote branch 'whot/for-keith'

Browse Source
This commit is contained in:
Keith Packard 2010-02-24 09:59:19 -08:00
commit 780c95caf9
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/devices.c
View File

@ -2020,14 +2020,6 @@ ProcBell(ClientPtr client)
return BadValue;
}
/* Seems like no keyboard actually has the BellProc set. Returning
* BadDevice (previous code) will make apps crash badly. The man pages
* doesn't say anything about a BadDevice being returned either.
* So just quietly do nothing and pretend everything has worked.
*/
if (!keybd->kbdfeed->BellProc)
return Success;
newpercent = (base * stuff->percent) / 100;
if (stuff->percent < 0)
newpercent = base + newpercent;

5
dix/events.c
View File

@ -1414,11 +1414,6 @@ CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
thisDev->deviceGrab.sync.other = NullGrab;
}
/*
XXX: Direct slave grab won't freeze the paired master device.
The correct thing to do would be to freeze all SDs attached to the
paired master device.
*/
if (IsMaster(thisDev))
{
dev = GetPairedDevice(thisDev);