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

add set_opacity, fix focus behavior

This commit is contained in:
Christopher Jeffrey 2011-11-11 04:10:24 -06:00
parent e7ee7018a4
commit adadcb92ac
1 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
compton.c
View File

@ -1624,6 +1624,31 @@ determine_mode(Display *dpy, win *w) {
} }
} }
static void
set_opacity(Display *dpy, win *w, unsigned long opacity) {
if (fade_trans) {
double old_opacity = (double)w->opacity / OPAQUE;
w->opacity = opacity;
set_fade(dpy, w, old_opacity,
(double)w->opacity / OPAQUE,
fade_out_step, 0, True, False);
} else {
w->opacity = opacity;
determine_mode(dpy, w);
if (w->shadow) {
XRenderFreePicture(dpy, w->shadow);
w->shadow = None;
if (w->extents != None) {
XFixesDestroyRegion(dpy, w->extents);
}
/* rebuild the shadow */
w->extents = win_extents(dpy, w);
}
}
}
static void static 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));
@ -2440,19 +2465,31 @@ main(int argc, char **argv) {
switch (ev.type) { switch (ev.type) {
case FocusIn: { case FocusIn: {
if (!inactive_opacity) break; if (!inactive_opacity) break;
// stop focusing windows the cursor is over.
// with this, windows dont focus right after being
// deiconified, this needs to be fixed by blocking
// the right kind of FocusOut event
if (ev.xfocus.detail == NotifyPointer) break;
win *fw = find_win(dpy, ev.xfocus.window); win *fw = find_win(dpy, ev.xfocus.window);
if (IS_NORMAL_WIN(fw)) { if (IS_NORMAL_WIN(fw)) {
fw->opacity = OPAQUE; set_opacity(dpy, fw, OPAQUE);
determine_mode(dpy, fw);
} }
break; break;
} }
case FocusOut: { case FocusOut: {
if (!inactive_opacity) break; if (!inactive_opacity) break;
// this fixes deiconify refocus
// need != notifygrab here otherwise windows wont
// lower opacity when grabbed for dragging
if (ev.xfocus.mode != NotifyGrab
&& ev.xfocus.detail == NotifyVirtual) break;
win *fw = find_win(dpy, ev.xfocus.window); win *fw = find_win(dpy, ev.xfocus.window);
if (IS_NORMAL_WIN(fw)) { if (IS_NORMAL_WIN(fw)) {
fw->opacity = INACTIVE_OPACITY; set_opacity(dpy, fw, INACTIVE_OPACITY);
determine_mode(dpy, fw);
} }
break; break;
} }
@ -2521,27 +2558,11 @@ main(int argc, char **argv) {
/* check if Trans property was changed */ /* check if Trans property was changed */
if (ev.xproperty.atom == opacity_atom) { if (ev.xproperty.atom == opacity_atom) {
/* reset mode and redraw window */ /* reset mode and redraw window */
win * w = find_win(dpy, ev.xproperty.window); win *w = find_win(dpy, ev.xproperty.window);
if (w) { if (w) {
if (fade_trans) { double def = win_type_opacity[w->window_type];
set_fade(dpy, w, set_opacity(dpy, w,
w->opacity * 1.0 / OPAQUE, get_opacity_prop(dpy, w, (unsigned long)(OPAQUE * def)));
get_opacity_percent(dpy, w),
fade_out_step, 0, True, False);
} else {
w->opacity = get_opacity_prop(dpy, w, OPAQUE);
determine_mode(dpy, w);
if (w->shadow) {
XRenderFreePicture(dpy, w->shadow);
w->shadow = None;
if (w->extents != None)
XFixesDestroyRegion(dpy, w->extents);
/* rebuild the shadow */
w->extents = win_extents(dpy, w);
}
}
} }
} }
break; break;