andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xephyr: fix a clipping issue xephyr-dri

Browse Source 
* hw/kdrive/ephyr/ephyrdri.c:
	  (ephyrDRIGetDrawableInfo): force the back clipping rects
	  to equal the front clipping rects.
	* hw/kdrive/ephyr/ephyrdriext.c:
	  (ProcXF86DRIGetDrawableInfo): properly overclip the clipping rects we
	   got from the client. This bug fixes a clipping rect that was too
	   small in height, basically. Also fix a possible mem corruption.
	* hw/kdrive/ephyr/hostx.c:
	  (hostx_set_window_geometry): remove a useless XSync
This commit is contained in:
Dodji Seketeli 2007-09-17 22:13:51 +02:00
parent 7978272661
commit ffe9ce6a84
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/ephyr/ephyrdri.c
View File

@ -240,7 +240,7 @@ ephyrDRIGetDrawableInfo (int a_screen,
goto out ;
}
EPHYR_LOG ("host x,y,w,h: (%d,%d,%d,%d)\n", *a_x, *a_y, *a_w, *a_h) ;
if (*a_num_back_clip_rects != *a_num_clip_rects) {
if (*a_num_clip_rects) {
free (*a_back_clip_rects) ;
*a_back_clip_rects = calloc (*a_num_clip_rects,
sizeof (drm_clip_rect_t)) ;

50
hw/kdrive/ephyr/ephyrdriext.c
View File

@ -1137,7 +1137,7 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
WindowPtr window=NULL;
EphyrWindowPair *pair=NULL;
int X=0, Y=0, W=0, H=0, backX=0, backY=0, rc=0, i=0;
drm_clip_rect_t *clipRects=NULL, *clippedRects=NULL;
drm_clip_rect_t *clipRects=NULL;
drm_clip_rect_t *backClipRects=NULL;
EPHYR_LOG ("enter\n") ;
@ -1197,7 +1197,6 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
}
EPHYR_LOG ("num clip rects:%d, num back clip rects:%d\n",
(int)rep.numClipRects, (int)rep.numBackClipRects) ;
backClipRects = clipRects ;
rep.drawableX = X;
rep.drawableY = Y;
@ -1209,37 +1208,37 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
rep.backX = backX;
rep.backY = backY;
if (rep.numBackClipRects)
rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;
clippedRects = clipRects;
if (rep.numClipRects) {
/* Clip cliprects to screen dimensions (redirected windows) */
clippedRects = xalloc(rep.numClipRects * sizeof(drm_clip_rect_t));
if (clippedRects) {
if (clipRects) {
ScreenPtr pScreen = screenInfo.screens[stuff->screen];
int i=0;
EPHYR_LOG ("clip list of host gl drawable:\n") ;
for (i = 0; i < rep.numClipRects; i++) {
clippedRects[i].x1 = max(clipRects[i].x1, 0);
clippedRects[i].y1 = max(clipRects[i].y1, 0);
clippedRects[i].x2 = min(clipRects[i].x2, pScreen->width);
clippedRects[i].y2 = min(clipRects[i].y2, pScreen->height);
EPHYR_LOG ("x1:%d, y1:%d, x2:%d, y2:%d\n",
clippedRects[i].x1, clippedRects[i].y1,
clippedRects[i].x2, clippedRects[i].y2) ;
}
clipRects[i].x1 = max (clipRects[i].x1, 0);
clipRects[i].y1 = max (clipRects[i].y1, 0);
clipRects[i].x2 = min (clipRects[i].x2,
pScreen->width + clipRects[i].x1) ;
clipRects[i].y2 = min (clipRects[i].y2,
pScreen->width + clipRects[i].y1) ;
/*rep.numClipRects = j*/;
EPHYR_LOG ("num host clip rects:%d\n", (int)rep.numClipRects) ;
EPHYR_LOG ("x1:%d, y1:%d, x2:%d, y2:%d\n",
clipRects[i].x1, clipRects[i].y1,
clipRects[i].x2, clipRects[i].y2) ;
}
} else {
rep.numClipRects = 0;
}
rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
} else {
EPHYR_LOG ("got zero host gl drawable clipping rects\n") ;
}
rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
backClipRects = clipRects ;
rep.numBackClipRects = rep.numClipRects ;
if (rep.numBackClipRects)
rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;
EPHYR_LOG ("num host clip rects:%d\n", (int)rep.numClipRects) ;
EPHYR_LOG ("num host back clip rects:%d\n", (int)rep.numBackClipRects) ;
rep.length = ((rep.length + 3) & ~3) >> 2;
@ -1248,8 +1247,7 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
if (rep.numClipRects) {
WriteToClient(client,
sizeof(drm_clip_rect_t) * rep.numClipRects,
(char *)clippedRects);
xfree(clippedRects);
(char *)clipRects);
}
if (rep.numBackClipRects) {
@ -1257,6 +1255,10 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client)
sizeof(drm_clip_rect_t) * rep.numBackClipRects,
(char *)backClipRects);
}
if (clipRects) {
xfree(clipRects);
clipRects = NULL ;
}
EPHYR_LOG ("leave\n") ;
return (client->noClientException);

1
hw/kdrive/ephyr/hostx.c
View File

@ -1211,7 +1211,6 @@ hostx_set_window_geometry (int a_win, EphyrBox *a_geo)
XMoveWindow (dpy, a_win, a_geo->x, a_geo->y) ;
XResizeWindow (dpy, a_win, a_geo->width, a_geo->height) ;
XFlush (dpy) ;
EPHYR_LOG ("leave\n") ;
return TRUE;
}