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

Detect ARGB windows, don't give them shadows, compose them correctly.

This commit is contained in:
Keith Packard 2003-11-11 08:59:15 +00:00
parent 41293ef755
commit 54fb13fa32
2 changed files with 57 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-11 Keith Packard <keithp@keithp.com>
* xcompmgr.c: (win_extents), (paint_all), (add_win), (main):
Detect ARGB windows, don't give them shadows, compose them
correctly.
2003-11-10 Keith Packard <keithp@keithp.com> 2003-11-10 Keith Packard <keithp@keithp.com>
* Makefile: * Makefile:

77
xcompmgr.c
View File

@ -66,9 +66,11 @@ XserverRegion allDamage;
int root_height, root_width; int root_height, root_width;
#define BACKGROUND_PROP "_XROOTPMAP_ID" #define BACKGROUND_PROP "_XROOTPMAP_ID"
#define WINDOW_PLAIN 0
#define WINDOW_DROP 1 #define WINDOW_SOLID 0
#define WINDOW_TRANS 2 #define WINDOW_TRANS 1
#define WINDOW_ARGB 2
#define TRANS_OPACITY 0.75 #define TRANS_OPACITY 0.75
#define SHADOW_RADIUS 15 #define SHADOW_RADIUS 15
#define SHADOW_OPACITY 0.75 #define SHADOW_OPACITY 0.75
@ -374,21 +376,31 @@ win_extents (Display *dpy, win *w)
{ {
XRectangle r; XRectangle r;
if (!w->shadow) if (w->mode == WINDOW_ARGB)
{ {
double opacity = SHADOW_OPACITY; r.x = w->a.x;
if (w->mode == WINDOW_TRANS) r.y = w->a.y;
opacity = opacity * TRANS_OPACITY; r.width = w->a.width + w->a.border_width * 2;
w->shadow = shadow_picture (dpy, opacity, SHADOW_RADIUS, r.height = w->a.height + w->a.border_width * 2;
w->a.width, w->a.height, }
&w->shadow_width, &w->shadow_height); else
w->shadow_dx = SHADOW_OFFSET_X; {
w->shadow_dy = SHADOW_OFFSET_Y; if (!w->shadow)
{
double opacity = SHADOW_OPACITY;
if (w->mode == WINDOW_TRANS)
opacity = opacity * TRANS_OPACITY;
w->shadow = shadow_picture (dpy, opacity, SHADOW_RADIUS,
w->a.width, w->a.height,
&w->shadow_width, &w->shadow_height);
w->shadow_dx = SHADOW_OFFSET_X;
w->shadow_dy = SHADOW_OFFSET_Y;
}
r.x = w->a.x + w->a.border_width + w->shadow_dx;
r.y = w->a.y + w->a.border_width + w->shadow_dy;
r.width = w->shadow_width;
r.height = w->shadow_height;
} }
r.x = w->a.x + w->a.border_width + w->shadow_dx;
r.y = w->a.y + w->a.border_width + w->shadow_dy;
r.width = w->shadow_width;
r.height = w->shadow_height;
return XFixesCreateRegion (dpy, &r, 1); return XFixesCreateRegion (dpy, &r, 1);
} }
@ -443,7 +455,7 @@ paint_all (Display *dpy, XserverRegion region)
if (w->extents) if (w->extents)
XFixesDestroyRegion (dpy, w->extents); XFixesDestroyRegion (dpy, w->extents);
w->extents = win_extents (dpy, w); w->extents = win_extents (dpy, w);
if (w->mode != WINDOW_TRANS) if (w->mode == WINDOW_SOLID)
{ {
XFixesSetPictureClipRegion (dpy, rootBuffer, 0, 0, region); XFixesSetPictureClipRegion (dpy, rootBuffer, 0, 0, region);
XFixesSubtractRegion (dpy, region, region, 0, 0, w->borderSize, 0, 0); XFixesSubtractRegion (dpy, region, region, 0, 0, w->borderSize, 0, 0);
@ -479,6 +491,13 @@ paint_all (Display *dpy, XserverRegion region)
w->a.y + w->a.border_width, w->a.y + w->a.border_width,
w->a.width, w->a.width,
w->a.height); w->a.height);
else if (w->mode == WINDOW_ARGB)
XRenderComposite (dpy, PictOpOver, w->picture, None, rootBuffer,
0, 0, 0, 0,
w->a.x + w->a.border_width,
w->a.y + w->a.border_width,
w->a.width,
w->a.height);
XFixesDestroyRegion (dpy, w->borderClip); XFixesDestroyRegion (dpy, w->borderClip);
w->borderClip = None; w->borderClip = None;
} }
@ -556,10 +575,11 @@ unmap_win (Display *dpy, Window id)
void void
add_win (Display *dpy, Window id, Window prev) add_win (Display *dpy, Window id, Window prev)
{ {
win *new = malloc (sizeof (win)); win *new = malloc (sizeof (win));
win **p; win **p;
XWindowAttributes a; XWindowAttributes a;
XRenderPictureAttributes pa; XRenderPictureAttributes pa;
XRenderPictFormat *format;
if (!new) if (!new)
return; return;
@ -581,12 +601,15 @@ add_win (Display *dpy, Window id, Window prev)
new->damage = None; new->damage = None;
pa.subwindow_mode = IncludeInferiors; pa.subwindow_mode = IncludeInferiors;
if (new->a.class == InputOnly) if (new->a.class == InputOnly)
{
new->picture = 0; new->picture = 0;
format = 0;
}
else else
{ {
format = XRenderFindVisualFormat (dpy, new->a.visual);
new->picture = XRenderCreatePicture (dpy, id, new->picture = XRenderCreatePicture (dpy, id,
XRenderFindVisualFormat (dpy, format,
new->a.visual),
CPSubwindowMode, CPSubwindowMode,
&pa); &pa);
} }
@ -594,10 +617,12 @@ add_win (Display *dpy, Window id, Window prev)
new->shadow = None; new->shadow = None;
new->borderSize = None; new->borderSize = None;
new->extents = None; new->extents = None;
if (new->a.override_redirect) if (format && format->type == PictTypeDirect && format->direct.alphaMask)
new->mode = WINDOW_ARGB;
else if (new->a.override_redirect)
new->mode = WINDOW_TRANS; new->mode = WINDOW_TRANS;
else else
new->mode = WINDOW_DROP; new->mode = WINDOW_SOLID;
new->next = *p; new->next = *p;
*p = new; *p = new;
if (new->a.map_state == IsViewable) if (new->a.map_state == IsViewable)
@ -816,7 +841,6 @@ main ()
allDamage = None; allDamage = None;
XGrabServer (dpy); XGrabServer (dpy);
XCompositeRedirectSubwindows (dpy, root, CompositeRedirectManual); XCompositeRedirectSubwindows (dpy, root, CompositeRedirectManual);
paint_all (dpy, None);
XSelectInput (dpy, root, XSelectInput (dpy, root,
SubstructureNotifyMask| SubstructureNotifyMask|
ExposureMask| ExposureMask|
@ -827,6 +851,7 @@ main ()
add_win (dpy, children[i], i ? children[i-1] : None); add_win (dpy, children[i], i ? children[i-1] : None);
XFree (children); XFree (children);
XUngrabServer (dpy); XUngrabServer (dpy);
paint_all (dpy, None);
last_update = time_in_millis (); last_update = time_in_millis ();
for (;;) for (;;)
{ {