← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xorg-server/maverick

« back to all changes in this revision

Viewing changes to dix/devices.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Timo Aaltonen, Bryce Harrington
  • Date: 2010-03-24 12:04:20 UTC
  • mfrom: (1.1.32 upstream) (0.11.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100324120420-qbk5la526uy4k8xe
Tags: 2:1.7.6-1ubuntu1
https://launchpad.net/bugs/401045
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
* control: Drop the udeb, we don't need it for lucid.
* control: Relax/drop some build-deps caused by the udeb.

[Bryce Harrington]
* Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
  crash in FindGlyphByHash.
  (LP: #401045)
* Renumber patch 201_armel-drv-fallbacks.patch to 111

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/devices.c
2019
2019
        return BadValue;
2020
2020
    }
2021
2021
 
2022
 
    /* Seems like no keyboard actually has the BellProc set. Returning
2023
 
     * BadDevice (previous code) will make apps crash badly. The man pages
2024
 
     * doesn't say anything about a BadDevice being returned either.
2025
 
     * So just quietly do nothing and pretend everything has worked.
2026
 
     */
2027
 
    if (!keybd->kbdfeed->BellProc)
2028
 
        return Success;
2029
 
 
2030
2022
    newpercent = (base * stuff->percent) / 100;
2031
2023
    if (stuff->percent < 0)
2032
2024
        newpercent = base + newpercent;