BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fix: Window rendered incorrectly if has no border with -e 

- Fix a bug that window content and some borders are not rendered if the
  window has no border on particular sides when -e (frame-opacity) is
  enabled, introduced in 66d3f30978. Just as what I said in the commit
  message of the commit, "bugs are to be expected". :-S

- Fix a potential segfault in win_match().

- Slightly update CPackConfig.cmake to add dependency to libdrm.
This commit is contained in:
Richard Grenville 2012-11-06 11:32:02 +08:00
parent c76d0fc150
commit 357bf94efc
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CPackConfig.cmake
View File

@ -30,11 +30,11 @@ set(CPACK_STRIP_FILES 1)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${CPACK_SYSTEM_NAME}")
set(CPACK_DEBIAN_PACKAGE_SECTION "x11")
# The dependencies are unreliable, just an example here
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libx11-6, libxext6, libxcomposite1, libxrender1, libxdamage1, libxfixes3, libpcre3, libconfig8")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libx11-6, libxext6, libxcomposite1, libxrender1, libxdamage1, libxfixes3, libpcre3, libconfig8, libdrm2")
# == RPM package config ==
# The dependencies are unreliable, just an example here
set(CPACK_RPM_PACKAGE_REQUIRES "libx11, libxext, libxcomposite, libxrender, libxdamage, libxfixes, libpcre, libconfig")
set(CPACK_RPM_PACKAGE_REQUIRES "libx11, libxext, libxcomposite, libxrender, libxdamage, libxfixes, libpcre, libconfig, libdrm")
# == Source package config ==
set(CPACK_SOURCE_GENERATOR "TBZ2 DEB RPM")

48
src/compton.c
View File

@ -866,7 +866,8 @@ win_match(win *w, wincond *condlst, wincond **cache) {
// Then go through the whole linked list
for (; condlst; condlst = condlst->next) {
if (win_match_once(w, condlst)) {
*cache = condlst;
if (cache)
*cache = condlst;
return true;
}
}
@ -1583,42 +1584,41 @@ win_paint_win(Display *dpy, win *w, Picture tgt_buffer) {
XRenderComposite(dpy, PictOpOver, w->picture, w->frame_alpha_pict, \
tgt_buffer, (cx), (cy), 0, 0, x + (cx), y + (cy), (cwid), (chei))
// The following complicated logic is requried because some broken
// The following complicated logic is required because some broken
// window managers (I'm talking about you, Openbox!) that makes
// top_width + bottom_width > height in some cases.
// top
COMP_BDR(0, 0, wid, min_i(t, hei));
int phei = min_i(t, hei);
if (phei > 0)
COMP_BDR(0, 0, wid, phei);
if (hei > t) {
int phei = min_i(hei - t, b);
phei = min_i(hei - t, b);
// bottom
if (phei) {
assert(phei > 0);
if (phei > 0)
COMP_BDR(0, hei - phei, wid, phei);
phei = hei - t - phei;
if (phei) {
assert(phei > 0);
// left
COMP_BDR(0, t, min_i(l, wid), phei);
phei = hei - t - phei;
if (phei > 0) {
int pwid = min_i(l, wid);
// left
if (pwid > 0)
COMP_BDR(0, t, pwid, phei);
if (wid > l) {
int pwid = min_i(wid - l, r);
if (wid > l) {
pwid = min_i(wid - l, r);
if (pwid) {
assert(pwid > 0);
// right
COMP_BDR(wid - pwid, t, pwid, phei);
// right
if (pwid > 0)
COMP_BDR(wid - pwid, t, pwid, phei);
pwid = wid - l - pwid;
if (pwid)
assert(pwid > 0);
// body
XRenderComposite(dpy, op, w->picture, alpha_mask,
tgt_buffer, l, t, 0, 0, x + l, y + t, pwid, phei);
}
pwid = wid - l - pwid;
if (pwid > 0) {
// body
XRenderComposite(dpy, op, w->picture, alpha_mask,
tgt_buffer, l, t, 0, 0, x + l, y + t, pwid, phei);
}
}
}