#include <sys/time.h>
#include <time.h>
#include <unistd.h>
+#include <getopt.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
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;
win *list;
{
*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);
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;
}
{
XImage *shadowImage;
Pixmap shadowPixmap;
- Pixmap finalPixmap;
Picture shadowPicture;
- Picture finalPicture;
GC gc;
shadowImage = make_shadow (dpy, opacity, width, height);
return 0;
}
-static char *backgroundProps[] = {
+static const char *backgroundProps[] = {
"_XROOTPMAP_ID",
"_XSETROOT_ID",
0,
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;
#endif
w->damaged = 0;
+#if HAS_NAME_WINDOW_PIXMAP
+ /* If the window was previously mapped and its pixmap still exists, it
+ is out of date now, so force us to reacquire it. (If the window
+ re-maps before the unmap fade-out finished) */
+ if (w->pixmap)
+ {
+ XFreePixmap (dpy, w->pixmap);
+ w->pixmap = None;
+ }
+#endif
+
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);
}
static void
#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 mode;
XRenderPictFormat *format;
- unsigned int default_opacity;
/* if trans prop == -1 fall back on previous tests*/
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;
- if (w->a.width != ce->width || w->a.height != ce->height)
+ /* Only destroy the pixmap if the window is mapped */
+ if (w->a.map_state != IsUnmapped &&
+ (w->a.width != ce->width || w->a.height != ce->height))
{
#if HAS_NAME_WINDOW_PIXMAP
if (w->pixmap)
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);
}
static void
-finish_destroy_win (Display *dpy, Window id, Bool gone)
+finish_destroy_win (Display *dpy, Window id)
{
win **prev, *w;
for (prev = &list; (w = *prev); prev = &w->next)
if (w->id == id)
{
- if (!gone)
- finish_unmap_win (dpy, w);
+ finish_unmap_win (dpy, w);
*prev = w->next;
- if (w->picture)
- {
- set_ignore (dpy, NextRequest (dpy));
- XRenderFreePicture (dpy, w->picture);
- w->picture = None;
- }
if (w->alphaPict)
{
XRenderFreePicture (dpy, w->alphaPict);
#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, "%s v1.1.1\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");
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;
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);
}
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);
projects / dana / xcompmgr.git / blobdiff