Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 15, 2010
  1. @whot

    test: compare byte padding macros against the expected bytes.

    whot authored
    We calculate the expected bytes for each value, let's use it.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit f49ee90)
  2. @ejsherry @whot

    Xi: Fix master button update when slave buttons are mapped. #24887

    ejsherry authored whot committed
    It is currently assumed that an event button delieved to a master device
    corresponds to the slave button states. However, the event button is a
    logical (mapped) slave button and slave button states correspond to
    physical (unmapped) slave buttons. This leads to incorrect update of the
    master button state and incorrect events devlivered to clients. Fix the
    situation by taking the slave button map into account when querying a
    slave button state.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24887
    
    Signed-off-by: Eoghan Sherry <ejsherry@gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 36b614d)
  3. @whot

    mi: handle DGA subtypes when determining the master device.

    whot authored
    The subtype in the DGA event is the core type and all ET_ event types (where
    applicable) are identical to the core types. Thus the switch statement below
    will work as required and assign the right master device.
    
    Fixes a crasher bug on keyboard devices with valuators. If a device sends a
    motion event while grabbed and a DGA client is active (but has not selected
    input through DGA), the valuator event is posted through the VCK and
    eventually results in a NULL-pointer dereference on dev->valuator.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 31ab9f8)
  4. @jeremyhu

    XQuartz GL: Add $(GL_CFLAGS) to CFLAGS

    jeremyhu authored
    This fixes a build failure I found on tinderbox.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit f641e4b)
Commits on Dec 13, 2010
  1. @jeremyhu

    XQuartz: Just NSBeep() for XBell()

    jeremyhu authored
    The CoreAudio path uses deprecated API and has reported crashes that
    aren't worth fixing (4e8bf12 fixed
    one and introduced another).  NSBeep() does the job just fine.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit 883039e)
  2. @jeremyhu

    Version bumped to 1.9.3

    jeremyhu authored
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Commits on Dec 4, 2010
  1. @jeremyhu

    Version bumped to 1.9.2.902 (1.9.3 RC2)

    jeremyhu authored
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  2. @jeremyhu

    XQuartz: RandR: Fix mode changing for multi-monitor configurations.

    jeremyhu authored
    This just fixes the regression whereby we couldn't switch between the legacy
    fullscreen mode and rootless on multi-monitor configurations.  This was
    happening because ref wasn't being set in these cases (since we don't ever
    actually change CG modes), so we failed a CFEqual.  Setting the references
    fixes this regression and places us one step closer to more mode RandR
    mode switching in multi-monitor configurations.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit 714b68d)
  3. @jeremyhu

    XQuartz: Cleanup some compiler warnings

    jeremyhu authored
    Mark __crashreporter_info__ as __attribute__((__used__))
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit 14f0044)
  4. @jeremyhu

    XQuartz: Disable the Mac OS X screensaver when in full screen mode

    jeremyhu authored
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit ca43137)
  5. @npen @jeremyhu

    Fix Xdmx and Xephyr build when DTrace support is enabled

    npen authored jeremyhu committed
    This fixes the following build errors when DTrace is enabled
    (--with-dtrace):
    
      CCLD   Xdmx
    /usr/bin/ld: ../../os/os.O: undefined reference to symbol 'dladdr@@GLIBC_2.2.5'
    /usr/bin/ld: note: 'dladdr@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line
    
      CCLD   Xephyr
    ../../../os/os.O: In function `TimerForce':
    /home/nico/work/xserver/os/WaitFor.c:481: multiple definition of `TimerForce'
    ../../../os/os.O:/home/nico/work/xserver/os/WaitFor.c:481: first defined here
    
    Signed-off-by: Nicolas Peninguy <nico@lostgeeks.org>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 311cad3)
Commits on Dec 3, 2010
  1. @jeremyhu

    Return Success from generate_modkeymap() when max_keys_per_mod is zero

    Adam Tkac authored jeremyhu committed
    max_keys_per_mod equal to zero is a valid situation so generate_modkeymap
    should not return BadAlloc in this case.
    
    Signed-off-by: Adam Tkac <atkac@redhat.com>
    Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 05e6167)
