diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-10-11 10:49:56 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-10-13 09:18:41 -0700 |
| commit | febf3e7ead8dbb355622c896ff1744b2ca52a49a (patch) | |
| tree | 2c47fd6201467e3f22ae89d06123d354ccbc7c2f /dix/dispatch.c | |
| parent | 1333e101b4f6ecca72568b7f462884f8b102a5c2 (diff) | |
dix: Remove the memory of the multibuffer extension
Drop DRAWABLE_BUFFER and related checks, mbuf was the only thing that
used them and it was killed in 0ba82562.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'dix/dispatch.c')
| -rw-r--r-- | dix/dispatch.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 17f308cf5..35e7ddd99 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -916,23 +916,14 @@ GetGeometry(ClientPtr client, xGetGeometryReply *rep) rep->width = pDraw->width; rep->height = pDraw->height; - /* XXX - Because the pixmap-implementation of the multibuffer extension - * may have the buffer-id's drawable resource value be a pointer - * to the buffer's window instead of the buffer itself - * (this happens if the buffer is the displayed buffer), - * we also have to check that the id matches before we can - * truly say that it is a DRAWABLE_WINDOW. - */ - - if ((pDraw->type == UNDRAWABLE_WINDOW) || - ((pDraw->type == DRAWABLE_WINDOW) && (stuff->id == pDraw->id))) + if (WindowDrawable(pDraw)) { WindowPtr pWin = (WindowPtr)pDraw; rep->x = pWin->origin.x - wBorderWidth (pWin); rep->y = pWin->origin.y - wBorderWidth (pWin); rep->borderWidth = pWin->borderWidth; } - else /* DRAWABLE_PIXMAP or DRAWABLE_BUFFER */ + else /* DRAWABLE_PIXMAP */ { rep->x = rep->y = rep->borderWidth = 0; } |