diff options
| author | Dave Airlie <airlied@gmail.com> | 2017-03-11 00:53:01 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 14:56:29 +0200 |
| commit | 93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (patch) | |
| tree | 9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/render | |
| parent | ab3974f22b213a64316bf4384c3fd6d92c005f58 (diff) | |
| download | nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.tar.gz nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.tar.bz2 nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.zip | |
xserver: remove index from CloseScreen (API/ABI breakage)
Extracted from X.org bulk commit:
commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 13:22:18 2012 +0100
api: rework the X server driver API to avoid global arrays.
This is a squash merge containing all the API changes, as
well as the video ABI bump.
Its been squashed to make bisection easier.
Full patch log below:
[...]
commit 06729dbbc804a20242e6499f446acb5d94023c3c
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:04:59 2012 +0100
xserver: remove index from CloseScreen (API/ABI breakage)
This drops the index from the CloseScreen callback,
its always been useless really, since the pScreen contains it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'nx-X11/programs/Xserver/render')
| -rw-r--r-- | nx-X11/programs/Xserver/render/animcur.c | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/render/picture.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/render/picturestr.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/render/animcur.c b/nx-X11/programs/Xserver/render/animcur.c index c5535050e..7cd6c8119 100644 --- a/nx-X11/programs/Xserver/render/animcur.c +++ b/nx-X11/programs/Xserver/render/animcur.c @@ -111,7 +111,7 @@ AnimCurSetCursorPosition (ScreenPtr pScreen, Bool generateEvent); static Bool -AnimCurCloseScreen (int index, ScreenPtr pScreen) +AnimCurCloseScreen (ScreenPtr pScreen) { AnimCurScreenPtr as = GetAnimCurScreen(pScreen); Bool ret; @@ -127,10 +127,10 @@ AnimCurCloseScreen (int index, ScreenPtr pScreen) Unwrap(as, pScreen, UnrealizeCursor); Unwrap(as, pScreen, RecolorCursor); SetAnimCurScreen(pScreen,0); - ret = (*pScreen->CloseScreen) (index, pScreen); + ret = (*pScreen->CloseScreen) (pScreen); free (as); - if (index == 0) - AnimCurScreenPrivateIndex = -1; + if (screenInfo.numScreens <= 1) + AnimCurScreenPrivateIndex = -1; return ret; } diff --git a/nx-X11/programs/Xserver/render/picture.c b/nx-X11/programs/Xserver/render/picture.c index 0d4c19969..4e7c02ecb 100644 --- a/nx-X11/programs/Xserver/render/picture.c +++ b/nx-X11/programs/Xserver/render/picture.c @@ -127,14 +127,14 @@ PictureDestroyWindow (WindowPtr pWindow) } Bool -PictureCloseScreen (int index, ScreenPtr pScreen) +PictureCloseScreen (ScreenPtr pScreen) { PictureScreenPtr ps = GetPictureScreen(pScreen); Bool ret; int n; pScreen->CloseScreen = ps->CloseScreen; - ret = (*pScreen->CloseScreen) (index, pScreen); + ret = (*pScreen->CloseScreen) (pScreen); PictureResetFilters (pScreen); for (n = 0; n < ps->nformats; n++) if (ps->formats[n].type == PictTypeIndexed) diff --git a/nx-X11/programs/Xserver/render/picturestr.h b/nx-X11/programs/Xserver/render/picturestr.h index 4969f6cab..7ce831c4b 100644 --- a/nx-X11/programs/Xserver/render/picturestr.h +++ b/nx-X11/programs/Xserver/render/picturestr.h @@ -406,7 +406,7 @@ Bool PictureDestroyWindow (WindowPtr pWindow); Bool -PictureCloseScreen (int Index, ScreenPtr pScreen); +PictureCloseScreen (ScreenPtr pScreen); void PictureStoreColors (ColormapPtr pColormap, int ndef, xColorItem *pdef); |