Commits on Dec 2, 2010
  1. @ranma42 @jeremyhu

    render: Fix byteswapping of gradient stops

    ranma42 authored jeremyhu committed
    The function swapStops repeatedly swaps the color components as
    CARD16, but incorrectly steps over them as if they were CARD32.
    
    This causes half of the stops not to be swapped at all and some
    unrelated data be swapped instead.
    
    Signed-off-by: Andrea Canciani <ranma42@gmail.com>
    Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit dab064f)
  2. @fhuberts @jeremyhu

    dix: do not use bit-wise operators on the boolean result of BitIsOn

    fhuberts authored jeremyhu committed
    Performing bit-wise operations on a boolean amounts to mixing types,
    is confusing and basically incorrect; one should only perform
    logical operations on booleans.
    
    Performing such operations relies on the implementation detail
    that a boolean is in fact an integer and that its value FALSE
    is implemented as zero.
    
    Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
    Reviewed-by: Matt Turner <mattst88@gmail.com>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit b169649)
  3. @whot @jeremyhu

    dix: remove now unnecessary !! before BitIsOn()

    whot authored jeremyhu committed
    The macro has been changed to do this already, no need for double
    not-not-ing.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 23e3d1f)
  4. @jeremyhu

    include: let BitIsOn() return a boolean value.

    jeremyhu authored
    Simply returning the mask bit breaks checks like
        BitIsOn(mask, 0) != BitIsOn(mask, 1);
    as used in 048e935.
    
    The naming of this macro suggests that it should return boolean values
    anyway. This patch also adds a few simple tests for these macros to make
    sure they don't accidentally break in the future.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Pat Kane <pekane52@gmail.com>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 42dc91e)
  5. @whot @jeremyhu

    xfree86: add missing linebreak in error message.

    whot authored jeremyhu committed
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net>
    (cherry picked from commit b31df04)
  6. @aaronp24 @jeremyhu

    xfree86: Fix rotation of 2-color non-interleaved cursor images

    aaronp24 authored jeremyhu committed
    When RandR 1.2's transformation code is enabled, it rotates the cursor
    image so that it appears upright on a rotated screen.  This code
    completely mangles 2-color cursors on hardware where the the mask and
    source images are not interleaved due to two problems:
    
    1. stride is calculated as (width / 4) rather than (width / 8), so the
       expression (y * stride) skips two lines instead of one for every
       time y is incremented.
    2. cursor_bitpos ignores the 'mask' parameter if the hardware doesn't
       specify any of the HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_* flags.
    
    To fix this, refactor the code to pass the whole xf86CursorInfoPtr
    through to cursor_bitpos and compute the correct stride there based on
    the flags.  If none of the SOURCE_MASK_INTERLEAVE flags are set, use
    the total cursor size to move the 'image' variable into the mask part
    of the image before computing the desired byte pointer.
    
    Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
    Reviewed-by: Robert Morell <rmorell@nvidia.com>
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Tested-by: Cyril Brulebois <kibi@debian.org>
    (cherry picked from commit ffcbfa0)
  7. @jeremyhu

    Fix screen number checks.

    Cyril Brulebois authored jeremyhu committed
    screenInfo.numScreens is not a valid screen number, they go from 0 to
    numScreens - 1.
    
    Signed-off-by: Cyril Brulebois <kibi@debian.org>
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 279ef1f)
  8. @jeremyhu

    DGA: fix screen number check

    Julien Cristau authored jeremyhu committed
    screenInfo.numScreens is not a valid screen number, they go from 0 to
    numScreens - 1.
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 8684543)
  9. @jeremyhu

    xfree86: store the screen's gamma information on init.

    Bill Nottingham authored jeremyhu committed
    This fixes a gamma issue on vt switch observed with KDM. VT switching away
    and back would result in a black screen. Avoid this by storing the current
    gamma information on init.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=533217
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 566d09a)
  10. @nwnk @jeremyhu

    xfree86: apply gamma settings on EnterVT.

    nwnk authored jeremyhu committed
    When entering the VT, re-apply the saved gamma settings for each screen.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit c050aa2)
  11. @whot @jeremyhu

    Xi: move property reset from extension shutdown to init.

    whot authored jeremyhu committed
    If any part of the stack calls XIGetKnownProperty during device shutdown
    the property is re-initialized before the server generation resets, leaving
    the value invalid again.
    
    Move the reset to the extension init which happens before input devices are
    initialized before the first property is requested.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit 5cd11d2)
