#include <sys/time.h>
#include <time.h>
#include <unistd.h>
+#include <pthread.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <getopt.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
Window id;
#if HAS_NAME_WINDOW_PIXMAP
Pixmap pixmap;
+ pthread_t pixmap_thread;
+ int pixmap_nthreads;
+ pthread_mutex_t pixmap_lock;
#endif
XWindowAttributes a;
#if CAN_DO_USABLE
unsigned int opacity;
Atom windowType;
unsigned long damage_sequence; /* sequence when damage was created */
+ Bool unmapped_configure;
/* for drawing translucent windows */
XserverRegion borderClip;
double cur;
double finish;
double step;
- void (*callback) (Display *dpy, win *w, Bool gone);
+ void (*callback) (Display *dpy, win *w);
Display *dpy;
- Bool gone;
} fade;
+typedef struct _threaddata {
+ Display *dpy;
+ win *w;
+ XserverRegion extents;
+ pthread_t prev_thread;
+} threaddata;
+
win *list;
fade *fades;
Display *dpy;
Picture transBlackPicture;
Picture rootTile;
XserverRegion allDamage;
+pthread_mutex_t damage_lock = PTHREAD_MUTEX_INITIALIZER;
Bool clipChanged;
#if HAS_NAME_WINDOW_PIXMAP
Bool hasNamePixmap;
CompMode compMode = CompSimple;
int shadowRadius = 12;
+int shadowOffsetX = -15;
+int shadowOffsetY = -15;
+double shadowOpacity = .75;
double fade_in_step = 0.028;
double fade_out_step = 0.03;
Bool autoRedirect = False;
+/* For shadow precomputation */
+int Gsize = -1;
+unsigned char *shadowCorner = NULL;
+unsigned char *shadowTop = NULL;
+
int
get_time_in_milliseconds ()
{
{
*prev = f->next;
if (f->callback)
- (*f->callback) (dpy, f->w, f->gone);
+ (*f->callback) (dpy, f->w);
free (f);
break;
}
static void
set_fade (Display *dpy, win *w, double start, double finish, double step,
- void (*callback) (Display *dpy, win *w, Bool gone),
- Bool gone, Bool exec_callback, Bool override)
+ void (*callback) (Display *dpy, win *w),
+ Bool exec_callback, Bool override)
{
fade *f;
{
if (exec_callback)
if (f->callback)
- (*f->callback)(dpy, f->w, f->gone);
+ (*f->callback)(dpy, f->w);
}
if (finish < 0)
else if (f->cur > finish)
f->step = -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);
run_fades (Display *dpy)
{
int now = get_time_in_milliseconds();
- fade *f, *next;
+ fade *next = fades;
int steps;
+ Bool need_dequeue;
#if 0
printf ("run fades\n");
if (fade_time - now > 0)
return;
steps = 1 + (now - fade_time) / fade_delta;
- for (next = fades; f = next; )
+
+ while (next)
{
+ fade *f = next;
win *w = f->w;
next = f->next;
f->cur += f->step * steps;
printf ("opacity now %g\n", f->cur);
#endif
w->opacity = f->cur * OPAQUE;
+ need_dequeue = False;
if (f->step > 0)
{
if (f->cur >= f->finish)
{
w->opacity = f->finish*OPAQUE;
- dequeue_fade (dpy, f);
- }
+ need_dequeue = True;
+ }
}
else
{
if (f->cur <= f->finish)
{
w->opacity = f->finish*OPAQUE;
- dequeue_fade (dpy, f);
- }
+ need_dequeue = True;
+ }
}
determine_mode (dpy, w);
if (w->shadow)
w->shadow = None;
w->extents = win_extents(dpy, w);
}
+ /* Must do this last as it might destroy f->w in callbacks */
+ if (need_dequeue)
+ dequeue_fade (dpy, f);
}
fade_time = now + fade_delta;
}
-#define SHADOW_OPACITY 0.75
-#define SHADOW_OFFSET_X (-shadowRadius * 5 / 4)
-#define SHADOW_OFFSET_Y (-shadowRadius * 5 / 4)
-
static double
gaussian (double r, double x, double y)
{
return ((unsigned char) (v * opacity * 255.0));
}
+/* precompute shadow corners and sides to save time for large windows */
+static void
+presum_gaussian (conv *map)
+{
+ int center = map->size/2;
+ int opacity, x, y;
+
+ Gsize = map->size;
+
+ if (shadowCorner)
+ free ((void *)shadowCorner);
+ if (shadowTop)
+ free ((void *)shadowTop);
+
+ shadowCorner = (unsigned char *)(malloc ((Gsize + 1) * (Gsize + 1) * 26));
+ shadowTop = (unsigned char *)(malloc ((Gsize + 1) * 26));
+
+ for (x = 0; x <= Gsize; x++)
+ {
+ shadowTop[25 * (Gsize + 1) + x] = sum_gaussian (map, 1, x - center, center, Gsize * 2, Gsize * 2);
+ for(opacity = 0; opacity < 25; opacity++)
+ shadowTop[opacity * (Gsize + 1) + x] = shadowTop[25 * (Gsize + 1) + x] * opacity / 25;
+ for(y = 0; y <= x; y++)
+ {
+ shadowCorner[25 * (Gsize + 1) * (Gsize + 1) + y * (Gsize + 1) + x]
+ = sum_gaussian (map, 1, x - center, y - center, Gsize * 2, Gsize * 2);
+ shadowCorner[25 * (Gsize + 1) * (Gsize + 1) + x * (Gsize + 1) + y]
+ = shadowCorner[25 * (Gsize + 1) * (Gsize + 1) + y * (Gsize + 1) + x];
+ for(opacity = 0; opacity < 25; opacity++)
+ shadowCorner[opacity * (Gsize + 1) * (Gsize + 1) + y * (Gsize + 1) + x]
+ = shadowCorner[opacity * (Gsize + 1) * (Gsize + 1) + x * (Gsize + 1) + y]
+ = shadowCorner[25 * (Gsize + 1) * (Gsize + 1) + y * (Gsize + 1) + x] * opacity / 25;
+ }
+ }
+}
+
static XImage *
make_shadow (Display *dpy, double opacity, int width, int height)
{
int x, y;
unsigned char d;
int x_diff;
-
+ int opacity_int = (int)(opacity * 25);
data = malloc (swidth * sheight * sizeof (unsigned char));
if (!data)
return 0;
/*
* center (fill the complete data array)
*/
-
- d = sum_gaussian (gaussianMap, opacity, center, center, width, height);
+ if (Gsize > 0)
+ d = shadowTop[opacity_int * (Gsize + 1) + Gsize];
+ else
+ d = sum_gaussian (gaussianMap, opacity, center, center, width, height);
memset(data, d, sheight * swidth);
/*
for (y = 0; y < ylimit; y++)
for (x = 0; x < xlimit; x++)
{
- d = sum_gaussian (gaussianMap, opacity, x - center, y - center, width, height);
+ if (xlimit == Gsize && ylimit == Gsize)
+ d = shadowCorner[opacity_int * (Gsize + 1) * (Gsize + 1) + y * (Gsize + 1) + x];
+ else
+ d = sum_gaussian (gaussianMap, opacity, x - center, y - center, width, height);
data[y * swidth + x] = d;
data[(sheight - y - 1) * swidth + x] = d;
data[(sheight - y - 1) * swidth + (swidth - x - 1)] = d;
{
for (y = 0; y < ylimit; y++)
{
- d = sum_gaussian (gaussianMap, opacity, center, y - center, width, height);
+ if (ylimit == Gsize)
+ d = shadowTop[opacity_int * (Gsize + 1) + y];
+ else
+ d = sum_gaussian (gaussianMap, opacity, center, y - center, width, height);
memset (&data[y * swidth + gsize], d, x_diff);
memset (&data[(sheight - y - 1) * swidth + gsize], d, x_diff);
}
for (x = 0; x < xlimit; x++)
{
- d = sum_gaussian (gaussianMap, opacity, x - center, center, width, height);
+ if (xlimit == Gsize)
+ d = shadowTop[opacity_int * (Gsize + 1) + x];
+ else
+ d = sum_gaussian (gaussianMap, opacity, x - center, center, width, height);
for (y = gsize; y < sheight - gsize; y++)
{
data[y * swidth + x] = d;
{
XImage *shadowImage;
Pixmap shadowPixmap;
- Pixmap finalPixmap;
Picture shadowPicture;
- Picture finalPicture;
GC gc;
shadowImage = make_shadow (dpy, opacity, width, height);
XRenderColor c;
pixmap = XCreatePixmap (dpy, root, 1, 1, argb ? 32 : 8);
+ if (!pixmap)
+ return None;
+
pa.repeat = True;
picture = XRenderCreatePicture (dpy, pixmap,
XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8),
CPRepeat,
&pa);
+ if (!picture)
+ {
+ XFreePixmap (dpy, pixmap);
+ return None;
+ }
+
c.alpha = a * 0xffff;
c.red = r * 0xffff;
c.green = g * 0xffff;
return 0;
}
-static char *backgroundProps[] = {
+static const char *backgroundProps[] = {
"_XROOTPMAP_ID",
"_XSETROOT_ID",
0,
}
else
{
- w->shadow_dx = SHADOW_OFFSET_X;
- w->shadow_dy = SHADOW_OFFSET_Y;
+ w->shadow_dx = shadowOffsetX;
+ w->shadow_dy = shadowOffsetY;
if (!w->shadow)
{
- double opacity = SHADOW_OPACITY;
+ double opacity = shadowOpacity;
if (w->mode == WINDOW_TRANS)
opacity = opacity * ((double)w->opacity)/((double)OPAQUE);
w->shadow = shadow_picture (dpy, opacity, w->alphaPict,
}
static void
+add_damage (Display *dpy, XserverRegion damage)
+{
+ pthread_mutex_lock (&damage_lock);
+ if (allDamage)
+ {
+ XFixesUnionRegion (dpy, allDamage, allDamage, damage);
+ XFixesDestroyRegion (dpy, damage);
+ }
+ else
+ allDamage = damage;
+ pthread_mutex_unlock (&damage_lock);
+}
+
+static void
+repair_win (Display *dpy, win *w)
+{
+ XserverRegion parts;
+
+ if (!w->damaged)
+ {
+ parts = win_extents (dpy, w);
+ set_ignore (dpy, NextRequest (dpy));
+ XDamageSubtract (dpy, w->damage, None, None);
+ }
+ else
+ {
+ XserverRegion o;
+ parts = XFixesCreateRegion (dpy, 0, 0);
+ set_ignore (dpy, NextRequest (dpy));
+ XDamageSubtract (dpy, w->damage, None, parts);
+ XFixesTranslateRegion (dpy, parts,
+ w->a.x + w->a.border_width,
+ w->a.y + w->a.border_width);
+ 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);
+ }
+ }
+ if (!w->picture)
+ printf("adding damage 0x%x 0x%x\n", w->id, w->picture);
+ add_damage (dpy, parts);
+ w->damaged = 1;
+}
+
+#if HAS_NAME_WINDOW_PIXMAP
+static void*
+get_pixmap_thread (void *vdata)
+{
+ threaddata *d = vdata;
+ Pixmap pix;
+ Picture pic;
+
+ /* if another thread is already running for this window, then wait for it
+ to exit before start */
+ if (d->prev_thread != 0) {
+ void *ret;
+
+ pthread_join (d->prev_thread, &ret);
+ }
+
+ pix = None;
+ pic = None;
+
+ printf("getting pixmap for 0x%x\n", d->w->id);
+
+ /* this is the slow stuff */
+ XLockDisplay (d->dpy);
+ pix = XCompositeNameWindowPixmap (d->dpy, d->w->id);
+ if (pix) {
+ XRenderPictureAttributes pa;
+ XRenderPictFormat *format;
+
+ format = XRenderFindVisualFormat (d->dpy, d->w->a.visual);
+ pa.subwindow_mode = IncludeInferiors;
+ pic = XRenderCreatePicture (d->dpy, pix,
+ format,
+ CPSubwindowMode,
+ &pa);
+ }
+ XUnlockDisplay (d->dpy);
+
+ /* we're done the slow stuff so lock and set things */
+
+ if (pic) {
+ pthread_mutex_lock (&d->w->pixmap_lock);
+
+ if (d->w->pixmap)
+ {
+ XFreePixmap (dpy, d->w->pixmap);
+ d->w->pixmap = None;
+ }
+
+ if (d->w->picture)
+ {
+ XRenderFreePicture (dpy, d->w->picture);
+ d->w->picture = None;
+ }
+
+ d->w->pixmap = pix;
+ d->w->picture = pic;
+
+ pthread_mutex_unlock (&d->w->pixmap_lock);
+
+ /* make the window redraw */
+ //add_damage(d->dpy, d->extents);
+ /* wake up the main loop */
+ kill(getpid(), SIGURG);
+ }
+
+ free(vdata);
+
+ pthread_mutex_lock (&d->w->pixmap_lock);
+ d->w->pixmap_nthreads--;
+ pthread_mutex_unlock (&d->w->pixmap_lock);
+
+ return NULL;
+}
+#endif
+
+#if HAS_NAME_WINDOW_PIXMAP
+static void
+start_get_pixmap_thread (Display *dpy, win *w, XserverRegion extents)
+{
+ if (hasNamePixmap) {
+ threaddata *data;
+
+ pthread_mutex_lock (&w->pixmap_lock);
+ w->pixmap_nthreads++;
+ pthread_mutex_unlock (&w->pixmap_lock);
+
+ data = malloc (sizeof (threaddata));
+ data->dpy = dpy;
+ data->w = w;
+ data->extents = extents;
+ data->prev_thread = w->pixmap_thread;
+ if (pthread_create (&w->pixmap_thread, NULL, get_pixmap_thread, data))
+ {
+ /* error */
+ pthread_mutex_lock (&w->pixmap_lock);
+ w->pixmap_nthreads--;
+ pthread_mutex_unlock (&w->pixmap_lock);
+ }
+ }
+}
+#endif
+
+static Bool
paint_all (Display *dpy, XserverRegion region)
{
win *w;
win *t = 0;
+ Bool pending = False;
if (!region)
{
/* never painted, ignore it */
if (!w->damaged)
continue;
+ /* if invisible, ignore it */
+ if (w->a.x + w->a.width < 1 || w->a.y + w->a.height < 1
+ || w->a.x >= root_width || w->a.y >= root_height)
+ continue;
+
+#if HAS_NAME_WINDOW_PIXMAP
+ pthread_mutex_lock (&w->pixmap_lock);
+#endif
if (!w->picture)
{
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,
+ w->picture = XRenderCreatePicture (dpy, w->id,
format,
CPSubwindowMode,
&pa);
+ printf("got temp picture for 0x%x\n", w->id);
+
+#if HAS_NAME_WINDOW_PIXMAP
+ pending = True;
+#endif
}
+#if HAS_NAME_WINDOW_PIXMAP
+ pthread_mutex_unlock (&w->pixmap_lock);
+#endif
+
#if DEBUG_REPAINT
printf (" 0x%x", w->id);
#endif
case CompSimple:
break;
case CompServerShadows:
+ /* dont' bother drawing shadows on desktop windows */
+ if (w->windowType == winDesktopAtom)
+ break;
set_ignore (dpy, NextRequest (dpy));
if (w->opacity != OPAQUE && !w->shadowPict)
w->shadowPict = solid_picture (dpy, True,
w->shadow_width, w->shadow_height);
break;
case CompClientShadows:
- if (w->shadow)
+ /* don't bother drawing shadows on desktop windows */
+ if (w->shadow && w->windowType != winDesktopAtom)
{
XRenderComposite (dpy, PictOpOver, blackPicture, w->shadow, rootBuffer,
0, 0, 0, 0,
XRenderComposite (dpy, PictOpSrc, rootBuffer, None, rootPicture,
0, 0, 0, 0, 0, 0, root_width, root_height);
}
-}
-static void
-add_damage (Display *dpy, XserverRegion damage)
-{
- if (allDamage)
- {
- XFixesUnionRegion (dpy, allDamage, allDamage, damage);
- XFixesDestroyRegion (dpy, damage);
- }
- else
- allDamage = damage;
+ return pending;
}
-static void
-repair_win (Display *dpy, win *w)
-{
- XserverRegion parts;
-
- if (!w->damaged)
- {
- parts = win_extents (dpy, w);
- set_ignore (dpy, NextRequest (dpy));
- XDamageSubtract (dpy, w->damage, None, None);
- }
- else
- {
- XserverRegion o;
- parts = XFixesCreateRegion (dpy, 0, 0);
- set_ignore (dpy, NextRequest (dpy));
- XDamageSubtract (dpy, w->damage, None, parts);
- XFixesTranslateRegion (dpy, parts,
- w->a.x + w->a.border_width,
- w->a.y + w->a.border_width);
- 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 unsigned int
+get_opacity_prop (Display *dpy, win *w, unsigned int def);
static void
map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
{
win *w = find_win (dpy, id);
- Drawable back;
if (!w)
return;
/* This needs to be here or else we lose transparency messages */
XSelectInput (dpy, id, PropertyChangeMask);
+ /* This needs to be here since we don't get PropertyNotify when unmapped */
+ w->opacity = get_opacity_prop (dpy, w, OPAQUE);
+ determine_mode (dpy, w);
+
#if CAN_DO_USABLE
w->damage_bounds.x = w->damage_bounds.y = 0;
w->damage_bounds.width = w->damage_bounds.height = 0;
w->damaged = 0;
if (fade && fadeWindows)
- set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, 0, False, True, True);
+ set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, 0, True, True);
+
+#if HAS_NAME_WINDOW_PIXMAP
+ start_get_pixmap_thread (dpy, w, 0);
+#endif
}
static void
add_damage (dpy, w->extents); /* destroys region */
w->extents = None;
}
-
+
+ if (w->unmapped_configure) {
#if HAS_NAME_WINDOW_PIXMAP
- if (w->pixmap)
- {
- XFreePixmap (dpy, w->pixmap);
- w->pixmap = None;
- }
+ pthread_mutex_lock (&w->pixmap_lock);
+ if (w->pixmap)
+ {
+ XFreePixmap (dpy, w->pixmap);
+ w->pixmap = None;
+ if (w->picture)
+ {
+ XRenderFreePicture (dpy, w->picture);
+ w->picture = None;
+ }
+ }
+ pthread_mutex_unlock (&w->pixmap_lock);
#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, w->id, 0);
#if HAS_NAME_WINDOW_PIXMAP
static void
-unmap_callback (Display *dpy, win *w, Bool gone)
+unmap_callback (Display *dpy, win *w)
{
finish_unmap_win (dpy, w);
}
w->a.map_state = IsUnmapped;
#if HAS_NAME_WINDOW_PIXMAP
if (w->pixmap && fade && fadeWindows)
- set_fade (dpy, w, w->opacity*1.0/OPAQUE, 0.0, fade_out_step, unmap_callback, False, False, True);
+ set_fade (dpy, w, w->opacity*1.0/OPAQUE, 0.0, fade_out_step, unmap_callback, False, True);
else
#endif
finish_unmap_win (dpy, w);
int result = XGetWindowProperty(dpy, w->id, opacityAtom, 0L, 1L, False,
XA_CARDINAL, &actual, &format,
&n, &left, &data);
- if (result == Success && data != None)
+ if (result == Success && data != NULL)
{
unsigned int i;
memcpy (&i, data, sizeof (unsigned int));
{
int mode;
XRenderPictFormat *format;
- unsigned int default_opacity;
/* if trans prop == -1 fall back on previous tests*/
determine_wintype (Display *dpy, Window w)
{
Window root_return, parent_return;
- Window *children;
+ Window *children = NULL;
unsigned int nchildren, i;
Atom type;
&nchildren))
{
/* XQueryTree failed. */
+ if (children)
+ XFree ((void *)children);
return winNormalAtom;
}
return type;
}
+ if (children)
+ XFree ((void *)children);
+
return winNormalAtom;
}
#endif
#if HAS_NAME_WINDOW_PIXMAP
new->pixmap = None;
+ new->pixmap_thread = 0;
+ new->pixmap_nthreads = 0;
+ pthread_mutex_init(&new->pixmap_lock, NULL);
#endif
new->picture = None;
if (new->a.class == InputOnly)
new->shadow_width = 0;
new->shadow_height = 0;
new->opacity = OPAQUE;
+ new->unmapped_configure = False;
new->borderClip = None;
new->prev_trans = 0;
- /* moved mode setting to one place */
- new->opacity = get_opacity_prop (dpy, new, OPAQUE);
new->windowType = determine_wintype (dpy, new->id);
- determine_mode (dpy, new);
new->next = *p;
*p = new;
configure_win (Display *dpy, XConfigureEvent *ce)
{
win *w = find_win (dpy, ce->window);
- Window above;
XserverRegion damage = None;
if (!w)
}
w->a.x = ce->x;
w->a.y = ce->y;
+ /* Only destroy the pixmap if the window is mapped */
if (w->a.width != ce->width || w->a.height != ce->height)
{
+ if (w->a.map_state == IsUnmapped)
+ w->unmapped_configure = True;
+ else {
#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;
- }
- }
+ start_get_pixmap_thread (dpy, w, 0);
#endif
- if (w->shadow)
- {
- XRenderFreePicture (dpy, w->shadow);
- w->shadow = None;
- }
+ 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;
w->a.override_redirect = ce->override_redirect;
restack_win (dpy, w, ce->above);
- if (damage)
+ if (w->a.map_state != IsUnmapped && damage)
{
XserverRegion extents = win_extents (dpy, w);
XFixesUnionRegion (dpy, damage, damage, extents);
win *w = find_win (dpy, ce->window);
Window new_above;
+ if (!w)
+ return;
+
if (ce->place == PlaceOnTop)
new_above = list->id;
else
}
static void
-finish_destroy_win (Display *dpy, Window id, Bool gone)
+finish_destroy_win (Display *dpy, Window id)
{
win **prev, *w;
+ void *ret;
for (prev = &list; (w = *prev); prev = &w->next)
if (w->id == id)
{
- if (!gone)
- finish_unmap_win (dpy, w);
+ /* join before freeing stuff so nothing leaks */
+ if (w->pixmap_nthreads > 0)
+ pthread_join (w->pixmap_thread, &ret);
+
+ finish_unmap_win (dpy, w);
*prev = w->next;
- if (w->picture)
- {
- set_ignore (dpy, NextRequest (dpy));
- XRenderFreePicture (dpy, w->picture);
- w->picture = None;
- }
+#if HAS_NAME_WINDOW_PIXMAP
+ if (w->pixmap)
+ {
+ XFreePixmap (dpy, w->pixmap);
+ w->pixmap = None;
+ }
+#endif
+ if (w->picture)
+ {
+ set_ignore (dpy, NextRequest (dpy));
+ XRenderFreePicture (dpy, w->picture);
+ w->picture = None;
+ }
if (w->alphaPict)
{
XRenderFreePicture (dpy, w->alphaPict);
w->damage = None;
}
cleanup_fade (dpy, w);
+ pthread_mutex_destroy(&w->pixmap_lock);
free (w);
break;
}
#if HAS_NAME_WINDOW_PIXMAP
static void
-destroy_callback (Display *dpy, win *w, Bool gone)
+destroy_callback (Display *dpy, win *w)
{
- finish_destroy_win (dpy, w->id, gone);
+ finish_destroy_win (dpy, w->id);
}
#endif
static void
-destroy_win (Display *dpy, Window id, Bool gone, Bool fade)
+destroy_win (Display *dpy, Window id, Bool fade)
{
win *w = find_win (dpy, id);
#if HAS_NAME_WINDOW_PIXMAP
if (w && w->pixmap && fade && fadeWindows)
- set_fade (dpy, w, w->opacity*1.0/OPAQUE, 0.0, fade_out_step, destroy_callback, gone, False, True);
+ set_fade (dpy, w, w->opacity*1.0/OPAQUE, 0.0, fade_out_step,
+ destroy_callback, False, (w->a.map_state != IsUnmapped));
else
#endif
{
- finish_destroy_win (dpy, id, gone);
+ finish_destroy_win (dpy, id);
}
}
{
clipChanged = True;
if (fadeWindows)
- set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, 0, False, True, True);
+ set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, 0, True, True);
w->usable = True;
}
}
error (Display *dpy, XErrorEvent *ev)
{
int o;
- char *name = 0;
+ const char *name = 0;
if (should_ignore (dpy, ev->serial))
return 0;
default: break;
}
- printf ("error %d request %d minor %d serial %d\n",
+ printf ("error %d request %d minor %d serial %lu\n",
ev->error_code, ev->request_code, ev->minor_code, ev->serial);
/* abort (); this is just annoying to most people */
add_damage (dpy, region);
}
-
+#if DEBUG_EVENTS
static int
ev_serial (XEvent *ev)
{
return NextRequest (ev->xany.display);
}
-
static char *
ev_name (XEvent *ev)
{
return 0;
}
}
+#endif
void
usage (char *program)
{
- fprintf (stderr, "usage: %s [-d display] [-acCfFnsS]\n", program);
+ fprintf (stderr, "%s v1.1.3\n", program);
+ fprintf (stderr, "usage: %s [options]\n", program);
fprintf (stderr, "Options\n");
fprintf (stderr, " -d display\n Specifies which display should be managed.\n");
+ fprintf (stderr, " -r radius\n Specifies the blur radius for client-side shadows. (default 12)\n");
+ fprintf (stderr, " -o opacity\n Specifies the translucency for client-side shadows. (default .75)\n");
+ fprintf (stderr, " -l left-offset\n Specifies the left offset for client-side shadows. (default -15)\n");
+ fprintf (stderr, " -t top-offset\n Specifies the top offset for clinet-side shadows. (default -15)\n");
+ fprintf (stderr, " -I fade-in-step\n Specifies the opacity change between steps while fading in. (default 0.028)\n");
+ fprintf (stderr, " -O fade-out-step\n Specifies the opacity change between steps while fading out. (default 0.03)\n");
+ fprintf (stderr, " -D fade-delta-time\n Specifies the time between steps in a fade in milliseconds. (default 10)\n");
fprintf (stderr, " -a\n Use automatic server-side compositing. Faster, but no special effects.\n");
fprintf (stderr, " -c\n Draw client-side shadows with fuzzy edges.\n");
fprintf (stderr, " -C\n Avoid drawing shadows on dock/panel windows.\n");
exit (1);
}
+static void
+register_cm (void)
+{
+ Window w;
+ Atom a;
+
+ w = XCreateSimpleWindow (dpy, RootWindow (dpy, 0), 0, 0, 1, 1, 0, None,
+ None);
+
+ Xutf8SetWMProperties (dpy, w, "xcompmgr", "xcompmgr", NULL, 0, NULL, NULL,
+ NULL);
+
+ /* FIXME: Don't hard code the screen number */
+ a = XInternAtom (dpy, "_NET_WM_CM_S0", False);
+
+ XSetSelectionOwner (dpy, a, w, 0);
+}
+
int
main (int argc, char **argv)
{
XEvent ev;
Window root_return, parent_return;
Window *children;
- Pixmap transPixmap;
- Pixmap blackPixmap;
unsigned int nchildren;
int i;
XRenderPictureAttributes pa;
- XRenderColor c;
XRectangle *expose_rects = 0;
int size_expose = 0;
int n_expose = 0;
struct pollfd ufd;
- int n;
- int last_update;
- int now;
int p;
int composite_major, composite_minor;
char *display = 0;
int o;
- while ((o = getopt (argc, argv, "d:scnfFCaS")) != -1)
+ while ((o = getopt (argc, argv, "D:I:O:d:r:o:l:t:scnfFCaS")) != -1)
{
switch (o) {
case 'd':
display = optarg;
break;
+ case 'D':
+ fade_delta = atoi (optarg);
+ if (fade_delta < 1)
+ fade_delta = 10;
+ break;
+ case 'I':
+ fade_in_step = atof (optarg);
+ if (fade_in_step <= 0)
+ fade_in_step = 0.01;
+ break;
+ case 'O':
+ fade_out_step = atof (optarg);
+ if (fade_out_step <= 0)
+ fade_out_step = 0.01;
+ break;
case 's':
compMode = CompServerShadows;
break;
case 'S':
synchronize = True;
break;
+ case 'r':
+ shadowRadius = atoi (optarg);
+ break;
+ case 'o':
+ shadowOpacity = atof (optarg);
+ break;
+ case 'l':
+ shadowOffsetX = atoi (optarg);
+ break;
+ case 't':
+ shadowOffsetY = atoi (optarg);
+ break;
default:
usage (argv[0]);
break;
}
}
-
+
+ XInitThreads();
dpy = XOpenDisplay (display);
if (!dpy)
{
fprintf (stderr, "No XFixes extension\n");
exit (1);
}
+
+ register_cm();
+
/* get atoms */
opacityAtom = XInternAtom (dpy, OPACITY_PROP, False);
winTypeAtom = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE", False);
pa.subwindow_mode = IncludeInferiors;
if (compMode == CompClientShadows)
+ {
gaussianMap = make_gaussian_map(dpy, shadowRadius);
+ presum_gaussian (gaussianMap);
+ }
root_width = DisplayWidth (dpy, scr);
root_height = DisplayHeight (dpy, scr);
}
XNextEvent (dpy, &ev);
- if (ev.type & 0x7f != KeymapNotify)
+ if ((ev.type & 0x7f) != KeymapNotify)
discard_ignore (dpy, ev.xany.serial);
#if DEBUG_EVENTS
printf ("event %10.10s serial 0x%08x window 0x%08x\n",
configure_win (dpy, &ev.xconfigure);
break;
case DestroyNotify:
- destroy_win (dpy, ev.xdestroywindow.window, True, True);
+ destroy_win (dpy, ev.xdestroywindow.window, True);
break;
case MapNotify:
map_win (dpy, ev.xmap.window, ev.xmap.serial, True);
if (ev.xreparent.parent == root)
add_win (dpy, ev.xreparent.window, 0);
else
- destroy_win (dpy, ev.xreparent.window, False, True);
+ destroy_win (dpy, ev.xreparent.window, True);
break;
case CirculateNotify:
circulate_win (dpy, &ev.xcirculate);
{
if (fadeTrans)
set_fade (dpy, w, w->opacity*1.0/OPAQUE, get_opacity_percent (dpy, w, 1.0),
- fade_out_step, 0, False, True, False);
+ fade_out_step, 0, True, False);
else
{
w->opacity = get_opacity_prop(dpy, w, OPAQUE);
break;
}
} while (QLength (dpy));
+ pthread_mutex_lock (&damage_lock);
if (allDamage && !autoRedirect)
{
static int paint;
- paint_all (dpy, allDamage);
+ if (!paint_all (dpy, allDamage))
+ allDamage = None;
paint++;
XSync (dpy, False);
- allDamage = None;
clipChanged = False;
}
+ pthread_mutex_unlock (&damage_lock);
}
}
projects / dana / xcompmgr.git / blobdiff