Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pr/big 1.4.2 upgrade v3 #902

Open
wants to merge 42 commits into
base: 3.6.x
Choose a base branch
from
Open

Pr/big 1.4.2 upgrade v3 #902

wants to merge 42 commits into from

Commits on Jan 18, 2020

  1. NXshm.c: call upstream ShmExtensionInit 

    Change ShmExtensionInit to call the unaltered upstream version and
trick it to do what we want.
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    6b2de64 View commit details
    Browse the repository at this point in the history

  2. Lift xkb to xorg 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    80f3821 View commit details
    Browse the repository at this point in the history

  3. dix: remove register keyword

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    b1c00e2 View commit details
    Browse the repository at this point in the history

  4. Lift dix to 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    e009bb0 View commit details
    Browse the repository at this point in the history

  5. dix: fix typo in clipAxis. 

    Backport of this commit:

  commit 00acb40f2bc5bb4a1977b9b08db75630677ff787
  Author: Peter Hutterer <[email protected]>
  Date:   Wed Apr 30 11:29:03 2008 +0930

    dix: fix typo in clipAxis.

    Check needs to be (min_axis < max_axis), not (min_axis < min_axis)
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    82210ad View commit details
    Browse the repository at this point in the history

  6. devices.c: replace Ace by XC_security

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    8acbf60 View commit details
    Browse the repository at this point in the history

  7. Update include files to match Xi 1.4.2 requirements

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    75e8da5 View commit details
    Browse the repository at this point in the history

  8. Xi: reorder function to make future merges easier 

    xorg upstream has changed order of functions between 1.3.0.0 and 1.4.2
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    fe6a118 View commit details
    Browse the repository at this point in the history

  9. Xi: remove register keywords 

    prepare 1.4.2 upgrade
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    78d6af3 View commit details
    Browse the repository at this point in the history

  10. Lift Xi to xorg 1.4.2 

    dix must be upgraded to 1.4.2, too, to make this work!
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    2106d60 View commit details
    Browse the repository at this point in the history

  11. main.c: FIXME: comment InitRegions for now 

    until we upgrade mi, too
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    23cc44e View commit details
    Browse the repository at this point in the history

  12. update swaprep.h

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    ea55e36 View commit details
    Browse the repository at this point in the history

  13. update window.h

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    66394a5 View commit details
    Browse the repository at this point in the history

  14. make dispatch.c compile again

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    607818b View commit details
    Browse the repository at this point in the history

  15. Keyboard.c: fix parameter type for LegalModifier

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    ac80d99 View commit details
    Browse the repository at this point in the history

  16. Pointer.c: needs additional parameter (numAxes)

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    21723e6 View commit details
    Browse the repository at this point in the history

  17. Keyboard.c: add missing DDXRingBell

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    6c37a4e View commit details
    Browse the repository at this point in the history

  18. Lift mi to xorg 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    bd4d6d8 View commit details
    Browse the repository at this point in the history

  19. Lift miext to xorg 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    412c630 View commit details
    Browse the repository at this point in the history

  20. nxagent: add Xi to include path

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    fffa9a3 View commit details
    Browse the repository at this point in the history

  21. Events.c Introduce nxagentQueueKeyEvent

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    e30734f View commit details
    Browse the repository at this point in the history

  22. nxagent: introduce global nxagent{Keyboard,Pointer}Device

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    c864af3 View commit details
    Browse the repository at this point in the history

  23. Events.c: update/replace all mieqEnqueue calls

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    7f8a5bd View commit details
    Browse the repository at this point in the history

  24. Pointer.c: port to the new DIX motion history API

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    1540168 View commit details
    Browse the repository at this point in the history

  25. mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite(). 

    The miPointerUpdate() call was responsible for crashes during window