Commits on Nov 26, 2010
  1. @jeremyhu

    XQuartz: Localization Updates

    jeremyhu authored
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit 97b9bb1)
  2. @jeremyhu

    XQuartz: Remove existing localization files on install to avoid confl…

    jeremyhu authored
    …icts
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit f9fbafa)
  3. @jeremyhu

    XQuartz dri: Don't check CoreGraphics version

    jeremyhu authored
    The version check is hackish, and I highly doubt anyone using this code is on
    a version of OS X that predates this support (10.2 has support for it).
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    (cherry picked from commit 6eed13a)
Commits on Nov 23, 2010
  1. @nwnk

    edid: Fix the HDTV sync pulse adjustment

    nwnk authored
    Simple typo, should have been adjusting the horizontal timings
    consistently since we're not trying to mangle vertical at all.
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit b2f9ce2)
  2. @libv @nwnk

    x86emu: fix jump_near_IMM to handle DATA: flag correctly.

    libv authored nwnk committed
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24348
    
    Before (data flag ignored -> broken):
    66                  DATA:
    e944f1              JMP       1ff6
    
    After (fixed):
    66                  DATA:
    e944f1ffff          JMP       00001ff8
    
    This subtle difference in the length of decoded instruction meant
    that the VBE call jumped to the routine setting AX=0x14F (VBE Failed)
    instead of the routine that set AX=0x4F (VBE success).
    
    The ability to run the same code in vm86 significantly aided the
    debugging of this issue. Those X.org developers who would like to drop
    vm86 better take special care towards _all_ vesa bugs, as those will
    expose further issues.
    
    Patch applies easily to even xserver 1.4.2.
    
    Signed-off-by: Luc Verhaegen <libv@skynet.be>
    Tested-by: Luc Verhaegen <libv@skynet.be>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit cc2c73d)
  3. @sthibaul @nwnk

    Do not trap access to timer and keyboard

    sthibaul authored nwnk committed
    Disable timer/keyboard trapping on GNU/Hurd for now
    
    Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these
    ports, and the int10 wrapper is not emulating them.
    
    It's effectively what happens in the Linux variant too, as iopl() is used there,
    making the ioperm() meaningless.
    
    Signed-off-by: Olaf Buddenhagen <antrik@users.sf.net>
    Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit a6c64d9)
  4. @nwnk

    DRI2: Avoid call to NULL pointer

    Pauli Nieminen authored nwnk committed
    DDX driver may implement schedule swap without GetMSC. In that case we
    can't call GetMSC in DRI2SwapBuffers.
    
    Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
    Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
    CC: Keith Packard <keithp@keithp.com>
    CC: Kristian Høgsberg <krh@bitplanet.net>
    Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 383dfe2)
  5. @nwnk

    modes: improve aspect ratio match for classic drivers

    Olivier Fourdan authored nwnk committed
    After we infer the aspect ratio for the screen, we pick the largest
    mode matching that aspect ratio from the best mode pool available.
    We then clamp virtual size to that mode, and run the resulting mode
    list through the driver's ValidMode hook.  In doing so we might filter
    away our initial guess.  If this happens we shrink the default mode
    to the next largest mode from _any_ mode pool.  This is usually wrong,
    and we should instead pick the next aspect-matched mode from the best
    available mode pool (as always, user then driver then default).
    
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    (cherry picked from commit 7bb653b)
Commits on Nov 15, 2010
  1. @jeremyhu

    XQuartz: Don't use bashism in uninstall-hook

    jeremyhu authored
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
  2. @listx @jeremyhu

    Xext: panoramiXprocs: fix typo

    listx authored jeremyhu committed
    This fixes a typo introduced in commit
    80b5d3a. The pointer pDst was changed
    unintentionally to pWin from a copy/paste error. This resulted in all
    QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
    starting up, when Xinerama was enabled.
    
    Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
    
    Signed-off-by: Elie Bleton <drozofil@gmail.com>
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Reviewed-by: Matt Turner <mattst88@gmail.com>
    Tested-by: Linus Arver <linusarver@gmail.com>
    (cherry picked from commit 78f94f1)
Commits on Nov 14, 2010
  1. @jeremyhu

    test: input - set valuators mask for event to core conversion

    Chase Douglas authored jeremyhu committed
    Commit de8be07 adds a requirement to
    event to core conversion that at least one of the X or Y valuators are
    set in the valuator mask. This commit fixes the event conversion test to
    be compliant.
    
    Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 290af04)
    Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
  2. @nwnk @jeremyhu

    ddc: Don't probe for DDC/CI or EEPROM

    nwnk authored jeremyhu committed
    For whatever reason, some (broken) monitors will crash if you do this.
    We're not actually using this information for anything, so let's just
    not do it.
    
    Originally reported as http://bugzilla.redhat.com/620333
    
    Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    (cherry picked from commit d2064fb)
Something went wrong with that request. Please try again.