frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Adam Jackson 2010-10-11 10:49:56 -04:00 committed by Keith Packard
parent 1333e101b4
commit febf3e7ead
5 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dix/dispatch.c
View File

@ -916,23 +916,14 @@ GetGeometry(ClientPtr client, xGetGeometryReply *rep)
rep->width = pDraw->width; rep->width = pDraw->width;
rep->height = pDraw->height; rep->height = pDraw->height;
/* XXX - Because the pixmap-implementation of the multibuffer extension if (WindowDrawable(pDraw))
* 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)))
{ {
WindowPtr pWin = (WindowPtr)pDraw; WindowPtr pWin = (WindowPtr)pDraw;
rep->x = pWin->origin.x - wBorderWidth (pWin); rep->x = pWin->origin.x - wBorderWidth (pWin);
rep->y = pWin->origin.y - wBorderWidth (pWin); rep->y = pWin->origin.y - wBorderWidth (pWin);
rep->borderWidth = pWin->borderWidth; rep->borderWidth = pWin->borderWidth;
} }
else /* DRAWABLE_PIXMAP or DRAWABLE_BUFFER */ else /* DRAWABLE_PIXMAP */
{ {
rep->x = rep->y = rep->borderWidth = 0; rep->x = rep->y = rep->borderWidth = 0;
} }

5
hw/xwin/winfillsp.c
View File

@ -854,11 +854,6 @@ winFillSpansNativeGDI (DrawablePtr pDrawable,
} }
break; break;
case DRAWABLE_BUFFER:
/* DRAWABLE_BUFFER seems to be undocumented. */
ErrorF ("winFillSpans - DRAWABLE_BUFFER - Unimplemented\n");
break;
default: default:
ErrorF ("winFillSpans - Unknown drawable type\n"); ErrorF ("winFillSpans - Unknown drawable type\n");
break; break;

4
hw/xwin/wingetsp.c
View File

@ -181,10 +181,6 @@ winGetSpansNativeGDI (DrawablePtr pDrawable,
FatalError ("winGetSpans - UNDRAWABLE_WINDOW\n"); FatalError ("winGetSpans - UNDRAWABLE_WINDOW\n");
break; break;
case DRAWABLE_BUFFER:
FatalError ("winGetSpans - DRAWABLE_BUFFER\n");
break;
default: default:
FatalError ("winGetSpans - Unknown drawable type\n"); FatalError ("winGetSpans - Unknown drawable type\n");
break; break;

4
hw/xwin/winsetsp.c
View File

@ -175,10 +175,6 @@ winSetSpansNativeGDI (DrawablePtr pDrawable,
FatalError ("\nwinSetSpansNativeGDI - UNDRAWABLE_WINDOW\n\n"); FatalError ("\nwinSetSpansNativeGDI - UNDRAWABLE_WINDOW\n\n");
break; break;
case DRAWABLE_BUFFER:
FatalError ("\nwinSetSpansNativeGDI - DRAWABLE_BUFFER\n\n");
break;
default: default:
FatalError ("\nwinSetSpansNativeGDI - Unknown drawable type\n\n"); FatalError ("\nwinSetSpansNativeGDI - Unknown drawable type\n\n");
break; break;

6
include/pixmap.h
View File

@ -55,16 +55,14 @@ SOFTWARE.
#define DRAWABLE_WINDOW 0 #define DRAWABLE_WINDOW 0
#define DRAWABLE_PIXMAP 1 #define DRAWABLE_PIXMAP 1
#define UNDRAWABLE_WINDOW 2 #define UNDRAWABLE_WINDOW 2
#define DRAWABLE_BUFFER 3
/* corresponding type masks for dixLookupDrawable() */ /* corresponding type masks for dixLookupDrawable() */
#define M_DRAWABLE_WINDOW (1<<0) #define M_DRAWABLE_WINDOW (1<<0)
#define M_DRAWABLE_PIXMAP (1<<1) #define M_DRAWABLE_PIXMAP (1<<1)
#define M_UNDRAWABLE_WINDOW (1<<2) #define M_UNDRAWABLE_WINDOW (1<<2)
#define M_DRAWABLE_BUFFER (1<<3)
#define M_ANY (-1) #define M_ANY (-1)
#define M_WINDOW (M_DRAWABLE_WINDOW|M_UNDRAWABLE_WINDOW) #define M_WINDOW (M_DRAWABLE_WINDOW|M_UNDRAWABLE_WINDOW)
#define M_DRAWABLE (M_DRAWABLE_WINDOW|M_DRAWABLE_PIXMAP|M_DRAWABLE_BUFFER) #define M_DRAWABLE (M_DRAWABLE_WINDOW|M_DRAWABLE_PIXMAP)
#define M_UNDRAWABLE (M_UNDRAWABLE_WINDOW) #define M_UNDRAWABLE (M_UNDRAWABLE_WINDOW)
/* flags to PaintWindow() */ /* flags to PaintWindow() */
@ -88,7 +86,7 @@ typedef union _PixUnion {
((as) == (bs) && (SamePixUnion (a, b, as))) ((as) == (bs) && (SamePixUnion (a, b, as)))
#define OnScreenDrawable(type) \ #define OnScreenDrawable(type) \
((type == DRAWABLE_WINDOW) || (type == DRAWABLE_BUFFER)) (type == DRAWABLE_WINDOW)
#define WindowDrawable(type) \ #define WindowDrawable(type) \
((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW)) ((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))