#include <sys/poll.h>
#include <sys/time.h>
#include <time.h>
+#include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xrender.h>
+#if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2
+#define HAS_NAME_WINDOW_PIXMAP 1
+#endif
+
+#define CAN_DO_USABLE 0
+
typedef struct _ignore {
struct _ignore *next;
unsigned long sequence;
typedef struct _win {
struct _win *next;
Window id;
+#if HAS_NAME_WINDOW_PIXMAP
Pixmap pixmap;
+#endif
XWindowAttributes a;
+#if CAN_DO_USABLE
+ Bool usable; /* mapped and all damaged at one point */
+ XRectangle damage_bounds; /* bounds of damage */
+#endif
int mode;
int damaged;
Damage damage;
double *data;
} conv;
+typedef struct _fade {
+ struct _fade *next;
+ win *w;
+ double cur;
+ double step;
+ void (*callback) (Display *dpy, win *w, Bool gone);
+ Display *dpy;
+ Bool gone;
+} fade;
+
win *list;
+fade *fades;
Display *dpy;
int scr;
Window root;
Picture rootTile;
XserverRegion allDamage;
Bool clipChanged;
+#if HAS_NAME_WINDOW_PIXMAP
Bool hasNamePixmap;
+#endif
int root_height, root_width;
ignore *ignore_head, **ignore_tail = &ignore_head;
int xfixes_event, xfixes_error;
int damage_event, damage_error;
int composite_event, composite_error;
int render_event, render_error;
+Bool synchronize;
+int composite_opcode;
/* find these once and be done with it */
Atom opacityAtom;
#define SHADOWS 1
#define SHARP_SHADOW 0
-#if SHADOWS
-#define SHADOW_RADIUS 12
+typedef enum _compMode {
+ CompSimple, /* looks like a regular X server */
+ CompServerShadows, /* use window alpha for shadow; sharp, but precise */
+ CompClientShadows, /* use window extents for shadow, blurred */
+} CompMode;
+
+static void
+determine_mode(Display *dpy, win *w);
+
+CompMode compMode = CompSimple;
+
+int shadowRadius = 12;
+
+double fade_step = 0.05;
+int fade_delta = 10;
+int fade_time = 0;
+Bool fadeWindows;
+
+Bool autoRedirect = False;
+
+int
+get_time_in_milliseconds ()
+{
+ struct timeval tv;
+
+ gettimeofday (&tv, NULL);
+ return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+}
+
+fade *
+find_fade (win *w)
+{
+ fade *f;
+
+ for (f = fades; f; f = f->next)
+ {
+ if (f->w == w)
+ return f;
+ }
+ return 0;
+}
+
+void
+dequeue_fade (Display *dpy, fade *f)
+{
+ fade **prev;
+
+ for (prev = &fades; *prev; prev = &(*prev)->next)
+ if (*prev == f)
+ {
+ *prev = f->next;
+ if (f->callback)
+ (*f->callback) (dpy, f->w, f->gone);
+ free (f);
+ break;
+ }
+}
+
+void
+cleanup_fade (Display *dpy, win *w)
+{
+ fade *f = find_fade (w);
+ if (f)
+ dequeue_fade (dpy, f);
+}
+
+void
+enqueue_fade (Display *dpy, fade *f)
+{
+ if (!fades)
+ fade_time = get_time_in_milliseconds () + fade_delta;
+ f->next = fades;
+ fades = f;
+}
+
+static void
+set_fade (Display *dpy, win *w, Bool in,
+ void (*callback) (Display *dpy, win *w, Bool gone),
+ Bool gone)
+{
+ fade *f;
+
+ f = find_fade (w);
+ if (!f)
+ {
+ f = malloc (sizeof (fade));
+ f->next = 0;
+ f->w = w;
+ if (in)
+ f->cur = 0;
+ else
+ f->cur = 1;
+ enqueue_fade (dpy, f);
+ }
+ if (in)
+ f->step = fade_step;
+ else
+ f->step = -fade_step;
+ f->callback = callback;
+ f->gone = gone;
+ w->opacity = f->cur * OPAQUE;
+#if 0
+ printf ("set_fade start %g step %g\n", f->cur, f->step);
+#endif
+ determine_mode (dpy, w);
+}
+
+int
+fade_timeout (void)
+{
+ int now;
+ int delta;
+ if (!fades)
+ return -1;
+ now = get_time_in_milliseconds();
+ delta = fade_time - now;
+ if (delta < 0)
+ delta = 0;
+/* printf ("timeout %d\n", delta); */
+ return delta;
+}
+
+void
+run_fades (Display *dpy)
+{
+ int now = get_time_in_milliseconds();
+ fade *f, *next;
+ int steps;
+
+#if 0
+ printf ("run fades\n");
+#endif
+ if (fade_time - now > 0)
+ return;
+ steps = 1 + (now - fade_time) / fade_delta;
+ for (next = fades; f = next; )
+ {
+ win *w = f->w;
+ next = f->next;
+ f->cur += f->step * steps;
+ if (f->cur >= 1)
+ f->cur = 1;
+ else if (f->cur < 0)
+ f->cur = 0;
+#if 0
+ printf ("opacity now %g\n", f->cur);
+#endif
+ w->opacity = f->cur * OPAQUE;
+ if (f->step > 0)
+ {
+ if (f->cur >= 1)
+ dequeue_fade (dpy, f);
+ }
+ else
+ {
+ if (f->cur <= 0)
+ dequeue_fade (dpy, f);
+ }
+ determine_mode (dpy, w);
+ }
+ fade_time = now + fade_delta;
+}
+
#define SHADOW_OPACITY 0.75
-#define SHADOW_OFFSET_X (-SHADOW_RADIUS * 5 / 4)
-#define SHADOW_OFFSET_Y (-SHADOW_RADIUS * 5 / 4)
+#define SHADOW_OFFSET_X (-shadowRadius * 5 / 4)
+#define SHADOW_OFFSET_Y (-shadowRadius * 5 / 4)
static double
gaussian (double r, double x, double y)
return shadowPicture;
}
-#endif /* SHADOWS */
-
Picture
solid_picture (Display *dpy, Bool argb, double a, double r, double g, double b)
{
r.y = w->a.y;
r.width = w->a.width + w->a.border_width * 2;
r.height = w->a.height + w->a.border_width * 2;
-#if SHADOWS
-#if !SHARP_SHADOW
- if (w->mode != WINDOW_ARGB)
-#endif
+ if (compMode != CompSimple)
{
- XRectangle sr;
-
-#if SHARP_SHADOW
- w->shadow_dx = 2;
- w->shadow_dy = 7;
- w->shadow_width = w->a.width;
- w->shadow_height = w->a.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,
- w->a.width + w->a.border_width * 2,
- w->a.height + w->a.border_width * 2,
- &w->shadow_width, &w->shadow_height);
- }
-#endif
- sr.x = w->a.x + w->shadow_dx;
- sr.y = w->a.y + w->shadow_dy;
- sr.width = w->shadow_width;
- sr.height = w->shadow_height;
- if (sr.x < r.x)
- {
- r.width = (r.x + r.width) - sr.x;
- r.x = sr.x;
- }
- if (sr.y < r.y)
+ if (compMode == CompServerShadows || w->mode != WINDOW_ARGB)
{
- r.height = (r.y + r.height) - sr.y;
- r.y = sr.y;
+ XRectangle sr;
+
+ if (compMode == CompServerShadows)
+ {
+ w->shadow_dx = 2;
+ w->shadow_dy = 7;
+ w->shadow_width = w->a.width;
+ w->shadow_height = w->a.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,
+ w->a.width + w->a.border_width * 2,
+ w->a.height + w->a.border_width * 2,
+ &w->shadow_width, &w->shadow_height);
+ }
+ }
+ sr.x = w->a.x + w->shadow_dx;
+ sr.y = w->a.y + w->shadow_dy;
+ sr.width = w->shadow_width;
+ sr.height = w->shadow_height;
+ if (sr.x < r.x)
+ {
+ r.width = (r.x + r.width) - sr.x;
+ r.x = sr.x;
+ }
+ if (sr.y < r.y)
+ {
+ r.height = (r.y + r.height) - sr.y;
+ r.y = sr.y;
+ }
+ if (sr.x + sr.width > r.x + r.width)
+ r.width = sr.x + sr.width - r.x;
+ if (sr.y + sr.height > r.y + r.height)
+ r.height = sr.y + sr.height - r.y;
}
- if (sr.x + sr.width > r.x + r.width)
- r.width = sr.x + sr.width - r.x;
- if (sr.y + sr.height > r.y + r.height)
- r.height = sr.y + sr.height - r.y;
}
-#endif
return XFixesCreateRegion (dpy, &r, 1);
}
#endif
for (w = list; w; w = w->next)
{
- if (w->a.map_state != IsViewable)
+#if CAN_DO_USABLE
+ if (!w->usable)
continue;
+#endif
/* never painted, ignore it */
if (!w->damaged)
continue;
if (!w->picture)
- continue;
+ {
+ XRenderPictureAttributes pa;
+ XRenderPictFormat *format;
+ Drawable draw = w->id;
+
+#if HAS_NAME_WINDOW_PIXMAP
+ if (hasNamePixmap && !w->pixmap)
+ w->pixmap = XCompositeNameWindowPixmap (dpy, w->id);
+ if (w->pixmap)
+ draw = w->pixmap;
+#endif
+ format = XRenderFindVisualFormat (dpy, w->a.visual);
+ pa.subwindow_mode = IncludeInferiors;
+ w->picture = XRenderCreatePicture (dpy, draw,
+ format,
+ CPSubwindowMode,
+ &pa);
+ }
#if DEBUG_REPAINT
printf (" 0x%x", w->id);
#endif
w->extents = win_extents (dpy, w);
if (w->mode == WINDOW_SOLID)
{
+ int x, y, wid, hei;
+#if HAS_NAME_WINDOW_PIXMAP
+ x = w->a.x;
+ y = w->a.y;
+ wid = w->a.width + w->a.border_width * 2;
+ hei = w->a.height + w->a.border_width * 2;
+#else
+ x = w->a.x + w->a.border_width;
+ y = w->a.y + w->a.border_width;
+ wid = w->a.width;
+ hei = w->a.height;
+#endif
XFixesSetPictureClipRegion (dpy, rootBuffer, 0, 0, region);
set_ignore (dpy, NextRequest (dpy));
XFixesSubtractRegion (dpy, region, region, w->borderSize);
set_ignore (dpy, NextRequest (dpy));
XRenderComposite (dpy, PictOpSrc, 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);
+ x, y, wid, hei);
}
if (!w->borderClip)
{
for (w = t; w; w = w->prev_trans)
{
XFixesSetPictureClipRegion (dpy, rootBuffer, 0, 0, w->borderClip);
-#if SHADOWS
-#if SHARP_SHADOW
- set_ignore (dpy, NextRequest (dpy));
- if (w->opacity != OPAQUE && !w->shadowPict)
- w->shadowPict = solid_picture (dpy, True,
- (double) w->opacity / OPAQUE * 0.3,
- 0, 0, 0);
- XRenderComposite (dpy, PictOpOver,
- w->shadowPict ? w->shadowPict : transBlackPicture,
- w->picture, rootBuffer,
- 0, 0, 0, 0,
- w->a.x + w->shadow_dx,
- w->a.y + w->shadow_dy,
- w->shadow_width, w->shadow_height);
-#else
- if (w->shadow)
- {
- XRenderComposite (dpy, PictOpOver, blackPicture, w->shadow, rootBuffer,
+ switch (compMode) {
+ case CompSimple:
+ break;
+ case CompServerShadows:
+ set_ignore (dpy, NextRequest (dpy));
+ if (w->opacity != OPAQUE && !w->shadowPict)
+ w->shadowPict = solid_picture (dpy, True,
+ (double) w->opacity / OPAQUE * 0.3,
+ 0, 0, 0);
+ XRenderComposite (dpy, PictOpOver,
+ w->shadowPict ? w->shadowPict : transBlackPicture,
+ w->picture, rootBuffer,
0, 0, 0, 0,
w->a.x + w->shadow_dx,
w->a.y + w->shadow_dy,
w->shadow_width, w->shadow_height);
+ break;
+ case CompClientShadows:
+ if (w->shadow)
+ {
+ XRenderComposite (dpy, PictOpOver, blackPicture, w->shadow, rootBuffer,
+ 0, 0, 0, 0,
+ w->a.x + w->shadow_dx,
+ w->a.y + w->shadow_dy,
+ w->shadow_width, w->shadow_height);
+ }
+ break;
}
-#endif
-#endif /* SHADOWS */
- if (w->opacity != OPAQUE)
+ if (w->opacity != OPAQUE && !w->alphaPict)
w->alphaPict = solid_picture (dpy, False,
(double) w->opacity / OPAQUE, 0, 0, 0);
if (w->mode == WINDOW_TRANS)
{
+ int x, y, wid, hei;
+#if HAS_NAME_WINDOW_PIXMAP
+ x = w->a.x;
+ y = w->a.y;
+ wid = w->a.width + w->a.border_width * 2;
+ hei = w->a.height + w->a.border_width * 2;
+#else
+ x = w->a.x + w->a.border_width;
+ y = w->a.y + w->a.border_width;
+ wid = w->a.width;
+ hei = w->a.height;
+#endif
set_ignore (dpy, NextRequest (dpy));
XRenderComposite (dpy, PictOpOver, w->picture, w->alphaPict, 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);
+ x, y, wid, hei);
}
else if (w->mode == WINDOW_ARGB)
{
+ int x, y, wid, hei;
+#if HAS_NAME_WINDOW_PIXMAP
+ x = w->a.x;
+ y = w->a.y;
+ wid = w->a.width + w->a.border_width * 2;
+ hei = w->a.height + w->a.border_width * 2;
+#else
+ x = w->a.x + w->a.border_width;
+ y = w->a.y + w->a.border_width;
+ wid = w->a.width;
+ hei = w->a.height;
+#endif
set_ignore (dpy, NextRequest (dpy));
XRenderComposite (dpy, PictOpOver, w->picture, w->alphaPict, 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);
+ x, y, wid, hei);
}
XFixesDestroyRegion (dpy, w->borderClip);
w->borderClip = None;
}
static void
-repair_win (Display *dpy, Window id)
+repair_win (Display *dpy, win *w)
{
- win *w = find_win (dpy, id);
XserverRegion parts;
- if (!w)
- return;
if (!w->damaged)
{
parts = win_extents (dpy, w);
XFixesTranslateRegion (dpy, parts,
w->a.x + w->a.border_width,
w->a.y + w->a.border_width);
-#if SHADOWS
-#if SHARP_SHADOW
- o = XFixesCreateRegion (dpy, 0, 0);
- XFixesCopyRegion (dpy, o, parts);
- XFixesTranslateRegion (dpy, o, w->shadow_dx, w->shadow_dy);
- XFixesUnionRegion (dpy, parts, parts, o);
- XFixesDestroyRegion (dpy, o);
-#endif
-#endif
+ if (compMode == CompServerShadows)
+ {
+ o = XFixesCreateRegion (dpy, 0, 0);
+ XFixesCopyRegion (dpy, o, parts);
+ XFixesTranslateRegion (dpy, o, w->shadow_dx, w->shadow_dy);
+ XFixesUnionRegion (dpy, parts, parts, o);
+ XFixesDestroyRegion (dpy, o);
+ }
}
add_damage (dpy, parts);
w->damaged = 1;
}
static void
-map_win (Display *dpy, Window id, unsigned long sequence)
+map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
{
win *w = find_win (dpy, id);
Drawable back;
if (!w)
return;
w->a.map_state = IsViewable;
-
- if (hasNamePixmap)
- {
- w->pixmap = XCompositeNameWindowPixmap (dpy, id);
- back = w->pixmap;
- }
- else
- {
- w->pixmap = 0;
- back = id;
- }
-
- if (w->a.class != InputOnly)
- {
- XRenderPictureAttributes pa;
- XRenderPictFormat *format;
- format = XRenderFindVisualFormat (dpy, w->a.visual);
- pa.subwindow_mode = IncludeInferiors;
- w->picture = XRenderCreatePicture (dpy, back,
- format,
- CPSubwindowMode,
- &pa);
- }
- /* make sure we know if property was changed */
- XSelectInput(dpy, id, PropertyChangeMask);
-
+#if CAN_DO_USABLE
+ w->damage_bounds.x = w->damage_bounds.y = 0;
+ w->damage_bounds.width = w->damage_bounds.height = 0;
+#endif
w->damaged = 0;
- clipChanged = True;
}
static void
-unmap_win (Display *dpy, Window id)
+finish_unmap_win (Display *dpy, win *w)
{
- win *w = find_win (dpy, id);
-
- if (!w)
- return;
- w->a.map_state = IsUnmapped;
w->damaged = 0;
+#if CAN_DO_USABLE
+ w->usable = False;
+#endif
if (w->extents != None)
{
add_damage (dpy, w->extents); /* destroys region */
w->extents = None;
}
- if (hasNamePixmap)
+
+#if HAS_NAME_WINDOW_PIXMAP
+ if (w->pixmap)
{
XFreePixmap (dpy, w->pixmap);
- w->pixmap = 0;
+ w->pixmap = None;
}
+#endif
+
if (w->picture)
+ {
+ set_ignore (dpy, NextRequest (dpy));
XRenderFreePicture (dpy, w->picture);
+ w->picture = None;
+ }
/* don't care about properties anymore */
set_ignore (dpy, NextRequest (dpy));
- XSelectInput(dpy, id, 0);
+ XSelectInput(dpy, w->id, 0);
if (w->borderSize)
{
clipChanged = True;
}
+#if HAS_NAME_WINDOW_PIXMAP
+static void
+unmap_callback (Display *dpy, win *w, Bool gone)
+{
+ finish_unmap_win (dpy, w);
+}
+#endif
+static void
+unmap_win (Display *dpy, Window id, Bool fade)
+{
+ win *w = find_win (dpy, id);
+ if (!w)
+ return;
+#if HAS_NAME_WINDOW_PIXMAP
+ if (w->pixmap && fade && fadeWindows)
+ set_fade (dpy, w, False, unmap_callback, False);
+ else
+#endif
+ finish_unmap_win (dpy, w);
+}
/* Get the opacity prop from window
not found: default
Future might check for menu flag and other cool things
*/
-
-static int
+static void
determine_mode(Display *dpy, win *w)
{
int mode;
/* if trans prop == -1 fall back on previous tests*/
- if (w->a.override_redirect)
- default_opacity = TRANSLUCENT;
- else
- default_opacity = OPAQUE;
-
- w->opacity = get_opacity_prop(dpy, w, default_opacity);
if (w->alphaPict)
{
XRenderFreePicture (dpy, w->alphaPict);
{
mode = WINDOW_SOLID;
}
- return mode;
+ w->mode = mode;
+ if (w->extents)
+ {
+ XserverRegion damage;
+ damage = XFixesCreateRegion (dpy, 0, 0);
+ XFixesCopyRegion (dpy, damage, w->extents);
+ add_damage (dpy, damage);
+ }
}
static void
return;
}
new->damaged = 0;
+#if CAN_DO_USABLE
+ new->usable = False;
+#endif
+#if HAS_NAME_WINDOW_PIXMAP
+ new->pixmap = None;
+#endif
new->picture = None;
if (new->a.class == InputOnly)
{
new->shadow_height = 0;
new->opacity = OPAQUE;
- /* moved mode setting to one place */
- new->mode = determine_mode(dpy, new);
new->borderClip = None;
new->prev_trans = 0;
+ /* moved mode setting to one place */
+ XSelectInput(dpy, id, PropertyChangeMask);
+ new->opacity = get_opacity_prop(dpy, new, OPAQUE);
+ determine_mode (dpy, new);
+
new->next = *p;
*p = new;
if (new->a.map_state == IsViewable)
- map_win (dpy, id, new->damage_sequence - 1);
+ map_win (dpy, id, new->damage_sequence - 1, False);
}
void
}
return;
}
- if (w->a.map_state == IsViewable)
+#if CAN_DO_USABLE
+ if (w->usable)
+#endif
{
damage = XFixesCreateRegion (dpy, 0, 0);
if (w->extents != None)
w->a.x = ce->x;
w->a.y = ce->y;
if (w->a.width != ce->width || w->a.height != ce->height)
+ {
+#if HAS_NAME_WINDOW_PIXMAP
+ if (w->pixmap)
+ {
+ XFreePixmap (dpy, w->pixmap);
+ w->pixmap = None;
+ if (w->picture)
+ {
+ XRenderFreePicture (dpy, w->picture);
+ w->picture = None;
+ }
+ }
+#endif
if (w->shadow)
{
XRenderFreePicture (dpy, w->shadow);
w->shadow = None;
}
+ }
w->a.width = ce->width;
w->a.height = ce->height;
w->a.border_width = ce->border_width;
}
static void
-destroy_win (Display *dpy, Window id, Bool gone)
+finish_destroy_win (Display *dpy, Window id, Bool gone)
{
win **prev, *w;
if (w->id == id)
{
if (!gone)
- unmap_win (dpy, id);
+ finish_unmap_win (dpy, w);
*prev = w->next;
if (w->picture)
{
XRenderFreePicture (dpy, w->picture);
}
if (w->alphaPict)
+ {
XRenderFreePicture (dpy, w->alphaPict);
+ w->alphaPict = None;
+ }
if (w->shadowPict)
+ {
XRenderFreePicture (dpy, w->shadowPict);
+ w->shadowPict = None;
+ }
if (w->damage != None)
{
set_ignore (dpy, NextRequest (dpy));
XDamageDestroy (dpy, w->damage);
}
+ cleanup_fade (dpy, w);
free (w);
break;
}
}
+#if HAS_NAME_WINDOW_PIXMAP
+static void
+destroy_callback (Display *dpy, win *w, Bool gone)
+{
+ finish_destroy_win (dpy, w->id, gone);
+}
+#endif
+
+static void
+destroy_win (Display *dpy, Window id, Bool gone, Bool fade)
+{
+ win *w = find_win (dpy, id);
+#if HAS_NAME_WINDOW_PIXMAP
+ if (w && w->pixmap && fade && fadeWindows)
+ set_fade (dpy, w, False, destroy_callback, gone);
+ else
+#endif
+ {
+ finish_destroy_win (dpy, id, gone);
+ }
+}
+
/*
static void
dump_win (win *w)
static void
damage_win (Display *dpy, XDamageNotifyEvent *de)
{
- repair_win (dpy, de->drawable);
+ win *w = find_win (dpy, de->drawable);
+
+ if (!w)
+ return;
+#if CAN_DO_USABLE
+ if (!w->usable)
+ {
+ if (w->damage_bounds.width == 0 || w->damage_bounds.height == 0)
+ {
+ w->damage_bounds = de->area;
+ }
+ else
+ {
+ if (de->area.x < w->damage_bounds.x)
+ {
+ w->damage_bounds.width += (w->damage_bounds.x - de->area.x);
+ w->damage_bounds.x = de->area.x;
+ }
+ if (de->area.y < w->damage_bounds.y)
+ {
+ w->damage_bounds.height += (w->damage_bounds.y - de->area.y);
+ w->damage_bounds.y = de->area.y;
+ }
+ if (de->area.x + de->area.width > w->damage_bounds.x + w->damage_bounds.width)
+ w->damage_bounds.width = de->area.x + de->area.width - w->damage_bounds.x;
+ if (de->area.y + de->area.height > w->damage_bounds.y + w->damage_bounds.height)
+ w->damage_bounds.height = de->area.y + de->area.height - w->damage_bounds.y;
+ }
+#if 0
+ printf ("unusable damage %d, %d: %d x %d bounds %d, %d: %d x %d\n",
+ de->area.x,
+ de->area.y,
+ de->area.width,
+ de->area.height,
+ w->damage_bounds.x,
+ w->damage_bounds.y,
+ w->damage_bounds.width,
+ w->damage_bounds.height);
+#endif
+ if (w->damage_bounds.x <= 0 &&
+ w->damage_bounds.y <= 0 &&
+ w->a.width <= w->damage_bounds.x + w->damage_bounds.width &&
+ w->a.height <= w->damage_bounds.y + w->damage_bounds.height)
+ {
+ clipChanged = True;
+ if (fadeWindows)
+ set_fade (dpy, w, True, 0, False);
+ w->usable = True;
+ }
+ }
+ if (w->usable)
+#endif
+ repair_win (dpy, w);
}
static int
if (should_ignore (dpy, ev->serial))
return 0;
+ if (ev->request_code == composite_opcode &&
+ ev->minor_code == X_CompositeRedirectSubwindows)
+ {
+ fprintf (stderr, "Another composite manager is already running\n");
+ exit (1);
+ }
o = ev->error_code - xfixes_error;
switch (o) {
printf ("error %d request %d minor %d serial %d\n",
ev->error_code, ev->request_code, ev->minor_code, ev->serial);
+/* abort (); this is just annoying to most people */
return 0;
}
}
}
+void
+usage (char *program)
+{
+ fprintf (stderr, "usage: %s [-d display] [-n] [-s] [-c] [-a]\n", program);
+ exit (1);
+}
+
int
main (int argc, char **argv)
{
int now;
int p;
int composite_major, composite_minor;
+ char *display = 0;
+ int o;
- dpy = XOpenDisplay (0);
+ while ((o = getopt (argc, argv, "d:scnfaS")) != -1)
+ {
+ switch (o) {
+ case 'd':
+ display = optarg;
+ break;
+ case 's':
+ compMode = CompServerShadows;
+ break;
+ case 'c':
+ compMode = CompClientShadows;
+ break;
+ case 'n':
+ compMode = CompSimple;
+ break;
+ case 'f':
+ fadeWindows = True;
+ break;
+ case 'a':
+ autoRedirect = True;
+ break;
+ case 'S':
+ synchronize = True;
+ break;
+ default:
+ usage (argv[0]);
+ break;
+ }
+ }
+
+ dpy = XOpenDisplay (display);
if (!dpy)
{
fprintf (stderr, "Can't open display\n");
exit (1);
}
XSetErrorHandler (error);
-#if 0
- XSynchronize (dpy, 1);
-#endif
+ if (synchronize)
+ XSynchronize (dpy, 1);
scr = DefaultScreen (dpy);
root = RootWindow (dpy, scr);
fprintf (stderr, "No render extension\n");
exit (1);
}
- if (!XCompositeQueryExtension (dpy, &composite_event, &composite_error))
+ if (!XQueryExtension (dpy, COMPOSITE_NAME, &composite_opcode,
+ &composite_event, &composite_error))
{
fprintf (stderr, "No composite extension\n");
exit (1);
}
XCompositeQueryVersion (dpy, &composite_major, &composite_minor);
-#if 0
+#if HAS_NAME_WINDOW_PIXMAP
if (composite_major > 0 || composite_minor >= 2)
hasNamePixmap = True;
#endif
pa.subwindow_mode = IncludeInferiors;
-#if SHADOWS && !SHARP_SHADOW
- gaussianMap = make_gaussian_map(dpy, SHADOW_RADIUS);
-#endif
+ if (compMode == CompClientShadows)
+ gaussianMap = make_gaussian_map(dpy, shadowRadius);
root_width = DisplayWidth (dpy, scr);
root_height = DisplayHeight (dpy, scr);
CPSubwindowMode,
&pa);
blackPicture = solid_picture (dpy, True, 1, 0, 0, 0);
-#if SHADOWS && SHARP_SHADOW
- transBlackPicture = solid_picture (dpy, True, 0.3, 0, 0, 0);
-#endif
+ if (compMode == CompServerShadows)
+ transBlackPicture = solid_picture (dpy, True, 0.3, 0, 0, 0);
allDamage = None;
clipChanged = True;
XGrabServer (dpy);
- XCompositeRedirectSubwindows (dpy, root, CompositeRedirectManual);
- XSelectInput (dpy, root,
- SubstructureNotifyMask|
- ExposureMask|
- StructureNotifyMask|
- PropertyChangeMask);
- XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren);
- for (i = 0; i < nchildren; i++)
- add_win (dpy, children[i], i ? children[i-1] : None);
- XFree (children);
+ if (autoRedirect)
+ XCompositeRedirectSubwindows (dpy, root, CompositeRedirectAutomatic);
+ else
+ {
+ XCompositeRedirectSubwindows (dpy, root, CompositeRedirectManual);
+ XSelectInput (dpy, root,
+ SubstructureNotifyMask|
+ ExposureMask|
+ StructureNotifyMask|
+ PropertyChangeMask);
+ XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren);
+ for (i = 0; i < nchildren; i++)
+ add_win (dpy, children[i], i ? children[i-1] : None);
+ XFree (children);
+ }
XUngrabServer (dpy);
- paint_all (dpy, None);
+ ufd.fd = ConnectionNumber (dpy);
+ ufd.events = POLLIN;
+ if (!autoRedirect)
+ paint_all (dpy, None);
for (;;)
{
/* dump_wins (); */
do {
+ if (autoRedirect)
+ XFlush (dpy);
+ if (!QLength (dpy))
+ {
+ if (poll (&ufd, 1, fade_timeout()) == 0)
+ {
+ run_fades (dpy);
+ break;
+ }
+ }
+
XNextEvent (dpy, &ev);
if (ev.type & 0x7f != KeymapNotify)
discard_ignore (dpy, ev.xany.serial);
printf ("event %10.10s serial 0x%08x window 0x%08x\n",
ev_name(&ev), ev_serial (&ev), ev_window (&ev));
#endif
- switch (ev.type) {
+ if (!autoRedirect) switch (ev.type) {
case CreateNotify:
add_win (dpy, ev.xcreatewindow.window, 0);
break;
configure_win (dpy, &ev.xconfigure);
break;
case DestroyNotify:
- destroy_win (dpy, ev.xdestroywindow.window, True);
+ destroy_win (dpy, ev.xdestroywindow.window, True, True);
break;
case MapNotify:
- map_win (dpy, ev.xmap.window, ev.xmap.serial);
+ map_win (dpy, ev.xmap.window, ev.xmap.serial, True);
break;
case UnmapNotify:
- unmap_win (dpy, ev.xunmap.window);
+ unmap_win (dpy, ev.xunmap.window, True);
break;
case ReparentNotify:
if (ev.xreparent.parent == root)
add_win (dpy, ev.xreparent.window, 0);
else
- destroy_win (dpy, ev.xreparent.window, False);
+ destroy_win (dpy, ev.xreparent.window, False, True);
break;
case CirculateNotify:
circulate_win (dpy, &ev.xcirculate);
win * w = find_win(dpy, ev.xproperty.window);
if (w)
{
- w->mode = determine_mode(dpy, w);
- if (w->extents)
- {
- XserverRegion damage;
- damage = XFixesCreateRegion (dpy, 0, 0);
- XFixesCopyRegion (dpy, damage, w->extents);
- add_damage (dpy, damage);
- }
+ w->opacity = get_opacity_prop(dpy, w, OPAQUE);
+ determine_mode(dpy, w);
}
}
break;
break;
}
} while (QLength (dpy));
- if (allDamage)
+ if (allDamage && !autoRedirect)
{
static int paint;
paint_all (dpy, allDamage);
projects / dana / xcompmgr.git / blobdiff