resizes. As nxagent is derived from xnest I found the following
backport appropriate.

  commit 6fb76acc4524d6af4bfb6bc6d862c1ee2bbb8baa
  Author: Peter Hutterer <[email protected]>
  Date:   Fri May 16 19:22:32 2008 +0930

    mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().

    In the xnest and vfb DDX we don't need the call anyway, it's performed by
    mieqProcessInputEvent.
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    0fd3004 View commit details
    Browse the repository at this point in the history

  26. Xext: add missing SecurityExtensionSetup 

    ... which effectly is merely a no-op without Xace ...
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    71f668f View commit details
    Browse the repository at this point in the history

  27. Lift damageext to xorg 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    d59c7ed View commit details
    Browse the repository at this point in the history

  28. Revert "misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move… 

    … code around so that we can drop nx-X11/programs/Xserver/render/miglyph.c (and by extension nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.)"

This reverts commit 1a7fc41.
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    c770558 View commit details
    Browse the repository at this point in the history

  29. Lift render to xorg 1.4.2 

    Had to revert 1a7fc41 to make this easier.
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    227af9c View commit details
    Browse the repository at this point in the history

  30. Lift fb to xorg 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    a51493a View commit details
    Browse the repository at this point in the history

  31. Make files depending on render compile again

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    a3f5d4d View commit details
    Browse the repository at this point in the history

  32. Add securitysrv.h

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    cadf97c View commit details
    Browse the repository at this point in the history

  33. Lift os to xorg 1.4.2

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    35701b3 View commit details
    Browse the repository at this point in the history

  34. dix: add missing InitRegions()

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    f7103be View commit details
    Browse the repository at this point in the history

  35. NXdispatch.c: whitespace fixes

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    17b099d View commit details
    Browse the repository at this point in the history

  36. NXdispatch.c: cleanup/update Dispatch() 

    mimimize/mark differences to dix/dispatch.c
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    bfd84b4 View commit details
    Browse the repository at this point in the history

  37. NXglyph.c: update to latest changes in render/glyph.c

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    074508d View commit details
    Browse the repository at this point in the history

  38. xkb: use the correct device instead of an uninitialised "dev". 

      commit 449723510a1f9d024e23d9eb33795cac27f9443e
  Author: Egbert Eich <[email protected]>
  Date:   Tue Apr 22 13:30:03 2008 +0930

    xkb: use the correct device instead of an uninitialised "dev". #15614

    X.Org Bug 15614 <http://bugs.freedesktop.org/show_bug.cgi?id=15614>

    Signed-off-by: Peter Hutterer <[email protected]>
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    fcc22c9 View commit details
    Browse the repository at this point in the history

  39. Give names to the virtual devices

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    25975f8 View commit details
    Browse the repository at this point in the history

  40. dix: avoid activating the VCP/VCK twice. 

      commit 6216abe0c1a94efa4b2f0d14e88278f128304cd2
  Author: Peter Hutterer <[email protected]>
  Date:   Fri Nov 30 11:34:24 2007 +1030

    dix: avoid activating the VCP/VCK twice.

    This may set dev->key-xkbinfo to NULL, causing a segfault in xkb code lateron.
    Spotted by David Huggins-Daines.
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    ee35df7 View commit details
    Browse the repository at this point in the history

  41. Free xkb devPrivates on CloseDevice 

    The situation here is unclear. There are chances that this needs to be
revised later.

With the integration of core keyboard and pointer memory leaks started
to (re-)appear.

For the core devices XkbSetExtension() is called on initialization and
allocates private data. But there's no corresponding code to free the
private data on CloseDevice. So I added XkbFreePrivates(). This
function should be called on DEVICE_CLOSE.

For the NX devices XkbSetExtension() is never called so the privates
are not allocated which _feels_ wrong but I am not sure if it really
_is_ wrong.

Nevertheless let's call XkbFreePrivates() for both core and NX devices
including sanity checks and nullification to be on the safe side.
    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    38282f6 View commit details
    Browse the repository at this point in the history

  42. fixup! NXdispatch.c: cleanup/update Dispatch()

    @uli42
    uli42 committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    bf5690c View commit details
    Browse the repository at this point in the history