Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.1:Update
tigervnc
U_tigervnc-better-check-for-screen-visibility.p...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File U_tigervnc-better-check-for-screen-visibility.patch of Package tigervnc
Git-commit: 9986dce0ae20b0821a5e189f58e86a764079048b Patch-Mainline: Upstream References: bnc#1022432 Author: Pierre Ossman <ossman@cendio.se> Subject: Better check for on screen visibility Signed-off-by: Michal Srb <msrb@suse.com> The check for visible drawables didn't account for compositing which can place a window off-screen. Put all of these checks in a common place and make sure it detects things properly. Index: tigervnc-1.5.0/unix/xserver/hw/vnc/vncHooks.c =================================================================== --- tigervnc-1.5.0.orig/unix/xserver/hw/vnc/vncHooks.c +++ tigervnc-1.5.0/unix/xserver/hw/vnc/vncHooks.c @@ -379,7 +379,7 @@ void vncGetScreenImage(int scrIdx, int x ///////////////////////////////////////////////////////////////////////////// // -// Helper functions for adding changes and copies +// Helper functions // static inline void add_changed(ScreenPtr pScreen, RegionPtr reg) @@ -405,6 +405,33 @@ static inline void add_copied(ScreenPtr (const struct UpdateRect*)REGION_RECTS(dst), dx, dy); } +static inline Bool is_visible(DrawablePtr drawable) +{ + PixmapPtr scrPixmap; + + scrPixmap = drawable->pScreen->GetScreenPixmap(drawable->pScreen); + + if (drawable->type == DRAWABLE_WINDOW) { + WindowPtr window; + PixmapPtr winPixmap; + + window = (WindowPtr)drawable; + winPixmap = drawable->pScreen->GetWindowPixmap(window); + + if (!window->viewable) + return FALSE; + + if (winPixmap != scrPixmap) + return FALSE; + + return TRUE; + } + + if (drawable != &scrPixmap->drawable) + return FALSE; + + return TRUE; +} ///////////////////////////////////////////////////////////////////////////// // @@ -732,8 +759,7 @@ void vncHooksComposite(CARD8 op, Picture RegionRec changed; - if (pDst->pDrawable->type == DRAWABLE_WINDOW && - ((WindowPtr) pDst->pDrawable)->viewable) { + if (is_visible(pDst->pDrawable)) { BoxRec box; box.x1 = max(pDst->pDrawable->x + xDst, 0); @@ -818,8 +844,7 @@ void vncHooksGlyphs(CARD8 op, PicturePtr RegionPtr changed; - if (pDst->pDrawable->type == DRAWABLE_WINDOW && - ((WindowPtr) pDst->pDrawable)->viewable) { + if (is_visible(pDst->pDrawable)) { BoxRec fbbox; RegionRec fbreg; @@ -945,16 +970,14 @@ static Bool vncHooksRandRCrtcSet(ScreenP (pGC)->ops = &vncHooksGCOps;\ } -// ValidateGC - wrap the "ops" if a viewable window OR the screen pixmap +// ValidateGC - wrap the "ops" if the drawable is on screen static void vncHooksValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { GC_FUNC_PROLOGUE(pGC, ValidateGC); (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable); - if ((pDrawable->type == DRAWABLE_WINDOW && - ((WindowPtr) pDrawable)->viewable) || - (pDrawable == &pGC->pScreen->GetScreenPixmap(pGC->pScreen)->drawable)) { + if (is_visible(pDrawable)) { pGCPriv->wrappedOps = pGC->ops; DBGPRINT((stderr,"vncHooksValidateGC: wrapped GC ops\n")); } else { @@ -1122,10 +1145,7 @@ static RegionPtr vncHooksCopyArea(Drawab REGION_INTERSECT(pGC->pScreen, &dst, &dst, pGC->pCompositeClip); // The source of the data has to be something that's on screen. - // This means either a window, or the screen pixmap. - if ((pSrc->pScreen == pGC->pScreen) && - ((pSrc->type == DRAWABLE_WINDOW) || - (pSrc == &pGC->pScreen->GetScreenPixmap(pGC->pScreen)->drawable))) { + if (is_visible(pSrc)) { box.x1 = srcx + pSrc->x; box.y1 = srcy + pSrc->y; box.x2 = box.x1 + w;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor